diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index b76b7ae5..61add043 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -420,21 +420,6 @@ todo: many biz objects are not using new PUT methodology
CURRENTLY DOING:
-todo 2: Implement "Show All" feature for workorder lists as follows:
- Already implemented in admin-user but now need to replicate to personal user areas:
- Schedule menu
- Dashboard menu
-
- Copy the code from the admin-user menu but change the if statement to use the store.state.isScheduleableUser flag set on login
- To show
- WorkORderItemScheduledUserDataList
- WorkOrderItemLaborDataList
-
-
-
-
-
-
todo 1: "DispatchFull" and "DispatchLimited" roles MUST be renamed to "ServiceFull" and "ServiceLimited" to match other roles and intent
dispatch is a subset of a service manager job
@@ -1226,3 +1211,12 @@ BUILD 115
- Project edit form "Work orders" menu item implemented to show all WorkOrders list filtered by project (new feature)
- Part edit form "Work orders" menu item implemented to show all WorkOrderItemParts list filtered by part (new feature)
- User edit form "Scheduled Users" and "Labors" menu items implemented to show all workorderitem scheduled user and workorderitemlabor lists filtered by User (new feature)
+- Dashboard form "Scheduled Users" and "Labors" menu items implemented to show all workorderitem scheduled user and workorderitemlabor lists filtered by current User (new feature)
+
+- Translation roles: changed "Limited" to "Restricted" to more properly reflect what it means and also in all translations which translate more accurately this way
+- Transtlation roles: removed "- full" from full rights roles
+ i.e. "Inventory - Full" is now just "Inventory"
+
+- Role object and Translation: renamed "Dispatch" roles to "Service" roles as "Dispatch" is a sub-set of all Service manager tasks and roles
+ i.e. "Dispatch", "Dispatch - restricted" now "Service", "Service - restricted"
+ this also ties in more tightly with the user interface menu options making it clearer where it applies
\ No newline at end of file
diff --git a/ayanova/src/api/authorizationroles.js b/ayanova/src/api/authorizationroles.js
index 79904ad9..37894e63 100644
--- a/ayanova/src/api/authorizationroles.js
+++ b/ayanova/src/api/authorizationroles.js
@@ -11,10 +11,10 @@ export default {
BizAdminLimited: 1,
///BizAdminFull
BizAdminFull: 2,
- ///DispatchLimited
- DispatchLimited: 4,
- ///DispatchFull
- DispatchFull: 8,
+ ///ServiceLimited
+ ServiceLimited: 4,
+ ///ServiceFull
+ ServiceFull: 8,
///InventoryLimited
InventoryLimited: 16,
///InventoryFull
diff --git a/ayanova/src/views/home-review.vue b/ayanova/src/views/home-review.vue
index 3eaa5892..5873f6a4 100644
--- a/ayanova/src/views/home-review.vue
+++ b/ayanova/src/views/home-review.vue
@@ -299,7 +299,7 @@ export default {
ayaType: window.$gz.type.Review,
currentUserIsASupervisor: window.$gz.role.hasRole([
window.$gz.role.AUTHORIZATION_ROLES.BizAdminFull,
- window.$gz.role.AUTHORIZATION_ROLES.DispatchFull,
+ window.$gz.role.AUTHORIZATION_ROLES.ServiceFull,
window.$gz.role.AUTHORIZATION_ROLES.InventoryFull,
window.$gz.role.AUTHORIZATION_ROLES.SalesFull,
window.$gz.role.AUTHORIZATION_ROLES.AccountingFull
@@ -353,14 +353,14 @@ export default {
//mirrored from ReviewBiz.cs validation rule at server
/*
CurrentUserRoles.HasFlag(AuthorizationRoles.BizAdminFull) ||
- CurrentUserRoles.HasFlag(AuthorizationRoles.DispatchFull) ||
+ CurrentUserRoles.HasFlag(AuthorizationRoles.ServiceFull) ||
CurrentUserRoles.HasFlag(AuthorizationRoles.InventoryFull) ||
CurrentUserRoles.HasFlag(AuthorizationRoles.SalesFull) ||
CurrentUserRoles.HasFlag(AuthorizationRoles.AccountingFull);
*/
return window.$gz.role.hasRole([
window.$gz.role.AUTHORIZATION_ROLES.BizAdminFull,
- window.$gz.role.AUTHORIZATION_ROLES.DispatchFull,
+ window.$gz.role.AUTHORIZATION_ROLES.ServiceFull,
window.$gz.role.AUTHORIZATION_ROLES.InventoryFull,
window.$gz.role.AUTHORIZATION_ROLES.SalesFull,
window.$gz.role.AUTHORIZATION_ROLES.AccountingFull
diff --git a/ayanova/src/views/home-schedule.vue b/ayanova/src/views/home-schedule.vue
index 64b707a1..5a034b43 100644
--- a/ayanova/src/views/home-schedule.vue
+++ b/ayanova/src/views/home-schedule.vue
@@ -18,4 +18,9 @@ export default {
});
}
};
+
+/*
+
+TODO: copy dashboard menu links to own workorders for here
+*/
diff --git a/ayanova/src/views/login.vue b/ayanova/src/views/login.vue
index 72b24d5e..28816ebf 100644
--- a/ayanova/src/views/login.vue
+++ b/ayanova/src/views/login.vue
@@ -286,14 +286,14 @@ export default {
p: "CustomerLimited"
},
{
- name: "Dispatcher",
- l: "DispatchFull",
- p: "DispatchFull"
+ name: "Service",
+ l: "ServiceFull",
+ p: "ServiceFull"
},
{
- name: "Dispatcher - limited",
- l: "DispatchLimited",
- p: "DispatchLimited"
+ name: "Service - limited",
+ l: "ServiceLimited",
+ p: "ServiceLimited"
},
{
name: "Head office",