Merge branch '1834createTravelModels' of verdnatura/salix into dev

db/docker.cnf

@@ -1,3 +1,4 @@
 [mysqld]
 innodb_log_file_size = 4M
 innodb_autoextend_increment = 4
+innodb_page_size = 8K

db/dump/fixtures.sql

@@ -1,5 +1,6 @@
 -- FIXME: cuando se eliminen los procedimientos de la cache, se podra eliminar esta linea
-CREATE SCHEMA `vn2008`;
+CREATE SCHEMA IF NOT EXISTS `vn2008`;
+
 
 ALTER TABLE `vn`.`itemTaxCountry` AUTO_INCREMENT = 1;
 ALTER TABLE `vn`.`address` AUTO_INCREMENT = 1;
@@ -334,8 +335,8 @@ INSERT INTO `vn`.`clientObservation`(`id`, `clientFk`, `workerFk`, `text`, `crea
         (6,  106,  5, 'My name is Legion, for we are many!',                                                                               CURDATE()),
         (7,  107,  9, 'I think our first move should be calling the Avengers..',                                                           CURDATE()),
         (8,  108,  9, 'Just because someone stumbles and loses their path, does not mean they are lost forever.',                          CURDATE()),
-        (9,  109,  20, 'HULK SMASH! ...',                                                                                                  CURDATE()),
+        (9,  109,  18, 'HULK SMASH! ...',                                                                                                  CURDATE()),
-        (10, 110,  20, 'They say everyone is born a hero. But if you let it, life will push you over the line until you are the villain.', CURDATE());
+        (10, 110,  18, 'They say everyone is born a hero. But if you let it, life will push you over the line until you are the villain.', CURDATE());
 
 INSERT INTO `vn`.`observationType`(`id`,`description`)
     VALUES
@@ -1930,7 +1931,6 @@ INSERT INTO `vn`.`userPhone`(`id`, `userFk`, `typeFk`, `phone`)
         (22,    17,     'personalPhone', 623111111),
         (23,    18,     'personalPhone', 623111111),
         (24,    19,     'personalPhone', 623111111),
-        (25,    20,     'personalPhone', 623111111),
         (26,    21,     'personalPhone', 623111111),
         (27,    22,     'personalPhone', 623111111),
         (28,    30,     'personalPhone', 623111111),

db/export-structure.sh

@@ -20,6 +20,7 @@ SCHEMAS=(
 mysqldump \
     --defaults-file=config.production.ini \
     --default-character-set=utf8 \
+    --column-statistics=0 \
     --no-data --comments \
     --triggers --routines --events \
     --databases \

modules/travel/back/methods/travel/getEntries.js

@@ -25,7 +25,7 @@ module.exports = Self => {
         let stmt;
 
         stmt = new ParameterizedSQL(`
-            SELECT e.travelFk, e.id, e.isConfirmed, e.ref, e.notes, e.evaNotes,
+            SELECT e.travelFk, e.id, e.isConfirmed, e.ref, e.notes, e.evaNotes AS observation,
                 s.name AS supplierName,
                 CAST((SUM(IF(p.volume > 0,p.volume,p.width * p.depth * IF(p.height, p.height, i.size + pconfig.upperGap)) 
                     * b.stickers)/1000000)/((pcc.width*pcc.depth*pcc.height)/1000000) AS DECIMAL(10,2)) cc,

modules/travel/back/model-config.json

@@ -5,5 +5,7 @@
         "dataSource": "vn"
     },"TravelLog": {
         "dataSource": "vn"
+    },"Currency": {
+        "dataSource": "vn"
     }
 }

modules/travel/back/models/currency.json

@@ -0,0 +1,25 @@
+{
+    "name": "Currency",
+	"base": "VnModel",
+    "options": {
+        "mysql": {
+        "table": "currency"
+        }
+    },
+    "properties": {
+        "id": {
+            "type": "Number",
+            "id": true,
+            "description": "Identifier"
+        },
+        "code": {
+            "type": "String"
+        },
+        "name": {
+            "type": "String"
+        },
+        "ratio": {
+            "type": "Number"
+        }
+    }
+}

modules/travel/back/models/entry.json

@@ -42,10 +42,10 @@
         "created": {
             "type": "date"
         },
-        "evaNotes": {
+        "observation": {
             "type": "String",
 			"mysql": {
-				"columnName": "observation"
+				"columnName": "evaNotes"
 			}
         },
         "isBlocked": {
@@ -70,6 +70,11 @@
             "type": "belongsTo",
             "model": "Company",
             "foreignKey": "companyFk"
+        },
+        "currency": {
+            "type": "belongsTo",
+            "model": "Currency",
+            "foreignKey": "currencyFk"
         }
     }
 }

modules/travel/front/summary/index.html

@@ -82,7 +82,7 @@
                             </vn-icon>
                             <vn-icon
                                 ng-if="entry.notes.length"
-                                vn-tooltip="{{entry.evaNotes}}"
+                                vn-tooltip="{{entry.observation}}"
                                 icon="insert_drive_file">
                             </vn-icon>
                         </vn-td>