From 2c9fd45958a59b158c506ef760ba79e73430b97e Mon Sep 17 00:00:00 2001
From: joan <joan@verdnatura.es>
Date: Fri, 5 Feb 2021 12:09:48 +0100
Subject: [PATCH 1/2] 2778 - Allow edit order number

---
 back/methods/dms/updateFile.js                | 27 ++++++++++----
 back/models/dms.json                          |  2 +-
 .../worker/back/methods/worker-dms/filter.js  |  2 +-
 modules/worker/front/dms/edit/index.html      |  2 +-
 modules/worker/front/dms/index/index.html     |  9 ++++-
 modules/worker/front/dms/index/index.js       | 36 -------------------
 6 files changed, 31 insertions(+), 47 deletions(-)

diff --git a/back/methods/dms/updateFile.js b/back/methods/dms/updateFile.js
index a420f2ea11..4182148f7c 100644
--- a/back/methods/dms/updateFile.js
+++ b/back/methods/dms/updateFile.js
@@ -11,25 +11,37 @@ module.exports = Self => {
             type: 'Number',
             description: 'The document id',
             http: {source: 'path'}
-        }, {
+        },
+        {
             arg: 'warehouseId',
             type: 'Number',
             description: 'The warehouse id'
-        }, {
+        },
+        {
             arg: 'companyId',
             type: 'Number',
             description: 'The company id'
-        }, {
+        },
+        {
             arg: 'dmsTypeId',
             type: 'Number',
             description: 'The dms type id'
-        }, {
+        },
+        {
             arg: 'reference',
             type: 'String'
-        }, {
+        },
+        {
             arg: 'description',
             type: 'String'
-        }, {
+        },
+        {
+            arg: 'hasFile',
+            type: 'Boolean',
+            description: 'True if has an attached file',
+            required: true
+        },
+        {
             arg: 'hasFileAttached',
             type: 'Boolean',
             description: 'True if has an attached file'
@@ -70,7 +82,8 @@ module.exports = Self => {
                 companyFk: args.companyId,
                 warehouseFk: args.warehouseId,
                 reference: args.reference,
-                description: args.description
+                description: args.description,
+                hasFile: args.hasFile
             }, myOptions);
 
             if (args.hasFileAttached)
diff --git a/back/models/dms.json b/back/models/dms.json
index 1d9e3ec21b..f517a23ffe 100644
--- a/back/models/dms.json
+++ b/back/models/dms.json
@@ -30,7 +30,7 @@
             "type": "string"
         },
         "hardCopyNumber": {
-            "type": "Number"
+            "type": "number"
         },
         "hasFile": {
             "type": "boolean"
diff --git a/modules/worker/back/methods/worker-dms/filter.js b/modules/worker/back/methods/worker-dms/filter.js
index 553cf2a25b..82216f956a 100644
--- a/modules/worker/back/methods/worker-dms/filter.js
+++ b/modules/worker/back/methods/worker-dms/filter.js
@@ -28,7 +28,7 @@ module.exports = Self => {
 
         const account = await Self.app.models.Account.findById(userId);
         const stmt = new ParameterizedSQL(
-            `SELECT d.id dmsFk, d.reference, d.description, d.file, d.created
+            `SELECT d.id dmsFk, d.reference, d.description, d.file, d.created, d.hardCopyNumber, d.hasFile
                 FROM workerDocument wd
                     JOIN dms d ON d.id = wd.document
                     JOIN dmsType dt ON dt.id = d.dmsTypeFk
diff --git a/modules/worker/front/dms/edit/index.html b/modules/worker/front/dms/edit/index.html
index 13bf6f953a..2ac96851c1 100644
--- a/modules/worker/front/dms/edit/index.html
+++ b/modules/worker/front/dms/edit/index.html
@@ -68,7 +68,7 @@
                 </vn-input-file>
             </vn-horizontal>
             <vn-vertical>
-                <vn-check disabled="true"
+                <vn-check disabled="watcher.orgData.hasFile"
                     label="Generate identifier for original file" 
                     ng-model="$ctrl.dms.hasFile">
                 </vn-check>
diff --git a/modules/worker/front/dms/index/index.html b/modules/worker/front/dms/index/index.html
index d6e1bc25c8..6ad1cffd88 100644
--- a/modules/worker/front/dms/index/index.html
+++ b/modules/worker/front/dms/index/index.html
@@ -15,6 +15,7 @@
         <vn-thead>
             <vn-tr>
                 <vn-th field="dmsFk" shrink>Id</vn-th>
+                <vn-th field="hardCopyNumber" shrink number>Order</vn-th>
                 <vn-th field="reference" shrink>Reference</vn-th>
                 <vn-th expand>Description</vn-th>
                 <vn-th field="hasFile" shrink>Original</vn-th>
@@ -28,6 +29,12 @@
         <vn-tbody>
             <vn-tr ng-repeat="document in $ctrl.workerDms">
                 <vn-td number shrink>{{::document.dmsFk}}</vn-td>
+                <vn-td shrink number>
+                    <span class="chip" title="{{::document.hardCopyNumber}}"
+                        ng-class="{'message': document.hardCopyNumber}">
+                        {{::document.hardCopyNumber}}
+                    </span>
+                </vn-td>
                 <vn-td expand>
                     <span title="{{::document.reference}}">
                         {{::document.reference}}
@@ -40,7 +47,7 @@
                 </vn-td>
                 <vn-td shrink>
                     <vn-check 
-                        ng-model="document.dms.hasFile"
+                        ng-model="document.hasFile"
                         disabled="true">
                     </vn-check>
                 </vn-td>
diff --git a/modules/worker/front/dms/index/index.js b/modules/worker/front/dms/index/index.js
index e67240a733..9bb3c896a3 100644
--- a/modules/worker/front/dms/index/index.js
+++ b/modules/worker/front/dms/index/index.js
@@ -6,42 +6,6 @@ class Controller extends Component {
     constructor($element, $, vnFile) {
         super($element, $);
         this.vnFile = vnFile;
-        this.filter = {
-            include: {
-                relation: 'dms',
-                scope: {
-                    fields: [
-                        'dmsTypeFk',
-                        'reference',
-                        'hardCopyNumber',
-                        'workerFk',
-                        'description',
-                        'hasFile',
-                        'file',
-                        'created',
-                    ],
-                    include: [
-                        {
-                            relation: 'dmsType',
-                            scope: {
-                                fields: ['name']
-                            }
-                        }, {
-                            relation: 'worker',
-                            scope: {
-                                fields: ['userFk'],
-                                include: {
-                                    relation: 'user',
-                                    scope: {
-                                        fields: ['nickname']
-                                    }
-                                },
-                            }
-                        }
-                    ]
-                },
-            }
-        };
     }
 
     deleteDms(index) {

From a849330eb41fceab511249b03403aa5482f2c8d9 Mon Sep 17 00:00:00 2001
From: joan <joan@verdnatura.es>
Date: Fri, 5 Feb 2021 17:26:48 +0100
Subject: [PATCH 2/2] Changed node version

---
 Jenkinsfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8f87ffe610..85914ad623 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -49,7 +49,7 @@ pipeline {
                 NODE_ENV = ""
             }
             steps {
-                nodejs('node-lts') {
+                nodejs('node-v12') {
                     sh 'npm install --no-audit --prefer-offline'
                     sh 'gulp install --ci'
                 }
@@ -66,14 +66,14 @@ pipeline {
             parallel {
                 stage('Frontend') {
                     steps {
-                        nodejs('node-lts') {
+                        nodejs('node-v12') {
                             sh 'jest --ci --reporters=default --reporters=jest-junit --maxWorkers=2'
                         }
                     }
                 }
                 // stage('Backend') {
                 //     steps {
-                //         nodejs('node-lts') {
+                //         nodejs('node-v12') {
                 //             sh 'gulp launchBackTest --ci'
                 //         }
                 //     }
@@ -89,7 +89,7 @@ pipeline {
                 CREDS = credentials('docker-registry')
             }
             steps {
-                nodejs('node-lts') {
+                nodejs('node-v12') {
                     sh 'gulp build'
                 }