fixed css bugs
This commit is contained in:
parent
b038e53ee1
commit
943c0c8188
|
@ -17,7 +17,7 @@ var mongoose = require('mongoose'),
|
||||||
var FieldSchema = require('./form_field.server.model.js'),
|
var FieldSchema = require('./form_field.server.model.js'),
|
||||||
FormSubmissionSchema = require('./form_submission.server.model.js'),
|
FormSubmissionSchema = require('./form_submission.server.model.js'),
|
||||||
Field = mongoose.model('Field', FieldSchema),
|
Field = mongoose.model('Field', FieldSchema),
|
||||||
FormSubmission = mongoose.model('FormSubmission', FormSubmissionSchema)
|
FormSubmission = mongoose.model('FormSubmission', FormSubmissionSchema);
|
||||||
|
|
||||||
var ButtonSchema = new Schema({
|
var ButtonSchema = new Schema({
|
||||||
url: {
|
url: {
|
||||||
|
@ -41,7 +41,7 @@ var ButtonSchema = new Schema({
|
||||||
/**
|
/**
|
||||||
* Form Schema
|
* Form Schema
|
||||||
*/
|
*/
|
||||||
var LogicJumpSchema = new Schema({
|
var FormSchema = new Schema({
|
||||||
created: {
|
created: {
|
||||||
type: Date,
|
type: Date,
|
||||||
default: Date.now
|
default: Date.now
|
||||||
|
@ -144,7 +144,7 @@ var LogicJumpSchema = new Schema({
|
||||||
|
|
||||||
|
|
||||||
//Delete template PDF of current Form
|
//Delete template PDF of current Form
|
||||||
LogicJumpSchema.pre('remove', function (next) {
|
FormSchema.pre('remove', function (next) {
|
||||||
if(this.pdf && process.env.NODE_ENV === 'development'){
|
if(this.pdf && process.env.NODE_ENV === 'development'){
|
||||||
//Delete template form
|
//Delete template form
|
||||||
fs.unlink(this.pdf.path, function(err){
|
fs.unlink(this.pdf.path, function(err){
|
||||||
|
@ -157,7 +157,7 @@ LogicJumpSchema.pre('remove', function (next) {
|
||||||
var _original;
|
var _original;
|
||||||
|
|
||||||
//Set _original
|
//Set _original
|
||||||
LogicJumpSchema.pre('save', function (next) {
|
FormSchema.pre('save', function (next) {
|
||||||
// console.log(this.constructor.model);
|
// console.log(this.constructor.model);
|
||||||
// console.log(FormModel);
|
// console.log(FormModel);
|
||||||
this.constructor // ≈ mongoose.model('…', FieldSchema).findById
|
this.constructor // ≈ mongoose.model('…', FieldSchema).findById
|
||||||
|
@ -175,7 +175,7 @@ LogicJumpSchema.pre('save', function (next) {
|
||||||
});
|
});
|
||||||
|
|
||||||
//Update lastModified and created everytime we save
|
//Update lastModified and created everytime we save
|
||||||
LogicJumpSchema.pre('save', function (next) {
|
FormSchema.pre('save', function (next) {
|
||||||
var now = new Date();
|
var now = new Date();
|
||||||
this.lastModified = now;
|
this.lastModified = now;
|
||||||
if( !this.created ){
|
if( !this.created ){
|
||||||
|
@ -198,7 +198,7 @@ function getDeletedIndexes(needle, haystack){
|
||||||
}
|
}
|
||||||
|
|
||||||
//Move PDF to permanent location after new template is uploaded
|
//Move PDF to permanent location after new template is uploaded
|
||||||
LogicJumpSchema.pre('save', function (next) {
|
FormSchema.pre('save', function (next) {
|
||||||
if(this.pdf){
|
if(this.pdf){
|
||||||
var that = this;
|
var that = this;
|
||||||
async.series([
|
async.series([
|
||||||
|
@ -311,7 +311,7 @@ LogicJumpSchema.pre('save', function (next) {
|
||||||
next();
|
next();
|
||||||
});
|
});
|
||||||
|
|
||||||
LogicJumpSchema.pre('save', function (next) {
|
FormSchema.pre('save', function (next) {
|
||||||
// var _original = this._original;
|
// var _original = this._original;
|
||||||
// console.log('_original\n------------');
|
// console.log('_original\n------------');
|
||||||
// console.log(_original);
|
// console.log(_original);
|
||||||
|
@ -445,7 +445,7 @@ LogicJumpSchema.pre('save', function (next) {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// LogicJumpSchema.methods.generateFDFTemplate = function() {
|
// FormSchema.methods.generateFDFTemplate = function() {
|
||||||
// var _keys = _.pluck(this.form_fields, 'title'),
|
// var _keys = _.pluck(this.form_fields, 'title'),
|
||||||
// _values = _.pluck(this.form_fields, 'fieldValue');
|
// _values = _.pluck(this.form_fields, 'fieldValue');
|
||||||
|
|
||||||
|
@ -462,4 +462,4 @@ LogicJumpSchema.pre('save', function (next) {
|
||||||
// return jsonObj;
|
// return jsonObj;
|
||||||
// };
|
// };
|
||||||
|
|
||||||
mongoose.model('LogicJump', LogicJumpSchema);
|
mongoose.model('Form', FormSchema);
|
||||||
|
|
|
@ -6,9 +6,7 @@
|
||||||
var mongoose = require('mongoose'),
|
var mongoose = require('mongoose'),
|
||||||
Schema = mongoose.Schema,
|
Schema = mongoose.Schema,
|
||||||
_ = require('lodash'),
|
_ = require('lodash'),
|
||||||
tree = require('mongoose-tree'),
|
math = require('math');
|
||||||
math = require('math'),
|
|
||||||
deasync = require('fibers');
|
|
||||||
|
|
||||||
|
|
||||||
var BooleanExpresssionSchema = new Schema({
|
var BooleanExpresssionSchema = new Schema({
|
||||||
|
@ -40,7 +38,6 @@ BooleanExpresssionSchema.methods.evaluate = function(){
|
||||||
headNode.traverse(function (node, path, parent) {
|
headNode.traverse(function (node, path, parent) {
|
||||||
if(node.type === 'SymbolNode'){
|
if(node.type === 'SymbolNode'){
|
||||||
|
|
||||||
Fiber()
|
|
||||||
mongoose.model('Field')
|
mongoose.model('Field')
|
||||||
.findOne({_id: node.name}).exec(function(err, field){
|
.findOne({_id: node.name}).exec(function(err, field){
|
||||||
if(err) {
|
if(err) {
|
||||||
|
@ -59,14 +56,14 @@ BooleanExpresssionSchema.methods.evaluate = function(){
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
var code = node.compile();
|
var code = headNode.compile();
|
||||||
var result = code.eval(expressionScope);
|
var result = code.eval(expressionScope);
|
||||||
|
|
||||||
this.result = result;
|
this.result = result;
|
||||||
return result;
|
return result;
|
||||||
});
|
};
|
||||||
|
|
||||||
mongoose.model('BooleanStatement', BooleanStatementSchema);
|
mongoose.model('BooleanExpresssion', BooleanExpresssionSchema);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Form Schema
|
* Form Schema
|
||||||
|
|
31
docs/testing_feedback_Sep12.md
Normal file
31
docs/testing_feedback_Sep12.md
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
##Tester 1: Justin Crosby
|
||||||
|
Browser: Chrome
|
||||||
|
Resolution: 1920x1080
|
||||||
|
OS: Windows 10
|
||||||
|
|
||||||
|
|
||||||
|
Landing Page:
|
||||||
|
Horizontal Scroll Bar Bug
|
||||||
|
create new form view (in listForms):
|
||||||
|
name field input is outside the red box
|
||||||
|
languages aren't capitalized
|
||||||
|
name field should be right next to label to be consistent
|
||||||
|
|
||||||
|
Admin Form View
|
||||||
|
it says drag and drop fields but there's no drag and drop, have to click
|
||||||
|
DropdownList Rendering Problems (see justin_testing2.jpg)
|
||||||
|
|
||||||
|
|
||||||
|
##Tester2: Evan Moore
|
||||||
|
Browser: FB Messenger Browser (Webkit)
|
||||||
|
Phone: iPhone 5
|
||||||
|
|
||||||
|
Well first thing I see is that some of the fields are compressed kinda weird on my iPhone (see evan_testing1.jpg)
|
||||||
|
|
||||||
|
And the settings button at the top right is a little hard to make out any of the detail, but that's a pretty minor fix
|
||||||
|
|
||||||
|
When I try to change the title of one of the fields, it bugs out quite a bit too
|
||||||
|
|
||||||
|
Like it seems to be trying to update the info before I've finished typing
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,7 @@
|
||||||
|
body {
|
||||||
|
overflow-x: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
/*Navbar Custom CSS*/
|
/*Navbar Custom CSS*/
|
||||||
.navbar-inverse {
|
.navbar-inverse {
|
||||||
background-color:#fafafa;
|
background-color:#fafafa;
|
||||||
|
|
Loading…
Reference in a new issue