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

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

This commit is contained in:
Gerard 2018-10-29 11:57:02 +01:00
parent 5ef3820912 b0c8ac7062
commit 20de81a3c8
10 changed files with 62 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/core/src/components/fetched-tags/index.html
View File

@ -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>

7
client/core/src/components/fetched-tags/style.scss
View File

@ -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;

12
client/ticket/src/component/style.scss
View File

@ -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;

1
e2e/helpers/selectors.js
View File

@ -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: {

3
e2e/paths/ticket-module/02_delete_ticket_expeditions.spec.js
View File

@ -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)

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

@ -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');

11
services/db/install/changes/1.2-CHECK/02-beforeInsertItemLog.sql Normal file
View File

@ -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 ;

11
services/db/install/changes/1.2-CHECK/03-beforeInsertClientLog.sql Normal file
View File

@ -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 ;

11
services/db/install/changes/1.2-CHECK/05-beforeInsertClaimLog.sql Normal file
View File

@ -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 ;

11
services/db/install/changes/1.2-CHECK/06-beforeInsertTicketLog.sql Normal file
View File

@ -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 ;