diff --git a/server/AyaNova/DataList/TaskGroupDataList.cs b/server/AyaNova/DataList/TaskGroupDataList.cs new file mode 100644 index 00000000..e2270d56 --- /dev/null +++ b/server/AyaNova/DataList/TaskGroupDataList.cs @@ -0,0 +1,48 @@ +using System.Collections.Generic; +using AyaNova.Biz; +namespace AyaNova.DataList +{ + internal class TaskGroupDataList : DataListProcessingBase + { + public TaskGroupDataList() + { + DefaultListAType = AyaType.TaskGroup; + SQLFrom = "from ataskgroup"; + var RoleSet = BizRoles.GetRoleSet(DefaultListAType); + AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change; + DefaultColumns = new List() { "taskgroupname" }; + DefaultSortBy = new Dictionary() { { "taskgroupname", "+" } }; + FieldDefinitions = new List(); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "TaskGroupName", + FieldKey = "taskgroupname", + AType = (int)AyaType.TaskGroup, + UiFieldDataType = (int)UiFieldDataType.Text, + SqlIdColumnName = "ataskgroup.id", + SqlValueColumnName = "ataskgroup.name", + IsRowId = true + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "TaskGroupNotes", + FieldKey = "Notes", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "ataskgroup.notes" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "Active", + FieldKey = "taskgroupactive", + UiFieldDataType = (int)UiFieldDataType.Bool, + SqlValueColumnName = "ataskgroup.active" + }); + + + + } + }//eoc +}//eons \ No newline at end of file diff --git a/server/AyaNova/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs index ad2db8c5..e493ce4f 100644 --- a/server/AyaNova/biz/FormFieldReference.cs +++ b/server/AyaNova/biz/FormFieldReference.cs @@ -646,6 +646,19 @@ namespace AyaNova.Biz } #endregion + + // #region TaskGroup + // { + // List l = new List(); + // l.Add(new FormField { TKey = "TaskGroupNotes", FieldKey = "Notes" }); + + + // _formFields.Add(AyaType.TaskGroup.ToString(), l); + + // } + // #endregion + + #region TaxCode { List l = new List(); @@ -960,13 +973,13 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "LineTotal", FieldKey = "TravelLineTotalViz", TKeySection = "WorkOrderItemTravels" }); - //WORKORDER ITEM TASKS + //WORKORDER ITEM TASKS l.Add(new FormField { TKey = "Sequence", FieldKey = "WorkOrderItemTaskSequence", TKeySection = "WorkOrderItemTask" }); l.Add(new FormField { TKey = "WorkOrderItemTaskTaskID", FieldKey = "WorkOrderItemTaskTaskID", TKeySection = "WorkOrderItemTask" }); l.Add(new FormField { TKey = "WorkOrderItemTaskWorkOrderItemTaskCompletionType", FieldKey = "WorkOrderItemTaskWorkOrderItemTaskCompletionType", TKeySection = "WorkOrderItemTask" }); l.Add(new FormField { TKey = "WorkOrderItemTaskUser", FieldKey = "WorkOrderItemTaskUser", TKeySection = "WorkOrderItemTask" }); l.Add(new FormField { TKey = "WorkOrderItemTaskCompletedDate", FieldKey = "WorkOrderItemTaskCompletedDate", TKeySection = "WorkOrderItemTask" }); - + _formFields.Add(AyaType.WorkOrder.ToString(), l); diff --git a/server/AyaNova/biz/TaskGroupBiz.cs b/server/AyaNova/biz/TaskGroupBiz.cs index ba7d5762..b6a55bb6 100644 --- a/server/AyaNova/biz/TaskGroupBiz.cs +++ b/server/AyaNova/biz/TaskGroupBiz.cs @@ -13,7 +13,7 @@ using Newtonsoft.Json; namespace AyaNova.Biz { - // add controller, pick list, form field defs for edit form, list object for main list + // add list object for main list internal class TaskGroupBiz : BizObject, IJobObject, ISearchAbleObject, IReportAbleObject, IExportAbleObject, IImportAbleObject { diff --git a/server/AyaNova/resource/de.json b/server/AyaNova/resource/de.json index 12ce8837..c868ef29 100644 --- a/server/AyaNova/resource/de.json +++ b/server/AyaNova/resource/de.json @@ -533,6 +533,7 @@ "Task": "Aufgabe", "TaskGroup": "Aufgabengruppe", "TaskGroupTask": "Aufgabe einer Aufgabengruppe", + "TaskGroupNotes": "Anmerkungen", "TaxCode": "Steuercode", "Unit": "Einheit", "UnitMeterReading": "Einheitenzählerstand", diff --git a/server/AyaNova/resource/en.json b/server/AyaNova/resource/en.json index d1d6ff91..d0e1e36e 100644 --- a/server/AyaNova/resource/en.json +++ b/server/AyaNova/resource/en.json @@ -533,6 +533,7 @@ "Task": "Task", "TaskGroup": "Task group", "TaskGroupTask": "TaskGroup task", + "TaskGroupNotes": "Notes", "TaxCode": "Tax code", "Unit": "Unit", "UnitMeterReading": "Unit Meter Reading", @@ -1566,8 +1567,8 @@ "WorkOrderItemTaskObject": "WorkOrder item task", "WorkOrderItemTaskTaskID": "Task", "WorkOrderItemTaskWorkOrderItemTaskCompletionType": "Status", - "WorkOrderItemTaskUser":"User", - "WorkOrderItemTaskCompletedDate":"Completed", + "WorkOrderItemTaskUser": "User", + "WorkOrderItemTaskCompletedDate": "Completed", "WorkOrderItemTravelDistance": "Distance", "WorkOrderItemTravelList": "Travels", "WorkOrderItemTravelNoChargeQuantity": "No Charge Quantity", @@ -2222,13 +2223,13 @@ "WorkOrderItemPriorityList": "Work order item priority list", "WorkOrderItemPriorityName": "Name", "WorkOrderItemPriorityColor": "Color", - "SaveRecordToProceed":"This record must be saved to continue", + "SaveRecordToProceed": "This record must be saved to continue", "ListPrice": "List price", "Price": "Price", "Tax": "Tax", "TaxAAmt": "Tax A amount", "TaxBAmt": "Tax B amount", - "GlobalWorkOrderCompleteByAge":"Default work order completion age", - "PriceOverride":"Price override", - "NetPrice":"Net price" + "GlobalWorkOrderCompleteByAge": "Default work order completion age", + "PriceOverride": "Price override", + "NetPrice": "Net price" } \ No newline at end of file diff --git a/server/AyaNova/resource/es.json b/server/AyaNova/resource/es.json index 3a67a82c..4e36aed6 100644 --- a/server/AyaNova/resource/es.json +++ b/server/AyaNova/resource/es.json @@ -532,6 +532,7 @@ "Task": "Tarea", "TaskGroup": "Grupo de tareas", "TaskGroupTask": "Tarea de grupo de tareas", + "TaskGroupNotes": "Notas", "TaxCode": "Código fiscal", "Unit": "Unidad", "UnitMeterReading": "Lectura de medición de unidad", diff --git a/server/AyaNova/resource/fr.json b/server/AyaNova/resource/fr.json index c8dd227f..a31ba2af 100644 --- a/server/AyaNova/resource/fr.json +++ b/server/AyaNova/resource/fr.json @@ -533,6 +533,7 @@ "Task": "Tâche", "TaskGroup": "Groupe de tâches", "TaskGroupTask": "Tâche de groupe de tâches", + "TaskGroupNotes": "Remarques", "TaxCode": "Code de taxe", "Unit": "Unité", "UnitMeterReading": "Lecture de compteur d'unités",