From a50f878de77d7a80938dc50e0210aa7062abb701 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 25 Jun 2021 20:06:27 +0000 Subject: [PATCH] --- .vscode/launch.json | 2 +- .../DataList/WorkOrderItemPartDataList.cs | 3 +- .../WorkOrderItemPartRequestDataList.cs | 568 ++++++++++++++++++ server/AyaNova/biz/FormFieldReference.cs | 2 +- .../models/WorkOrderItemPartRequest.cs | 6 +- 5 files changed, 576 insertions(+), 5 deletions(-) create mode 100644 server/AyaNova/DataList/WorkOrderItemPartRequestDataList.cs 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/server/AyaNova/DataList/WorkOrderItemPartDataList.cs b/server/AyaNova/DataList/WorkOrderItemPartDataList.cs index 247c5d4f..fd46d4bb 100644 --- a/server/AyaNova/DataList/WorkOrderItemPartDataList.cs +++ b/server/AyaNova/DataList/WorkOrderItemPartDataList.cs @@ -33,7 +33,8 @@ namespace AyaNova.DataList "WorkOrderItemSummary", "Customer", "WorkOrderServiceDate", - "WorkOrderItemPartPartID" + "WorkOrderItemPartPartID", + "WorkOrderItemPartQuantity" }; DefaultSortBy = new Dictionary() { { "WorkOrderSerialNumber", "-" }, { "WorkOrderItemSequence", "+" }, { "WorkOrderItemPartPartID", "+" } }; FieldDefinitions = new List(); diff --git a/server/AyaNova/DataList/WorkOrderItemPartRequestDataList.cs b/server/AyaNova/DataList/WorkOrderItemPartRequestDataList.cs new file mode 100644 index 00000000..7801af71 --- /dev/null +++ b/server/AyaNova/DataList/WorkOrderItemPartRequestDataList.cs @@ -0,0 +1,568 @@ +using System.Collections.Generic; +using AyaNova.Biz; +using AyaNova.Models; + +namespace AyaNova.DataList +{ + internal class WorkOrderItemPartRequestDataList : DataListProcessingBase, IDataListInternalCriteria + { + public WorkOrderItemPartRequestDataList() + { + DefaultListAType = AyaType.WorkOrder; + SQLFrom = "from aworkorder " + + "left join aworkorderstatus on (aworkorder.laststatusid = aworkorderstatus.id) " + + "left join acustomer on (aworkorder.customerid=acustomer.id) " + + "left join aheadoffice on (acustomer.headofficeid=aheadoffice.id) " + + "left join aproject on (aworkorder.projectid=aproject.id) " + + "left join acontract on (aworkorder.contractid=acontract.id)" + + "left join aworkorderitem on aworkorder.id=aworkorderitem.workorderid " + + "left join aworkorderitemstatus on (aworkorderitem.workorderitemstatusid = aworkorderitemstatus.id) " + + "left join aworkorderitempriority on (aworkorderitem.workorderitempriorityid = aworkorderitempriority.id) " + + //workorder item partrequest + + "left join aworkorderitempartrequest on aworkorderitem.id=aworkorderitempartrequest.workorderitemid " + + "left join apart on (aworkorderitempartrequest.partid=apart.id) " + + "left join apartwarehouse on (aworkorderitempartrequest.partwarehouseid=apartwarehouse.id) " + + "left join apurchaseorderitem on (aworkorderitempartrequest.purchaseorderitemid=apurchaseorderitem.id) " + + "left join apurchaseorder on (apurchaseorderitem.purchaseorderid=apurchaseorder.id) " + ; + + var RoleSet = BizRoles.GetRoleSet(DefaultListAType); + AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change; + DefaultColumns = new List() { + "WorkOrderSerialNumber", + "WorkOrderItemSequence", + "WorkOrderItemSummary", + "Customer", + "WorkOrderServiceDate", + "WorkOrderItemPartRequestPartID", + "WorkOrderItemPartRequestQuantity", + "WorkOrderItemPartRequestPurchaseOrder", + "WorkOrderItemPartRequestOrderedDate", + "WorkOrderItemPartRequestExpectedReceiveDate", + "WorkOrderItemPartRequestReceived" + + }; + DefaultSortBy = new Dictionary() { { "WorkOrderSerialNumber", "-" }, { "WorkOrderItemSequence", "+" }, { "WorkOrderItemPartRequestPartID", "+" } }; + FieldDefinitions = new List(); + + + /* + ██████╗ █████╗ ██████╗ ████████╗ ██████╗ ███████╗ ██████╗ ██╗ ██╗███████╗███████╗████████╗███████╗ + ██╔══██╗██╔══██╗██╔══██╗╚══██╔══╝ ██╔══██╗██╔════╝██╔═══██╗██║ ██║██╔════╝██╔════╝╚══██╔══╝██╔════╝ + ██████╔╝███████║██████╔╝ ██║█████╗██████╔╝█████╗ ██║ ██║██║ ██║█████╗ ███████╗ ██║ ███████╗ + ██╔═══╝ ██╔══██║██╔══██╗ ██║╚════╝██╔══██╗██╔══╝ ██║▄▄ ██║██║ ██║██╔══╝ ╚════██║ ██║ ╚════██║ + ██║ ██║ ██║██║ ██║ ██║ ██║ ██║███████╗╚██████╔╝╚██████╔╝███████╗███████║ ██║ ███████║ + ╚═╝ ╚═╝ ╚═╝╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝╚══════╝ ╚══▀▀═╝ ╚═════╝ ╚══════╝╚══════╝ ╚═╝ ╚══════╝ + */ + + #region WorkOrderItemPartRequest fields + /* +l.Add(new FormField { TKey = "WorkOrderItemPartRequestPartID", FieldKey = "WorkOrderItemPartRequestPartID", TKeySection = "WorkOrderItemPartRequests" }); +l.Add(new FormField { TKey = "WorkOrderItemPartRequestPartWarehouseID", FieldKey = "WorkOrderItemPartRequestPartWarehouseID", TKeySection = "WorkOrderItemPartRequests" }); +l.Add(new FormField { TKey = "WorkOrderItemPartRequestQuantity", FieldKey = "WorkOrderItemPartRequestQuantity", TKeySection = "WorkOrderItemPartRequests" }); +l.Add(new FormField { TKey = "PartUPC", FieldKey = "PartRequestPartUPC", TKeySection = "WorkOrderItemPartRequests" }); +l.Add(new FormField { TKey = "PurchaseOrder", FieldKey = "WorkOrderItemPartRequestPurchaseOrder", TKeySection = "WorkOrderItemPartRequests" }); + +l.Add(new FormField { TKey = "PurchaseOrderExpectedReceiveDate", FieldKey = "WorkOrderItemPartRequestExpectedReceiveDate", TKeySection = "WorkOrderItemPartRequests" }); +l.Add(new FormField { TKey = "PurchaseOrderOrderedDate", FieldKey = "WorkOrderItemPartRequestOrderedDate", TKeySection = "WorkOrderItemPartRequests" }); +l.Add(new FormField { TKey = "WorkOrderItemPartRequestOnOrder", FieldKey = "WorkOrderItemPartRequestOnOrder", TKeySection = "WorkOrderItemPartRequests" }); +l.Add(new FormField { TKey = "WorkOrderItemPartRequestReceived", FieldKey = "WorkOrderItemPartRequestReceived", TKeySection = "WorkOrderItemPartRequests" }); + +"CREATE TABLE aworkorderitempartrequest (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, workorderitemid BIGINT NOT NULL REFERENCES aworkorderitem (id), " ++ "partid BIGINT NOT NULL REFERENCES apart, partwarehouseid BIGINT NOT NULL REFERENCES apartwarehouse, quantity DECIMAL(19,5) NOT NULL default 0, received DECIMAL(19,5) NOT NULL default 0, " ++ "purchaseorderitemid BIGINT NULL REFERENCES apurchaseorderitem" + + */ + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderItemPartRequestPartID", + FieldKey = "WorkOrderItemPartRequestPartID", + UiFieldDataType = (int)UiFieldDataType.Text, + AType = (int)AyaType.WorkOrderItemPartRequest, + SqlIdColumnName = "aworkorderitempartrequest.id", + SqlValueColumnName = "apart.partnumber", + IsRowId = true + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderItemPartRequestPartWarehouseID", + FieldKey = "WorkOrderItemPartRequestPartWarehouseID", + UiFieldDataType = (int)UiFieldDataType.Text, + AType = (int)AyaType.PartWarehouse, + SqlIdColumnName = "aworkorderitempartrequest.partwarehouseid", + SqlValueColumnName = "apartwarehouse.name" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderItemPartRequestQuantity", + FieldKey = "WorkOrderItemPartRequestQuantity", + UiFieldDataType = (int)UiFieldDataType.Decimal, + SqlValueColumnName = "aworkorderitempartrequest.quantity" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "PartUPC", + FieldKey = "PartRequestPartUPC", + UiFieldDataType = (int)UiFieldDataType.Text, + AType = (int)AyaType.WorkOrderItemPartRequest, + SqlIdColumnName = "aworkorderitempartrequest.id", + SqlValueColumnName = "apart.upc" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "PurchaseOrder", + FieldKey = "WorkOrderItemPartRequestPurchaseOrder", + UiFieldDataType = (int)UiFieldDataType.Text, + AType = (int)AyaType.PurchaseOrder, + SqlIdColumnName = "apurchaseorder.id", + SqlValueColumnName = "apurchaseorder.serial" + }); + + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "PurchaseOrderExpectedReceiveDate", + FieldKey = "WorkOrderItemPartRequestExpectedReceiveDate", + AType = (int)AyaType.PurchaseOrder, + UiFieldDataType = (int)UiFieldDataType.DateTime, + SqlIdColumnName = "apurchaseorder.id", + SqlValueColumnName = "apurchaseorder.expectedreceivedate" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "PurchaseOrderOrderedDate", + FieldKey = "WorkOrderItemPartRequestOrderedDate", + AType = (int)AyaType.PurchaseOrder, + UiFieldDataType = (int)UiFieldDataType.DateTime, + SqlIdColumnName = "apurchaseorder.id", + SqlValueColumnName = "apurchaseorder.ordereddate" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderItemPartRequestReceived", + FieldKey = "WorkOrderItemPartRequestReceived", + UiFieldDataType = (int)UiFieldDataType.Decimal, + SqlValueColumnName = "aworkorderitempartrequest.received" + }); + + + //META column + FieldDefinitions.Add(new DataListFieldDefinition + { + FieldKey = "metawoitempartrequestid", + UiFieldDataType = (int)UiFieldDataType.InternalId, + SqlIdColumnName = "aworkorderitempartrequest.id", + SqlValueColumnName = "aworkorderitempartrequest.id", + IsMeta = true + }); + + #endregion + + + + + /* + ██╗████████╗███████╗███╗ ███╗███████╗ + ██║╚══██╔══╝██╔════╝████╗ ████║██╔════╝ + ██║ ██║ █████╗ ██╔████╔██║███████╗ + ██║ ██║ ██╔══╝ ██║╚██╔╝██║╚════██║ + ██║ ██║ ███████╗██║ ╚═╝ ██║███████║ + ╚═╝ ╚═╝ ╚══════╝╚═╝ ╚═╝╚══════╝ + */ + #region WorkOrderItem fields + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderItemSummary", + FieldKey = "WorkOrderItemSummary", + AType = (int)AyaType.WorkOrderItem, + UiFieldDataType = (int)UiFieldDataType.Text, + SqlIdColumnName = "aworkorderitem.id", + SqlValueColumnName = "aworkorderitem.notes", + IsRowId = true + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "Sequence", + FieldKey = "WorkOrderItemSequence", + AType = (int)AyaType.WorkOrderItem, + UiFieldDataType = (int)UiFieldDataType.Integer, + SqlIdColumnName = "aworkorderitem.id", + SqlValueColumnName = "aworkorderitem.sequence" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderItemTechNotes", + FieldKey = "WorkOrderItemTechNotes", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "aworkorderitem.technotes" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "Tags", + FieldKey = "WorkOrderItemTags", + UiFieldDataType = (int)UiFieldDataType.Tags, + SqlValueColumnName = "aworkorderitem.tags" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderItemWorkOrderStatusID", + FieldKey = "WorkOrderItemWorkOrderStatusID", + UiFieldDataType = (int)UiFieldDataType.Text, + AType = (int)AyaType.WorkOrderItemStatus, + SqlIdColumnName = "aworkorderitem.workorderitemstatusid", + SqlColorColumnName = "aworkorderitemstatus.color", + SqlValueColumnName = "aworkorderitemstatus.name" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderItemPriorityID", + FieldKey = "WorkOrderItemPriorityID", + UiFieldDataType = (int)UiFieldDataType.Text, + AType = (int)AyaType.WorkOrderItemStatus, + SqlIdColumnName = "aworkorderitem.workorderitempriorityid", + SqlColorColumnName = "aworkorderitempriority.color", + SqlValueColumnName = "aworkorderitempriority.name" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderItemRequestDate", + FieldKey = "WorkOrderItemRequestDate", + UiFieldDataType = (int)UiFieldDataType.DateTime, + SqlValueColumnName = "aworkorderitem.requestdate" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderItemWarrantyService", + FieldKey = "WorkOrderItemWarrantyService", + UiFieldDataType = (int)UiFieldDataType.Bool, + SqlValueColumnName = "aworkorderitem.warrantyservice" + }); + + + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderItemCustom1", FieldKey = "workorderitemcustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorderitem.customfields", TKeySection = "WorkOrderItem" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderItemCustom2", FieldKey = "workorderitemcustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorderitem.customfields", TKeySection = "WorkOrderItem" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderItemCustom3", FieldKey = "workorderitemcustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorderitem.customfields", TKeySection = "WorkOrderItem" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderItemCustom4", FieldKey = "workorderitemcustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorderitem.customfields", TKeySection = "WorkOrderItem" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderItemCustom5", FieldKey = "workorderitemcustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorderitem.customfields", TKeySection = "WorkOrderItem" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderItemCustom6", FieldKey = "workorderitemcustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorderitem.customfields", TKeySection = "WorkOrderItem" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderItemCustom7", FieldKey = "workorderitemcustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorderitem.customfields", TKeySection = "WorkOrderItem" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderItemCustom8", FieldKey = "workorderitemcustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorderitem.customfields", TKeySection = "WorkOrderItem" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderItemCustom9", FieldKey = "workorderitemcustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorderitem.customfields", TKeySection = "WorkOrderItem" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderItemCustom10", FieldKey = "workorderitemcustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorderitem.customfields", TKeySection = "WorkOrderItem" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderItemCustom11", FieldKey = "workorderitemcustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorderitem.customfields", TKeySection = "WorkOrderItem" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderItemCustom12", FieldKey = "workorderitemcustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorderitem.customfields", TKeySection = "WorkOrderItem" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderItemCustom13", FieldKey = "workorderitemcustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorderitem.customfields", TKeySection = "WorkOrderItem" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderItemCustom14", FieldKey = "workorderitemcustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorderitem.customfields", TKeySection = "WorkOrderItem" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderItemCustom15", FieldKey = "workorderitemcustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorderitem.customfields", TKeySection = "WorkOrderItem" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderItemCustom16", FieldKey = "workorderitemcustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorderitem.customfields", TKeySection = "WorkOrderItem" }); + + + + + #endregion workorderitem fields + + + + /* + ██╗ ██╗ ██████╗ ██████╗ ██╗ ██╗ ██████╗ ██████╗ ██████╗ ███████╗██████╗ + ██║ ██║██╔═══██╗██╔══██╗██║ ██╔╝ ██╔═══██╗██╔══██╗██╔══██╗██╔════╝██╔══██╗ + ██║ █╗ ██║██║ ██║██████╔╝█████╔╝█████╗██║ ██║██████╔╝██║ ██║█████╗ ██████╔╝ + ██║███╗██║██║ ██║██╔══██╗██╔═██╗╚════╝██║ ██║██╔══██╗██║ ██║██╔══╝ ██╔══██╗ + ╚███╔███╔╝╚██████╔╝██║ ██║██║ ██╗ ╚██████╔╝██║ ██║██████╔╝███████╗██║ ██║ + ╚══╝╚══╝ ╚═════╝ ╚═╝ ╚═╝╚═╝ ╚═╝ ╚═════╝ ╚═╝ ╚═╝╚═════╝ ╚══════╝╚═╝ ╚═╝ + */ + #region WorkOrder Header fields + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderSerialNumber", + FieldKey = "WorkOrderSerialNumber", + AType = (int)AyaType.WorkOrder, + UiFieldDataType = (int)UiFieldDataType.Integer, + SqlIdColumnName = "aworkorder.id", + SqlValueColumnName = "aworkorder.serial" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + FieldKey = "Customer", + TKey = "Customer", + UiFieldDataType = (int)UiFieldDataType.Text, + AType = (int)AyaType.Customer, + SqlIdColumnName = "acustomer.id", + SqlValueColumnName = "acustomer.name" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "HeadOffice", + FieldKey = "workorderheadoffice", + UiFieldDataType = (int)UiFieldDataType.Text, + AType = (int)AyaType.HeadOffice, + SqlIdColumnName = "aheadoffice.id", + SqlValueColumnName = "aheadoffice.name" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderStatus", + FieldKey = "WorkOrderStatus", + UiFieldDataType = (int)UiFieldDataType.Text, + AType = (int)AyaType.WorkOrderStatus, + SqlIdColumnName = "aworkorder.laststatusid", + SqlColorColumnName = "aworkorderstatus.color", + SqlValueColumnName = "aworkorderstatus.name" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderSummary", + FieldKey = "workordernotes", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "aworkorder.notes" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "Tags", + FieldKey = "workordertags", + UiFieldDataType = (int)UiFieldDataType.Tags, + SqlValueColumnName = "aworkorder.tags" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + FieldKey = "Project", + TKey = "Project", + UiFieldDataType = (int)UiFieldDataType.Text, + AType = (int)AyaType.User, + SqlIdColumnName = "aproject.id", + SqlValueColumnName = "aproject.name" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "Contract", + FieldKey = "Contract", + UiFieldDataType = (int)UiFieldDataType.Text, + AType = (int)AyaType.Contract, + SqlIdColumnName = "acontract.id", + SqlValueColumnName = "acontract.name" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderInternalReferenceNumber", + FieldKey = "WorkOrderInternalReferenceNumber", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "aworkorder.internalreferencenumber" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderCustomerReferenceNumber", + FieldKey = "WorkOrderCustomerReferenceNumber", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "aworkorder.customerreferencenumber" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderCustomerContactName", + FieldKey = "WorkOrderCustomerContactName", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "aworkorder.customercontactname" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderServiceDate", + FieldKey = "WorkOrderServiceDate", + UiFieldDataType = (int)UiFieldDataType.DateTime, + SqlValueColumnName = "aworkorder.servicedate" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderCloseByDate", + FieldKey = "WorkOrderCloseByDate", + UiFieldDataType = (int)UiFieldDataType.DateTime, + SqlValueColumnName = "aworkorder.completebydate" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderInvoiceNumber", + FieldKey = "WorkOrderInvoiceNumber", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "aworkorder.invoicenumber" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderOnsite", + FieldKey = "WorkOrderOnsite", + UiFieldDataType = (int)UiFieldDataType.Bool, + SqlValueColumnName = "aworkorder.onsite" + }); + + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "AddressPostalDeliveryAddress", + FieldKey = "workorderpostaddress", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "aworkorder.postaddress" + }); + + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "AddressPostalCity", + FieldKey = "workorderpostcity", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "aworkorder.postcity" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "AddressPostalStateProv", + FieldKey = "workorderpostregion", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "aworkorder.postregion" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "AddressPostalCountry", + FieldKey = "workorderpostcountry", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "aworkorder.postcountry" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "AddressPostalPostal", + FieldKey = "workorderpostcode", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "aworkorder.postcode" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "AddressDeliveryAddress", + FieldKey = "workorderaddress", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "aworkorder.address" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "AddressCity", + FieldKey = "workordercity", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "aworkorder.city" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "AddressStateProv", + FieldKey = "workorderregion", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "aworkorder.region" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "AddressCountry", + FieldKey = "workordercountry", + UiFieldDataType = (int)UiFieldDataType.Text, + SqlValueColumnName = "aworkorder.country" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "AddressLatitude", + FieldKey = "workorderlatitude", + UiFieldDataType = (int)UiFieldDataType.Decimal, + SqlValueColumnName = "aworkorder.latitude" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "AddressLongitude", + FieldKey = "workorderlongitude", + UiFieldDataType = (int)UiFieldDataType.Decimal, + SqlValueColumnName = "aworkorder.longitude" + }); + + + /* + + await ExecQueryAsync("CREATE TABLE aworkorder (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, serial BIGINT GENERATED BY DEFAULT AS IDENTITY NOT NULL, " + + "notes TEXT, wiki TEXT, customfields TEXT, tags VARCHAR(255) ARRAY, customerid BIGINT NOT NULL REFERENCES acustomer (id), " + + "projectid BIGINT REFERENCES aproject, contractid BIGINT NULL, internalreferencenumber text, customerreferencenumber text, customercontactname text, " + + "servicedate TIMESTAMP, completebydate TIMESTAMP, invoicenumber TEXT, customersignature TEXT, customersignaturename TEXT, customersignaturecaptured TIMESTAMP, " + + "techsignature TEXT, techsignaturename TEXT, techsignaturecaptured TIMESTAMP, durationtocompleted INTERVAL NOT NULL, onsite BOOL NOT NULL, contract TEXT, " + + "postaddress TEXT, postcity TEXT, postregion TEXT, postcountry TEXT, postcode TEXT, address TEXT, city TEXT, region TEXT, country TEXT, latitude DECIMAL(9,6), longitude DECIMAL(9,6) " + + ")");//n + */ + + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderCloseByDate", + FieldKey = "WorkOrderCloseByDate", + UiFieldDataType = (int)UiFieldDataType.DateTime, + SqlValueColumnName = "aworkorder.closebydate" + }); + + + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom1", FieldKey = "workordercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom2", FieldKey = "workordercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom3", FieldKey = "workordercustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom4", FieldKey = "workordercustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom5", FieldKey = "workordercustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom6", FieldKey = "workordercustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom7", FieldKey = "workordercustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom8", FieldKey = "workordercustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom9", FieldKey = "workordercustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom10", FieldKey = "workordercustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom11", FieldKey = "workordercustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom12", FieldKey = "workordercustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom13", FieldKey = "workordercustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom14", FieldKey = "workordercustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom15", FieldKey = "workordercustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom16", FieldKey = "workordercustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields" }); + + #endregion + } + + + public List DataListInternalCriteria(long currentUserId, AuthorizationRoles userRoles, string clientCriteria) + { + //This is required to filter out rows where there are no matching scheduled user otherwise we'd get all workorders and items regardless + List ret = new List(); + DataListFilterOption FilterOption = new DataListFilterOption() { Column = "metawoitempartrequestid" }; + FilterOption.Items.Add(new DataListColumnFilter() { value = "*NULL*", op = DataListFilterComparisonOperator.NotEqual }); + ret.Add(FilterOption); + return ret; + } + }//eoc +}//eons \ No newline at end of file diff --git a/server/AyaNova/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs index ca9cbc12..23578ed4 100644 --- a/server/AyaNova/biz/FormFieldReference.cs +++ b/server/AyaNova/biz/FormFieldReference.cs @@ -989,7 +989,7 @@ namespace AyaNova.Biz l.Add(new FormField { TKey = "PurchaseOrder", FieldKey = "WorkOrderItemPartRequestPurchaseOrder", TKeySection = "WorkOrderItemPartRequests" }); l.Add(new FormField { TKey = "PurchaseOrderExpectedReceiveDate", FieldKey = "WorkOrderItemPartRequestExpectedReceiveDate", TKeySection = "WorkOrderItemPartRequests" }); l.Add(new FormField { TKey = "PurchaseOrderOrderedDate", FieldKey = "WorkOrderItemPartRequestOrderedDate", TKeySection = "WorkOrderItemPartRequests" }); - l.Add(new FormField { TKey = "WorkOrderItemPartRequestOnOrder", FieldKey = "WorkOrderItemPartRequestOnOrder", TKeySection = "WorkOrderItemPartRequests" }); + // l.Add(new FormField { TKey = "WorkOrderItemPartRequestOnOrder", FieldKey = "WorkOrderItemPartRequestOnOrder", TKeySection = "WorkOrderItemPartRequests" }); l.Add(new FormField { TKey = "WorkOrderItemPartRequestReceived", FieldKey = "WorkOrderItemPartRequestReceived", TKeySection = "WorkOrderItemPartRequests" }); //WORKORDER ITEM LABOR diff --git a/server/AyaNova/models/WorkOrderItemPartRequest.cs b/server/AyaNova/models/WorkOrderItemPartRequest.cs index 610a3cf1..23a73890 100644 --- a/server/AyaNova/models/WorkOrderItemPartRequest.cs +++ b/server/AyaNova/models/WorkOrderItemPartRequest.cs @@ -35,8 +35,10 @@ namespace AyaNova.Models public DateTime? PurchaseOrderDateViz { get; set; } [NotMapped] public DateTime? PurchaseOrderExpectedDateViz { get; set; } - [NotMapped] - public bool PurchaseOrderOnOrderViz { get; set; } + + //redundant; the poid suffices + // [NotMapped] + // public bool PurchaseOrderOnOrderViz { get; set; } [Required] public decimal Received { get; set; }