Improve messages explaining why Save button is disabled in sub forms

mchapman · mchapman · commit d20c0ef43a00 · 2019-09-20T15:33:32.000Z
diff --git a/src/client/js/services/record-handler.ts b/src/client/js/services/record-handler.ts
@@ -1092,47 +1092,63 @@ module fng.services {
           $scope.whyDisabled = undefined;
           let pristine = false;
 
-          if ($scope[$scope.topLevelFormName]) {
-            if ($scope[$scope.topLevelFormName].$invalid) {
-              $scope.whyDisabled = 'The form data is invalid:';
-              $scope[$scope.topLevelFormName].$$controls.forEach(c => {
-                if (c.$invalid) {
-                  $scope.whyDisabled += '<br /><strong>';
-
+          function generateWhyDisabledMessage(form, subFormName?: string) {
+            form.$$controls.forEach(c => {
+              if (c.$invalid) {
+                if (c.$$controls) {
+                  // nested form
+                  generateWhyDisabledMessage(c, c.$name)
+                } else {
+                  $scope.whyDisabled += "<br /><strong>";
+                  if (subFormName) {
+                    $scope.whyDisabled += subFormName + ' ';
+                  }
                   if (
-                    cssFrameworkService.framework() === 'bs2' &&
+                    cssFrameworkService.framework() === "bs2" &&
                     c.$$element &&
                     c.$$element.parent() &&
                     c.$$element.parent().parent() &&
-                    c.$$element.parent().parent().find('label') &&
-                    c.$$element.parent().parent().find('label').text()
+                    c.$$element.parent().parent().find("label") &&
+                    c.$$element.parent().parent().find("label").text()
                   ) {
-                    $scope.whyDisabled += c.$$element.parent().parent().find('label').text()
+                    $scope.whyDisabled += c.$$element.parent().parent().find("label").text();
                   } else if (
-                    cssFrameworkService.framework() === 'bs3' &&
+                    cssFrameworkService.framework() === "bs3" &&
                     c.$$element &&
                     c.$$element.parent() &&
                     c.$$element.parent().parent() &&
                     c.$$element.parent().parent().parent() &&
-                    c.$$element.parent().parent().parent().find('label') &&
-                    c.$$element.parent().parent().parent().find('label').text()
+                    c.$$element.parent().parent().parent().find("label") &&
+                    c.$$element.parent().parent().parent().find("label").text()
                   ) {
-                    $scope.whyDisabled += c.$$element.parent().parent().parent().find('label').text()
+                    $scope.whyDisabled += c.$$element.parent().parent().parent().find("label").text();
                   } else {
                     $scope.whyDisabled += c.$name;
                   }
-                  $scope.whyDisabled += '</strong>: ';
+                  $scope.whyDisabled += "</strong>: ";
                   if (c.$error) {
                     for (let type in c.$error) {
                       switch (type) {
-                        case 'required': $scope.whyDisabled += 'Field missing required value. '; break;
-                        case 'pattern': $scope.whyDisabled += 'Field does not match required pattern. '; break;
-                        default: $scope.whyDisabled += type + '. ';
+                        case "required":
+                          $scope.whyDisabled += "Field missing required value. ";
+                          break;
+                        case "pattern":
+                          $scope.whyDisabled += "Field does not match required pattern. ";
+                          break;
+                        default:
+                          $scope.whyDisabled += type + ". ";
                       }
                     }
                   }
                 }
-              })
+              }
+            });
+          }
+
+          if ($scope[$scope.topLevelFormName]) {
+            if ($scope[$scope.topLevelFormName].$invalid) {
+              $scope.whyDisabled = 'The form data is invalid:';
+              generateWhyDisabledMessage($scope[$scope.topLevelFormName]);
             } else if ($scope[$scope.topLevelFormName].$pristine) {
               // Don't have disabled message - should be obvious from Cancel being disabled,
               // and the message comes up when the Save button is clicked.
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
@@ -4,7 +4,7 @@ import { IFngSchemaDefinition } from "../../../src/fng-schema";
 
 const ExamsSchemaDef : IFngSchemaDefinition = {
   subject: {type: String, required: true},
-  examDate: {type: Date, 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']},
   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}}},
