Multiple dropdowns yay

Author: Nick Litwin

app/services/submissions.service.js

@@ -47,9 +47,10 @@
           var status = xhr.status;
           if (((status >= 200 && status < 300) || status === 304) && xhr.readyState === 4) {
             $log.info('Successfully uploaded file');
-            console.log('xhr response: ', xhr.responseXML);
-            var xhrResponse = xhr.responseXML;
-            deferred.resolve(xhrResponse);
+            console.log('xhr response: ', xhr.responseText);
+
+            // updateSubmissionStatus and then resolve?
+            deferred.resolve();
 
           } else if (status >= 400) {
             $log.error('Error uploading to S3 with status: ' + status);
@@ -72,6 +73,7 @@
       return $q.all(promises)
         .then(function(response) {
           console.log('response from S3: ', response);
+
         })
         .catch(function(err) {
           console.log('error uploading to S3: ', err);

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

@@ -7,6 +7,18 @@
 
   function SubmitFileController($stateParams, UserService, SubmissionsService) {
     var vm = this;
+
+    vm.fontList1 = [
+      { label: 'Studio Standard Fonts List', value: 'STUDIO_STANDARDS_FONTS_LIST', id: 1 },
+      { label: 'Fonts.com', value: 'FONTS_DOT_COM', id: 1  },
+      { label: 'MyFonts', value: 'MYFONTS', id: 1  },
+      { label: 'Adobe Fonts', value: 'ADOBE_FONTS', id: 1  },
+      { label: 'Font Shop', value: 'FONT_SHOP', id: 1  },
+      { label: 'T.26 Digital Type Foundry', value: 'T26_DIGITAL_TYPE_FOUNDRY', id: 1  },
+      { label: 'Font Squirrel', value: 'FONT_SQUIRREL', id: 1  },
+      { label: 'Typography.com', value: 'TYPOGRAPHY_DOT_COM', id: 1 }
+    ];
+
     var files = {};
     vm.comments = '';
     vm.submissionForm = {
@@ -17,9 +29,9 @@
       submitterComments: '',
       fonts: [{
         id: 1,
+        source: '',
         name: '',
-        sourceUrl: '',
-        source: ''
+        sourceUrl: ''
       }],
       stockArts: [{
         id: 1,
@@ -58,6 +70,8 @@
 
     vm.setFileReference = setFileReference;
     vm.uploadSubmission = uploadSubmission;
+    vm.selectFont = selectFont;
+    vm.createAnotherFontFieldset = createAnotherFontFieldset;
     vm.createAnotherStockArtFieldset = createAnotherStockArtFieldset;
 
     activate();
@@ -101,6 +115,28 @@
       }
     }
 
+    function selectFont(newFont) {
+      console.log('new value: ', newFont);
+      var id = newFont.id - 1;
+      vm.submissionForm.fonts[id].source = newFont.value;
+    }
+
+    function createAnotherFontFieldset() {
+      var id = vm.submissionForm.fonts.length;
+      var newFontList = vm['fontList' + (id + 1)] = angular.copy(vm['fontList' + id]);
+
+      newFontList.forEach(function(font) {
+        font.id++;
+      });
+
+      vm.submissionForm.fonts.push({
+        id: vm.submissionForm.fonts.length + 1,
+        source: '',
+        name: '',
+        sourceUrl: ''
+      });
+    }
+
     function createAnotherStockArtFieldset() {
       vm.submissionForm.stockArts.push({
         id: vm.submissionForm.stockArts.length + 1,
@@ -115,8 +151,17 @@
       vm.submissionsBody.data.submitterRank = vm.submissionForm.submitterRank;
 
       var stockArts = angular.copy(vm.submissionForm.stockArts);
-      vm.submissionsBody.data.stockArts = stockArts.forEach(function(stockArt) {
+      vm.submissionsBody.data.stockArts = stockArts.map(function(stockArt) {
         delete stockArt.id;
+        return stockArt;
+      });
+
+      var fonts = angular.copy(vm.submissionForm.fonts);
+      vm.submissionsBody.data.fonts = fonts.map(function(font) {
+        if (font.source) {
+          delete font.id;
+          return font;
+        }
       });
 
       SubmissionsService.getPresignedURL(vm.submissionsBody, files);

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

@@ -87,12 +87,30 @@
 
       .form-block__fields
         .fieldsets
-          .fieldset
-            tc-input.fieldset__input(label-text="Font Name", placeholder="Select font source to edit field")
+          ng-form.fieldset(name="font_{{$index + 1}}", ng-repeat="font in vm.submissionForm.fonts track by font.id")
+            dropdown(
+              name="'font-source{{$index + 1}}'",
+              options="vm.fontList{{$index + 1}}",
+              placeholder="'Select from the list'",
+              searchable="false",
+              clearable="false",
+              on-change="vm.selectFont",
+              value="vm.submissionForm.fonts[{{$index}}].source"
+            )
+
+            tc-input.fieldset__input(
+              label-text="Font Name",
+              placeholder="Select font source to edit field"
+              input-value="font.name"
+            )
 
-            tc-input.fieldset__input(label-text="Font URL", placeholder="Select font source to edit field")
+            tc-input.fieldset__input(
+              label-text="Font URL",
+              placeholder="Select font source to edit field",
+              input-value="font.sourceUrl"
+            )
 
-          button.fieldset__button.tc-btn.tc-btn-s(type="button", ng-click="") + Add Font
+          button.fieldset__button.tc-btn.tc-btn-s(type="button", ng-click="vm.createAnotherFontFieldset()") + Add Font
 
     .form-block.flex.wrap
       .form-block__instructions
@@ -103,7 +121,7 @@
 
       .form-block__fields
         .fieldsets
-          ng-form.fieldset(name="stockArt_{{$index}}", ng-repeat="stockArt in vm.submissionForm.stockArts track by stockArt.id")
+          ng-form.fieldset(name="stockArt_{{$index + 1}}", ng-repeat="stockArt in vm.submissionForm.stockArts track by stockArt.id")
             tc-input.fieldset__input(
               label-text="Photo Description",
               placeholder="A picture of a girl",