Merge pull request '232402_test_to_dev' (!1637) from 232402_test_to_dev into dev

Reviewed-on: #1637
Reviewed-by: Carlos Satorres Adam <carlossa@verdnatura.es>

CHANGELOG.md

@@ -18,11 +18,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - (Entradas -> Correo) Al cambiar el tipo de cambio enviará un correo a las personas designadas
+- (General -> Históricos) Botón para ver el estado del registro en cada punto
+- (General -> Históricos) Al filtar por registro se muestra todo el histórial desde que fue creado
 
 ### Changed
+- (General -> Históricos) Los registros se muestran agrupados por usuario y entidad
+- (Facturas -> Facturación global) Optimizada, generación de PDFs y notificaciones en paralelo
 
 ### Fixed
--
+- (General -> Históricos) Duplicidades eliminadas
+- (Facturas -> Facturación global) Solucionados fallos que paran el proceso
 
 ## [2324.01] - 2023-06-15
 

db/changes/232402/00-hotFix_travelConfig.sql

@@ -0,0 +1,22 @@
+CREATE TABLE `vn`.`travelConfig` (
+    `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+    `warehouseInFk` smallint(6) unsigned NOT NULL DEFAULT 8 COMMENT 'Warehouse de origen',
+    `warehouseOutFk` smallint(6) unsigned NOT NULL DEFAULT 60 COMMENT 'Warehouse destino',
+    `agencyFk` int(11) NOT NULL DEFAULT 1378 COMMENT 'Agencia por defecto',
+    `companyFk` int(10) unsigned NOT NULL DEFAULT 442 COMMENT 'Compañía por defecto',
+    PRIMARY KEY (`id`),
+    KEY `travelConfig_FK` (`warehouseInFk`),
+    KEY `travelConfig_FK_1` (`warehouseOutFk`),
+    KEY `travelConfig_FK_2` (`agencyFk`),
+    KEY `travelConfig_FK_3` (`companyFk`),
+    CONSTRAINT `travelConfig_FK` FOREIGN KEY (`warehouseInFk`) REFERENCES `warehouse` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT `travelConfig_FK_1` FOREIGN KEY (`warehouseOutFk`) REFERENCES `warehouse` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT `travelConfig_FK_2` FOREIGN KEY (`agencyFk`) REFERENCES `agencyMode` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
+    CONSTRAINT `travelConfig_FK_3` FOREIGN KEY (`companyFk`) REFERENCES `company` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+
+INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `principalType`, `principalId`)
+    VALUES
+        ('Entry', 'addFromPackaging', 'WRITE', 'ALLOW', 'ROLE', 'production'),
+        ('Entry', 'addFromBuy', 'WRITE', 'ALLOW', 'ROLE', 'production'),
+        ('Supplier', 'getItemsPackaging', 'READ', 'ALLOW', 'ROLE', 'production');

e2e/helpers/selectors.js

@@ -479,9 +479,6 @@ export default {
         fourthBalance: 'vn-item-diary vn-tbody > vn-tr:nth-child(4) > vn-td.balance  > span',
         firstBalance: 'vn-item-diary vn-tbody > vn-tr:nth-child(1) > vn-td.balance'
     },
-    itemLog: {
-        anyLineCreated: 'vn-item-log > vn-log vn-tbody > vn-tr',
-    },
     ticketSummary: {
         header: 'vn-ticket-summary > vn-card > h5',
         state: 'vn-ticket-summary vn-label-value[label="State"] > section > span',
@@ -667,15 +664,6 @@ export default {
         thirdRemoveRequestButton: 'vn-ticket-request-index vn-tr:nth-child(3) vn-icon[icon="delete"]',
         thirdRequestQuantity: 'vn-ticket-request-index vn-table vn-tr:nth-child(3) > vn-td:nth-child(6) vn-input-number',
         saveButton: 'vn-ticket-request-create button[type=submit]',
-
-    },
-    ticketLog: {
-        firstTD: 'vn-ticket-log vn-table vn-td:nth-child(1)',
-        logButton: 'vn-left-menu a[ui-sref="ticket.card.log"]',
-        user: 'vn-ticket-log vn-tbody vn-tr vn-td:nth-child(2)',
-        action: 'vn-ticket-log vn-tbody vn-tr vn-td:nth-child(4)',
-        changes: 'vn-ticket-log vn-data-viewer vn-tbody vn-tr table tr:nth-child(2) td.after',
-        id: 'vn-ticket-log vn-tr:nth-child(1) table tr:nth-child(1) td.before'
     },
     ticketService: {
         addServiceButton: 'vn-ticket-service vn-icon-button[vn-tooltip="Add service"] > button',

e2e/paths/02-client/07_edit_web_access.spec.js

@@ -5,8 +5,8 @@ const $ = {
     userName: 'vn-client-web-access vn-textfield[ng-model="$ctrl.account.name"]',
     email: 'vn-client-web-access vn-textfield[ng-model="$ctrl.account.email"]',
     saveButton: 'vn-client-web-access button[type=submit]',
-    nameValue: 'vn-client-log .change:nth-child(1) .basic-json:nth-child(2) vn-json-value',
+    nameValue: 'vn-client-log .changes-log:nth-child(2) .basic-json:nth-child(2) vn-json-value',
-    activeValue: 'vn-client-log .change:nth-child(2) .basic-json:nth-child(1) vn-json-value'
+    activeValue: 'vn-client-log .changes-log:nth-child(3) .basic-json:nth-child(1) vn-json-value'
 };
 
 describe('Client web access path', () => {

front/core/components/avatar/style.scss

@@ -4,8 +4,8 @@ vn-avatar {
     display: block;
     border-radius: 50%;
     overflow: hidden;
-    height: 36px;
+    height: 38px;
-    width: 36px;
+    width: 38px;
     font-size: 22px;
     background-color: $color-main;
     position: relative;

front/salix/components/log/index.html

@@ -2,8 +2,6 @@
     vn-id="model"
     url="{{$ctrl.url}}"
     filter="$ctrl.filter"
-    link="{originFk: $ctrl.originId}"
-    where="{changedModel: $ctrl.changedModel, changedModelId: $ctrl.changedModelId}"
     data="$ctrl.logs"
     order="creationDate DESC, id DESC"
     limit="20">
@@ -17,90 +15,108 @@
 <vn-data-viewer
     model="model"
     class="vn-w-sm vn-px-sm vn-pb-xl">
-    <div class="change vn-mb-sm" ng-repeat="log in $ctrl.logs">
+    <div class="origin-log" ng-repeat="originLog in $ctrl.logTree">
-        <div class="left">
+        <div class="origin-info vn-mb-md" ng-if="::$ctrl.logTree.length > 1">
-            <vn-avatar class="vn-mt-xs"
+            <h6 class="origin-id">
-                ng-class="::{system: !log.user}"
+                {{::$ctrl.modelI18n}} #{{::originLog.originFk}}
-                val="{{::log.user ? log.user.nickname : $ctrl.$t('System')}}"
+            </h6>
-                ng-click="$ctrl.showWorkerDescriptor($event, log)">
-                <img
-                    ng-if="::log.user.image"
-                    ng-src="/api/Images/user/160x160/{{::log.userFk}}/download?access_token={{::$ctrl.vnToken.token}}">
-                </img>
-            </vn-avatar>
-            <div class="arrow bg-panel"></div>
             <div class="line"></div>
         </div>
-        <vn-card class="detail">
+        <div class="user-log vn-mb-sm" ng-repeat="userLog in ::originLog.logs">
-            <div class="header vn-pa-sm">
+            <div class="timeline">
-                <div class="action-model">
+                <vn-avatar
-                    <span class="model-name"
+                    ng-class="::{system: !userLog.user}"
-                        ng-if="::$ctrl.showModelName && log.changedModel"
+                    val="{{::userLog.user ? userLog.user.nickname : $ctrl.$t('System')}}"
-                        ng-style="::{backgroundColor: $ctrl.hashToColor(log.changedModel)}"
+                    ng-click="$ctrl.showWorkerDescriptor($event, userLog)">
-                        title="{{::log.changedModel}}">
+                    <img
-                        {{::log.changedModelI18n}}
+                        ng-if="::userLog.user.image"
-                    </span>
+                        ng-src="/api/Images/user/160x160/{{::userLog.userFk}}/download?access_token={{::$ctrl.vnToken.token}}">
-                </div>
+                    </img>
-                <div
+                </vn-avatar>
-                    class="action-date text-secondary text-caption vn-ml-sm"
+                <div class="arrow bg-panel" ng-if="::$ctrl.byRecord"></div>
-                    title="{{::log.creationDate | date:'dd/MM/yyyy HH:mm:ss'}}">
+                <div class="line"></div>
-                    {{::$ctrl.relativeDate(log.creationDate)}}
-                    <vn-icon
-                        class="action vn-ml-xs"
-                        ng-class="::$ctrl.actionsClass[log.action]"
-                        icon="{{::$ctrl.actionsIcon[log.action]}}"
-                        translate-attr="::{title: $ctrl.actionsText[log.action]}">
-                    </vn-icon>
-                </div>
             </div>
-            <div class="model vn-pb-sm vn-px-sm"
+            <div class="user-changes">
-                ng-if="::$ctrl.showModelName">
+                <div class="model-log" ng-repeat="modelLog in ::userLog.logs">
-                <span class="model-id" ng-if="::log.changedModelId">#{{::log.changedModelId}}</span>
+                    <div class="model-info vn-my-sm" ng-if="::!$ctrl.byRecord">
-                <vn-icon
+                        <vn-icon
-                    icon="filter_alt"
+                            icon="filter_alt"
-                    translate-attr="{title: 'Show all record changes'}"
+                            translate-attr="{title: 'Show all record changes'}"
-                    ng-click="$ctrl.filterByEntity(log)">
+                            ng-click="$ctrl.filterByRecord(modelLog)">
-                </vn-icon>
+                        </vn-icon>
-                <span class="model-value" title="{{::log.changedModelValue}}">{{::log.changedModelValue}}</span>
+                        <span class="model-name"
-            </div>
+                            ng-if="::$ctrl.showModelName && modelLog.model"
-            <div class="changes vn-pa-sm"
+                            ng-style="::{backgroundColor: $ctrl.hashToColor(modelLog.model)}"
-                ng-class="{expanded: log.expand}"
+                            title="{{::modelLog.model}}">
-                ng-if="::log.props.length || log.description">
+                            {{::modelLog.modelI18n}}
-                <vn-icon
-                    icon="expand_more"
-                    translate-attr="{title: 'Details'}"
-                    ng-click="log.expand = !log.expand">
-                </vn-icon>
-                <span ng-if="::log.props.length"
-                    class="attributes">
-                    <span ng-if="!log.expand" ng-repeat="prop in ::log.props"
-                        class="basic-json">
-                        <span class="json-field" title="{{::prop.name}}">
-                            {{::prop.nameI18n}}:
                         </span>
-                        <vn-json-value value="::prop.val.val"></vn-json-value><span ng-if="::!$last">,</span>
+                        <span class="model-id" ng-if="::modelLog.id">#{{::modelLog.id}}</span>
-                    </span>
+                        <span class="model-value" title="{{::modelLog.showValue}}">{{::modelLog.showValue}}</span>
-                    <div ng-if="log.expand" class="expanded-json">
-                        <div ng-repeat="prop in ::log.props">
-                            <span class="json-field" title="{{::prop.name}}">
-                                {{::prop.nameI18n}}:
-                            </span>
-                            <vn-log-value val="::prop.val"></vn-log-value>
-                            <span ng-if="::log.action == 'update'">
-                                ← <vn-log-value val="::prop.old"></vn-log-value>
-                            </span>
-                        </div>
                     </div>
-                </span>
+                    <vn-card class="changes-log vn-mb-xs" ng-repeat="log in ::modelLog.logs">
-                <span ng-if="::!log.props.length" class="description">
+                        <div class="change-info vn-pa-sm">
-                    {{::log.description}}
+                            <div
-                </span>
+                                class="date text-secondary text-caption vn-mr-sm"
-            </vn-card>
+                                title="{{::log.creationDate | date:'dd/MM/yyyy HH:mm:ss'}}">
+                                {{::$ctrl.relativeDate(log.creationDate)}}
+                            </div>
+                            <div>
+                                <vn-icon
+                                    class="pit vn-ml-xs"
+                                    icon="preview"
+                                    translate-attr="::{title: 'View record at this point in time'}"
+                                    ng-show="::log.action != 'insert'"
+                                    ng-click="$ctrl.viewPitInstance($event, log.id, modelLog)">
+                                </vn-icon>
+                                <vn-icon
+                                    class="action vn-ml-xs"
+                                    ng-class="::$ctrl.actionsClass[log.action]"
+                                    icon="{{::$ctrl.actionsIcon[log.action]}}"
+                                    translate-attr="::{title: $ctrl.actionsText[log.action]}">
+                                </vn-icon>
+                            </div>
+                        </div>
+                        <div class="change-detail vn-pa-sm"
+                            ng-class="{expanded: log.expand}"
+                            ng-if="::log.props.length || log.description">
+                            <vn-icon
+                                icon="expand_more"
+                                translate-attr="{title: 'Details'}"
+                                ng-click="log.expand = !log.expand">
+                            </vn-icon>
+                            <span ng-if="::log.props.length"
+                                class="attributes">
+                                <span ng-if="!log.expand" ng-repeat="prop in ::log.props"
+                                    class="basic-json">
+                                    <span class="json-field" title="{{::prop.name}}">
+                                        {{::prop.nameI18n}}:
+                                    </span>
+                                    <vn-json-value value="::prop.val.val"></vn-json-value><span ng-if="::!$last">,</span>
+                                </span>
+                                <div ng-if="log.expand" class="expanded-json">
+                                    <div ng-repeat="prop in ::log.props">
+                                        <span class="json-field" title="{{::prop.name}}">
+                                            {{::prop.nameI18n}}:
+                                        </span>
+                                        <vn-log-value val="::prop.val"></vn-log-value>
+                                        <span ng-if="::log.action == 'update'">
+                                            ← <vn-log-value val="::prop.old"></vn-log-value>
+                                        </span>
+                                    </div>
+                                </div>
+                            </span>
+                            <span ng-if="::!log.props.length" class="description">
+                                {{::log.description}}
+                            </span>
+                        </vn-card>
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
 </vn-data-viewer>
 <vn-float-button
-    ng-if="model.userFilter"
+    ng-if="$ctrl.hasFilter"
     icon="filter_alt_off"
     translate-attr="{title: 'Quit filter'}"
     ng-click="$ctrl.resetFilter()"
@@ -212,5 +228,33 @@
         </vn-date-picker>
     </form>
 </vn-side-menu>
-<vn-worker-descriptor-popover vn-id="workerDescriptor">
+<vn-popover vn-id="instance-popover">
+    <tpl-body class="vn-log-instance">
+        <vn-spinner
+            ng-if="$ctrl.instance.canceler"
+            class="loading vn-pa-sm"
+            enable="true">
+        </vn-spinner>
+        <div
+            ng-if="!$ctrl.instance.canceler" class="instance">
+            <h6 class="header vn-pa-sm">
+                {{$ctrl.instance.modelLog.modelI18n}} #{{$ctrl.instance.modelLog.id}}
+            </h6>
+            <div class="change-detail vn-pa-sm">
+                <div ng-if="$ctrl.instance.props"
+                    ng-repeat="prop in $ctrl.instance.props">
+                    <span class="json-field" title="{{::prop.name}}">
+                        {{::prop.nameI18n}}:
+                    </span>
+                    <vn-log-value val="::prop.val"></vn-log-value>
+                </div>
+                <div ng-if="!$ctrl.instance.props" translate>
+                    No data
+                </div>
+            </div>
+        </div>
+    </tpl-body>
+</vn-popover>
+<vn-worker-descriptor-popover
+    vn-id="worker-descriptor">
 </vn-worker-descriptor-popover>

front/salix/components/log/index.js

@@ -3,7 +3,10 @@ import Section from '../section';
 import {hashToColor} from 'core/lib/string';
 import './style.scss';
 
-const validDate = /^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[12][0-9])T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(.[0-9]+)?(Z)?$/;
+const validDate = new RegExp(
+    /^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[12][0-9])/.source
+    + /T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(.[0-9]+)?(Z)?$/.source
+);
 
 export default class Controller extends Section {
     constructor($element, $) {
@@ -28,6 +31,20 @@ export default class Controller extends Section {
             select: 'visibility'
         };
         this.filter = {
+            fields: [
+                'id',
+                'originFk',
+                'userFk',
+                'action',
+                'changedModel',
+                'oldInstance',
+                'newInstance',
+                'creationDate',
+                'changedModel',
+                'changedModelId',
+                'changedModelValue',
+                'description'
+            ],
             include: [{
                 relation: 'user',
                 scope: {
@@ -48,6 +65,11 @@ export default class Controller extends Section {
         this.today.setHours(0, 0, 0, 0);
     }
 
+    $onInit() {
+        const match = this.url?.match(/(.*)Logs$/);
+        this.modelI18n = match && this.translateModel(match[1]);
+    }
+
     $postLink() {
         this.resetFilter();
         this.$.$watch(
@@ -63,47 +85,75 @@ export default class Controller extends Section {
 
     set logs(value) {
         this._logs = value;
+        this.logTree = [];
         if (!value) return;
 
         const empty = {};
         const validations = window.validations;
-        const castJsonValue = this.castJsonValue;
 
-        for (const log of value) {
+        let originLog;
+        let userLog;
+        let modelLog;
+        let nLogs;
+
+        for (let i = 0; i < value.length; i++) {
+            const log = value[i];
+            const prevLog = i > 0 ? value[i - 1] : null;
+            const locale = validations[log.changedModel]?.locale || empty;
+
+            // Origin
+
+            const originChanged = !prevLog
+                || log.originFk != prevLog.originFk;
+            if (originChanged) {
+                this.logTree.push(originLog = {
+                    originFk: log.originFk,
+                    logs: []
+                });
+            }
+
+            // User
+
+            const userChanged = originChanged
+                || log.userFk != prevLog.userFk
+                || nLogs >= 5;
+            if (userChanged) {
+                originLog.logs.push(userLog = {
+                    user: log.user,
+                    userFk: log.userFk,
+                    logs: []
+                });
+                nLogs = 0;
+            }
+            nLogs++;
+
+            // Model
+
+            const modelChanged = userChanged
+                || log.changedModel != prevLog.changedModel
+                || log.changedModelId != prevLog.changedModelId;
+            if (modelChanged) {
+                userLog.logs.push(modelLog = {
+                    model: log.changedModel,
+                    modelI18n: firstUpper(locale.name) || log.changedModel,
+                    id: log.changedModelId,
+                    showValue: log.changedModelValue,
+                    logs: []
+                });
+            }
+
+            modelLog.logs.push(log);
+
+            // Changes
+
             const notDelete = log.action != 'delete';
             const olds = (notDelete ? log.oldInstance : null) || empty;
             const vals = (notDelete ? log.newInstance : log.oldInstance) || empty;
-            const locale = validations[log.changedModel]?.locale || empty;
-            log.changedModelI18n = firstUpper(locale.name) || log.changedModel;
 
-            let props = Object.keys(olds).concat(Object.keys(vals));
+            let propNames = Object.keys(olds).concat(Object.keys(vals));
-            props = [...new Set(props)];
+            propNames = [...new Set(propNames)];
 
-            log.props = [];
+            log.props = this.parseProps(propNames, locale, vals, olds);
-            for (const prop of props) {
-                if (prop.endsWith('$')) continue;
-                log.props.push({
-                    name: prop,
-                    nameI18n: firstUpper(locale.columns?.[prop]) || prop,
-                    old: getVal(olds, prop),
-                    val: getVal(vals, prop)
-                });
-            }
-            log.props.sort(
-                (a, b) => a.nameI18n.localeCompare(b.nameI18n));
-        }
-
-        function getVal(vals, prop) {
-            let val, id;
-            const showProp = `${prop}$`;
-
-            if (vals[showProp] != null) {
-                val = vals[showProp];
-                id = vals[prop];
-            } else
-                val = vals[prop];
-
-            return {val: castJsonValue(val), id};
         }
     }
 
@@ -114,17 +164,76 @@ export default class Controller extends Section {
     set models(value) {
         this._models = value;
         if (!value) return;
-        for (const model of value) {
+        for (const model of value)
-            const name = model.changedModel;
+            model.changedModelI18n = this.translateModel(model.changedModel);
-            model.changedModelI18n =
-                firstUpper(window.validations[name]?.locale?.name) || name;
-        }
     }
 
     get showModelName() {
         return !(this.changedModel && this.changedModelId);
     }
 
+    parseProps(propNames, locale, vals, olds) {
+        const castJsonValue = this.castJsonValue;
+        const props = [];
+
+        for (const prop of propNames) {
+            if (prop.endsWith('$')) continue;
+            props.push({
+                name: prop,
+                nameI18n: firstUpper(locale.columns?.[prop]) || prop,
+                val: getVal(vals, prop),
+                old: olds && getVal(olds, prop)
+            });
+        }
+        props.sort(
+            (a, b) => a.nameI18n.localeCompare(b.nameI18n));
+
+        function getVal(vals, prop) {
+            let val; let id;
+            const showProp = `${prop}$`;
+
+            if (vals[showProp] != null) {
+                val = vals[showProp];
+                id = vals[prop];
+            } else
+                val = vals[prop];
+
+            return {val: castJsonValue(val), id};
+        }
+
+        return props;
+    }
+
+    viewPitInstance(event, id, modelLog) {
+        if (this.instance?.canceler)
+            this.instance.canceler.resolve();
+
+        const canceler = this.$q.defer();
+        this.instance = {
+            modelLog,
+            canceler
+        };
+        const options = {timeout: canceler.promise};
+
+        this.$http.get(`${this.url}/${id}/pitInstance`, options)
+            .then(res => {
+                const instance = res.data;
+                const propNames = Object.keys(instance);
+                const locale = window.validations[modelLog.model]?.locale || {};
+                this.instance.props = this.parseProps(propNames, locale, instance);
+            })
+            .finally(() => {
+                this.instance.canceler = null;
+                this.$.$applyAsync(() => this.$.instancePopover.relocate());
+            });
+
+        this.$.instancePopover.show(event);
+    }
+
+    translateModel(name) {
+        return firstUpper(window.validations[name]?.locale?.name) || name;
+    }
+
     castJsonValue(value) {
         return typeof value === 'string' && validDate.test(value)
             ? new Date(value)
@@ -160,12 +269,11 @@ export default class Controller extends Section {
     applyFilter() {
         const filter = this.$.filter;
 
-        function getParam(prop, value) {
+        const getParam = (prop, value) => {
             if (value == null || value == '') return null;
             switch (prop) {
             case 'search':
-                const or = [];
+                if (/^\s*[0-9]+\s*$/.test(value) || this.byRecord)
-                if (/^\s*[0-9]+\s*$/.test(value))
                     return {changedModelId: value.trim()};
                 else
                     return {changedModelValue: {like: `%${value}%`}};
@@ -177,72 +285,86 @@ export default class Controller extends Section {
                 ]};
             case 'who':
                 switch (value) {
-                case 'all':
-                    return null;
                 case 'user':
                     return {userFk: {neq: null}};
                 case 'system':
                     return {userFk: null};
+                case 'all':
+                default:
+                    return null;
                 }
-            case 'actions':
+            case 'actions': {
                 const inq = [];
                 for (const action in value) {
                     if (value[action])
                         inq.push(action);
                 }
                 return inq.length ? {action: {inq}} : null;
+            }
             case 'from':
-                if (filter.to) {
+                if (filter.to)
                     return {creationDate: {gte: value}};
-                } else {
+                else {
                     const to = new Date(value);
                     to.setHours(23, 59, 59, 999);
                     return {creationDate: {between: [value, to]}};
                 }
-            case 'to':
+            case 'to': {
                 const to = new Date(value);
                 to.setHours(23, 59, 59, 999);
                 return {creationDate: {lte: to}};
+            }
             case 'userFk':
                 return filter.who != 'system'
                     ? {[prop]: value} : null;
             default:
                 return {[prop]: value};
             }
-        }
+        };
 
+        this.hasFilter = false;
         const and = [];
+
+        if (!filter.search || !filter.changedModel)
+            this.byRecord = false;
+        if (!this.byRecord)
+            and.push({originFk: this.originId});
+
         for (const prop in filter) {
             const param = getParam(prop, filter[prop]);
-            if (param) and.push(param);
+            if (param) {
+                and.push(param);
+                this.hasFilter = true;
+            }
         }
 
         const lbFilter = and.length ? {where: {and}} : null;
         return this.$.model.applyFilter(lbFilter);
     }
 
-    filterByEntity(log) {
+    filterByRecord(modelLog) {
+        this.byRecord = true;
         this.$.filter = {
             who: 'all',
-            search: log.changedModelId,
+            search: modelLog.id,
-            changedModel: log.changedModel
+            changedModel: modelLog.model
         };
     }
 
     searchUser(search) {
-        if (/^[0-9]+$/.test(search)) {
+        if (/^[0-9]+$/.test(search))
             return {id: search};
-        } else {
+        else {
             return {or: [
                 {name: search},
                 {nickname: {like: `%${search}%`}}
-            ]}
+            ]};
         }
     }
 
-    showWorkerDescriptor(event, log) {
+    showWorkerDescriptor(event, userLog) {
-        if (log.user?.worker)
+        if (userLog.user?.worker)
-            this.$.workerDescriptor.show(event.target, log.userFk);
+            this.$.workerDescriptor.show(event.target, userLog.userFk);
     }
 }
 

front/salix/components/log/locale/es.yml

@@ -24,4 +24,5 @@ Changes: Cambios
 today: hoy
 yesterday: ayer
 Show all record changes: Mostrar todos los cambios realizados en el registro
+View record at this point in time: Ver el registro en este punto
 Quit filter: Quitar filtro

front/salix/components/log/style.scss

@@ -1,13 +1,49 @@
 @import "util";
 
 vn-log {
-    .change {
+    .origin-log {
+        &:first-child > .origin-info {
+            margin-top: 0;
+        }
+        & > .origin-info {
+            display: flex;
+            align-items: center;
+            margin-top: 28px;
+            gap: 6px;
+
+            & > .origin-id {
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+                color: $color-font-secondary;
+                margin: 0;
+            }
+            & > .line {
+                flex-grow: 1;
+                background-color: $color-font-secondary;
+                height: 2px;
+            }
+        }
+    }
+    .user-log {
         display: flex;
 
-        & > .left {
+        & > .timeline {
             position: relative;
             padding-right: 10px;
+            width: 38px;
+            min-width: 38px;
+            flex-grow: auto;
 
+            & > .arrow {
+                height: 8px;
+                width: 8px;
+                position: absolute;
+                transform: rotateY(0deg) rotate(45deg);
+                top: 15px;
+                right: -4px;
+                z-index: 1;
+            }
             & > vn-avatar {
                 cursor: pointer;
 
@@ -15,153 +51,187 @@ vn-log {
                     background-color: $color-main !important;
                 }
             }
-            & > .arrow {
-                height: 8px;
-                width: 8px;
-                position: absolute;
-                transform: rotateY(0deg) rotate(45deg);
-                top: 18px;
-                right: -4px;
-                z-index: 1;
-            }
             & > .line {
                 position: absolute;
                 background-color: $color-main;
                 width: 2px;
-                left: 17px;
+                left: 18px;
                 z-index: -1;
                 top: 44px;
-                bottom: -8px;
+                bottom: -2px;
             }
         }
-        &:last-child > .left > .line {
+        &:last-child > .timeline > .line {
             display: none;
         }
-        .detail {
+        & > .user-changes {
-            position: relative;
             flex-grow: 1;
-            width: 100%;
-            border-radius: 2px;
             overflow: hidden;
+        }
+    }
+    .model-log {
+        & > .model-info {
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            min-height: 22px;
 
-            & > .header {
+            & > .model-name {
-                display: flex;
+                display: inline-block;
-                justify-content: space-between;
+                padding: 2px 5px;
-                align-items: center;
+                color: $color-font-dark;
-                overflow: hidden;
+                border-radius: 8px;
+                vertical-align: middle;
+            }
+            & > .model-value {
+                font-style: italic;
+            }
+            & > .model-id {
+                color: $color-font-secondary;
+                font-size: .9rem;
+            }
+            & > vn-icon[icon="filter_alt"] {
+                @extend %clickable-light;
+                vertical-align: middle;
+                font-size: 18px;
+                color: $color-font-secondary;
+                float: right;
+                display: none;
 
-                & > .action-model {
+                @include mobile {
-                    display: inline-flex;
+                    display: initial;
-                    overflow: hidden;
-
-                    & > .model-name {
-                        display: inline-block;
-                        padding: 2px 5px;
-                        color: $color-font-dark;
-                        border-radius: 8px;
-                        overflow: hidden;
-                        text-overflow: ellipsis;
-                        white-space: nowrap;
-                    }
-                }
-                & > .action-date {
-                    white-space: nowrap;
-
-                    & > .action {
-                        display: inline-flex;
-                        align-items: center;
-                        justify-content: center;
-                        color: $color-font-bg;
-                        vertical-align: middle;
-                        border-radius: 50%;
-                        width: 24px;
-                        height: 24px;
-                        font-size: 18px;
-
-                        &.notice {
-                            background-color: $color-notice-medium
-                        }
-                        &.success {
-                            background-color: $color-success-medium;
-                        }
-                        &.warning {
-                            background-color: $color-main-medium;
-                        }
-                        &.alert {
-                            background-color: lighten($color-alert, 5%);
-                        }
-                    }
                 }
             }
-            & > .model {
+        }
-                overflow: hidden;
+        &:hover > .model-info > vn-icon[icon="filter_alt"] {
-                text-overflow: ellipsis;
+            display: initial;
-                white-space: nowrap;
+        }
-                max-height: 18px;
+    }
+    .changes-log {
+        position: relative;
+        max-width: 100%;
+        width: 100%;
+        border-radius: 2px;
+        overflow: hidden;
 
-                & > vn-icon {
+        &:last-child {
+            margin-bottom: 0;
+        }
+        & > .change-info {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            overflow: hidden;
+
+            & > .date {
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+            }
+            & > div {
+                white-space: nowrap;
+
+                & > vn-icon.pit {
                     @extend %clickable-light;
                     vertical-align: middle;
-                    padding: 2px;
+                    font-size: 20px;
-                    margin: -2px;
-                    font-size: 18px;
                     color: $color-font-secondary;
-                    float: right;
                     display: none;
 
                     @include mobile {
-                        display: initial;
+                        display: inline-block;
                     }
                 }
-                & > .model-value {
+                & > .action {
-                    font-style: italic;
+                    display: inline-flex;
-                }
+                    align-items: center;
-                & > .model-id {
+                    justify-content: center;
-                    color: $color-font-secondary;
+                    color: $color-font-bg;
-                    font-size: .9rem;
+                    vertical-align: middle;
-                }
+                    border-radius: 50%;
-            }
+                    width: 24px;
-            &:hover > .model > vn-icon {
+                    height: 24px;
-                display: initial;
+                    font-size: 18px;
-            }
-        }
-    }
-    .changes {
-        overflow: hidden;
-        background-color: rgba(255, 255, 255, .05);
-        color: $color-font-light;
-        position: relative;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        min-height: 34px;
-        box-sizing: border-box;
 
-        & > vn-icon {
+                    &.notice {
-            @extend %clickable;
+                        background-color: $color-notice-medium
-            float: right;
+                    }
-            position: relative;
+                    &.success {
-            transition-property: transform, background-color;
+                        background-color: $color-success-medium;
-            transition-duration: 150ms;
+                    }
-            margin: -5px;
+                    &.warning {
-            margin-left: 4px;
+                        background-color: $color-main-medium;
-            padding: 1px;
+                    }
-            border-radius: 50%;
+                    &.alert {
+                        background-color: lighten($color-alert, 5%);
+                    }
+                }
+            }
+            &:hover vn-icon.pit {
+                display: inline-block;
+            }
         }
-        &.expanded {
+        & > .change-detail {
-            text-overflow: initial;
+            overflow: hidden;
-            white-space: initial;
+            background-color: rgba(255, 255, 255, .05);
+            color: $color-font-light;
+            position: relative;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            min-height: 34px;
+            box-sizing: border-box;
 
             & > vn-icon {
-                transform: rotate(180deg);
+                @extend %clickable;
+                float: right;
+                position: relative;
+                transition-property: transform, background-color;
+                transition-duration: 150ms;
+                margin: -5px;
+                margin-left: 4px;
+                padding: 1px;
+                border-radius: 50%;
+            }
+            &.expanded {
+                text-overflow: initial;
+                white-space: initial;
+
+                & > vn-icon {
+                    transform: rotate(180deg);
+                }
+            }
+            & > .no-changes {
+                font-style: italic;
             }
         }
-        & > .no-changes {
+    }
-            font-style: italic;
+    .id-value {
+        font-size: .9rem;
+        color: $color-font-secondary;
+    }
+}
+.vn-log-instance {
+    display: block;
+
+    & > .loading {
+        display: flex;
+        justify-content: center;
+    }
+    & > .instance {
+        min-width: 180px;
+        max-width: 400px;
+
+        & > .header {
+            background-color: $color-main;
+            color: $color-font-dark;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            margin: 0;
+        }
+        & > .change-detail {
+            color: $color-font-light;
         }
     }
 }
-vn-log-value > .id-value {
-    font-size: .9rem;
-    color: $color-font-secondary;
-}

loopback/common/methods/log/pitInstance.js

@@ -0,0 +1,91 @@
+const NotFoundError = require('vn-loopback/util/not-found-error');
+
+module.exports = Self => {
+    Self.remoteMethod('pitInstance', {
+        description: 'Gets the status of instance at specific point in time',
+        accepts: [
+            {
+                arg: 'id',
+                type: 'integer',
+                description: 'The log id',
+                required: true
+            }
+        ],
+        returns: {
+            type: [Self],
+            root: true
+        },
+        http: {
+            path: `/:id/pitInstance`,
+            verb: 'GET'
+        }
+    });
+
+    Self.pitInstance = async function(id) {
+        const log = await Self.findById(id, {
+            fields: [
+                'changedModel',
+                'changedModelId',
+                'creationDate'
+            ]
+        });
+        if (!log)
+            throw new NotFoundError();
+
+        const where = {
+            changedModel: log.changedModel,
+            changedModelId: log.changedModelId
+        };
+
+        // Fetch creation and all update logs for record up to requested log
+
+        const createdWhere = {
+            action: 'insert',
+            creationDate: {lte: log.creationDate}
+        };
+        const createdLog = await Self.findOne({
+            fields: ['id', 'creationDate', 'newInstance'],
+            where: Object.assign(createdWhere, where),
+            order: 'creationDate DESC, id DESC'
+        });
+
+        const instance = {};
+
+        let logsWhere = {
+            action: 'update'
+        };
+        if (createdLog) {
+            Object.assign(instance, createdLog.newInstance);
+            Object.assign(logsWhere, {
+                creationDate: {between: [
+                    createdLog.creationDate,
+                    log.creationDate
+                ]},
+                id: {between: [
+                    Math.min(id, createdLog.id),
+                    Math.max(id, createdLog.id)
+                ]}
+            });
+        } else {
+            Object.assign(logsWhere, {
+                creationDate: {lte: log.creationDate},
+                id: {lte: id}
+            });
+        }
+
+        const logs = await Self.find({
+            fields: ['newInstance'],
+            where: Object.assign(logsWhere, where),
+            order: 'creationDate, id'
+        });
+        if (!logs.length && !createdLog)
+            throw new NotFoundError('No logs found for record');
+
+        // Merge all logs in order into one instance
+
+        for (const log of logs)
+            Object.assign(instance, log.newInstance);
+
+        return instance;
+    };
+};

loopback/common/models/log.js

@@ -5,6 +5,7 @@ module.exports = function(Self) {
             Self.super_.setup.call(this);
             require('../methods/log/editors')(this);
             require('../methods/log/models')(this);
+            require('../methods/log/pitInstance')(this);
         }
     });
 };

modules/invoiceOut/back/methods/invoiceOut/createPdf.js

@@ -24,20 +24,15 @@ module.exports = Self => {
 
     Self.createPdf = async function(ctx, id, options) {
         const models = Self.app.models;
+        options = typeof options == 'object'
+            ? Object.assign({}, options) : {};
 
         let tx;
-        const myOptions = {};
+        if (!options.transaction)
-
+            tx = options.transaction = await Self.beginTransaction({});
-        if (typeof options == 'object')
-            Object.assign(myOptions, options);
-
-        if (!myOptions.transaction) {
-            tx = await Self.beginTransaction({});
-            myOptions.transaction = tx;
-        }
 
         try {
-            const invoiceOut = await Self.findById(id, {fields: ['hasPdf']}, myOptions);
+            const invoiceOut = await Self.findById(id, {fields: ['hasPdf']}, options);
 
             if (invoiceOut.hasPdf) {
                 const canCreatePdf = await models.ACL.checkAccessAcl(ctx, 'InvoiceOut', 'canCreatePdf', 'WRITE');
@@ -45,7 +40,7 @@ module.exports = Self => {
                     throw new UserError(`You don't have enough privileges`);
             }
 
-            await Self.makePdf(id, myOptions);
+            await Self.makePdf(id, options);
 
             if (tx) await tx.commit();
         } catch (err) {

modules/invoiceOut/back/methods/invoiceOut/download.js

@@ -1,6 +1,5 @@
 const fs = require('fs-extra');
 const path = require('path');
-const UserError = require('vn-loopback/util/user-error');
 
 module.exports = Self => {
     Self.remoteMethodCtx('download', {
@@ -37,47 +36,43 @@ module.exports = Self => {
 
     Self.download = async function(ctx, id, options) {
         const models = Self.app.models;
-        const myOptions = {};
+        options = typeof options == 'object'
+            ? Object.assign({}, options) : {};
 
-        if (typeof options == 'object')
+        const pdfFile = await Self.filePath(id, options);
-            Object.assign(myOptions, options);
+
+        const container = await models.InvoiceContainer.container(pdfFile.year);
+        const rootPath = container.client.root;
+
+        const file = {
+            path: path.join(rootPath, pdfFile.path, pdfFile.name),
+            contentType: 'application/pdf',
+            name: pdfFile.name
+        };
 
         try {
-            const invoiceOut = await models.InvoiceOut.findById(id, {
+            await fs.access(file.path);
-                fields: ['ref', 'issued']
+        } catch (error) {
-            }, myOptions);
+            await Self.createPdf(ctx, id, options);
+        }
 
-            const issued = invoiceOut.issued;
+        let stream = await fs.createReadStream(file.path);
-            const year = issued.getFullYear().toString();
+        // XXX: To prevent unhandled ENOENT error
-            const month = (issued.getMonth() + 1).toString();
+        // https://stackoverflow.com/questions/17136536/is-enoent-from-fs-createreadstream-uncatchable
-            const day = issued.getDate().toString();
+        stream.on('error', err => {
-
+            const e = new Error(err.message);
-            const container = await models.InvoiceContainer.container(year);
+            err.stack = e.stack;
-            const rootPath = container.client.root;
+            console.error(err);
-            const src = path.join(rootPath, year, month, day);
+        });
-            const fileName = `${year}${invoiceOut.ref}.pdf`;
-            const fileSrc = path.join(src, fileName);
-
-            const file = {
-                path: fileSrc,
-                contentType: 'application/pdf',
-                name: fileName
-            };
 
+        if (process.env.NODE_ENV == 'test') {
             try {
                 await fs.access(file.path);
             } catch (error) {
-                await Self.createPdf(ctx, id, myOptions);
+                stream = null;
             }
-
-            const stream = fs.createReadStream(file.path);
-
-            return [stream, file.contentType, `filename="${file.name}"`];
-        } catch (error) {
-            if (error.code === 'ENOENT')
-                throw new UserError('The PDF document does not exist');
-
-            throw error;
         }
+
+        return [stream, file.contentType, `filename="${pdfFile.name}"`];
     };
 };

modules/invoiceOut/back/methods/invoiceOut/invoiceClient.js

@@ -45,7 +45,6 @@ module.exports = Self => {
     Self.invoiceClient = async(ctx, options) => {
         const args = ctx.args;
         const models = Self.app.models;
-
         options = typeof options == 'object'
             ? Object.assign({}, options) : {};
         options.userId = ctx.req.accessToken.userId;

modules/invoiceOut/back/methods/invoiceOut/invoiceEmail.js

@@ -11,20 +11,17 @@ module.exports = Self => {
                 type: 'string',
                 required: true,
                 http: {source: 'path'}
-            },
+            }, {
-            {
                 arg: 'recipient',
                 type: 'string',
                 description: 'The recipient email',
                 required: true,
-            },
+            }, {
-            {
                 arg: 'replyTo',
                 type: 'string',
                 description: 'The sender email to reply to',
                 required: false
-            },
+            }, {
-            {
                 arg: 'recipientId',
                 type: 'number',
                 description: 'The recipient id to send to the recipient preferred language',
@@ -43,16 +40,13 @@ module.exports = Self => {
 
     Self.invoiceEmail = async(ctx, reference) => {
         const args = Object.assign({}, ctx.args);
-        const {InvoiceOut} = Self.app.models;
         const params = {
             recipient: args.recipient,
             lang: ctx.req.getLocale()
         };
 
-        const invoiceOut = await InvoiceOut.findOne({
+        const invoiceOut = await Self.findOne({
-            where: {
+            where: {ref: reference}
-                ref: reference
-            }
         });
 
         delete args.ctx;

modules/invoiceOut/back/methods/invoiceOut/specs/download.spec.js

@@ -1,28 +0,0 @@
-const models = require('vn-loopback/server/server').models;
-const fs = require('fs-extra');
-
-describe('InvoiceOut download()', () => {
-    const userId = 9;
-    const invoiceId = 1;
-    const ctx = {
-        req: {
-
-            accessToken: {userId: userId},
-            headers: {origin: 'http://localhost:5000'},
-        }
-    };
-
-    it('should return the downloaded file name', async() => {
-        spyOn(models.InvoiceContainer, 'container').and.returnValue({
-            client: {root: '/path'}
-        });
-        spyOn(fs, 'createReadStream').and.returnValue(new Promise(resolve => resolve('streamObject')));
-        spyOn(fs, 'access').and.returnValue(true);
-        spyOn(models.InvoiceOut, 'createPdf').and.returnValue(new Promise(resolve => resolve(true)));
-
-        const result = await models.InvoiceOut.download(ctx, invoiceId);
-
-        expect(result[1]).toEqual('application/pdf');
-        expect(result[2]).toMatch(/filename="\d{4}T1111111.pdf"/);
-    });
-});

modules/invoiceOut/back/models/invoice-out.js

@@ -1,4 +1,5 @@
 const print = require('vn-print');
+const path = require('path');
 
 module.exports = Self => {
     require('../methods/invoiceOut/filter')(Self);
@@ -23,20 +24,31 @@ module.exports = Self => {
     require('../methods/invoiceOut/negativeBases')(Self);
     require('../methods/invoiceOut/negativeBasesCsv')(Self);
 
-    Self.makePdf = async function(id, options) {
+    Self.filePath = async function(id, options) {
-        const fields = ['id', 'hasPdf', 'ref', 'issued'];
+        const fields = ['ref', 'issued'];
         const invoiceOut = await Self.findById(id, {fields}, options);
-        const invoiceReport = new print.Report('invoice', {
-            reference: invoiceOut.ref
-        });
-        const buffer = await invoiceReport.toPdfStream();
 
         const issued = invoiceOut.issued;
         const year = issued.getFullYear().toString();
         const month = (issued.getMonth() + 1).toString();
         const day = issued.getDate().toString();
 
-        const fileName = `${year}${invoiceOut.ref}.pdf`;
+        return {
+            path: path.join(year, month, day),
+            name: `${year}${invoiceOut.ref}.pdf`,
+            year
+        };
+    };
+
+    Self.makePdf = async function(id, options) {
+        const fields = ['id', 'hasPdf', 'ref'];
+        const invoiceOut = await Self.findById(id, {fields}, options);
+        const invoiceReport = new print.Report('invoice', {
+            reference: invoiceOut.ref
+        });
+        const buffer = await invoiceReport.toPdfStream();
+
+        const pdfFile = await Self.filePath(id, options);
 
         // Store invoice
 
@@ -47,8 +59,8 @@ module.exports = Self => {
         if (process.env.NODE_ENV !== 'test') {
             await print.storage.write(buffer, {
                 type: 'invoice',
-                path: `${year}/${month}/${day}`,
+                path: pdfFile.path,
-                fileName: fileName
+                fileName: pdfFile.name
             });
         }
     };

modules/ticket/back/methods/ticket/setDeleted.js

@@ -81,17 +81,15 @@ module.exports = Self => {
                 throw new UserError('You must delete all the buy requests first');
 
             // removes item shelvings
-            if (hasItemShelvingSales && isSalesAssistant) {
+            const promises = [];
-                const promises = [];
+            for (let sale of sales) {
-                for (let sale of sales) {
+                if (sale.itemShelvingSale()) {
-                    if (sale.itemShelvingSale()) {
+                    const itemShelvingSale = sale.itemShelvingSale();
-                        const itemShelvingSale = sale.itemShelvingSale();
+                    const destroyedShelving = models.ItemShelvingSale.destroyById(itemShelvingSale.id, myOptions);
-                        const destroyedShelving = models.ItemShelvingSale.destroyById(itemShelvingSale.id, myOptions);
+                    promises.push(destroyedShelving);
-                        promises.push(destroyedShelving);
-                    }
                 }
-                await Promise.all(promises);
             }
+            await Promise.all(promises);
 
             // Remove ticket greuges
             const ticketGreuges = await models.Greuge.find({where: {ticketFk: id}}, myOptions);

modules/worker/back/models/operator.js

@@ -1,10 +1,10 @@
 module.exports = function(Self) {
     Self.observe('after save', async function(ctx) {
-        const instance = ctx.instance;
+        const instance = ctx.data || ctx.instance;
         const models = Self.app.models;
         const options = ctx.options;
 
-        if (!instance.sectorFk || !instance.labelerFk) return;
+        if (!instance?.sectorFk || !instance?.labelerFk) return;
 
         const sector = await models.Sector.findById(instance.sectorFk, {
             fields: ['mainPrinterFk']

modules/worker/back/models/operator.json

@@ -16,18 +16,12 @@
 			"type": "number"
 		},
 		"trainFk": {
-			"type": "number",
+			"type": "number"
-			"required": true
 		},
 		"itemPackingTypeFk": {
-			"type": "string",
+			"type": "string"
-			"required": true
 		},
 		"warehouseFk": {
-			"type": "number",
-			"required": true
-		},
-		"sectorFk": {
 			"type": "number"
 		},
 		"labelerFk": {

print/core/email.js

@@ -63,12 +63,12 @@ class Email extends Component {
                     await getAttachments(componentPath, component.attachments);
 
                     if (component.components)
-                        await getSubcomponentAttachments(component)
+                        await getSubcomponentAttachments(component);
                 }
             }
         }
 
-        await getSubcomponentAttachments(instance)
+        await getSubcomponentAttachments(instance);
 
         if (this.attachments)
             await getAttachments(this.path, this.attachments);

print/core/smtp.js

@@ -20,14 +20,18 @@ module.exports = {
             options.to = config.app.senderEmail;
         }
 
+        let res;
         let error;
-        return this.transporter.sendMail(options).catch(err => {
+        try {
+            res = await this.transporter.sendMail(options);
+        } catch (err) {
             error = err;
-
             throw err;
-        }).finally(async() => {
+        } finally {
             await this.mailLog(options, error);
-        });
+        }
+
+        return res;
     },
 
     async mailLog(options, error) {