feat(claim.notes): added the observations setction to claim plus refactors

db/changes/10480-june/00-ACL.sql

@@ -1,4 +1,6 @@
 INSERT INTO `salix`.`ACL` (model,property,accessType,permission,principalType,principalId)
 	VALUES 
+		('ClaimObservation','*','WRITE','ALLOW','ROLE','salesPerson'),
+		('ClaimObservation','*','READ','ALLOW','ROLE','salesPerson'),
 		('Client','setPassword','WRITE','ALLOW','ROLE','salesPerson'),
 		('Client','updateUser','WRITE','ALLOW','ROLE','salesPerson');

db/changes/10480-june/01-claimObservation.sql

@@ -0,0 +1,13 @@
+CREATE TABLE `vn`.`claimObservation` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `claimFk` int(10) unsigned NOT NULL,
+  `workerFk` int(10) unsigned NOT NULL,
+  `text` text COLLATE utf8_unicode_ci NOT NULL,
+  `created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  KEY `worker_key` (`workerFk`),
+  KEY `claim_key` (`claimFk`),
+  KEY `claimObservation_created_IDX` (`created`) USING BTREE,
+  CONSTRAINT `claimObservation_ibfk_1` FOREIGN KEY (`claimFk`) REFERENCES `vn`.`claim` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `claimObservation_ibfk_2` FOREIGN KEY (`workerFk`) REFERENCES `vn`.`worker` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='Todas las observaciones referentes a una reclamación'

db/dump/fixtures.sql

@@ -1744,6 +1744,13 @@ INSERT INTO `vn`.`claim`(`id`, `ticketCreated`, `claimStateFk`, `observation`, `
         (3, util.VN_CURDATE(), 3, 'An vim commodo dolorem volutpat, cu expetendis voluptatum usu, et mutat consul adversarium his. His natum numquam legimus an, diam fabulas mei ut. Melius fabellas sadipscing vel id. Partem diceret mandamus mea ne, has te tempor nostrud. Aeque nostro eum no.', 1101, 18, 1, 1, util.VN_CURDATE(), 5),
         (4, util.VN_CURDATE(), 3, 'Wisi forensibus mnesarchum in cum. Per id impetus abhorreant, his no magna definiebas, inani rationibus in quo. Ut vidisse dolores est, ut quis nominavi mel. Ad pri quod apeirian concludaturque.',  1104, 18, 5, 0, util.VN_CURDATE(), 10);
 
+INSERT INTO `vn`.`claimObservation` (`claimFk`, `workerFk`, `text`, `created`)
+    VALUES
+        (1, 18, 'Cu nam labores lobortis definiebas, ei aliquyam salutatus persequeris quo, cum eu nemore fierent dissentiunt. Per vero dolor id, vide democritum scribentur eu vim, pri erroribus temporibus ex.', util.VN_CURDATE()),
+        (2, 18, 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.', util.VN_CURDATE()),
+        (3, 18, 'An vim commodo dolorem volutpat, cu expetendis voluptatum usu, et mutat consul adversarium his. His natum numquam legimus an, diam fabulas mei ut. Melius fabellas sadipscing vel id. Partem diceret mandamus mea ne, has te tempor nostrud. Aeque nostro eum no.', util.VN_CURDATE()),
+        (4, 18, 'Wisi forensibus mnesarchum in cum. Per id impetus abhorreant, his no magna definiebas, inani rationibus in quo. Ut vidisse dolores est, ut quis nominavi mel. Ad pri quod apeirian concludaturque.', util.VN_CURDATE());
+
 INSERT INTO `vn`.`claimBeginning`(`id`, `claimFk`, `saleFk`, `quantity`)
     VALUES
         (1, 1, 7,  5),

modules/claim/back/methods/claim/getSummary.js

@@ -84,6 +84,20 @@ module.exports = Self => {
         };
         promises.push(Self.app.models.ClaimBeginning.find(filter, myOptions));
 
+        // Claim observations
+        filter = {
+            where: {claimFk: id},
+            include: [
+                {
+                    relation: 'worker',
+                    scope: {
+                        fields: ['id', 'firstName', 'lastName']
+                    }
+                }
+            ]
+        };
+        promises.push(Self.app.models.ClaimObservation.find(filter, myOptions));
+
         // Claim developments
         filter = {
             where: {claimFk: id},
@@ -138,8 +152,9 @@ module.exports = Self => {
         summary.isEditable = await Self.isEditable(ctx, id, myOptions);
         [summary.claim] = res[0];
         summary.salesClaimed = res[1];
-        summary.developments = res[2];
-        summary.actions = res[3];
+        summary.observations = res[2];
+        summary.developments = res[3];
+        summary.actions = res[4];
 
         return summary;
     };

modules/claim/back/methods/claim/specs/getSummary.spec.js

@@ -19,6 +19,7 @@ describe('claim getSummary()', () => {
             expect(keys).toContain('claim');
             expect(keys).toContain('salesClaimed');
             expect(keys).toContain('developments');
+            expect(keys).toContain('observations');
             expect(keys).toContain('actions');
             expect(keys).toContain('isEditable');
 

modules/claim/back/model-config.json

@@ -38,6 +38,9 @@
     "ClaimLog": {
         "dataSource": "vn"
     },
+    "ClaimObservation": {
+        "dataSource": "vn"
+    },
     "ClaimContainer": {
         "dataSource": "claimStorage"
     }               

modules/claim/back/models/claim-observation.json

@@ -0,0 +1,34 @@
+{
+    "name": "ClaimObservation",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "claimObservation"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true,
+            "description": "Identifier"
+        },
+        "claimFk": {
+            "type": "number",
+            "required": true
+        },
+        "text": {
+            "type": "string",
+            "required": true
+        },
+        "created": {
+            "type": "date"
+        }
+    },
+    "relations": {
+        "worker": {
+            "type": "belongsTo",
+            "model": "Worker",
+            "foreignKey": "workerFk"
+        }
+    }
+}

modules/claim/front/basic-data/index.html

@@ -52,13 +52,6 @@
                 ng-model="$ctrl.claim.packages">
             </vn-input-number>
         </vn-horizontal>
-        <vn-horizontal>
-            <vn-textarea
-                label="Observation" 
-                ng-model="$ctrl.claim.observation"
-                rule>
-            </vn-textarea>
-        </vn-horizontal>
         <vn-horizontal>
             <vn-check
                 class="vn-mr-md"

modules/claim/front/index.js

@@ -12,3 +12,5 @@ import './search-panel';
 import './summary';
 import './photos';
 import './log';
+import './note/index';
+import './note/create';

modules/claim/front/locale/es.yml

@@ -6,6 +6,7 @@ Client Id: Id cliente
 Claimed ticket: Ticket reclamado
 Delete claim: Eliminar reclamación
 Observation: Observación
+Observations: Observaciones
 Responsible: Responsable
 Remove sale: Eliminar linea
 Claim Id: Id reclamación

modules/claim/front/note/create/index.html

@@ -0,0 +1,30 @@
+<vn-watcher
+    vn-id="watcher"
+    url="claimObservations"
+    id-field="id"
+    data="$ctrl.note"
+    insert-mode="true"
+    form="form">
+</vn-watcher>
+<form name="form" ng-submit="watcher.submitGo('claim.card.note.index')" class="vn-w-md">
+    <vn-card class="vn-pa-lg">
+        <vn-horizontal>
+            <vn-textarea
+                vn-one
+                label="Note"
+                ng-model="$ctrl.note.text"
+                vn-focus>
+            </vn-textarea>
+        </vn-horizontal>
+    </vn-card>
+    <vn-button-bar>
+        <vn-submit
+            ng-if="watcher.dataChanged()"
+            label="Save">
+        </vn-submit>
+        <vn-button
+            ng-click="$ctrl.cancel()"
+            label="Cancel">
+        </vn-button>
+    </vn-button-bar>
+</form>

modules/claim/front/note/create/index.js

@@ -0,0 +1,22 @@
+import ngModule from '../../module';
+import Section from 'salix/components/section';
+
+export default class Controller extends Section {
+    constructor($element, $) {
+        super($element, $);
+        this.note = {
+            claimFk: parseInt(this.$params.id),
+            workerFk: window.localStorage.currentUserWorkerId,
+            text: null
+        };
+    }
+
+    cancel() {
+        this.$state.go('claim.card.note.index', {id: this.$params.id});
+    }
+}
+
+ngModule.vnComponent('vnClaimNoteCreate', {
+    template: require('./index.html'),
+    controller: Controller
+});

modules/claim/front/note/index/index.html

@@ -0,0 +1,32 @@
+<vn-crud-model
+    vn-id="model"
+    url="ClaimObservations"
+    filter="$ctrl.filter"
+    where="{claimFk: $ctrl.$params.id}"
+    include="$ctrl.include"
+    data="notes"
+    auto-load="true">
+</vn-crud-model>
+<vn-data-viewer
+    model="model"
+    class="vn-w-md">
+    <vn-card class="vn-pa-md">
+        <div
+            ng-repeat="note in notes"
+            class="note vn-pa-sm border-solid border-radius vn-mb-md">
+            <vn-horizontal class="vn-mb-sm" style="color: #666">
+                <vn-one>{{::note.worker.firstName}} {{::note.worker.lastName}}</vn-one>
+                <vn-auto>{{::note.created | date:'dd/MM/yyyy HH:mm'}}</vn-auto>
+            </vn-horizontal>
+            <vn-horizontal class="text">
+                {{::note.text}}
+            </vn-horizontal>
+        </div>
+    </vn-card>
+</vn-data-viewer>
+<a vn-tooltip="New note"
+    ui-sref="claim.card.note.create({id: $ctrl.$params.id})"
+    vn-bind="+"
+    fixed-bottom-right>
+    <vn-float-button icon="add"></vn-float-button>
+</a>

modules/claim/front/note/index/index.js

@@ -0,0 +1,25 @@
+import ngModule from '../../module';
+import Section from 'salix/components/section';
+import './style.scss';
+
+export default class Controller extends Section {
+    constructor($element, $) {
+        super($element, $);
+        this.filter = {
+            order: 'created DESC',
+        };
+        this.include = {
+            relation: 'worker',
+            scope: {
+                fields: ['id', 'firstName', 'lastName']
+            }
+        };
+    }
+}
+
+Controller.$inject = ['$element', '$scope'];
+
+ngModule.vnComponent('vnClaimNote', {
+    template: require('./index.html'),
+    controller: Controller,
+});

modules/claim/front/note/index/style.scss

@@ -0,0 +1,5 @@
+vn-client-note {
+    .note:last-child {
+        margin-bottom: 0;
+    }
+}

modules/claim/front/routes.json

@@ -12,6 +12,7 @@
             {"state": "claim.card.basicData", "icon": "settings"},
             {"state": "claim.card.detail", "icon": "icon-details"},
             {"state": "claim.card.photos", "icon": "image"},
+            {"state": "claim.card.note.index", "icon": "insert_drive_file"},
             {"state": "claim.card.development", "icon": "icon-traceability"},
             {"state": "claim.card.action", "icon": "icon-actions"},
             {"state": "claim.card.log", "icon": "history"}
@@ -69,6 +70,30 @@
             },
             "acl": ["salesPerson"]
         },
+        {
+            "url": "/note",
+            "state": "claim.card.note",
+            "component": "ui-view", 
+            "abstract": true,
+            "acl": ["salesPerson"]
+        },
+        {
+            "url": "/index",
+            "state": "claim.card.note.index",
+            "component": "vn-claim-note",
+            "description": "Notes",
+            "params": {
+                "claim": "$ctrl.claim"
+            },
+            "acl": ["salesPerson"]
+        },
+        {
+            "url": "/create",
+            "state": "claim.card.note.create",
+            "component": "vn-claim-note-create",
+            "description": "New note",
+            "acl": ["salesPerson"]
+        },
         {
             "url": "/development",
             "state": "claim.card.development",

modules/claim/front/summary/index.html

@@ -1,11 +1,12 @@
-<vn-crud-model vn-id="model"
+<vn-crud-model
+    vn-id="model"
     url="ClaimDms"
     filter="::$ctrl.filter"
     data="photos">
 </vn-crud-model>
 <vn-card class="summary">
     <h5>
-        <a 
+        <a
             ng-if="::$ctrl.summary.claim.id"
             vn-tooltip="Go to the claim"
             ui-sref="claim.card.summary({id: {{::$ctrl.summary.claim.id}}})"
@@ -13,7 +14,7 @@
             <vn-icon-button icon="launch"></vn-icon-button>
         </a>
         <span>{{::$ctrl.summary.claim.id}} - {{::$ctrl.summary.claim.client.name}}</span>
-        <vn-button-menu 
+        <vn-button-menu
             disabled="!$ctrl.summary.isEditable"
             class="message"
             label="Change state"
@@ -26,30 +27,47 @@
     <vn-horizontal>
         <vn-one>
             <vn-label-value
-                label="Created" 
+                label="Created"
                 value="{{$ctrl.summary.claim.created | date: 'dd/MM/yyyy'}}">
             </vn-label-value>
             <vn-label-value
-                label="State" 
+                label="State"
                 value="{{$ctrl.summary.claim.claimState.description}}">
             </vn-label-value>
             <vn-label-value
-                label="Salesperson" 
+                label="Salesperson"
                 value="{{$ctrl.summary.claim.client.salesPersonUser.name}}">
             </vn-label-value>
             <vn-label-value
-                label="Attended by" 
+                label="Attended by"
                 value="{{$ctrl.summary.claim.worker.user.nickname}}">
             </vn-label-value>
         </vn-one>
-        <vn-two>
-            <vn-textarea
-                vn-three
-                disabled="true"
-                label="Observation"
-                ng-model="$ctrl.summary.claim.observation">
-            </vn-textarea>
-        </vn-two>
+        <vn-auto>
+            <h4 ng-show="$ctrl.isSalesPerson && $ctrl.summary.observations.length">
+                <a 
+                    ui-sref="claim.card.note.index({id:$ctrl.claim.id})"
+                    target="_self">
+                    <span translate vn-tooltip="Go to">Observations</span>
+                </a>
+            </h4>
+            <h4 
+                ng-show="!$ctrl.isSalesPerson && $ctrl.summary.observations.length"
+                translate>
+                Observations
+            </h4>
+            <div
+                ng-repeat="note in $ctrl.summary.observations"
+                class="note vn-pa-sm border-solid border-radius vn-mb-md">
+                <vn-horizontal class="vn-mb-sm" style="color: #666">
+                    <vn-one>{{::note.worker.firstName}} {{::note.worker.lastName}}</vn-one>
+                    <vn-auto>{{::note.created | date:'dd/MM/yyyy HH:mm'}}</vn-auto>
+                </vn-horizontal>
+                <vn-horizontal class="text">
+                    {{::note.text}}
+                </vn-horizontal>
+            </div>
+        </vn-auto>
         <vn-auto>
             <h4 ng-show="$ctrl.isSalesPerson">
                 <a