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

5660-changeRolDeliveryAssistant #1607

Merged
carlossa merged 36 commits from 5660-changeRolDeliveryAssistant into dev 2023-09-20 11:04:32 +00:00
Conversation 0 Commits 36 Files Changed 22 +36 -36
21 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9870cc7b14 - Show all commits

2
db/changes/232601/00-deliveryAssistantACL.sql
View File

@ -1,7 +1,7 @@
-- Auto-generated SQL script #202306121356 -- Auto-generated SQL script #202306121356
UPDATE `account`.`role` UPDATE `account`.`role`
SET `description` = 'Asistente de envios' SET `description` = 'Asistente de envios'
WHERE `name` = 'deliveryAssist'; WHERE `name` = 'deliveryAssistant';

4
db/changes/232601/00-useSpecificsAcls.sql
View File

@ -3,11 +3,11 @@ INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `pri
('Ticket', 'editDiscount', 'WRITE', 'ALLOW', 'ROLE', 'claimManager'), ('Ticket', 'editDiscount', 'WRITE', 'ALLOW', 'ROLE', 'claimManager'),
('Ticket', 'editDiscount', 'WRITE', 'ALLOW', 'ROLE', 'salesPerson'), ('Ticket', 'editDiscount', 'WRITE', 'ALLOW', 'ROLE', 'salesPerson'),
('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'salesAssistant'), ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'salesAssistant'),
('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'deliveryAssist'), ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'deliveryAssistant'),
('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'buyer'), ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'buyer'),
('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'claimManager'), ('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'claimManager'),
('Ticket', 'deleteTicketWithPartPrepared', 'WRITE', 'ALLOW', 'ROLE', 'salesAssistant'), ('Ticket', 'deleteTicketWithPartPrepared', 'WRITE', 'ALLOW', 'ROLE', 'salesAssistant'),
('Ticket', 'editZone', 'WRITE', 'ALLOW', 'ROLE', 'deliveryAssist'), ('Ticket', 'editZone', 'WRITE', 'ALLOW', 'ROLE', 'deliveryAssistant'),
('State', 'editableStates', 'READ', 'ALLOW', 'ROLE', 'employee'), ('State', 'editableStates', 'READ', 'ALLOW', 'ROLE', 'employee'),
('State', 'seeEditableStates', 'READ', 'ALLOW', 'ROLE', 'administrative'), ('State', 'seeEditableStates', 'READ', 'ALLOW', 'ROLE', 'administrative'),
('State', 'seeEditableStates', 'READ', 'ALLOW', 'ROLE', 'production'), ('State', 'seeEditableStates', 'READ', 'ALLOW', 'ROLE', 'production'),

4
db/dump/dumpedFixtures.sql
View File

File diff suppressed because one or more lines are too long

2
e2e/paths/02-client/01_create_client.spec.js
View File

@ -8,7 +8,7 @@ describe('Client create path', () => {
beforeAll(async() => { beforeAll(async() => {
browser = await getBrowser(); browser = await getBrowser();
page = browser.page; page = browser.page;
await page.loginAndModule(' deliveryAssist', 'client'); await page.loginAndModule(' deliveryAssistant', 'client');
}); });
afterAll(async() => { afterAll(async() => {

2
e2e/paths/03-worker/06_create.spec.js
View File

@ -45,7 +45,7 @@ describe('Worker create path', () => {
// should create a new worker and go to worker basic data' // should create a new worker and go to worker basic data'
await page.pickDate(selectors.workerCreate.birth, new Date(1962, 8, 5)); await page.pickDate(selectors.workerCreate.birth, new Date(1962, 8, 5));
await page.autocompleteSearch(selectors.workerCreate.boss, 'deliveryAssist'); await page.autocompleteSearch(selectors.workerCreate.boss, 'deliveryAssistant');
await page.waitToClick(selectors.workerCreate.createButton); await page.waitToClick(selectors.workerCreate.createButton);
message = await page.waitForSnackbar(); message = await page.waitForSnackbar();
await page.waitForState('worker.card.basicData'); await page.waitForState('worker.card.basicData');

2
e2e/paths/11-zone/01_basic-data.spec.js
View File

@ -9,7 +9,7 @@ describe('Zone basic data path', () => {
browser = await getBrowser(); browser = await getBrowser();
page = browser.page; page = browser.page;
await page.loginAndModule('deliveryAssist', await page.loginAndModule('deliveryAssistant',
carlossa marked this conversation as resolved Outdated
jgallego commented 2023-06-16 05:42:18 +00:00
Outdated
Review
Copy Link

votau de linea per a que no traga el comentari

votau de linea per a que no traga el comentari
'zone'); // turns up the zone module name and route aint the same lol 'zone'); // turns up the zone module name and route aint the same lol
await page.accessToSearchResult('10'); await page.accessToSearchResult('10');
await page.accessToSection('zone.card.basicData'); await page.accessToSection('zone.card.basicData');

2
e2e/paths/11-zone/02_descriptor.spec.js
View File

@ -8,7 +8,7 @@ describe('Zone descriptor path', () => {
beforeAll(async() => { beforeAll(async() => {
browser = await getBrowser(); browser = await getBrowser();
page = browser.page; page = browser.page;
await page.loginAndModule('deliveryAssist', 'zone'); await page.loginAndModule('deliveryAssistant', 'zone');
await page.accessToSearchResult('13'); await page.accessToSearchResult('13');
}); });

2
modules/client/front/address/create/index.html
View File

@ -68,7 +68,7 @@
icon="add_circle" icon="add_circle"
vn-tooltip="New postcode" vn-tooltip="New postcode"
ng-click="postcode.open()" ng-click="postcode.open()"
vn-acl="deliveryAssist" vn-acl="deliveryAssistant"
carlossa marked this conversation as resolved Outdated
jgallego commented 2023-06-16 05:45:54 +00:00
Outdated
Review
Copy Link

perque no has gastat deliveryAssistant?

perque no has gastat deliveryAssistant?
carlossa commented 2023-06-16 07:26:05 +00:00
Outdated
Review
Copy Link

Per el tema de caracters, he vist que en la taula role hi ha rols que tenen més silabes i fiquen Assist o Assi, com per exemple productionAssi o coolerAssist, en canvi els que tenen menos caracters si que fiquen Asssistant com salesAssistants

Per el tema de caracters, he vist que en la taula role hi ha rols que tenen més silabes i fiquen Assist o Assi, com per exemple productionAssi o coolerAssist, en canvi els que tenen menos caracters si que fiquen Asssistant com salesAssistants
vn-acl-action="remove"> vn-acl-action="remove">
</vn-icon-button> </vn-icon-button>
</append> </append>

2
modules/client/front/address/edit/index.html
View File

@ -81,7 +81,7 @@
icon="add_circle" icon="add_circle"
vn-tooltip="New postcode" vn-tooltip="New postcode"
ng-click="postcode.open()" ng-click="postcode.open()"
vn-acl="deliveryAssist" vn-acl="deliveryAssistant"
vn-acl-action="remove"> vn-acl-action="remove">
</vn-icon-button> </vn-icon-button>
</append> </append>

2
modules/client/front/create/index.html
View File

@ -76,7 +76,7 @@
icon="add_circle" icon="add_circle"
vn-tooltip="New postcode" vn-tooltip="New postcode"
ng-click="postcode.open()" ng-click="postcode.open()"
vn-acl="deliveryAssist" vn-acl="deliveryAssistant"
vn-acl-action="remove"> vn-acl-action="remove">
</vn-icon-button> </vn-icon-button>
</append> </append>

2
modules/client/front/fiscal-data/index.html
View File

@ -92,7 +92,7 @@
icon="add_circle" icon="add_circle"
vn-tooltip="New postcode" vn-tooltip="New postcode"
ng-click="postcode.open()" ng-click="postcode.open()"
vn-acl="deliveryAssist" vn-acl="deliveryAssistant"
vn-acl-action="remove"> vn-acl-action="remove">
</vn-icon-button> </vn-icon-button>
</append> </append>

4
modules/client/front/postcode/index.html
View File

@ -27,7 +27,7 @@
icon="add_circle" icon="add_circle"
vn-tooltip="New city" vn-tooltip="New city"
ng-click="city.open($event)" ng-click="city.open($event)"
vn-acl="deliveryAssist" vn-acl="deliveryAssistant"
vn-acl-action="remove"> vn-acl-action="remove">
</vn-icon-button> </vn-icon-button>
</append> </append>
@ -45,7 +45,7 @@
icon="add_circle" icon="add_circle"
vn-tooltip="New province" vn-tooltip="New province"
ng-click="province.open($event)" ng-click="province.open($event)"
vn-acl="deliveryAssist" vn-acl="deliveryAssistant"
vn-acl-action="remove"> vn-acl-action="remove">
</vn-icon-button> </vn-icon-button>
</append> </append>

4
modules/route/front/descriptor/index.html
View File

@ -15,14 +15,14 @@
</vn-item> </vn-item>
<vn-item <vn-item
ng-click="updateVolumeConfirmation.show()" ng-click="updateVolumeConfirmation.show()"
vn-acl="deliveryAssist" vn-acl="deliveryAssistant"
vn-acl-action="remove" vn-acl-action="remove"
translate> translate>
Update volume Update volume
</vn-item> </vn-item>
<vn-item <vn-item
ng-click="$ctrl.deleteCurrentRoute()" ng-click="$ctrl.deleteCurrentRoute()"
vn-acl="deliveryAssist" vn-acl="deliveryAssistant"
vn-acl-action="remove" vn-acl-action="remove"
translate> translate>
Delete route Delete route

2
modules/route/front/tickets/index.html
View File

@ -37,7 +37,7 @@
icon="format_list_numbered"> icon="format_list_numbered">
</vn-button> </vn-button>
<vn-button <vn-button
vn-acl="deliveryAssist" vn-acl="deliveryAssistant"
vn-acl-action="remove" vn-acl-action="remove"
disabled="!$ctrl.isChecked" disabled="!$ctrl.isChecked"
icon="sms" icon="sms"

2
modules/supplier/front/address/create/index.html
View File

@ -50,7 +50,7 @@
icon="add_circle" icon="add_circle"
vn-tooltip="New postcode" vn-tooltip="New postcode"
ng-click="postcode.open()" ng-click="postcode.open()"
vn-acl="deliveryAssist" vn-acl="deliveryAssistant"
vn-acl-action="remove"> vn-acl-action="remove">
</vn-icon-button> </vn-icon-button>
</append> </append>

2
modules/supplier/front/address/edit/index.html
View File

@ -48,7 +48,7 @@
icon="add_circle" icon="add_circle"
vn-tooltip="New postcode" vn-tooltip="New postcode"
ng-click="postcode.open()" ng-click="postcode.open()"
vn-acl="deliveryAssist" vn-acl="deliveryAssistant"
vn-acl-action="remove"> vn-acl-action="remove">
</vn-icon-button> </vn-icon-button>
</append> </append>

2
modules/supplier/front/fiscal-data/index.html
View File

@ -150,7 +150,7 @@
icon="add_circle" icon="add_circle"
vn-tooltip="New postcode" vn-tooltip="New postcode"
ng-click="postcode.open()" ng-click="postcode.open()"
vn-acl="deliveryAssist" vn-acl="deliveryAssistant"
vn-acl-action="remove"> vn-acl-action="remove">
</vn-icon-button> </vn-icon-button>
</append> </append>

2
modules/worker/front/create/index.html
View File

@ -72,7 +72,7 @@
icon="add_circle" icon="add_circle"
vn-tooltip="New postcode" vn-tooltip="New postcode"
ng-click="postcode.open()" ng-click="postcode.open()"
vn-acl="deliveryAssist" vn-acl="deliveryAssistant"
vn-acl-action="remove"> vn-acl-action="remove">
</vn-icon-button> </vn-icon-button>
</append> </append>

22
modules/zone/front/basic-data/index.html
View File

@ -14,7 +14,7 @@
<vn-textfield <vn-textfield
label="Name" label="Name"
ng-model="$ctrl.zone.name" ng-model="$ctrl.zone.name"
vn-acl="deliveryAssist" vn-acl="deliveryAssistant"
rule> rule>
</vn-textfield> </vn-textfield>
</vn-horizontal> </vn-horizontal>
@ -26,7 +26,7 @@
show-field="name" show-field="name"
value-field="id" value-field="id"
label="Agency" label="Agency"
vn-acl="deliveryAssist" vn-acl="deliveryAssistant"
rule> rule>
</vn-autocomplete> </vn-autocomplete>
<vn-input-number <vn-input-number
@ -34,7 +34,7 @@
label="Max m³" label="Max m³"
ng-model="$ctrl.zone.itemMaxSize" ng-model="$ctrl.zone.itemMaxSize"
min="0" min="0"
vn-acl="deliveryAssist" vn-acl="deliveryAssistant"
rule> rule>
</vn-input-number> </vn-input-number>
<vn-input-number <vn-input-number
@ -42,7 +42,7 @@
label="Maximum m³" label="Maximum m³"
ng-model="$ctrl.zone.m3Max" ng-model="$ctrl.zone.m3Max"
min="0" min="0"
vn-acl="deliveryAssist" vn-acl="deliveryAssistant"
rule> rule>
</vn-input-number> </vn-input-number>
</vn-horizontal> </vn-horizontal>
@ -52,13 +52,13 @@
ng-model="$ctrl.zone.travelingDays" ng-model="$ctrl.zone.travelingDays"
min="0" min="0"
step="1" step="1"
vn-acl="deliveryAssist" vn-acl="deliveryAssistant"
rule> rule>
</vn-input-number> </vn-input-number>
<vn-input-time <vn-input-time
label="Closing" label="Closing"
ng-model="$ctrl.zone.hour" ng-model="$ctrl.zone.hour"
vn-acl="deliveryAssist" vn-acl="deliveryAssistant"
rule> rule>
</vn-input-time> </vn-input-time>
</vn-horizontal> </vn-horizontal>
@ -68,14 +68,14 @@
ng-model="$ctrl.zone.price" ng-model="$ctrl.zone.price"
min="0" min="0"
step="0.01" step="0.01"
vn-acl="deliveryAssist" vn-acl="deliveryAssistant"
rule> rule>
</vn-input-number> </vn-input-number>
<vn-input-number <vn-input-number
label="Bonus" label="Bonus"
ng-model="$ctrl.zone.bonus" ng-model="$ctrl.zone.bonus"
step="0.01" step="0.01"
vn-acl="deliveryAssist" vn-acl="deliveryAssistant"
rule> rule>
</vn-input-number> </vn-input-number>
</vn-horizontal> </vn-horizontal>
@ -86,14 +86,14 @@
ng-model="$ctrl.zone.inflation" ng-model="$ctrl.zone.inflation"
min="0" min="0"
step="0.01" step="0.01"
vn-acl="deliveryAssist" vn-acl="deliveryAssistant"
rule> rule>
</vn-input-number> </vn-input-number>
<vn-check <vn-check
vn-one vn-one
label="Volumetric" label="Volumetric"
ng-model="$ctrl.zone.isVolumetric" ng-model="$ctrl.zone.isVolumetric"
vn-acl="deliveryAssist" vn-acl="deliveryAssistant"
rule> rule>
</vn-check> </vn-check>
</vn-horizontal> </vn-horizontal>
@ -101,7 +101,7 @@
<vn-button-bar> <vn-button-bar>
<vn-submit <vn-submit
disabled="!watcher.dataChanged()" disabled="!watcher.dataChanged()"
vn-acl="deliveryAssist" vn-acl="deliveryAssistant"
label="Save"> label="Save">
</vn-submit> </vn-submit>
<vn-button <vn-button

4
modules/zone/front/index/index.html
View File

@ -32,7 +32,7 @@
vn-click-stop="clone.show(zone)" vn-click-stop="clone.show(zone)"
vn-tooltip="Clone" vn-tooltip="Clone"
icon="icon-clone" icon="icon-clone"
vn-acl="deliveryAssist" vn-acl="deliveryAssistant"
vn-acl-action="remove"> vn-acl-action="remove">
</vn-icon-button> </vn-icon-button>
<vn-icon-button <vn-icon-button
@ -62,7 +62,7 @@
fixed-bottom-right> fixed-bottom-right>
<vn-float-button <vn-float-button
icon="add" icon="add"
vn-acl="deliveryAssist" vn-acl="deliveryAssistant"
vn-acl-action="remove"> vn-acl-action="remove">
</vn-float-button> </vn-float-button>
</a> </a>

2
modules/zone/front/location/index.html
View File

@ -16,7 +16,7 @@
root-label="Locations" root-label="Locations"
fetch-func="$ctrl.onFetch($item)" fetch-func="$ctrl.onFetch($item)"
sort-func="$ctrl.onSort($a, $b)"> sort-func="$ctrl.onSort($a, $b)">
<vn-check acl-role="deliveryAssist" <vn-check acl-role="deliveryAssistant"
ng-model="item.selected" ng-model="item.selected"
on-change="$ctrl.onSelection(value, item)" on-change="$ctrl.onSelection(value, item)"
triple-state="true" triple-state="true"