Merge branch 'dev' into 1047-print_sql_def

Jenkinsfile

@@ -69,13 +69,13 @@ pipeline {
                         }
                     }
                 }
-                /* stage('Backend') {
+                stage('Backend') {
                     steps {
                         nodejs('node-lts') {
                             sh 'gulp backTestOnce --ci'
                         }
                     }
-                } */
+                }
             }
         }
         stage('Build') {

db/Dockerfile

@@ -14,20 +14,41 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 COPY docker/docker.cnf /etc/mysql/conf.d/
-COPY docker/docker-init.sh docker/docker-start.sh /usr/local/bin/
+COPY \
+    docker/docker-init.sh \
+    docker/docker-temp-start.sh \
+    docker/docker-temp-stop.sh \
+    docker/docker-dump.sh \
+    docker/docker-start.sh \
+    /usr/local/bin/
 
 RUN mkdir /mysql-data \
     && chown -R mysql:mysql /mysql-data
 
-COPY dump /docker-boot/dump
+WORKDIR /docker-boot
-COPY changes /docker-boot/changes
-COPY import-changes.sh config.ini /docker-boot/
 
-COPY docker/docker-boot.sh /docker-entrypoint-initdb.d/
+COPY \
+    import-changes.sh \
+    config.ini \
+    dump/mysqlPlugins.sql \
+    dump/structure.sql \
+    dump/dumpedFixtures.sql \
+    ./
+RUN gosu mysql docker-init.sh \
+    && docker-dump.sh mysqlPlugins \
+    && docker-dump.sh structure \
+    && docker-dump.sh dumpedFixtures \
+    && gosu mysql docker-temp-stop.sh
 
+COPY changes ./changes
+COPY dump/fixtures.sql ./
 ARG STAMP=unknown
-RUN gosu mysql docker-init.sh mysqld \
+RUN gosu mysql docker-temp-start.sh \
-    && rm -rf /docker-entrypoint-initdb.d/* \
+    && ./import-changes.sh \
+    && docker-dump.sh fixtures \
+    && gosu mysql docker-temp-stop.sh
+
+RUN echo "[INFO] -> Import finished" \
     && rm -rf /docker-boot
 
 USER mysql
@@ -35,5 +56,5 @@ ENTRYPOINT ["docker-start.sh"]
 
 CMD ["mysqld"]
 
-HEALTHCHECK --interval=5s --timeout=10s --retries=200 \
+HEALTHCHECK --interval=2s --timeout=10s --retries=200 \
-    CMD mysqladmin ping -h 127.0.0.1 -u root || exit 1
+    CMD mysqladmin ping -h 127.0.0.1 -u root --password=root || exit 1

db/PASTE_COMMENT_REMINDER

@@ -0,0 +1,4 @@
+/**
+ * Hay una versión en salix que machacará toda esta función/procedimiento avisa
+ * a ___ de los cambios que quieres hacer.
+ */

db/changes/10221-accountModule/00-myUser_loginWithKey.sql

@@ -15,7 +15,7 @@ BEGIN
 	SELECT loginKey INTO vLoginKey FROM userConfig;
 
 	IF vLoginKey = vKey THEN
-		CALL user_loginWithName(vUserName);
+		CALL myUser_loginWithName(vUserName);
 	ELSE
 		CALL util.throw('INVALID_KEY');
 	END IF;

db/changes/10221-accountModule/00-user_getNameFromId.sql

@@ -13,8 +13,8 @@ BEGIN
 
 	SELECT `name` INTO vName 
 		FROM user 
-		WHERE id = vId;
+		WHERE id = vSelf;
 
-	RETURN vSelf;
+	RETURN vName;
 END$$
 DELIMITER ;

db/changes/PASTE_COMMENT_REMINDER

@@ -1,4 +0,0 @@
-/*
-Hay una versión en salix que machacará toda esta función/procedimiento
-avisa a ___ de los cambios que quieres hacer
-*/

db/docker.js

@@ -53,7 +53,7 @@ module.exports = class Docker {
                 this.dbConf.port = netSettings.Ports['3306/tcp'][0]['HostPort'];
             }
 
-            await this.waitForHealthy();
+            await this.wait();
         } catch (err) {
             if (this.isRandom)
                 await this.rm();
@@ -147,7 +147,7 @@ module.exports = class Docker {
                 let state;
 
                 try {
-                    let result = await this.execP(`docker container inspect -f "{{json .State}}" ${this.id}`);
+                    let result = await this.execP(`docker inspect -f "{{json .State}}" ${this.id}`);
                     state = JSON.parse(result.stdout);
                 } catch (err) {
                     return reject(new Error(err.message));

db/docker/docker-boot.sh

@@ -1,18 +0,0 @@
-#!/bin/bash
-
-cd /docker-boot
-export MYSQL_PWD=root
-
-mysql_import() {
-    FILE=$1
-    echo "[INFO] -> Importing $FILE"
-    mysql -u root --default-character-set=utf8 --comments -f < "$FILE"
-}
-
-mysql_import dump/structure.sql
-mysql_import dump/mysqlPlugins.sql
-mysql_import dump/dumpedFixtures.sql
-./import-changes.sh
-mysql_import dump/fixtures.sql
-
-echo "[INFO] -> Import finished"

db/docker/docker-dump.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+export MYSQL_PWD=root
+FILE="/docker-boot/$1.sql"
+echo "[INFO] -> Importing $FILE"
+mysql -u root --default-character-set=utf8 --comments -f < "$FILE"

db/docker/docker-init.sh

@@ -1,16 +1,14 @@
 #!/bin/bash
 
 . /usr/local/bin/docker-entrypoint.sh
+CMD=mysqld
 
-mysql_check_config "$@"
+mysql_check_config "$CMD"
-docker_setup_env "$@"
+docker_setup_env "$CMD"
 docker_create_db_directories
 
 docker_verify_minimum_env
-docker_init_database_dir "$@"
+docker_init_database_dir "$CMD"
-docker_temp_server_start "$@"
+docker_temp_server_start "$CMD"
 docker_setup_db
-
 docker_process_init_files /docker-entrypoint-initdb.d/*
-
-docker_temp_server_stop

db/docker/docker-temp-start.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+. /usr/local/bin/docker-entrypoint.sh
+CMD=mysqld
+
+docker_setup_env "$CMD"
+docker_temp_server_start "$CMD"

db/docker/docker-temp-stop.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+. /usr/local/bin/docker-entrypoint.sh
+CMD=mysqld
+
+docker_setup_env "$CMD"
+docker_temp_server_stop

db/dump/fixtures.sql

@@ -781,8 +781,8 @@ INSERT INTO `vn`.`item`(`id`, `typeFk`, `size`, `inkFk`, `stems`, `originFk`, `d
 INSERT INTO `vn`.`priceFixed`(`id`, `itemFk`, `rate0`, `rate1`, `rate2`, `rate3`, `started`, `ended`, `bonus`, `warehouseFk`, `created`)
     VALUES
         (1, 1, 0,   0,  2.5,    2,  CURDATE(), DATE_ADD(CURDATE(), INTERVAL +1 MONTH), 0, 1, CURDATE()),
-        (3, 3, 10,  10, 10,     10, CURDATE(), DATE_ADD(CURDATE(), INTERVAL +1 MONTH), 0, 1, CURDATE()),
+        (2, 3, 10,  10, 10,     10, CURDATE(), DATE_ADD(CURDATE(), INTERVAL +1 MONTH), 0, 1, CURDATE()),
-        (4, 5, 8.5, 10, 7.5,    6,  CURDATE(), DATE_ADD(CURDATE(), INTERVAL +1 MONTH), 1, 2, CURDATE());
+        (3, 5, 8.5, 10, 7.5,    6,  CURDATE(), DATE_ADD(CURDATE(), INTERVAL +1 MONTH), 1, 2, CURDATE());
 
 INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `isBox`, `created`, `itemFk`, `counter`, `checked`, `workerFk`)
     VALUES
@@ -1643,13 +1643,13 @@ INSERT INTO `vn`.`ticketRequest`(`id`, `description`, `requesterFk`, `attenderFk
         (4, 'Melee weapon combat first 15cm',   18, 35, 15, NULL,   1.30, NULL, NULL,   11, CURDATE()),
         (5, 'Melee weapon combat first 15cm',   18, 35, 15, 4,      1.30, 0,    NULL,   18, CURDATE());
 
-INSERT INTO `vn`.`ticketServiceType`(`id`, `name`)
+INSERT INTO `vn`.`ticketServiceType`(`id`, `name`, `expenceFk`)
     VALUES
-        (1, 'Porte Agencia'),
+        (1, 'Porte Agencia',        7001000000),
-        (2, 'Portes Retorno'),
+        (2, 'Portes Retorno',       7001000000),
-        (3, 'Porte Carry'),
+        (3, 'Porte Carry',          7001000000),
-        (4, 'Cargo FITOSANITARIO'),
+        (4, 'Cargo FITOSANITARIO',  4751000000),
-        (5, 'Documentos');
+        (5, 'Documentos',           2000000000);
 
 INSERT INTO `vn`.`ticketService`(`id`, `description`, `quantity`, `price`, `taxClassFk`, `ticketFk`, `ticketServiceTypeFk`)
     VALUES

db/export-data.sh

@@ -44,6 +44,7 @@ TABLES=(
     cplusTaxBreak
     pgc
     tag
+    time
     claimResponsible
     claimReason
     claimRedelivery

front/core/components/searchbar/searchbar.js

@@ -251,7 +251,7 @@ export default class Searchbar extends Component {
             this.model.clear();
         if (source != 'state')
             this.transition = this.$state.go(state, params, opts).transition;
-        if (source != 'bar')
+        if (source != 'bar' && (source != 'state' || this.$state.is(this.baseState)))
             focus(this.element.querySelector('vn-textfield input'));
     }