server/AyaNova/DataList/WorkOrderItemExpenseDataList.cs

@@ -21,7 +21,7 @@ namespace AyaNova.DataList
 
             //workorder item expense
             + "left join aworkorderitemexpense on aworkorderitem.id=aworkorderitemexpense.workorderitemid "
-            + "left join auser on (aworkorderitemexpense.completedbyuserid=auser.id) "
+            + "left join auser on (aworkorderitemexpense.userid=auser.id) "
             ;
 
             var RoleSet = BizRoles.GetRoleSet(DefaultListAType);
@@ -32,21 +32,105 @@ namespace AyaNova.DataList
                     "WorkOrderItemSummary",
                     "Customer",
                     "WorkOrderServiceDate",
+                    "WorkOrderItemExpenseName",
+                    "WorkOrderItemExpenseChargeAmount",
+                    "WorkOrderItemExpenseUserID"
                   };
-            DefaultSortBy = new Dictionary<string, string>() { { "WorkOrderSerialNumber", "-" }, { "WorkOrderItemSequence", "+" }, { "XXXXXXXXXXXXX", "+" } };
+            DefaultSortBy = new Dictionary<string, string>() { { "WorkOrderSerialNumber", "-" }, { "WorkOrderItemSequence", "+" } };
             FieldDefinitions = new List<DataListFieldDefinition>();
 
 
-        /*
+            /*
-            ███████╗██╗  ██╗██████╗ ███████╗███╗   ██╗███████╗███████╗███████╗
+                ███████╗██╗  ██╗██████╗ ███████╗███╗   ██╗███████╗███████╗███████╗
-            ██╔════╝╚██╗██╔╝██╔══██╗██╔════╝████╗  ██║██╔════╝██╔════╝██╔════╝
+                ██╔════╝╚██╗██╔╝██╔══██╗██╔════╝████╗  ██║██╔════╝██╔════╝██╔════╝
-            █████╗   ╚███╔╝ ██████╔╝█████╗  ██╔██╗ ██║███████╗█████╗  ███████╗
+                █████╗   ╚███╔╝ ██████╔╝█████╗  ██╔██╗ ██║███████╗█████╗  ███████╗
-            ██╔══╝   ██╔██╗ ██╔═══╝ ██╔══╝  ██║╚██╗██║╚════██║██╔══╝  ╚════██║
+                ██╔══╝   ██╔██╗ ██╔═══╝ ██╔══╝  ██║╚██╗██║╚════██║██╔══╝  ╚════██║
-            ███████╗██╔╝ ██╗██║     ███████╗██║ ╚████║███████║███████╗███████║
+                ███████╗██╔╝ ██╗██║     ███████╗██║ ╚████║███████║███████╗███████║
-            ╚══════╝╚═╝  ╚═╝╚═╝     ╚══════╝╚═╝  ╚═══╝╚══════╝╚══════╝╚══════╝
+                ╚══════╝╚═╝  ╚═╝╚═╝     ╚══════╝╚═╝  ╚═══╝╚══════╝╚══════╝╚══════╝
-        */
+            */
 
             #region WorkOrderItemExpense fields
+            /*
+            l.Add(new FormField { TKey = "WorkOrderItemExpenseChargeAmount", FieldKey = "WorkOrderItemExpenseChargeAmount", TKeySection = "WorkOrderItemExpense" });
+            l.Add(new FormField { TKey = "WorkOrderItemExpenseChargeTaxCodeID", FieldKey = "WorkOrderItemExpenseChargeTaxCodeID", TKeySection = "WorkOrderItemExpense" });
+            l.Add(new FormField { TKey = "WorkOrderItemExpenseTaxPaid", FieldKey = "WorkOrderItemExpenseTaxPaid", TKeySection = "WorkOrderItemExpense" });
+            l.Add(new FormField { TKey = "WorkOrderItemExpenseChargeToCustomer", FieldKey = "WorkOrderItemExpenseChargeToCustomer", TKeySection = "WorkOrderItemExpense" });
+            l.Add(new FormField { TKey = "WorkOrderItemExpenseDescription", FieldKey = "WorkOrderItemExpenseDescription", TKeySection = "WorkOrderItemExpense" });
+            l.Add(new FormField { TKey = "WorkOrderItemExpenseName", FieldKey = "WorkOrderItemExpenseName", TKeySection = "WorkOrderItemExpense" });
+            l.Add(new FormField { TKey = "WorkOrderItemExpenseReimburseUser", FieldKey = "WorkOrderItemExpenseReimburseUser", TKeySection = "WorkOrderItemExpense" });
+            l.Add(new FormField { TKey = "WorkOrderItemExpenseTotalCost", FieldKey = "WorkOrderItemExpenseTotalCost", TKeySection = "WorkOrderItemExpense" });
+            l.Add(new FormField { TKey = "WorkOrderItemExpenseUserID", FieldKey = "WorkOrderItemExpenseUserID", TKeySection = "WorkOrderItemExpense" });
+
+            CREATE TABLE aworkorderitemexpense (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, workorderitemid BIGINT NOT NULL REFERENCES aworkorderitem (id), "
+            + "description TEXT, name TEXT, totalcost DECIMAL(38,18) NOT NULL default 0, chargeamount DECIMAL(38,18) NOT NULL default 0, taxpaid DECIMAL(38,18) NOT NULL default 0, "
+            + "chargetaxcodeid BIGINT REFERENCES ataxcode, reimburseuser BOOL NOT NULL, userid BIGINT REFERENCES auser, chargetocustomer BOOL NOT NULL
+            */
+
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "WorkOrderItemExpenseName",
+                FieldKey = "WorkOrderItemExpenseName",
+                UiFieldDataType = (int)UiFieldDataType.Text,
+                AType = (int)AyaType.WorkOrderItemExpense,
+                SqlIdColumnName = "aworkorderitemexpense.id",
+                SqlValueColumnName = "aworkorderitemexpense.name",
+                IsRowId = true
+            });
+
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "WorkOrderItemExpenseTotalCost",
+                FieldKey = "WorkOrderItemExpenseTotalCost",
+                AType = (int)AyaType.WorkOrderItemExpense,
+                UiFieldDataType = (int)UiFieldDataType.Currency,
+                SqlIdColumnName = "aworkorderitemexpense.id",
+                SqlValueColumnName = "aworkorderitemexpense.totalcost"
+            });
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "WorkOrderItemExpenseTaxPaid",
+                FieldKey = "WorkOrderItemExpenseTaxPaid",
+                AType = (int)AyaType.WorkOrderItemExpense,
+                UiFieldDataType = (int)UiFieldDataType.Currency,
+                SqlIdColumnName = "aworkorderitemexpense.id",
+                SqlValueColumnName = "aworkorderitemexpense.taxpaid"
+            });
+
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "WorkOrderItemExpenseChargeAmount",
+                FieldKey = "WorkOrderItemExpenseChargeAmount",
+                AType = (int)AyaType.WorkOrderItemExpense,
+                UiFieldDataType = (int)UiFieldDataType.Currency,
+                SqlIdColumnName = "aworkorderitemexpense.id",
+                SqlValueColumnName = "aworkorderitemexpense.chargeamount"
+            });
+
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "WorkOrderItemExpenseUserID",
+                FieldKey = "WorkOrderItemExpenseUserID",
+                UiFieldDataType = (int)UiFieldDataType.Text,
+                AType = (int)AyaType.WorkOrderItemExpense,
+                SqlIdColumnName = "aworkorderitemexpense.id",
+                SqlValueColumnName = "auser.name"
+            });
+
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "WorkOrderItemExpenseChargeToCustomer",
+                FieldKey = "WorkOrderItemExpenseChargeToCustomer",
+                UiFieldDataType = (int)UiFieldDataType.Bool,
+                SqlValueColumnName = "aworkorderitemexpense.chargetocustomer"
+            });
+
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "WorkOrderItemExpenseReimburseUser",
+                FieldKey = "WorkOrderItemExpenseReimburseUser",
+                UiFieldDataType = (int)UiFieldDataType.Bool,
+                SqlValueColumnName = "aworkorderitemexpense.reimburseuser"
+            });