fix(journal): comments can be removed

This commit allows the journal to remove comments. Additionally, the comment modal has been improved such that, if a unique value is used for a comment, it is displayed in the input. This makes the component feel more like it belongs on the page.
IMA-WorldHealth · Sep 25, 2017 · 9bd7a36 · 9bd7a36
1 parent 76825d2
commit 9bd7a36
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/client/src/modules/account_statement/modals/comment.modal.html b/client/src/modules/account_statement/modals/comment.modal.html
@@ -1,7 +1,4 @@
-<form name="ModalForm"
-  ng-submit="$ctrl.submit(ModalForm)"
-  novalidate>
-
+<form name="ModalForm" bh-submit="$ctrl.submit(ModalForm)" novalidate>
   <div class="modal-header" translate>
     ACCOUNT_STATEMENT.COMMENT
   </div>
@@ -12,9 +9,8 @@
       <label translate>ACCOUNT_STATEMENT.SELECTED_ROWS</label>
     </div>
 
-    <div class="form-group"
-      ng-class="{ 'has-error' : ModalForm.$submitted && ModalForm.comment.$invalid }">
-      <input type="text" class="form-control" name="comment" ng-model="$ctrl.comment" required>
+    <div class="form-group" ng-class="{ 'has-error' : ModalForm.$submitted && ModalForm.comment.$invalid }">
+      <input type="text" class="form-control" name="comment" ng-model="$ctrl.comment">
 
       <div class="help-block" ng-messages="ModalForm.comment.$error" ng-show="ModalForm.$submitted">
         <div ng-messages-include="modules/templates/messages.tmpl.html"></div>
@@ -23,11 +19,11 @@
   </div>
 
   <div class="modal-footer">
-    <button type="button" class="btn btn-default" ng-click="$ctrl.cancel()" translate>
+    <button type="button" class="btn btn-default" ng-click="$ctrl.cancel()" data-method="cancel" translate>
       FORM.BUTTONS.CLOSE
     </button>
     <bh-loading-button loading-state="$ctrl.$loading">
       <span translate>FORM.BUTTONS.SUBMIT</span>
     </bh-loading-button>
   </div>
-</form>
+</form>
diff --git a/client/src/modules/journal/journal.js b/client/src/modules/journal/journal.js
@@ -84,7 +84,6 @@ function JournalController(
 
     Journal.openCommentModal({ rows : selectedRows })
       .then(function (comment) {
-        if (!comment) { return; }
         updateGridComment(selectedRows, comment);
         Notify.success('ACCOUNT_STATEMENT.SUCCESSFULLY_COMMENTED');
       })

diff --git a/client/src/modules/journal/modals/comment.modal.js b/client/src/modules/journal/modals/comment.modal.js
@@ -9,11 +9,25 @@ CommentJournalController.$inject = [
 // Comment Account Statement Controller
 function CommentJournalController(Instance, ModalParameters, Journal, Notify) {
   var vm = this;
+  var comments;
 
   vm.cancel = Instance.dismiss;
   vm.submit = submit;
   vm.rows = ModalParameters.rows;
 
+  // get the unique comments
+  comments = vm.rows
+    .map(function (row) {
+      return row.entity.comment;
+    })
+    .filter(function (comment, index, array) {
+      return array.indexOf(comment) === index;
+    });
+
+  if (comments.length === 1) {
+    vm.comment = comments[0];
+  }
+
   // submit the comment
   function submit(form) {
     if (form.$invalid) { return; }

diff --git a/server/models/procedures.sql b/server/models/procedures.sql
@@ -1585,7 +1585,6 @@ BEGIN
     sm.document_uuid = document_uuid
   GROUP BY inv.uuid;
 END $$
-DELIMITER ;
 
 
 /*
@@ -1648,3 +1647,5 @@ BEGIN
   JOIN account ON account.id = combined.account_id
   ORDER BY account.number;
 END $$
+
+DELIMITER ;