verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

Merge branch 'dev' of https://git.verdnatura.es/salix into dev

This commit is contained in:
gerard 2018-07-27 12:20:14 +02:00
parent 38ba6bae7a bf5a48f126
commit ddc6b9d77e
13 changed files with 151 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/item/src/data/index.html
View File

@ -61,6 +61,11 @@
field="$ctrl.item.expenceFk"
initial-data="$ctrl.item.expence">
</vn-autocomplete>
<vn-textfield
vn-one label="Full name"
field="$ctrl.item.longName"
info="Full name calculates based on tags 1-3. Is not recommended to change it manually">
</vn-textfield>
</vn-horizontal>
</vn-card>
<vn-button-bar>

6
client/item/src/data/locale/es.yml
View File

@ -1 +1,5 @@
Reference: Referencia
Reference: Referencia
Full name calculates based on tags 1-3. Is not recommended to change it manually: >-
El nombre completo se calcula
basado en los tags 1-3.
No se recomienda cambiarlo manualmente

1
client/item/src/locale/es.yml
View File

@ -5,6 +5,7 @@ Description: Descripción
Size: Tamaño
Type: Tipo
Name: Nombre
Full name: Nombre completo
Relevancy: Relevancia
Picture: Foto
Changed by: Cambiado por

3
client/item/src/summary/index.html
View File

@ -29,6 +29,9 @@
<vn-label-value label="Name"
value="{{::$ctrl.summary.item.name}}">
</vn-label-value>
<vn-label-value label="Full name"
value="{{::$ctrl.summary.item.longName}}">
</vn-label-value>
<vn-label-value label="Type"
value="{{::$ctrl.summary.item.itemType.name}}">
</vn-label-value>

1
e2e/helpers/selectors.js
View File

@ -187,6 +187,7 @@ export default {
originSelectOptionTwo: `vn-autocomplete[field="$ctrl.item.originFk"] vn-drop-down ul > li:nth-child(2)`,
expenceSelect: `vn-autocomplete[field="$ctrl.item.expenceFk"] input`,
expenceSelectOptionTwo: `vn-autocomplete[field="$ctrl.item.expenceFk"] vn-drop-down ul > li:nth-child(2)`,
longNameInput: `vn-horizontal:nth-child(5) > ${components.vnTextfield}`,
submitBasicDataButton: `${components.vnSubmit}`
},
itemTags: {

10
e2e/paths/item-module/02_edit_item_basic_data.spec.js
View File

@ -58,6 +58,8 @@ describe('Item', () => {
.waitToClick(selectors.itemBasicData.originSelectOptionTwo)
.waitToClick(selectors.itemBasicData.expenceSelect)
.waitToClick(selectors.itemBasicData.expenceSelectOptionTwo)
.clearInput(selectors.itemBasicData.longNameInput)
.type(selectors.itemBasicData.longNameInput, 'RS Rose of Purity')
.click(selectors.itemBasicData.submitBasicDataButton)
.waitForSnackbar()
.then(result => {
@ -116,5 +118,13 @@ describe('Item', () => {
expect(result).toEqual('Adquisición mercancia Extracomunitaria');
});
});
it(`should confirm the item long name was edited`, () => {
return nightmare
.getInputValue(selectors.itemBasicData.longNameInput)
.then(result => {
expect(result).toEqual('RS Rose of Purity');
});
});
});
});

20
services/client/common/models/client-notification.json → services/client/common/models/client-sample.json
View File

@ -1,9 +1,9 @@
{
"name": "ClientNotification",
"name": "ClientSample",
"base": "VnModel",
"options": {
"mysql": {
"table": "clientNotification"
"table": "clientSample"
}
},
"properties": {
@ -22,15 +22,25 @@
"model": "Client",
"foreignKey": "clientFk"
},
"clientNotificationType": {
"type": {
"type": "belongsTo",
"model": "ClientNotificationType",
"foreignKey": "clientNotificationTypeFk"
"model": "Sample",
"foreignKey": "typeFk"
},
"worker": {
"type": "belongsTo",
"model": "Worker",
"foreignKey": "workerFk"
},
"account": {
"type": "belongsTo",
"model": "Account",
"foreignKey": "userFk"
},
"company": {
"type": "belongsTo",
"model": "Company",
"foreignKey": "companyFk"
}
}
}

4
services/client/common/models/client-notification-type.json → services/client/common/models/sample.json
View File

@ -1,9 +1,9 @@
{
"name": "ClientNotificationType",
"name": "Sample",
"base": "VnModel",
"options": {
"mysql": {
"table": "clientNotificationType"
"table": "sample"
}
},
"properties": {

4
services/client/server/model-config.json
View File

@ -38,10 +38,10 @@
"CreditClassification": {
"dataSource": "vn"
},
"ClientNotificationType": {
"Sample": {
"dataSource": "vn"
},
"ClientNotification": {
"ClientSample": {
"dataSource": "vn"
}
}

15
services/db/install/changes/1.0.9/04-sample.sql Normal file
View File

@ -0,0 +1,15 @@
USE `vn`;
CREATE
OR REPLACE ALGORITHM = UNDEFINED
DEFINER = `root`@`%`
SQL SECURITY DEFINER
VIEW `sample` AS
SELECT
`e`.`id` AS `id`,
`e`.`abrev` AS `code`,
`e`.`descripcion` AS `description`,
`e`.`visible` AS `isVisible`
FROM
`vn2008`.`escritos` `e`;
DROP VIEW `vn`.`clientNotificationType`;

18
services/db/install/changes/1.0.9/05-clientSample.sql Normal file
View File

@ -0,0 +1,18 @@
USE `vn`;
CREATE
OR REPLACE ALGORITHM = UNDEFINED
DEFINER = `root`@`%`
SQL SECURITY DEFINER
VIEW `clientSample` AS
SELECT
`e`.`id` AS `id`,
`e`.`Id_Cliente` AS `clientFk`,
`e`.`escritos_id` AS `typeFk`,
`e`.`fecha` AS `created`,
`e`.`Id_Trabajador` AS `workerFk`,
`e`.`userFk` AS `userFk`,
`e`.`empresa_id` AS `companyFk`
FROM
`vn2008`.`escritos_det` `e`;
DROP VIEW `vn`.`clientNotification`;

131
services/db/install/dump/01-structure.sql
View File

@ -17192,7 +17192,7 @@ BEGIN
DECLARE datINV DATE;
SELECT FechaInventario INTO datINV FROM tblContadores;
ALTER TABLE `article_inventory`
ALTER TABLE `article_inventory`
ADD `buy_date` datetime NOT NULL;
UPDATE article_inventory INNER JOIN
@ -17219,7 +17219,7 @@ BEGIN
GROUP BY article_id
)
AS buy ON article_inventory.article_id = buy.article_id
SET article_inventory.buy_date = buy.bdate;
SET article_inventory.buy_date = buy.bdate;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@ -22618,7 +22618,8 @@ DELIMITER ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `calling`()
BEGIN
DROP TEMPORARY TABLE IF EXISTS Agenda, Agenda2;
DROP TEMPORARY TABLE IF EXISTS Agenda, Agenda2;
CREATE TEMPORARY TABLE IF NOT EXISTS Agenda (Telefono varchar(15) PRIMARY KEY, Cliente VARCHAR(45));
@ -25034,7 +25035,8 @@ BEGIN
-- Insertamos los tickets que ya tienen expediciones, que fallaran si se repite la clave primaria.
INSERT INTO zeleVOL(Provincia, Id_Ticket, Bultos) SELECT p.name, e.ticket_id, COUNT(e.ticket_id)
INSERT INTO zeleVOL(Provincia, Id_Ticket, Bultos)
SELECT p.name, e.ticket_id, COUNT(e.ticket_id)
FROM expeditions e
JOIN Tickets t ON ticket_id = Id_Ticket
JOIN Consignatarios c USING(Id_Consigna)
@ -25068,7 +25070,8 @@ BEGIN
GROUP BY p.name, Id_Ticket
) sub GROUP BY province
ON DUPLICATE KEY UPDATE Faltan = Faltan;
-- Mostramos el resultado
-- Mostramos el resultado
SELECT Provincia, COUNT(Id_Ticket) expediciones, SUM(Bultos) Bultos, SUM(Faltan) Prevision
FROM zeleVOL
@ -31606,7 +31609,8 @@ BEGIN
INSERT INTO Mensajes(Mensaje,Fecha,Remitente,Destinatario)
VALUES(memTXT, NOW(),idREM, idDES);
SELECT LAST_INSERT_ID() INTO last_ID;
SELECT LAST_INSERT_ID() INTO last_ID;
INSERT INTO Incidencias(Incidencia,Id_Trabajador,Destino,Fecha,Fecha_Mod)
@ -43227,31 +43231,32 @@ SET character_set_client = utf8;
SET character_set_client = @saved_cs_client;
--
-- Temporary table structure for view `clientNotification`
-- Temporary table structure for view `clientSample`
--
DROP TABLE IF EXISTS `clientNotification`;
/*!50001 DROP VIEW IF EXISTS `clientNotification`*/;
DROP TABLE IF EXISTS `clientSample`;
/*!50001 DROP VIEW IF EXISTS `clientSample`*/;
SET @saved_cs_client = @@character_set_client;
SET character_set_client = utf8;
/*!50001 CREATE VIEW `clientNotification` AS SELECT
/*!50001 CREATE VIEW `clientSample` AS SELECT
1 AS `id`,
1 AS `clientFk`,
1 AS `clientNotificationTypeFk`,
1 AS `typeFk`,
1 AS `created`,
1 AS `workerFk`,
1 AS `userFk`*/;
1 AS `userFk`,
1 AS `companyFk`*/;
SET character_set_client = @saved_cs_client;
--
-- Temporary table structure for view `clientNotificationType`
-- Temporary table structure for view `sample`
--
DROP TABLE IF EXISTS `clientNotificationType`;
/*!50001 DROP VIEW IF EXISTS `clientNotificationType`*/;
DROP TABLE IF EXISTS `sample`;
/*!50001 DROP VIEW IF EXISTS `sample`*/;
SET @saved_cs_client = @@character_set_client;
SET character_set_client = utf8;
/*!50001 CREATE VIEW `clientNotificationType` AS SELECT
/*!50001 CREATE VIEW `sample` AS SELECT
1 AS `id`,
1 AS `code`,
1 AS `description`,
@ -47706,38 +47711,38 @@ DELIMITER ;;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;;
/*!50003 SET @saved_time_zone = @@time_zone */ ;;
/*!50003 SET time_zone = 'SYSTEM' */ ;;
/*!50106 CREATE*/ /*!50117 DEFINER=`z-developer`@`%`*/ /*!50106 EVENT `printingQueueChecker` ON SCHEDULE EVERY 10 MINUTE STARTS '2018-05-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
DECLARE vCurrentCount INT;
DECLARE vCheckSum INT;
DECLARE vIsAlreadyNotified BOOLEAN;
SELECT COUNT(*), SUM(id) INTO vCurrentCount, vCheckSum
FROM printingQueue WHERE state = 1;
SELECT isAlreadyNotified INTO vIsAlreadyNotified
FROM printingQueueCheck;
IF (SELECT lastCount FROM printingQueueCheck) = vCurrentCount AND
(SELECT lastCheckSum FROM printingQueueCheck) = vCheckSum AND
vIsAlreadyNotified = FALSE
THEN
INSERT INTO vn2008.mail (`to`, subject, text)
VALUES ('cau@verdnatura.es',
'servidor de impresion parado',
CONCAT('Hay ', vCurrentCount, ' lineas bloqueadas'));
UPDATE printingQueueCheck SET isAlreadyNotified = TRUE;
END IF;
IF (SELECT lastCount FROM printingQueueCheck) > vCurrentCount AND
vIsAlreadyNotified = TRUE
THEN
UPDATE printingQueueCheck SET isAlreadyNotified = FALSE;
END IF;
UPDATE printingQueueCheck
SET lastCount = vCurrentCount,
lastCheckSum = vCheckSum;
/*!50106 CREATE*/ /*!50117 DEFINER=`z-developer`@`%`*/ /*!50106 EVENT `printingQueueChecker` ON SCHEDULE EVERY 10 MINUTE STARTS '2018-05-01 00:00:00' ON COMPLETION NOT PRESERVE ENABLE DO BEGIN
DECLARE vCurrentCount INT;
DECLARE vCheckSum INT;
DECLARE vIsAlreadyNotified BOOLEAN;
SELECT COUNT(*), SUM(id) INTO vCurrentCount, vCheckSum
FROM printingQueue WHERE state = 1;
SELECT isAlreadyNotified INTO vIsAlreadyNotified
FROM printingQueueCheck;
IF (SELECT lastCount FROM printingQueueCheck) = vCurrentCount AND
(SELECT lastCheckSum FROM printingQueueCheck) = vCheckSum AND
vIsAlreadyNotified = FALSE
THEN
INSERT INTO vn2008.mail (`to`, subject, text)
VALUES ('cau@verdnatura.es',
'servidor de impresion parado',
CONCAT('Hay ', vCurrentCount, ' lineas bloqueadas'));
UPDATE printingQueueCheck SET isAlreadyNotified = TRUE;
END IF;
IF (SELECT lastCount FROM printingQueueCheck) > vCurrentCount AND
vIsAlreadyNotified = TRUE
THEN
UPDATE printingQueueCheck SET isAlreadyNotified = FALSE;
END IF;
UPDATE printingQueueCheck
SET lastCount = vCurrentCount,
lastCheckSum = vCheckSum;
END */ ;;
/*!50003 SET time_zone = @saved_time_zone */ ;;
/*!50003 SET sql_mode = @saved_sql_mode */ ;;
@ -70280,15 +70285,15 @@ DELIMITER ;
/*!50003 SET sql_mode = 'NO_ENGINE_SUBSTITUTION' */ ;
DELIMITER ;;
CREATE DEFINER=`root`@`%` PROCEDURE `myTicketGetRows`(`vTicket` INT)
BEGIN
SELECT r.itemFk, r.quantity, r.concept, r.price, r.discount,
i.image, i.category, i.size, i.stems, i.inkFk,
i.tag5, i.value5, i.tag6, i.value6, i.tag7, i.value7
FROM myTicketRow r
JOIN vn.item i ON i.id = r.itemFk
WHERE r.ticketFk = vTicket
ORDER BY r.concept;
BEGIN
SELECT r.itemFk, r.quantity, r.concept, r.price, r.discount,
i.image, i.category, i.size, i.stems, i.inkFk,
i.tag5, i.value5, i.tag6, i.value6, i.tag7, i.value7
FROM myTicketRow r
JOIN vn.item i ON i.id = r.itemFk
WHERE r.ticketFk = vTicket
ORDER BY r.concept;
END ;;
DELIMITER ;
/*!50003 SET sql_mode = @saved_sql_mode */ ;
@ -74253,10 +74258,10 @@ USE `vn`;
/*!50001 SET collation_connection = @saved_col_connection */;
--
-- Final view structure for view `clientNotification`
-- Final view structure for view `clientSample`
--
/*!50001 DROP VIEW IF EXISTS `clientNotification`*/;
/*!50001 DROP VIEW IF EXISTS `clientSample`*/;
/*!50001 SET @saved_cs_client = @@character_set_client */;
/*!50001 SET @saved_cs_results = @@character_set_results */;
/*!50001 SET @saved_col_connection = @@collation_connection */;
@ -74265,16 +74270,16 @@ USE `vn`;
/*!50001 SET collation_connection = utf8_general_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
/*!50001 VIEW `clientNotification` AS select `e`.`id` AS `id`,`e`.`Id_Cliente` AS `clientFk`,`e`.`escritos_id` AS `clientNotificationTypeFk`,`e`.`fecha` AS `created`,`e`.`Id_Trabajador` AS `workerFk`,`e`.`userFk` AS `userFk` from `vn2008`.`escritos_det` `e` */;
/*!50001 VIEW `clientSample` AS select `e`.`id` AS `id`,`e`.`Id_Cliente` AS `clientFk`,`e`.`escritos_id` AS `typeFk`,`e`.`fecha` AS `created`,`e`.`Id_Trabajador` AS `workerFk`,`e`.`userFk` AS `userFk`,`e`.`empresa_id` AS `companyFk` from `vn2008`.`escritos_det` `e` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;
--
-- Final view structure for view `clientNotificationType`
-- Final view structure for view `sample`
--
/*!50001 DROP VIEW IF EXISTS `clientNotificationType`*/;
/*!50001 DROP VIEW IF EXISTS `sample`*/;
/*!50001 SET @saved_cs_client = @@character_set_client */;
/*!50001 SET @saved_cs_results = @@character_set_results */;
/*!50001 SET @saved_col_connection = @@collation_connection */;
@ -74283,7 +74288,7 @@ USE `vn`;
/*!50001 SET collation_connection = utf8_general_ci */;
/*!50001 CREATE ALGORITHM=UNDEFINED */
/*!50013 DEFINER=`root`@`%` SQL SECURITY DEFINER */
/*!50001 VIEW `clientNotificationType` AS select `e`.`id` AS `id`,`e`.`abrev` AS `code`,`e`.`descripcion` AS `description`,`e`.`visible` AS `isVisible` from `vn2008`.`escritos` `e` */;
/*!50001 VIEW `sample` AS select `e`.`id` AS `id`,`e`.`abrev` AS `code`,`e`.`descripcion` AS `description`,`e`.`visible` AS `isVisible` from `vn2008`.`escritos` `e` */;
/*!50001 SET character_set_client = @saved_cs_client */;
/*!50001 SET character_set_results = @saved_cs_results */;
/*!50001 SET collation_connection = @saved_col_connection */;

12
services/db/install/dump/fixtures.sql
View File

@ -729,10 +729,10 @@ call vn.manaSpellersRequery(19);
call vn.manaSpellersRequery(18);
INSERT INTO `vn`.`clientNotification`(`id`, `clientFk`, `clientNotificationTypeFk`, `created`, `workerFk`)
INSERT INTO `vn`.`clientSample`(`id`, `clientFk`, `typeFk`, `created`, `workerFk`, `companyFk`)
VALUES
( 1, 101, 1, CURDATE(), 18),
( 2, 101, 1, CURDATE(), 18),
( 3, 101, 2, CURDATE(), 18),
( 4, 102, 2, CURDATE(), 18),
( 5, 102, 3, CURDATE(), 19);
( 1, 101, 1, CURDATE(), 18, 442),
( 2, 101, 1, CURDATE(), 18, 442),
( 3, 101, 2, CURDATE(), 18, 442),
( 4, 102, 2, CURDATE(), 18, 567),
( 5, 102, 3, CURDATE(), 19, 567);