Feature/unable to save notes(comments)

report/src/main/webapp/app/layout/main/url/navigation/navigation.comments.html

@@ -19,8 +19,8 @@
 -->
 <span class="comments-status pull-left"
       data-toggle="popover"
-      data-ng-class="case.comment ? 'present' : 'absent'"
-      data-content="{{case.comment && '<p>' + case.comment + '</p>' || !case.model.comment && '<span>Click to update this case note</span>'}}"
+      data-ng-class="case.comment ? 'present' : case.comparator.comment ? 'present' : 'absent'"
+      data-content="{{case.comment && '<p>' + case.comment + '</p>' || case.comparator.comment && '<p>' + case.comparator.comment + '</p>' || !case.model.comment && '<span>Click to update this case note</span>'}}"
       data-html="true" data-trigger="hover"
       data-aet-included-comment-popover
       data-ng-click="urlView.displayCommentModal(case)">

report/src/main/webapp/app/layout/modal/note/noteModal.controller.js

@@ -19,8 +19,9 @@ define(['angularAMD'], function (angularAMD) {
   'use strict';
   angularAMD.controller('noteModalController', NoteModalController);
 
-  function NoteModalController($scope, $uibModalInstance, model, viewMode,
-      notesService) {
+  function NoteModalController($scope, $uibModalInstance, model, viewMode, viewModeService,
+      notesService, $stateParams) {
+
     var vm = this;
     init();
 
@@ -33,12 +34,21 @@ define(['angularAMD'], function (angularAMD) {
       vm.cancelNote = cancelNote;
       vm.deleteNote = deleteNote;
       vm.viewMode = viewMode;
-      vm.noteText = model.comment ? model.comment : '';
+      vm.noteText = getComment(viewMode);
       vm.model = model;
     }
 
+    function getComment(viewMode) {
+      if (viewMode === viewModeService.COMPARATOR) {
+        return model.comparator.comment ? model.comparator.comment : '';
+      }
+      else {
+        return model.comment ? model.comment : '';
+      }
+    }
+
     function updateNote() {
-      notesService.updateNote(vm.model, vm.noteText);
+      notesService.updateNote(vm, $stateParams);
       $uibModalInstance.close();
     }
 

report/src/main/webapp/app/services/metadata.service.js

@@ -31,7 +31,9 @@ define(['angularAMD', 'metadataCacheService', 'metadataEndpointService'],
               getTest: getTest,
               getUrl: getUrl,
               getStep: getStep,
+              getStepComparator: getStepComparator,
               notifyMetadataChanged: notifyMetadataChanged,
+              updateComment: updateComment,
               saveChangesLocally: saveChangesLocally,
               discardLocalChanges: discardLocalChanges,
               commitLocalChanges: commitLocalChanges
@@ -89,10 +91,38 @@ define(['angularAMD', 'metadataCacheService', 'metadataEndpointService'],
           return step;
         }
 
+        function getStepByStepName(testName, urlName, stepName) {
+          var step = null;
+          var url = getUrl(testName, urlName);
+          for (var stepNr = 0; stepNr < url.steps.length; stepNr++) {
+            if (url.steps[stepNr].name === stepName) {
+              step = url.steps[stepNr];
+            }
+          }
+          return step;
+        }
+
+        function getStepComparator(testName, urlName, stepName, comparatorIndex) {
+          var step = getStepByStepName(testName, urlName, stepName);
+          var comparator = null;
+          if (step !== null && step.comparators[comparatorIndex] !== null ) {
+            comparator = step.comparators[comparatorIndex];
+          }
+          return comparator
+        }
+
         function notifyMetadataChanged() {
           $rootScope.$emit('metadata:changed');
         }
 
+        function updateComment(vm, param) {
+          var caseName = vm.model.displayName.split(" ")[0];
+          var testName = param.test;
+          var comparatorIndex = vm.model.index;
+          var comparator = getStepComparator(testName, param.url, caseName, comparatorIndex);
+          comparator.comment = vm.noteText;
+        }
+
         function saveChangesLocally() {
           metadataCacheService.put(suite);
         }
@@ -251,7 +281,7 @@ define(['angularAMD', 'metadataCacheService', 'metadataEndpointService'],
 
         function hasStepComparatorAcceptedChanges(comparator) {
           return comparator && comparator.stepResult &&
-              comparator.stepResult.rebaseable  &&
+              comparator.stepResult.rebaseable &&
               comparator.stepResult.status === 'REBASED';
         }
 
@@ -354,4 +384,5 @@ define(['angularAMD', 'metadataCacheService', 'metadataEndpointService'],
           }
         }
       }
-    });
+    }
+);

report/src/main/webapp/app/services/metadataAccess.service.js

@@ -30,6 +30,7 @@ define(['angularAMD', 'metadataService'], function (angularAMD) {
       getUrl: getUrl,
       getTestUrls: getTestUrls,
       getStep: getStep,
+      getStepComparator:getStepComparator,
       getUrlSteps: getUrlSteps
     };
 
@@ -64,5 +65,8 @@ define(['angularAMD', 'metadataService'], function (angularAMD) {
     function getStep(testName, urlName, stepIndex) {
       return metadataService.getStep(testName, urlName, stepIndex);
     }
+    function getStepComparator(testName, urlName, stepIndex) {
+      return metadataService.getStepComparator(testName, urlName, stepIndex);
+    }
   }
 });

report/src/main/webapp/app/services/notes.service.js

@@ -22,7 +22,7 @@ define(['angularAMD', 'metadataService'], function (angularAMD) {
   /**
    * Service responsible adding and removing notes from metadata.
    */
-  function NotesService(metadataService) {
+  function NotesService(metadataService, viewModeService) {
     var service = {
       updateNote: updateNote,
       deleteNote: deleteNote,
@@ -31,16 +31,34 @@ define(['angularAMD', 'metadataService'], function (angularAMD) {
 
     return service;
 
-    function updateNote(object, text) {
-      object.comment = text;
+    function updateNote(vm, param) {
+      if (vm.viewMode === viewModeService.COMPARATOR) {
+        updateComparatorComment(vm, param);
+      } else {
+        updateUrlComment(vm);
+      }
       updateUnsavedNotesFlag();
       metadataService.saveChangesLocally();
       metadataService.notifyMetadataChanged();
     }
 
+    function updateUrlComment(vm) {
+      vm.model.comment = vm.noteText;
+    }
+
+    function updateComparatorComment(vm, param) {
+      metadataService.updateComment(vm, param);
+    }
+
     function deleteNote(object) {
       var text = object.comment;
-      delete object.comment;
+      if (object.comment) {
+        text = object.comment;
+        delete object.comment;
+      } else {
+        text = object.comparator.comment;
+        delete object.comparator.comment;
+      }
       updateUnsavedNotesFlag();
       metadataService.saveChangesLocally();
       metadataService.notifyMetadataChanged();