Merge pull request #634 from appirio-tech/SUP-2920-required-form-inputs

Require files to be set in order for form to be submitted

Author: nlitwin

app/directives/tc-file-input/tc-file-input.directive.js

@@ -6,6 +6,7 @@
   function tcFileInput() {
     return {
       restrict: 'E',
+      require: '^form',
       templateUrl: 'directives/tc-file-input/tc-file-input.html',
       scope: {
         labelText: '@',
@@ -14,9 +15,10 @@
         fileType: '@',
         mandatory: '=',
         buttonText: '@',
-        setFileReference: '&'
+        setFileReference: '&',
+        fileValue: '=ngModel'
       },
-      link: function(scope, element, attrs) {
+      link: function(scope, element, attrs, formController) {
         scope.selectFile = selectFile;
 
         // fieldId is not set on element at this point, so grabbing with class .none
@@ -32,6 +34,7 @@
 
           // Set the file name as the value of the disabled input
           fileNameInput[0].value = file.name;
+          formController[attrs.fieldId].$setValidity('required', true);
         });
 
         function selectFile() {

app/directives/tc-file-input/tc-file-input.jade

@@ -5,8 +5,8 @@
     span.tc-label__mandatory.lowercase(ng-if="mandatory") #[span *]mandatory
 
 .tc-file-field__inputs
-  input.tc-file-field__input(type="text", placeholder="{{placeholder}}", required)
+  input.tc-file-field__input(type="text", placeholder="{{placeholder}}")
 
   button.tc-btn(ng-click="selectFile()") {{buttonText}}
 
-  input.none(type="file", id="{{fieldId}}")
+  input.none(name="{{fieldId}}", type="file", id="{{fieldId}}", required, ng-model="fileValue")

app/submissions/submit-file/submit-file.controller.js

@@ -26,6 +26,10 @@
     vm.comments = '';
     vm.submissionForm = {
       files: [],
+      submissionZip: null,
+      sourceZip: null,
+      designCover: null,
+
 
       // Should the rank input field be set to 1 automatically?
       submitterRank: 1,
@@ -80,6 +84,7 @@
     function activate() {}
 
     function setFileReference(file, fieldId) {
+      // Can clean up since fileValue on tcFileInput has file reference?
       files[fieldId] = file;
 
       var fileObject = {

app/submissions/submit-file/submit-file.jade

@@ -32,7 +32,8 @@
             file-type="(*.zip)",
             placeholder="Attach all visible files as a single .zip file",
             mandatory="true",
-            set-file-reference="vm.setFileReference(file, fieldId)"
+            set-file-reference="vm.setFileReference(file, fieldId)",
+            file-value="vm.submissionForm.submissionZip"
           )
 
           tc-file-input.tc-file-field(
@@ -42,7 +43,8 @@
             file-type="(*.zip)",
             placeholder="Attach all source files as a single .zip file",
             mandatory="true",
-            set-file-reference="vm.setFileReference(file, fieldId)"
+            set-file-reference="vm.setFileReference(file, fieldId)",
+            file-value="vm.submissionForm.sourceZip"
           )
 
           tc-file-input.tc-file-field(
@@ -51,7 +53,8 @@
             button-text="Add File",
             placeholder="Image file as .jpg or .png",
             mandatory="true",
-            set-file-reference="vm.setFileReference(file, fieldId)"
+            set-file-reference="vm.setFileReference(file, fieldId)",
+            file-value="vm.submissionForm.designCover"
           )
 
           tc-input.fieldset__input.submitterRank(label-text="Rank #", input-value="vm.submissionForm.submitterRank")