From bf05296b841f1383faa8febd2ce268ba88676803 Mon Sep 17 00:00:00 2001
From: carlosjr <carlosjr@verdnatura.es>
Date: Tue, 18 May 2021 13:20:08 +0200
Subject: [PATCH 1/3] made dev debug info window less nav intrusive

---
 front/core/components/debug-info/index.html |  3 ---
 front/core/components/debug-info/style.scss | 10 +++++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/front/core/components/debug-info/index.html b/front/core/components/debug-info/index.html
index 1ce9e6b08..93bd83a83 100644
--- a/front/core/components/debug-info/index.html
+++ b/front/core/components/debug-info/index.html
@@ -1,8 +1,5 @@
 <h6>Debug info</h6>
 <ul>
-    <li>
-        {{$ctrl.env}}
-    </li>
     <li>
         <span ng-class="{alert: $root.$$watchersCount > 500}">{{$root.$$watchersCount}}</span> watchers
     </li>
diff --git a/front/core/components/debug-info/style.scss b/front/core/components/debug-info/style.scss
index 290b84890..1c366b23f 100644
--- a/front/core/components/debug-info/style.scss
+++ b/front/core/components/debug-info/style.scss
@@ -2,10 +2,10 @@
 
 .vn-debug-info {
     position: fixed;
-    bottom: 16px;
-    left: 16px;
-    padding: 16px;
-    min-width: 128px;
+    top: 3px;
+    left: 300px;
+    padding: 5px;
+    min-width: 100px;
     background-color: #3f51b5;
     color: $color-font-dark;
     border-radius: 4px;
@@ -15,7 +15,7 @@
 
     &.right {
         left: auto;
-        right: 16px;
+        right: 160px;
     }
     & > h6 {
         font-weight: normal;
-- 
2.40.1


From c0e2ff12da772e2b4a492a3ed5a3cc04997b7052 Mon Sep 17 00:00:00 2001
From: carlosjr <carlosjr@verdnatura.es>
Date: Tue, 18 May 2021 13:22:40 +0200
Subject: [PATCH 2/3] moved vn-log to salix components + css changes and
 renamed worker-log to log

---
 front/salix/components/index.js               |   1 +
 front/salix/components/log/index.html         |  93 ++++++++++++++
 front/salix/components/log/index.js           |  75 ++++++++++++
 .../salix/components}/log/locale/es.yml       |   0
 .../salix/components}/log/style.scss          |   6 +
 modules/worker/front/index.js                 |   1 -
 modules/worker/front/log/index.html           | 114 +-----------------
 modules/worker/front/log/index.js             |  72 +----------
 modules/worker/front/worker-log/index.html    |   1 -
 modules/worker/front/worker-log/index.js      |   7 --
 10 files changed, 178 insertions(+), 192 deletions(-)
 create mode 100644 front/salix/components/log/index.html
 create mode 100644 front/salix/components/log/index.js
 rename {modules/worker/front => front/salix/components}/log/locale/es.yml (100%)
 rename {modules/worker/front => front/salix/components}/log/style.scss (86%)
 delete mode 100644 modules/worker/front/worker-log/index.html
 delete mode 100644 modules/worker/front/worker-log/index.js

diff --git a/front/salix/components/index.js b/front/salix/components/index.js
index 5167b21d6..ce4ad585a 100644
--- a/front/salix/components/index.js
+++ b/front/salix/components/index.js
@@ -15,3 +15,4 @@ import './topbar/topbar';
 import './user-popover';
 import './upload-photo';
 import './bank-entity';
+import './log';
diff --git a/front/salix/components/log/index.html b/front/salix/components/log/index.html
new file mode 100644
index 000000000..bcb17d8d7
--- /dev/null
+++ b/front/salix/components/log/index.html
@@ -0,0 +1,93 @@
+<vn-crud-model vn-id="model" url="{{$ctrl.url}}" filter="$ctrl.filter" link="{originFk: $ctrl.originId}"
+    data="$ctrl.logs" limit="20" auto-load="true">
+</vn-crud-model>
+<vn-data-viewer model="model" class="vn-w-xl">
+    <vn-card>
+        <vn-table model="model">
+            <vn-thead>
+                <vn-tr>
+                    <vn-th field="creationDate">Date</vn-th>
+                    <vn-th field="userFk" class="expendable" shrink>Author</vn-th>
+                    <vn-th field="changedModel" class="expendable" shrink>Model</vn-th>
+                    <vn-th field="action" class="expendable" shrink>Action</vn-th>
+                    <vn-th field="changedModelValue" class="expendable">Name</vn-th>
+                    <vn-th expand>Before</vn-th>
+                    <vn-th expand>After</vn-th>
+                </vn-tr>
+            </vn-thead>
+            <vn-tbody>
+                <vn-tr ng-repeat="log in $ctrl.logs">
+                    <vn-td expand>
+                        {{::log.creationDate | date:'dd/MM/yyyy HH:mm'}}
+                        <div class="changes">
+                            <div>
+                                <span translate class="label">Changed by</span><span class="label">: </span>
+                                <span ng-class="{'link': log.user.worker.id, 'value': !log.user.worker.id}"
+                                    ng-click="$ctrl.showWorkerDescriptor($event, log.user.worker.id)"
+                                    translate>{{::log.user.name || 'System' | translate}}
+                                </span>
+                            </div>
+                            <div>
+                                <span translate class="label">Model</span><span class="label">: </span>
+                                <span translate class="value">{{::log.changedModel | dashIfEmpty}}</span>
+                            </div>
+                            <div>
+                                <span translate class="label">Action</span><span class="label">: </span>
+                                <span translate class="value">{{::$ctrl.actionsText[log.action] | dashIfEmpty}}</span>
+                            </div>
+                            <div>
+                                <span translate class="label">Name</span><span class="label">: </span>
+                                <span translate class="value">{{::log.changedModelValue | dashIfEmpty}}</span>
+                            </div>
+                        </div>
+                    </vn-td>
+                    <vn-td class="expendable">
+                        <span ng-class="{'link': log.user.worker.id, 'value': !log.user.worker.id}"
+                            ng-click="$ctrl.showWorkerDescriptor($event, log.user.worker.id)"
+                            translate>{{::log.user.name || 'System' | translate}}
+                        </span>
+                    </vn-td>
+                    <vn-td class="expendable">
+                        {{::log.changedModel}}
+                    </vn-td>
+                    <vn-td translate class="expendable">
+                        {{::$ctrl.actionsText[log.action]}}
+                    </vn-td>
+                    <vn-td class="expendable" expand>
+                        {{::log.changedModelValue}}
+                    </vn-td>
+                    <vn-td expand class="before">
+                        <vn-one ng-repeat="old in log.oldProperties">
+                            <div>
+                                <span translate class="label alignSpan">{{::old.key}}</span><span
+                                    class="label alignSpan">: </span>
+                                <span translate class="value no-ellipsize" vn-tooltip="{{::old.value | dashIfEmpty}}">
+                                    {{::old.value | dashIfEmpty}}
+                                </span>
+                            </div>
+                        </vn-one>
+                    </vn-td>
+                    <vn-td expand class="after">
+                        <vn-one ng-repeat="new in log.newProperties" ng-if="!log.description" id="newInstance">
+                            <div>
+                                <span translate class="label alignSpan">{{::new.key}}</span><span
+                                    class="label alignSpan">: </span>
+                                <span translate class="value no-ellipsize" vn-tooltip="{{::new.value | dashIfEmpty}}">
+                                    {{::new.value | dashIfEmpty}}
+                                </span>
+                            </div>
+                        </vn-one>
+                        <vn-one ng-if="!log.newProperties" id="description">
+                            <div>
+                                <span no-ellipsize>{{::log.description}}</span>
+                            </div>
+                        </vn-one>
+                    </vn-td>
+                </vn-tr>
+            </vn-tbody>
+        </vn-table>
+        <vn-pagination model="model"></vn-pagination>
+    </vn-card>
+</vn-data-viewer>
+<vn-worker-descriptor-popover vn-id="workerDescriptor">
+</vn-worker-descriptor-popover>
\ No newline at end of file
diff --git a/front/salix/components/log/index.js b/front/salix/components/log/index.js
new file mode 100644
index 000000000..c5a4febcc
--- /dev/null
+++ b/front/salix/components/log/index.js
@@ -0,0 +1,75 @@
+import ngModule from '../../module';
+import Section from '../section';
+import './style.scss';
+
+export default class Controller extends Section {
+    constructor($element, $) {
+        super($element, $);
+        this.actionsText = {
+            'insert': 'Creates',
+            'update': 'Updates',
+            'delete': 'Deletes',
+            'select': 'Views'
+        }; ``;
+        this.filter = {
+            include: [{
+                relation: 'user',
+                scope: {
+                    fields: ['name'],
+                    include: {
+                        relation: 'worker',
+                        scope: {
+                            fields: ['id']
+                        }
+                    }
+                },
+            }],
+        };
+    }
+
+    get logs() {
+        return this._logs;
+    }
+
+    set logs(value) {
+        this._logs = value;
+
+        if (this.logs) {
+            this.logs.forEach(log => {
+                log.oldProperties = this.getInstance(log.oldInstance);
+                log.newProperties = this.getInstance(log.newInstance);
+            });
+        }
+    }
+
+    getInstance(instance) {
+        const properties = [];
+        let 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)?$/;
+
+        if (typeof instance == 'object' && instance != null) {
+            Object.keys(instance).forEach(property => {
+                if (validDate.test(instance[property]))
+                    instance[property] = new Date(instance[property]).toLocaleString('es-ES');
+
+                properties.push({key: property, value: instance[property]});
+            });
+            return properties;
+        }
+        return null;
+    }
+
+    showWorkerDescriptor(event, workerId) {
+        if (!workerId) return;
+        this.$.workerDescriptor.show(event.target, workerId);
+    }
+}
+
+ngModule.vnComponent('vnLog', {
+    controller: Controller,
+    template: require('./index.html'),
+    bindings: {
+        model: '<',
+        originId: '<',
+        url: '@'
+    }
+});
diff --git a/modules/worker/front/log/locale/es.yml b/front/salix/components/log/locale/es.yml
similarity index 100%
rename from modules/worker/front/log/locale/es.yml
rename to front/salix/components/log/locale/es.yml
diff --git a/modules/worker/front/log/style.scss b/front/salix/components/log/style.scss
similarity index 86%
rename from modules/worker/front/log/style.scss
rename to front/salix/components/log/style.scss
index 351ceccbd..ca1de113a 100644
--- a/modules/worker/front/log/style.scss
+++ b/front/salix/components/log/style.scss
@@ -31,6 +31,12 @@ vn-log {
     text-overflow: ellipsis;
     display: inline-block;
 }
+.no-ellipsize,
+[no-ellipsize] {
+    text-overflow: '';
+    white-space: normal;
+    overflow: auto;
+}
 .alignSpan {
     overflow: hidden;
     display: inline-block;
diff --git a/modules/worker/front/index.js b/modules/worker/front/index.js
index 00b4bdaa8..f703e7c21 100644
--- a/modules/worker/front/index.js
+++ b/modules/worker/front/index.js
@@ -13,7 +13,6 @@ import './department';
 import './calendar';
 import './time-control';
 import './log';
-import './worker-log';
 import './dms/index';
 import './dms/create';
 import './dms/edit';
diff --git a/modules/worker/front/log/index.html b/modules/worker/front/log/index.html
index f8e03239e..090dbf2e3 100644
--- a/modules/worker/front/log/index.html
+++ b/modules/worker/front/log/index.html
@@ -1,113 +1 @@
-<vn-crud-model
-    vn-id="model"
-    url="{{$ctrl.url}}"
-    filter="$ctrl.filter"
-    link="{originFk: $ctrl.originId}"
-    data="$ctrl.logs"
-    limit="20"
-    auto-load="true">
-</vn-crud-model>
-<vn-data-viewer
-    model="model"
-    class="vn-w-xl">
-    <vn-card>
-        <vn-table model="model">
-            <vn-thead>
-                <vn-tr>
-                    <vn-th field="creationDate">Date</vn-th>
-                    <vn-th field="userFk" class="expendable" shrink>Author</vn-th>
-                    <vn-th field="changedModel" class="expendable" shrink>Model</vn-th>
-                    <vn-th field="action" class="expendable" shrink>Action</vn-th>
-                    <vn-th field="changedModelValue" class="expendable">Name</vn-th>
-                    <vn-th expand>Before</vn-th>
-                    <vn-th expand>After</vn-th>
-                </vn-tr>
-            </vn-thead>
-            <vn-tbody>
-                <vn-tr ng-repeat="log in $ctrl.logs"> 
-                    <vn-td expand>
-                        {{::log.creationDate | date:'dd/MM/yyyy HH:mm'}}
-                        <div class="changes">
-                            <div>
-                                <span translate class="label">Changed by</span><span class="label">: </span>
-                                <span
-                                    ng-class="{'link': log.user.worker.id, 'value': !log.user.worker.id}"
-                                    ng-click="$ctrl.showWorkerDescriptor($event, log.user.worker.id)"
-                                    translate>{{::log.user.name || 'System' | translate}}
-                                </span>
-                            </div>
-                            <div>
-                                <span translate class="label">Model</span><span class="label">: </span>
-                                <span translate class="value">{{::log.changedModel | dashIfEmpty}}</span>
-                            </div>
-                            <div>
-                                <span translate class="label">Action</span><span class="label">: </span>
-                                <span translate class="value">{{::$ctrl.actionsText[log.action] | dashIfEmpty}}</span>
-                            </div>
-                            <div>
-                                <span translate class="label">Name</span><span class="label">: </span>
-                                <span translate class="value">{{::log.changedModelValue | dashIfEmpty}}</span>
-                            </div>
-                        </div>
-                    </vn-td>
-                    <vn-td class="expendable">
-                        <span
-                            ng-class="{'link': log.user.worker.id, 'value': !log.user.worker.id}"
-                            ng-click="$ctrl.showWorkerDescriptor($event, log.user.worker.id)"
-                            translate>{{::log.user.name || 'System' | translate}}
-                        </span>
-                    </vn-td>
-                    <vn-td class="expendable">
-                        {{::log.changedModel}}
-                    </vn-td>
-                    <vn-td translate class="expendable">
-                        {{::$ctrl.actionsText[log.action]}}
-                    </vn-td>
-                    <vn-td class="expendable" expand>
-                        {{::log.changedModelValue}}
-                    </vn-td>
-                    <vn-td expand class="before">
-                        <vn-one ng-repeat="old in log.oldProperties">
-                            <div>
-                                <span translate class="label alignSpan">{{::old.key}}</span><span class="label alignSpan">: </span>
-                                <span 
-                                    translate 
-                                    class="value ellipsis" 
-                                    vn-tooltip="{{::old.value | dashIfEmpty}}">
-                                    {{::old.value | dashIfEmpty}}
-                                </span>
-                            </div>
-                        </vn-one>
-                    </vn-td>
-                    <vn-td expand class="after">
-                        <vn-one 
-                            ng-repeat="new in log.newProperties" 
-                            ng-if="!log.description" 
-                            id="newInstance">
-                            <div>
-                                <span translate class="label alignSpan">{{::new.key}}</span><span class="label alignSpan">: </span>
-                                <span 
-                                    translate 
-                                    class="value ellipsis" 
-                                    vn-tooltip="{{::new.value | dashIfEmpty}}">
-                                    {{::new.value | dashIfEmpty}}
-                                </span>
-                            </div>
-                        </vn-one>
-                        <vn-one
-                            ng-if="!log.newProperties"
-                            id="description">
-                            <div>
-                                <span>{{::log.description}}</span>
-                            </div>
-                        </vn-one>
-                    </vn-td>
-                </vn-tr>
-            </vn-tbody>
-        </vn-table>
-        <vn-pagination model="model"></vn-pagination>
-    </vn-card>
-</vn-data-viewer>
-<vn-worker-descriptor-popover 
-    vn-id="workerDescriptor">
-</vn-worker-descriptor-popover>
+<vn-log url="WorkerLogs" origin-id="$ctrl.$params.id"></vn-log>
\ No newline at end of file
diff --git a/modules/worker/front/log/index.js b/modules/worker/front/log/index.js
index ca64bed17..e30ce7e22 100644
--- a/modules/worker/front/log/index.js
+++ b/modules/worker/front/log/index.js
@@ -1,75 +1,7 @@
 import ngModule from '../module';
 import Section from 'salix/components/section';
-import './style.scss';
 
-export default class Controller extends Section {
-    constructor($element, $) {
-        super($element, $);
-        this.actionsText = {
-            'insert': 'Creates',
-            'update': 'Updates',
-            'delete': 'Deletes',
-            'select': 'Views'
-        };
-        this.filter = {
-            include: [{
-                relation: 'user',
-                scope: {
-                    fields: ['name'],
-                    include: {
-                        relation: 'worker',
-                        scope: {
-                            fields: ['id']
-                        }
-                    }
-                },
-            }],
-        };
-    }
-
-    get logs() {
-        return this._logs;
-    }
-
-    set logs(value) {
-        this._logs = value;
-
-        if (this.logs) {
-            this.logs.forEach(log => {
-                log.oldProperties = this.getInstance(log.oldInstance);
-                log.newProperties = this.getInstance(log.newInstance);
-            });
-        }
-    }
-
-    getInstance(instance) {
-        const properties = [];
-        let 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)?$/;
-
-        if (typeof instance == 'object' && instance != null) {
-            Object.keys(instance).forEach(property => {
-                if (validDate.test(instance[property]))
-                    instance[property] = new Date(instance[property]).toLocaleString('es-ES');
-
-                properties.push({key: property, value: instance[property]});
-            });
-            return properties;
-        }
-        return null;
-    }
-
-    showWorkerDescriptor(event, workerId) {
-        if (!workerId) return;
-        this.$.workerDescriptor.show(event.target, workerId);
-    }
-}
-
-ngModule.vnComponent('vnLog', {
-    controller: Controller,
+ngModule.vnComponent('vnWorkerLog', {
     template: require('./index.html'),
-    bindings: {
-        model: '<',
-        originId: '<',
-        url: '@'
-    }
+    controller: Section,
 });
diff --git a/modules/worker/front/worker-log/index.html b/modules/worker/front/worker-log/index.html
deleted file mode 100644
index 090dbf2e3..000000000
--- a/modules/worker/front/worker-log/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<vn-log url="WorkerLogs" origin-id="$ctrl.$params.id"></vn-log>
\ No newline at end of file
diff --git a/modules/worker/front/worker-log/index.js b/modules/worker/front/worker-log/index.js
deleted file mode 100644
index e30ce7e22..000000000
--- a/modules/worker/front/worker-log/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import ngModule from '../module';
-import Section from 'salix/components/section';
-
-ngModule.vnComponent('vnWorkerLog', {
-    template: require('./index.html'),
-    controller: Section,
-});
-- 
2.40.1


From 8fb5d66d8d912f2651af4e76d5980563e66e6672 Mon Sep 17 00:00:00 2001
From: carlosjr <carlosjr@verdnatura.es>
Date: Tue, 18 May 2021 14:53:08 +0200
Subject: [PATCH 3/3] replaced spans with label-value components

---
 front/salix/components/log/index.html | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/front/salix/components/log/index.html b/front/salix/components/log/index.html
index bcb17d8d7..15a7b38b3 100644
--- a/front/salix/components/log/index.html
+++ b/front/salix/components/log/index.html
@@ -59,22 +59,22 @@
                     <vn-td expand class="before">
                         <vn-one ng-repeat="old in log.oldProperties">
                             <div>
-                                <span translate class="label alignSpan">{{::old.key}}</span><span
-                                    class="label alignSpan">: </span>
-                                <span translate class="value no-ellipsize" vn-tooltip="{{::old.value | dashIfEmpty}}">
-                                    {{::old.value | dashIfEmpty}}
-                                </span>
+                                <vn-label-value
+                                    no-ellipsize
+                                    label="{{::old.key}}"
+                                    value="{{::old.value}}">
+                                </vn-label-value>
                             </div>
                         </vn-one>
                     </vn-td>
                     <vn-td expand class="after">
                         <vn-one ng-repeat="new in log.newProperties" ng-if="!log.description" id="newInstance">
                             <div>
-                                <span translate class="label alignSpan">{{::new.key}}</span><span
-                                    class="label alignSpan">: </span>
-                                <span translate class="value no-ellipsize" vn-tooltip="{{::new.value | dashIfEmpty}}">
-                                    {{::new.value | dashIfEmpty}}
-                                </span>
+                                <vn-label-value
+                                    no-ellipsize
+                                    label="{{::new.key}}"
+                                    value="{{::new.value}}">
+                                </vn-label-value>
                             </div>
                         </vn-one>
                         <vn-one ng-if="!log.newProperties" id="description">
-- 
2.40.1