Merge pull request '5934-clientSms' (!1675) from 5934-clientSms into dev

Reviewed-on: #1675
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

db/changes/233001/00-clientSms.sql

@@ -0,0 +1,15 @@
+CREATE TABLE `vn`.`clientSms` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `clientFk` int(11) NOT NULL,
+  `smsFk` mediumint(8) unsigned NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `clientSms_FK` (`clientFk`),
+  KEY `clientSms_FK_1` (`smsFk`),
+  CONSTRAINT `clientSms_FK` FOREIGN KEY (`clientFk`) REFERENCES `client` (`id`) ON UPDATE CASCADE,
+  CONSTRAINT `clientSms_FK_1` FOREIGN KEY (`smsFk`) REFERENCES `sms` (`id`) ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('ClientSms', 'find', 'READ', 'ALLOW', 'ROLE', 'employee'),
+        ('ClientSms', 'create', 'WRITE', 'ALLOW', 'ROLE', 'employee');

modules/client/back/methods/client/sendSms.js

@@ -7,7 +7,7 @@ module.exports = Self => {
             arg: 'id',
             type: 'number',
             required: true,
-            description: 'The ticket id',
+            description: 'The client id',
             http: {source: 'path'}
         },
         {
@@ -33,6 +33,12 @@ module.exports = Self => {
     Self.sendSms = async(ctx, id, destination, message) => {
         const models = Self.app.models;
         const sms = await models.Sms.send(ctx, destination, message);
+
+        await models.ClientSms.create({
+            clientFk: id,
+            smsFk: sms.id
+        });
+
         return sms;
     };
 };

modules/client/back/model-config.json

@@ -95,6 +95,9 @@
     "ClientSample": {
         "dataSource": "vn"
     },
+    "ClientSms": {
+        "dataSource": "vn"
+    },
     "Sms": {
         "dataSource": "vn"
     },

modules/client/back/models/client-sms.json

@@ -0,0 +1,26 @@
+{
+    "name": "ClientSms",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "clientSms"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "number",
+            "id": true,
+            "description": "Identifier"
+        },
+        "clientFk": {
+            "type": "number"
+        }
+    },
+    "relations": {
+        "sms": {
+            "type": "belongsTo",
+            "model": "Sms",
+            "foreignKey": "smsFk"
+        }
+    }
+}

modules/client/front/index.js

@@ -48,4 +48,5 @@ import './notification';
 import './unpaid';
 import './extended-list';
 import './credit-management';
+import './sms';
 

modules/client/front/routes.json

@@ -23,6 +23,7 @@
             {"state": "client.card.recovery.index", "icon": "icon-recovery"},
             {"state": "client.card.webAccess", "icon": "cloud"},
             {"state": "client.card.log", "icon": "history"},
+            {"state": "client.card.sms", "icon": "sms"},
             {
                 "description": "Credit management",
                 "icon": "monetization_on",
@@ -373,6 +374,12 @@
             "component": "vn-client-log",
             "description": "Log"
         },
+        {
+            "url" : "/sms",
+            "state": "client.card.sms",
+            "component": "vn-client-sms",
+            "description": "Sms"
+        },
         {
             "url": "/dms",
             "state": "client.card.dms",

modules/client/front/sms/index.html

@@ -0,0 +1,40 @@
+<vn-crud-model
+    vn-id="model"
+    url="ClientSms"
+    link="{clientFk: $ctrl.$params.id}"
+    filter="::$ctrl.filter"
+    data="clientSmsList"
+    limit="20"
+    auto-load="true">
+</vn-crud-model>
+<vn-data-viewer model="model">
+    <vn-card class="vn-w-md">
+        <vn-table model="model" auto-load="false">
+            <vn-thead>
+                <vn-tr>
+                    <vn-th field="senderFk">Sender</vn-th>
+                    <vn-th field="destination" number>Destination</vn-th>
+                    <vn-th field="message">Message</vn-th>
+                    <vn-th field="status">Status</vn-th>
+                    <vn-th field="created" expand>Created</vn-th>
+                </vn-tr>
+            </vn-thead>
+            <vn-tbody>
+                <vn-tr ng-repeat="clientSms in clientSmsList">
+                    <vn-td>
+                        <span class="link" ng-click="workerDescriptor.show($event, clientSms.sms.senderFk)">
+                            {{::clientSms.sms.sender.name}}
+                        </span>
+                    </vn-td>
+                    <vn-td number expand>{{::clientSms.sms.destination}}</vn-td>
+                    <vn-td>{{::clientSms.sms.message}}</vn-td>
+                    <vn-td>{{::clientSms.sms.status}}</vn-td>
+                    <vn-td shrink-datetime>{{::clientSms.sms.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>
+                </vn-tr>
+            </vn-tbody>
+        </vn-table>
+    </vn-card>
+</vn-data-viewer>
+<vn-worker-descriptor-popover
+    vn-id="worker-descriptor">
+</vn-worker-descriptor-popover>

modules/client/front/sms/index.js

@@ -0,0 +1,39 @@
+import ngModule from '../module';
+import Section from 'salix/components/section';
+
+export default class Controller extends Section {
+    constructor($element, $) {
+        super($element, $);
+
+        this.filter = {
+            fields: ['id', 'smsFk'],
+            include: {
+                relation: 'sms',
+                scope: {
+                    fields: [
+                        'senderFk',
+                        'sender',
+                        'destination',
+                        'message',
+                        'statusCode',
+                        'status',
+                        'created'],
+                    include: {
+                        relation: 'sender',
+                        scope: {
+                            fields: ['name']
+                        }
+                    }
+                }
+            }
+        };
+    }
+}
+
+ngModule.vnComponent('vnClientSms', {
+    template: require('./index.html'),
+    controller: Controller,
+    bindings: {
+        client: '<'
+    }
+});

modules/client/front/sms/locale/es.yml

@@ -0,0 +1,2 @@
+Sender: Remitente
+Number sender: Número remitente