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

client/core/src/components/fetched-tags/index.html

@@ -1,11 +1,11 @@
 <vn-horizontal>
     <vn-one>{{::$ctrl.concept}}</vn-one>
-    <vn-one>   
+    <vn-auto>  
         <section 
             class="inline-tag ellipsize" ng-class="{'empty': !fetchedTag.value}" 
             ng-repeat="fetchedTag in $ctrl.tags track by $index" 
             vn-tooltip="{{::fetchedTag.tag.name}}: {{::fetchedTag.value}}">
             {{::fetchedTag.value}}
         </section>
-    </vn-one>
+    </vn-auto>
 </vn-horizontal>

client/core/src/components/fetched-tags/style.scss

@@ -22,7 +22,7 @@ vn-fetched-tags {
         }
     }
 
-    @media screen and (max-width: 1200px){
+    @media screen and (max-width: 1200px) {
         & vn-horizontal {
             .inline-tag {
                 font-size: 0.6em;
@@ -31,9 +31,15 @@ vn-fetched-tags {
         }
     }
 
+    & vn-horizontal {
+        flex-direction: column;
+        text-align: center;
+    }
     
     & vn-one {
+        white-space: nowrap;
         padding-top: 0.2em
+
     }
 
     & vn-two {
@@ -43,6 +49,7 @@ vn-fetched-tags {
     & .inline-tag {
         background-color: $secondary-font-color;
         display: inline-block;
+        float: none;
         color: $color-white;
         margin-right: 0.4em;
         text-align: center;

client/ticket/src/component/style.scss

@@ -1,16 +1,4 @@
 vn-ticket-components {
-    vn-fetched-tags {
-        & vn-horizontal {
-            flex-direction: column;
-            text-align: center;
-
-            & .inline-tag {
-                display: inline-block;
-                float: none
-            }
-        }
-    }
-    
     .vn-grid {
         tbody:not(:last-child) {
             border-bottom: none;

e2e/helpers/selectors.js

@@ -300,6 +300,7 @@ export default {
     ticketExpedition: {
         expeditionButton: `vn-menu-item a[ui-sref="ticket.card.expedition"]`,
         secondExpeditionRemoveButton: `vn-ticket-expedition vn-table div > vn-tbody > vn-tr:nth-child(2) > vn-td:nth-child(1) > vn-icon-button[icon="delete"]`,
+        acceptDeleteRowButton: `vn-ticket-expedition > vn-confirm[vn-id="delete-expedition"] button[response=ACCEPT]`,
         expeditionRow: `vn-ticket-expedition vn-table vn-tbody > vn-tr`,
     },
     ticketPackages: {

e2e/paths/ticket-module/02_delete_ticket_expeditions.spec.js

@@ -41,9 +41,10 @@ describe('Ticket', () => {
             expect(url).toContain('expedition');
         });
 
-        it(`should delete a former expedition and confirm the remaining expedition are the expected one`, async () => {
+        it(`should delete a former expedition and confirm the remaining expedition are the expected ones`, async () => {
             const result = await nightmare
                 .waitToClick(selectors.ticketExpedition.secondExpeditionRemoveButton)
+                .waitToClick(selectors.ticketExpedition.acceptDeleteRowButton)
                 .click(selectors.ticketPackages.packagesButton)
                 .wait(selectors.ticketPackages.firstPackageSelect)
                 .click(selectors.ticketExpedition.expeditionButton)

services/db/install/changes/1.0-OnlyLocal/07-fieldAcl.sql

@@ -75,3 +75,8 @@ DELETE FROM `salix`.`ACL` WHERE `id`='59';
 DELETE FROM `salix`.`ACL` WHERE `id`='57';
 INSERT INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES (116, 'BankEntity', '*', '*', 'ALLOW', 'role', 'employee');
 INSERT INTO `salix`.`ACL` (`id`, `model`, `property`, `accessType`, `permission`, `principalType`, `principalId`) VALUES (117, 'ClientSample', '*', '*', 'ALLOW', 'role', 'employee');
+
+
+
+
+INSERT INTO `salix`.`fieldAcl` (`model`, `property`, `actionType`, `role`) VALUES ('TicketWeekly', '*', '*', 'employee');

services/db/install/changes/1.2-CHECK/02-beforeInsertItemLog.sql

@@ -0,0 +1,11 @@
+DROP TRIGGER IF EXISTS `vn`.`itemLog_BEFORE_INSERT`;
+
+DELIMITER $$
+USE `vn`$$
+CREATE DEFINER=`root`@`%` TRIGGER `vn`.`itemLog_BEFORE_INSERT` BEFORE INSERT ON `itemLog` FOR EACH ROW
+BEGIN
+	IF NEW.newInstance is NULL THEN
+		SET NEW.newInstance = NEW.description;
+	END IF;
+END$$
+DELIMITER ;

services/db/install/changes/1.2-CHECK/03-beforeInsertClientLog.sql

@@ -0,0 +1,11 @@
+DROP TRIGGER IF EXISTS `vn`.`ticketLog_BEFORE_INSERT`;
+
+DELIMITER $$
+USE `vn`$$
+CREATE DEFINER=`root`@`%` TRIGGER `vn`.`ticketLog_BEFORE_INSERT` BEFORE INSERT ON `ticketLog` FOR EACH ROW
+BEGIN
+	IF NEW.newInstance is NULL THEN
+		SET NEW.newInstance = NEW.description;
+	END IF;
+END$$
+DELIMITER ;

services/db/install/changes/1.2-CHECK/05-beforeInsertClaimLog.sql

@@ -0,0 +1,11 @@
+DROP TRIGGER IF EXISTS `vn`.`claimLog_BEFORE_INSERT`;
+
+DELIMITER $$
+USE `vn`$$
+CREATE DEFINER=`root`@`%` TRIGGER `vn`.`claimLog_BEFORE_INSERT` BEFORE INSERT ON `claimLog` FOR EACH ROW
+BEGIN
+	IF NEW.newInstance is NULL THEN
+		SET NEW.newInstance = NEW.description;
+	END IF;
+END$$
+DELIMITER ;

services/db/install/changes/1.2-CHECK/06-beforeInsertTicketLog.sql

@@ -0,0 +1,11 @@
+DROP TRIGGER IF EXISTS `vn`.`clientLog_BEFORE_INSERT`;
+
+DELIMITER $$
+USE `vn`$$
+CREATE DEFINER=`root`@`%` TRIGGER `vn`.`clientLog_BEFORE_INSERT` BEFORE INSERT ON `clientLog` FOR EACH ROW
+BEGIN
+	IF NEW.newInstance is NULL THEN
+		SET NEW.newInstance = NEW.description;
+	END IF;
+END$$
+DELIMITER ;