Merge pull request #39 from appirio-tech/DEM-1283

DEM-1283 Modify Features Modal Behavior & Add Save Notes Button

Author: samsep

dist/main.js

@@ -501,7 +501,6 @@ $templateCache.put("views/submit-work-complete.directive.html","<modal show=\"vm
           return vm.updatedFeatures.push(feature);
         }
       });
-      vm.activeFeature = null;
       return onChange();
     };
     vm.removeFeature = function() {

src/scripts/controllers/features.controller.coffee

@@ -26,6 +26,15 @@ SubmitWorkFeaturesController = ($scope, $rootScope, SubmitWorkService, SubmitWor
       custom: true
       fileIds: []
 
+  vm.activeFeatureChangedNotes = (activeFeature) ->
+    changedNotes = false
+
+    vm.updatedFeatures?.forEach (feature) ->
+      if feature.id == activeFeature?.id && feature.notes != activeFeature?.notes
+        changedNotes = true
+
+    changedNotes
+
   vm.showFeatures = ->
     vm.showFeaturesModal = true
 
@@ -41,12 +50,16 @@ SubmitWorkFeaturesController = ($scope, $rootScope, SubmitWorkService, SubmitWor
   vm.activateFeature = (feature) ->
     vm.activeFeature = feature
 
+  vm.saveNotes = ->
+    vm.updatedFeatures.forEach (updatedFeature) ->
+      if updatedFeature.id == vm.activeFeature.id
+        updatedFeature.notes = vm.activeFeature.notes
+
   vm.applyFeature = ->
     vm.features.forEach (feature) ->
       if feature.id == vm.activeFeature.id
         vm.updatedFeatures.push feature
 
-    vm.activeFeature = null
     onChange()
 
   vm.removeFeature = ->
@@ -121,6 +134,7 @@ SubmitWorkFeaturesController = ($scope, $rootScope, SubmitWorkService, SubmitWor
         vm.features.forEach (vmFeature) ->
           if feature.id == vmFeature.id
             vmFeature.selected = true
+            vmFeature.notes = feature.notes
             vm.selectedFeaturesCount++
 
     vm.projectType = work.projectType

src/views/submit-work-features.directive.jade

@@ -71,6 +71,8 @@ modal.full.define-features(show="vm.showFeaturesModal" background-click-close=tr
 
           button.wider.action(ng-if="vm.activeFeature.selected" ng-click="vm.removeFeature()") remove feature
 
+          button.wider.action(ng-if="vm.activeFeatureChangedNotes(vm.activeFeature)" ng-click="vm.saveNotes()") save notes
+
         form.new-feature(ng-submit="vm.addCustomFeature()" ng-class="{active: vm.showDefineFeaturesForm}")
           h4 Define a new feature