diff --git a/.vscode/launch.json b/.vscode/launch.json index b77f3b95..fcc80a75 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -53,7 +53,7 @@ "AYANOVA_FOLDER_USER_FILES": "c:\\temp\\RavenTestData\\userfiles", "AYANOVA_FOLDER_BACKUP_FILES": "c:\\temp\\RavenTestData\\backupfiles", "AYANOVA_FOLDER_TEMPORARY_SERVER_FILES": "c:\\temp\\RavenTestData\\tempfiles", - "AYANOVA_SERVER_TEST_MODE": "false", + "AYANOVA_SERVER_TEST_MODE": "true", "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small", "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-7", "AYANOVA_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_13\\bin\\" diff --git a/docs/8.0/ayanova/docs/svc-workorders.md b/docs/8.0/ayanova/docs/svc-workorders.md index b0f78867..f6d7fbb7 100644 --- a/docs/8.0/ayanova/docs/svc-workorders.md +++ b/docs/8.0/ayanova/docs/svc-workorders.md @@ -49,7 +49,7 @@ docs / sections required * These restricted Users are not shown the option of viewing the full work order list. They will access their work orders via their Home -> Schedule form * Work order main menu * limited to Report, Save and Help options only - * Work order / work order item can not be created or deleted + * Work order / work order items can not be created or deleted * Work order *Item* restrictions * These restricted Users will only be able to access the Work order Items for which they are Scheduled in the work order editing form. In other words if you do not want a Sub contractor or tech - restricted user to see parts of a Work order do not add them to the Scheduled users collection on those work order items diff --git a/server/AyaNova/DataList/ReportDataList.cs b/server/AyaNova/DataList/ReportDataList.cs index 34801e76..5edc81fc 100644 --- a/server/AyaNova/DataList/ReportDataList.cs +++ b/server/AyaNova/DataList/ReportDataList.cs @@ -50,6 +50,16 @@ namespace AyaNova.DataList SqlValueColumnName = "aReport.active" }); + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "SelectRoles", + FieldKey = "roles", + UiFieldDataType = (int)UiFieldDataType.Roles, + //NOTE: not technically an enum list but this will trigger datagrid at client to fetch roles for special handling + EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(AuthorizationRoles).ToString()), + SqlValueColumnName = "areport.roles" + }); + } }//eoc }//eons \ No newline at end of file diff --git a/server/AyaNova/DataList/WorkOrderStatusDataList.cs b/server/AyaNova/DataList/WorkOrderStatusDataList.cs index c99eb841..87517454 100644 --- a/server/AyaNova/DataList/WorkOrderStatusDataList.cs +++ b/server/AyaNova/DataList/WorkOrderStatusDataList.cs @@ -58,6 +58,26 @@ namespace AyaNova.DataList SqlValueColumnName = "aworkorderstatus.locked" }); + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "SelectRoles", + FieldKey = "SelectRoles", + UiFieldDataType = (int)UiFieldDataType.Roles, + //NOTE: not technically an enum list but this will trigger datagrid at client to fetch roles for special handling + EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(AuthorizationRoles).ToString()), + SqlValueColumnName = "aworkorderstatus.selectroles" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderStatusRemoveRoles", + FieldKey = "WorkOrderStatusRemoveRoles", + UiFieldDataType = (int)UiFieldDataType.Roles, + //NOTE: not technically an enum list but this will trigger datagrid at client to fetch roles for special handling + EnumType = AyaNova.Util.StringUtil.TrimTypeName(typeof(AuthorizationRoles).ToString()), + SqlValueColumnName = "aworkorderstatus.removeroles" + }); + } }//eoc diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index 2c35b164..102732b4 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -1639,7 +1639,7 @@ "WorkOrderStatusName": "Name", "WorkOrderStatusNotes": "Anmerkungen", "WorkOrderStatusColor": "Farbe", - "WorkOrderStatusSelectRoles": "Wer kann auswählen", + "SelectRoles": "Wer kann auswählen", "WorkOrderStatusRemoveRoles": "Wer kann entfernen", "WorkOrderStatusCompleted": "Ist ein abgeschlossener Status", "WorkOrderStatusLocked": "Ist ein Sperrstatus", diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index e0ee2cf9..2f5565ef 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -1639,7 +1639,7 @@ "WorkOrderStatusName": "Name", "WorkOrderStatusNotes": "Notes", "WorkOrderStatusColor": "Color", - "WorkOrderStatusSelectRoles": "Who can select", + "SelectRoles": "Who can select", "WorkOrderStatusRemoveRoles": "Who can remove", "WorkOrderStatusCompleted": "Is a completed status", "WorkOrderStatusLocked": "Is a locking status", diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index d9101e98..b32db0c2 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -1639,7 +1639,7 @@ "WorkOrderStatusName": "Nombre", "WorkOrderStatusNotes": "Notas", "WorkOrderStatusColor": "Color", - "WorkOrderStatusSelectRoles": "Quien puede seleccionar", + "SelectRoles": "Quien puede seleccionar", "WorkOrderStatusRemoveRoles": "Quien puede remover", "WorkOrderStatusCompleted": "Es un estado completo", "WorkOrderStatusLocked": "Es un estado de bloqueo", diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index f61731f2..5f4ebf17 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -1639,7 +1639,7 @@ "WorkOrderStatusName": "Nom", "WorkOrderStatusNotes": "Remarques", "WorkOrderStatusColor": "Couleur", - "WorkOrderStatusSelectRoles": "Qui peut sélectionner", + "SelectRoles": "Qui peut sélectionner", "WorkOrderStatusRemoveRoles": "Qui peut supprimer", "WorkOrderStatusCompleted": "Est un statut terminé", "WorkOrderStatusLocked": "Est un statut de verrouillage",