From 78f893b8112d3a05e9afd0bf9a44f6892322dcc7 Mon Sep 17 00:00:00 2001
From: Daniel Herrero <dherrero@alfatecsistemas.es>
Date: Wed, 7 Mar 2018 13:34:34 +0100
Subject: [PATCH] Bug #124 address observations validations

---
 .../client/src/address-edit/address-edit.html | 27 ++++++++++++-------
 .../client/src/address-edit/address-edit.js   | 22 +++++----------
 client/client/src/address-edit/locale/es.yml  |  4 ++-
 3 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/client/client/src/address-edit/address-edit.html b/client/client/src/address-edit/address-edit.html
index a6e2b9499c..a5830d7155 100644
--- a/client/client/src/address-edit/address-edit.html
+++ b/client/client/src/address-edit/address-edit.html
@@ -61,29 +61,36 @@
                     <tpl-item>{{$parent.$parent.item.description}}</tpl-item>
                 </vn-autocomplete>
                 <vn-textfield
-                    vn-auto
+                    vn-two
+                    margin-large-right
                     label="Description"
                     model="observation.description"
                     rule="addressObservation.description">
                 </vn-textfield>
-                <vn-one pad-medium-top>
+                <vn-auto pad-medium-top>
                     <vn-icon
                         pointer 
                         medium-grey
+                        vn-tooltip="Remove note"
+                        tooltip-position = "left"
                         icon="remove_circle_outline"
                         ng-click="$ctrl.removeObservation($index)">
-                    </vn-icon>
-                    <vn-icon
-                        pointer 
-                        margin-medium-left
-                        orange
-                        icon="add_circle"
-                        ng-if="observation.showAddIcon && observationsTypes.model.length > $ctrl.observations.length" 
-                        ng-click="$ctrl.addObservation()">
                     </vn-icon>  
                 </vn-one>
             </vn-horizontal>
         </vn-one>
+        <vn-one>
+            <vn-icon
+                pointer 
+                margin-medium-left
+                vn-tooltip="Add note"
+                tooltip-position = "right"
+                orange
+                icon="add_circle"
+                ng-if="observationsTypes.model.length > $ctrl.observations.length" 
+                ng-click="$ctrl.addObservation()">
+            </vn-icon>
+        </vn-one>
     </vn-card>
     <vn-button-bar>
         <vn-submit label="Save"></vn-submit>
diff --git a/client/client/src/address-edit/address-edit.js b/client/client/src/address-edit/address-edit.js
index ef20f68f1d..4d73dc215a 100644
--- a/client/client/src/address-edit/address-edit.js
+++ b/client/client/src/address-edit/address-edit.js
@@ -17,18 +17,6 @@ export default class Controller {
         this.observationsRemoved = [];
     }
 
-    _setIconAdd() {
-        if (this.observations.length) {
-            this.observations.map(element => {
-                element.showAddIcon = false;
-                return true;
-            });
-            this.observations[this.observations.length - 1].showAddIcon = true;
-        } else {
-            this.addObservation();
-        }
-    }
-
     _setDirtyForm() {
         if (this.$scope.form) {
             this.$scope.form.$setDirty();
@@ -41,15 +29,13 @@ export default class Controller {
     }
 
     addObservation() {
-        this.observations.push({observationTypeFk: null, addressFk: this.address.id, description: null, showAddIcon: true});
-        this._setIconAdd();
+        this.observations.push({observationTypeFk: null, addressFk: this.address.id, description: null});
     }
 
     removeObservation(index) {
         let item = this.observations[index];
         if (item) {
             this.observations.splice(index, 1);
-            this._setIconAdd();
             if (item.id) {
                 this.observationsRemoved.push(item.id);
                 this._setDirtyForm();
@@ -65,7 +51,10 @@ export default class Controller {
     }
 
     submit() {
-        this._unsetDirtyForm();
+        if (this.$scope.form.$invalid) {
+            return false;
+        }
+
         let canWatcherSubmit = this.$scope.watcher.dataChanged();
         let canObservationsSubmit;
         let repeatedTypes = false;
@@ -118,6 +107,7 @@ export default class Controller {
                 this.$translate.instant('No changes to save')
             );
         }
+        this._unsetDirtyForm();
     }
 
     $onInit() {
diff --git a/client/client/src/address-edit/locale/es.yml b/client/client/src/address-edit/locale/es.yml
index 78f2360394..aa9c23ef02 100644
--- a/client/client/src/address-edit/locale/es.yml
+++ b/client/client/src/address-edit/locale/es.yml
@@ -2,4 +2,6 @@ Enabled: Activo
 Is equalizated: Recargo de equivalencia
 Observation type: Tipo de observación
 Description: Descripción
-The observation type must be unique: El tipo de observación ha de ser único
\ No newline at end of file
+The observation type must be unique: El tipo de observación ha de ser único
+Add note: Añadir nota
+Remove note: Quitar nota
\ No newline at end of file