From 12aa5da355acb1c65aca232e88910e116685dcc5 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Fri, 28 Feb 2020 07:17:19 +0100
Subject: [PATCH] Changed fields order

---
 front/core/components/input-file/index.html   |  2 +-
 .../back/methods/travel/createThermograph.js  |  9 +++-
 .../front/thermograph/create/index.html       | 51 +++++++++++--------
 .../travel/front/thermograph/create/index.js  |  2 +-
 4 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/front/core/components/input-file/index.html b/front/core/components/input-file/index.html
index 11478430a..be4c15248 100644
--- a/front/core/components/input-file/index.html
+++ b/front/core/components/input-file/index.html
@@ -30,7 +30,7 @@
             ng-click="$ctrl.onClear($event)">
         </vn-icon>
         <vn-icon
-            icon="cloud_upload"
+            icon="attach_file"
             vn-tooltip="Select a file"
             ng-click="$ctrl.openFileSelector()">
         </vn-icon>
diff --git a/modules/travel/back/methods/travel/createThermograph.js b/modules/travel/back/methods/travel/createThermograph.js
index cbf0678d1..816e8cebd 100644
--- a/modules/travel/back/methods/travel/createThermograph.js
+++ b/modules/travel/back/methods/travel/createThermograph.js
@@ -14,6 +14,10 @@ module.exports = Self => {
             type: 'String',
             description: 'The thermograph id',
             required: true
+        }, {
+            arg: 'state',
+            type: 'String',
+            required: true
         }, {
             arg: 'warehouseId',
             type: 'Number',
@@ -48,7 +52,7 @@ module.exports = Self => {
         }
     });
 
-    Self.createThermograph = async(ctx, id, thermographId) => {
+    Self.createThermograph = async(ctx, id, thermographId, state) => {
         const models = Self.app.models;
         const tx = await Self.beginTransaction({});
 
@@ -70,7 +74,8 @@ module.exports = Self => {
 
             await travelThermograph.updateAttributes({
                 dmsFk: firstDms.id,
-                travelFk: id
+                travelFk: id,
+                result: state
             }, options);
 
             await tx.commit();
diff --git a/modules/travel/front/thermograph/create/index.html b/modules/travel/front/thermograph/create/index.html
index 02ef54264..4b1fc8cf4 100644
--- a/modules/travel/front/thermograph/create/index.html
+++ b/modules/travel/front/thermograph/create/index.html
@@ -9,6 +9,35 @@
     enctype="multipart/form-data">
     <div class="vn-w-md">
         <vn-card class="vn-pa-lg">
+            <vn-horizontal>
+                <vn-autocomplete vn-one
+                    label="Thermograph"
+                    ng-model="$ctrl.dms.thermographId"
+                    url="TravelThermographs"
+                    where="{travelFk: null}"
+                    show-field="thermographFk"
+                    value-field="thermographFk">
+                </vn-autocomplete>
+                <vn-textfield vn-one
+                    label="State" 
+                    ng-model="$ctrl.dms.state"
+                    rule>
+                </vn-textfield>
+            </vn-horizontal>
+            <vn-horizontal>
+                <vn-textfield vn-one
+                    label="Reference" 
+                    ng-model="$ctrl.dms.reference"
+                    rule>
+                </vn-textfield>
+                <vn-autocomplete vn-one
+                    label="Type"
+                    ng-model="$ctrl.dms.dmsTypeId"
+                    url="DmsTypes"
+                    show-field="name"
+                    value-field="id">
+                </vn-autocomplete>
+            </vn-horizontal>
             <vn-horizontal>
                 <vn-autocomplete vn-one
                     label="Company"
@@ -25,28 +54,6 @@
                     value-field="id">
                 </vn-autocomplete>
             </vn-horizontal>
-            <vn-horizontal>
-                <vn-autocomplete vn-one
-                    label="Type"
-                    ng-model="$ctrl.dms.dmsTypeId"
-                    url="DmsTypes"
-                    show-field="name"
-                    value-field="id">
-                </vn-autocomplete>
-                <vn-textfield vn-one
-                    label="Reference" 
-                    ng-model="$ctrl.dms.reference"
-                    rule>
-                </vn-textfield>
-                <vn-autocomplete vn-one
-                    label="Thermograph"
-                    ng-model="$ctrl.dms.thermographId"
-                    url="TravelThermographs"
-                    where="{travelFk: null}"
-                    show-field="thermographFk"
-                    value-field="thermographFk">
-                </vn-autocomplete>
-            </vn-horizontal>
             <vn-horizontal>
                 <vn-textarea vn-one vn-focus
                     label="Description" 
diff --git a/modules/travel/front/thermograph/create/index.js b/modules/travel/front/thermograph/create/index.js
index 8e10aca0f..b35313fc8 100644
--- a/modules/travel/front/thermograph/create/index.js
+++ b/modules/travel/front/thermograph/create/index.js
@@ -8,7 +8,7 @@ class Controller {
         this.$translate = $translate;
         this.vnApp = vnApp;
         this.vnConfig = vnConfig;
-        this.dms = {files: []};
+        this.dms = {files: [], state: 'Ok'};
     }
 
     get travel() {