Fixes for the cases where default is 0

mchapman · mchapman · commit a4356208bad3 · 2019-09-23T15:29:04.000Z
diff --git a/src/client/js/services/form-generator.ts b/src/client/js/services/form-generator.ts
@@ -222,9 +222,9 @@ module fng.services {
       if (mongooseOptions.readonly) {
         formInstructions['readonly'] = true;
       }
-      if (mongooseType.defaultValue) {
+      if (mongooseType.defaultValue !== undefined) {
         formInstructions.defaultValue = mongooseType.defaultValue;
-      } else if (mongooseType.options && mongooseType.options.default) {
+      } else if (mongooseType.options && mongooseType.options.default !== undefined) {
         console.log('No support for default with no value, yet')
       }
       return formInstructions;
diff --git a/src/client/js/services/record-handler.ts b/src/client/js/services/record-handler.ts
@@ -862,29 +862,6 @@ module fng.services {
                 setData(anObject, fieldname, null, newVal);
               }
             }
-            // // Convert {lookup:'List description for 012abcde'} to {lookup:'012abcde'}
-            // const idList = $scope[suffixCleanId(schemaI, '_ids')];
-            // let thisConversion: any;
-            // if (idList && idList.length > 0) {
-            //   updateObject(fieldname, anObject, function (value) {
-            //     return convertToForeignKeys(schemaI, value, $scope[suffixCleanId(schemaI, 'Options')], idList);
-            //   });
-            // } else if (thisConversion = getConversionObject($scope, fieldname, schemaName)) {
-            //   const lookup = getData(anObject, fieldname, null);
-            //   let newVal;
-            //   if (schemaI.array) {
-            //     newVal = [];
-            //     if (lookup) {
-            //       for (let n = 0; n < lookup.length; n++) {
-            //         newVal[n] = convertLookup(lookup[n], thisConversion);
-            //       }
-            //     }
-            //   } else {
-            //     newVal = convertLookup(lookup, thisConversion);
-            //   }
-            //   setData(anObject, fieldname, null, newVal);
-            // }
-
           }
         }
         return anObject;
@@ -1220,7 +1197,7 @@ module fng.services {
         $scope.setDefaults = function(formSchema: IFormInstruction[], base = ''): any {
           const retVal = {};
           formSchema.forEach(s => {
-            if (s.defaultValue) {
+            if (s.defaultValue !== undefined) {
               retVal[s.name.replace(base, '')] = s.defaultValue;
             }
           });
diff --git a/src/client/template/base-edit.html b/src/client/template/base-edit.html
@@ -13,5 +13,8 @@ <h4>{{modelNameDisplay}} :
     <div class="container-fluid page-body edit-body">
         <form-input name="baseForm" schema="baseSchema()" formstyle="compact"></form-input>
     </div>
-    <!--{{ formSchema | json }}-->
+<!--    <pre>-->
+<!--    {{ formSchema | json }}-->
+<!--    {{ record | json }}-->
+<!--    </pre>-->
 </div>
diff --git a/website/app/models/f_nested_schema.js b/website/app/models/f_nested_schema.js
diff --git a/website/app/models/f_nested_schema.ts b/website/app/models/f_nested_schema.ts
@@ -5,8 +5,8 @@ import { IFngSchemaDefinition } from "../../../src/fng-schema";
 const ExamsSchemaDef : IFngSchemaDefinition = {
   subject: {type: String, required: true},
   examDate: {type: Date, required: true, default: new Date(), form: {add: " ng-model-options=\"{timezone:'UTC'}\""}},
-  score: Number,
-  result: {type: String, enum: ['distinction', 'merit', 'pass', 'fail']},
+  score: {type: Number, default: 60},
+  result: {type: String, enum: ['distinction', 'merit', 'pass', 'fail'], default: 'pass'},
   scan: {type: [new Schema(jqUploads.FileSchema)], form: {hidden: true, help:'Attach a scan of the paper - maximum size 0.5MB', directive: 'fng-jq-upload-form', fngJqUploadForm:{single:true, autoUpload: true, sizeLimit:524288}}},
   grader: { type: Schema.Types.ObjectId, ref:'b_enhanced_schema', form: {directive: 'fng-ui-select', fngUiSelect: {fngAjax: true}, label: 'Marked By'}},
   retakeDate: {type: Date, form: {showWhen: {lhs: '$exams.result', comp: 'eq', rhs: 'fail'}}}

Original file line number	Diff line number	Diff line change
`@@ -222,9 +222,9 @@ module fng.services {`
`222`	`222`	`if (mongooseOptions.readonly) {`
`223`	`223`	`formInstructions['readonly'] = true;`
`224`	`224`	`}`
`225`		`- if (mongooseType.defaultValue) {`
	`225`	`+ if (mongooseType.defaultValue !== undefined) {`
`226`	`226`	`formInstructions.defaultValue = mongooseType.defaultValue;`
`227`		`- } else if (mongooseType.options && mongooseType.options.default) {`
	`227`	`+ } else if (mongooseType.options && mongooseType.options.default !== undefined) {`
`228`	`228`	`console.log('No support for default with no value, yet')`
`229`	`229`	`}`
`230`	`230`	`return formInstructions;`