Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2937-module_transactions

db/changes/10330-jun2021/00-invoiceInLog.sql

@@ -0,0 +1,18 @@
+CREATE TABLE `vn`.`invoiceInLog` (
+    `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+    `originFk` MEDIUMINT UNSIGNED NOT NULL,
+    `userFk` int(10) unsigned DEFAULT NULL,
+    `action` set('insert','update','delete') COLLATE utf8_unicode_ci NOT NULL,
+    `creationDate` timestamp NULL DEFAULT current_timestamp(),
+    `description` text CHARACTER SET utf8 DEFAULT NULL,
+    `changedModel` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
+    `oldInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
+    `newInstance` text COLLATE utf8_unicode_ci DEFAULT NULL,
+    `changedModelId` int(11) DEFAULT NULL,
+    `changedModelValue` varchar(45) COLLATE utf8_unicode_ci DEFAULT NULL,
+    PRIMARY KEY (`id`),
+    KEY `originFk` (`originFk`),
+    KEY `userFk` (`userFk`),
+    CONSTRAINT `invoiceInLog_ibfk_1` FOREIGN KEY (`originFk`) REFERENCES `vn`.`invoiceIn` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT `invoiceInLog_ibfk_2` FOREIGN KEY (`userFk`) REFERENCES `account`.`user` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;

db/changes/10330-jun2021/deleteMe.keep

@@ -1 +0,0 @@
-Delete me!!

modules/entry/front/routes.json

@@ -26,30 +26,35 @@
             "abstract": true,
             "component": "vn-entry",
             "description": "Entries"
-        }, {
+        },
+        {
             "url": "/index?q",
             "state": "entry.index",
             "component": "vn-entry-index",
             "description": "Entries",
             "acl": ["buyer", "administrative"]
-        }, {
+        },
+        {
             "url": "/latest-buys?q",
             "state": "entry.latestBuys",
             "component": "vn-entry-latest-buys",
             "description": "Latest buys",
             "acl": ["buyer", "administrative"]
-        }, {
+        },
+        {
             "url": "/create?supplierFk&travelFk&companyFk",
             "state": "entry.create",
             "component": "vn-entry-create",
             "description": "New entry",
             "acl": ["buyer", "administrative"]
-        }, {
+        },
+        {
             "url": "/:id",
             "state": "entry.card",
             "abstract": true,
             "component": "vn-entry-card"
-        }, {
+        },
+        {
             "url": "/summary",
             "state": "entry.card.summary",
             "component": "vn-entry-summary",
@@ -58,7 +63,8 @@
                 "entry": "$ctrl.entry"
             },
             "acl": ["buyer", "administrative"]
-        }, {
+        },
+        {
             "url": "/basic-data",
             "state": "entry.card.basicData",
             "component": "vn-entry-basic-data",
@@ -67,7 +73,8 @@
                 "entry": "$ctrl.entry"
             },
             "acl": ["buyer", "administrative"]
-        },{
+        },
+        {
             "url": "/observation",
             "state": "entry.card.observation",
             "component": "vn-entry-observation",
@@ -76,7 +83,8 @@
                 "entry": "$ctrl.entry"
             },
             "acl": ["buyer", "administrative"]
-        },{
+        },
+        {
             "url" : "/log",
             "state": "entry.card.log",
             "component": "vn-entry-log",

modules/invoiceIn/back/model-config.json

@@ -4,5 +4,8 @@
     },
     "InvoiceInDueDay": {
         "dataSource": "vn"
+    },
+    "InvoiceInLog": {
+        "dataSource": "vn"
     }
 }

modules/invoiceIn/back/models/invoice-in-log.json

@@ -0,0 +1,61 @@
+{
+    "name": "InvoiceInLog",
+    "base": "VnModel",
+    "options": {
+        "mysql": {
+            "table": "invoiceInLog"
+        }
+    },
+    "properties": {
+        "id": {
+            "id": true,
+            "type": "number",
+            "forceId": false
+        },
+        "originFk": {
+            "type": "number",
+            "required": true
+        },
+        "userFk": {
+            "type": "number"
+        },
+        "action": {
+            "type": "string",
+            "required": true
+        },
+        "changedModel": {
+            "type": "string"
+        },
+        "oldInstance": {
+            "type": "object"
+        },
+        "newInstance": {
+            "type": "object"
+        },
+        "creationDate": {
+            "type": "date"
+        },
+        "changedModelId": {
+            "type": "string"
+        },
+        "changedModelValue": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        }
+    },
+    "relations": {
+        "user": {
+            "type": "belongsTo",
+            "model": "Account",
+            "foreignKey": "userFk"
+        }
+    },
+    "scope": {
+        "order": [
+            "creationDate DESC",
+            "id DESC"
+        ]
+    }
+}

modules/invoiceIn/back/models/invoice-in.json

@@ -1,6 +1,9 @@
 {
     "name": "InvoiceIn",
-    "base": "VnModel",
+    "base": "Loggable",
+    "log": {
+        "model": "InvoiceInLog"
+    },
     "options": {
         "mysql": {
             "table": "invoiceIn"

modules/invoiceIn/front/index.js

@@ -8,3 +8,4 @@ import './descriptor';
 import './descriptor-popover';
 import './summary';
 import './basic-data';
+import './log';

modules/invoiceIn/front/log/index.html

@@ -0,0 +1 @@
+<vn-log url="InvoiceInLogs" origin-id="$ctrl.$params.id"></vn-log>

modules/invoiceIn/front/log/index.js

@@ -0,0 +1,7 @@
+import ngModule from '../module';
+import Section from 'salix/components/section';
+
+ngModule.vnComponent('vnInvoiceInLog', {
+    template: require('./index.html'),
+    controller: Section,
+});

modules/invoiceIn/front/routes.json

@@ -12,6 +12,10 @@
             {
                 "state": "invoiceIn.card.basicData",
                 "icon": "settings"
+            },
+            {
+                "state": "invoiceIn.card.log",
+                "icon": "history"
             }
         ]
     },
@@ -53,7 +57,15 @@
             "description": "Basic data",
             "params": {
                 "invoice-in": "$ctrl.invoiceIn"
-            }
+            },
+            "acl": ["administrative"]
+        },
+        {
+            "url": "/log",
+            "state": "invoiceIn.card.log",
+            "component": "vn-invoice-in-log",
+            "description": "Log",
+            "acl": ["administrative"]
         }
     ]
 }

modules/monitor/front/index/tickets/index.html

@@ -34,7 +34,7 @@
         <vn-thead>
             <vn-tr>
                 <vn-th class="icon-field"></vn-th>
-                <vn-th field="nickname" expand>Client</vn-th>
+                <vn-th field="nickname">Client</vn-th>
                 <vn-th field="salesPersonFk" class="expendable" shrink>Salesperson</vn-th>
                 <vn-th field="shipped" shrink-date>Date</vn-th>
                 <vn-th>Hour</vn-th>
@@ -88,7 +88,7 @@
                         icon="icon-components">
                     </vn-icon>
                 </vn-td>
-                <vn-td expand>
+                <vn-td>
                     <span
                         title="{{::ticket.nickname}}"
                         vn-click-stop="clientDescriptor.show($event, ticket.clientFk)"
@@ -105,7 +105,7 @@
                     </span>
                 </vn-td>
                 <vn-td shrink-date>
-                    <span class="chip {{$ctrl.compareDate(ticket.shipped)}}">
+                    <span class="chip {{::$ctrl.compareDate(ticket.shipped)}}">
                         {{::ticket.shipped | date: 'dd/MM/yyyy'}}
                     </span>
                 </vn-td>
@@ -122,8 +122,8 @@
                     </span>
                     <span 
                         ng-show="::!ticket.refFk"
-                        class="chip {{$ctrl.stateColor(ticket)}}">
+                        class="chip {{::$ctrl.stateColor(ticket)}}">
-                        {{ticket.state}}
+                        {{::ticket.state}}
                     </span>
                 </vn-td>
                 <vn-td>

modules/monitor/front/index/tickets/style.scss

@@ -12,6 +12,10 @@ vn-monitor-sales-tickets {
         padding: 0
     }
 
+    vn-th[field="nickname"] {
+        width: 250px
+    }
+
     vn-td.icon-field > vn-icon {
         margin-left: 3px;
         margin-right: 3px;