diff --git a/.vscode/launch.json b/.vscode/launch.json index fcc80a75..b77f3b95 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": "true", + "AYANOVA_SERVER_TEST_MODE": "false", "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/DataListFieldDefinition.cs b/server/AyaNova/DataList/DataListFieldDefinition.cs index a9668687..177a8a75 100644 --- a/server/AyaNova/DataList/DataListFieldDefinition.cs +++ b/server/AyaNova/DataList/DataListFieldDefinition.cs @@ -53,9 +53,7 @@ namespace AyaNova.DataList [JsonIgnore] public string SqlColorColumnName { get; set; }//column to fetch the color if applicable to this field - [JsonIgnore] - public string SqlColumnExpression { get; set; }//column is based on this expression, not directly on the source tables - + public DataListFieldDefinition() { //most common defaults @@ -67,8 +65,7 @@ namespace AyaNova.DataList //Set openable object type to no type which is the default and means it's not a link to another object AType = (int)AyaType.NoType; SqlATypeColumnName = null;//must be null as that is checked against specifically - SqlColorColumnName = null;//must be null to be ignored properly - SqlColumnExpression = null; + SqlColorColumnName = null;//must be null to be ignored properly } //Get column to query for display name or use FieldName if there is no difference diff --git a/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs b/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs index bef85f42..090615d0 100644 --- a/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs +++ b/server/AyaNova/DataList/DataListSqlFilterCriteriaBuilder.cs @@ -844,6 +844,51 @@ namespace AyaNova.DataList sb.Append("::varchar(255)]"); } break; + case UiFieldDataType.TimeSpan: //TIMESPAN / DURATION + { + sValue=TimeSpanToPostgresInterval(sValue); +/* + { name: vm.$ay.t("GridRowFilterDropDownGreaterThan"), id: ">" }, + { + name: vm.$ay.t("GridRowFilterDropDownGreaterThanOrEqualTo"), + id: ">=" + }, + { name: vm.$ay.t("GridRowFilterDropDownLessThan"), id: "<" }, + { name: vm.$ay.t("GridRowFilterDropDownLessThanOrEqualTo"), id: "<=" }, + { name: vm.$ay.t("GridRowFilterDropDownNotEquals"), id: "!=" } +*/ + switch (sOperator) + { + case DataListFilterComparisonOperator.Equality: + sb.Append("="); + sb.Append(sValue); + break; + case DataListFilterComparisonOperator.GreaterThan: + sb.Append(">"); + sb.Append(sValue); + break; + case DataListFilterComparisonOperator.GreaterThanOrEqualTo: + sb.Append(">="); + sb.Append(sValue); + break; + case DataListFilterComparisonOperator.LessThan: + sb.Append("<"); + sb.Append(sValue); + break; + case DataListFilterComparisonOperator.LessThanOrEqualTo: + sb.Append("<="); + sb.Append(sValue); + break; + case DataListFilterComparisonOperator.NotEqual: + sb.Append("<>"); + sb.Append(sValue); + break; + default: + throw new System.ArgumentOutOfRangeException("OPERATOR_TYPE", sOperator, "DataListSqlFilterCriteriaBuilder unhandled operator type [" + sOperator + "] IN TIMESPAN / DURATION"); + + } + break; + } default: throw new System.ArgumentOutOfRangeException("DATA_TYPE", DataType, "DataListSqlFilterCriteriaBuilder unhandled data type[" + DataType + "]"); } @@ -896,5 +941,62 @@ namespace AyaNova.DataList return theDate.ToString("o", CultureInfo.InvariantCulture); } + + + /////////////////////////////////////////// + // + // + private static string TimeSpanToPostgresInterval(string value) + { + //ISO 8601 duration format "brief" or short + // "5.0:0:0" <-what it looks like as a timespan string + // P6Y5M4DT3H2M1S <- What a postgres compatible iso 8601 format looks like + // interval 'P6Y5M4DT3H2M1S' <- actual query fragment + + int theDays = 0; + int theHours = 0; + int theMinutes = 0; + int theSeconds = 0; + + if (string.IsNullOrWhiteSpace(value)) + { + return "INTERVAL 'P0DT0H0M0S'"; + } + else + { + var work = value.Split(":"); + //has days? + if (work[0].Contains(".")) + { + var dh = work[0].Split("."); + theDays = int.Parse(dh[0]); + theHours = int.Parse(dh[1]); + } + else + { + theHours = int.Parse(work[0]); + } + theMinutes = int.Parse(work[1]); + //has milliseconds? (ignore them) + if (work[2].Contains(".")) + { + var dh = work[2].Split("."); + theSeconds = int.Parse(dh[0]); + } + else + { + theSeconds = int.Parse(work[2]); + } + + //format return string + return $"INTERVAL 'P{theDays}DT{theHours}H{theMinutes}M{theSeconds}S'"; + + } + } + + + + + }//eoc }//ens \ No newline at end of file diff --git a/server/AyaNova/DataList/DataListSqlSelectBuilder.cs b/server/AyaNova/DataList/DataListSqlSelectBuilder.cs index 8ecd28c8..c9c2e3a1 100644 --- a/server/AyaNova/DataList/DataListSqlSelectBuilder.cs +++ b/server/AyaNova/DataList/DataListSqlSelectBuilder.cs @@ -58,11 +58,7 @@ namespace AyaNova.DataList { if (firstColumnAdded) sb.Append(", "); - - if (o.SqlColumnExpression != null)//if there is an expression defined then add it into the select statement, the valuecolumnname will be the AS alias of it - sb.Append(o.SqlColumnExpression); - else - sb.Append(valueColumnName); + sb.Append(valueColumnName); firstColumnAdded = true; map.Add(valueColumnName, nOrdinal++); } diff --git a/server/AyaNova/DataList/WorkOrderDataList.cs b/server/AyaNova/DataList/WorkOrderDataList.cs index b05d07c5..2f0f8550 100644 --- a/server/AyaNova/DataList/WorkOrderDataList.cs +++ b/server/AyaNova/DataList/WorkOrderDataList.cs @@ -10,12 +10,12 @@ namespace AyaNova.DataList public WorkOrderDataList() { DefaultListAType = AyaType.WorkOrder; - SQLFrom = "from aworkorder " - + "left join aworkorderstatus on (aworkorder.laststatusid = aworkorderstatus.id) " - + "left join acustomer on (aworkorder.customerid=acustomer.id) " + SQLFrom = "from viewworkorder " + + "left join aworkorderstatus on (viewworkorder.laststatusid = aworkorderstatus.id) " + + "left join acustomer on (viewworkorder.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 aproject on (viewworkorder.projectid=aproject.id) " + + "left join acontract on (viewworkorder.contractid=acontract.id)"; var RoleSet = BizRoles.GetRoleSet(DefaultListAType); AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change; DefaultColumns = new List() { "WorkOrderSerialNumber", "Customer", "WorkOrderServiceDate", "WorkOrderCloseByDate", "WorkOrderStatus", "Project", "WorkOrderAge" }; @@ -28,8 +28,8 @@ namespace AyaNova.DataList FieldKey = "WorkOrderSerialNumber", AType = (int)AyaType.WorkOrder, UiFieldDataType = (int)UiFieldDataType.Integer, - SqlIdColumnName = "aworkorder.id", - SqlValueColumnName = "aworkorder.serial", + SqlIdColumnName = "viewworkorder.id", + SqlValueColumnName = "viewworkorder.serial", IsRowId = true }); @@ -59,7 +59,7 @@ namespace AyaNova.DataList FieldKey = "WorkOrderStatus", UiFieldDataType = (int)UiFieldDataType.Text, AType = (int)AyaType.WorkOrderStatus, - SqlIdColumnName = "aworkorder.laststatusid", + SqlIdColumnName = "viewworkorder.laststatusid", SqlColorColumnName = "aworkorderstatus.color", SqlValueColumnName = "aworkorderstatus.name" }); @@ -69,7 +69,7 @@ namespace AyaNova.DataList TKey = "WorkOrderSummary", FieldKey = "workordernotes", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.notes" + SqlValueColumnName = "viewworkorder.notes" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -77,7 +77,7 @@ namespace AyaNova.DataList TKey = "Tags", FieldKey = "workordertags", UiFieldDataType = (int)UiFieldDataType.Tags, - SqlValueColumnName = "aworkorder.tags" + SqlValueColumnName = "viewworkorder.tags" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -105,7 +105,7 @@ namespace AyaNova.DataList TKey = "WorkOrderInternalReferenceNumber", FieldKey = "WorkOrderInternalReferenceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.internalreferencenumber" + SqlValueColumnName = "viewworkorder.internalreferencenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -113,7 +113,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCustomerReferenceNumber", FieldKey = "WorkOrderCustomerReferenceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.customerreferencenumber" + SqlValueColumnName = "viewworkorder.customerreferencenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -121,7 +121,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCustomerContactName", FieldKey = "WorkOrderCustomerContactName", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.customercontactname" + SqlValueColumnName = "viewworkorder.customercontactname" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -129,7 +129,7 @@ namespace AyaNova.DataList TKey = "WorkOrderServiceDate", FieldKey = "WorkOrderServiceDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.servicedate" + SqlValueColumnName = "viewworkorder.servicedate" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -137,7 +137,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCloseByDate", FieldKey = "WorkOrderCloseByDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.completebydate" + SqlValueColumnName = "viewworkorder.completebydate" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -145,7 +145,7 @@ namespace AyaNova.DataList TKey = "WorkOrderInvoiceNumber", FieldKey = "WorkOrderInvoiceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.invoicenumber" + SqlValueColumnName = "viewworkorder.invoicenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -153,7 +153,7 @@ namespace AyaNova.DataList TKey = "WorkOrderOnsite", FieldKey = "WorkOrderOnsite", UiFieldDataType = (int)UiFieldDataType.Bool, - SqlValueColumnName = "aworkorder.onsite" + SqlValueColumnName = "viewworkorder.onsite" }); @@ -162,7 +162,7 @@ namespace AyaNova.DataList TKey = "AddressPostalDeliveryAddress", FieldKey = "workorderpostaddress", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postaddress" + SqlValueColumnName = "viewworkorder.postaddress" }); @@ -171,7 +171,7 @@ namespace AyaNova.DataList TKey = "AddressPostalCity", FieldKey = "workorderpostcity", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcity" + SqlValueColumnName = "viewworkorder.postcity" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -179,7 +179,7 @@ namespace AyaNova.DataList TKey = "AddressPostalStateProv", FieldKey = "workorderpostregion", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postregion" + SqlValueColumnName = "viewworkorder.postregion" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -187,7 +187,7 @@ namespace AyaNova.DataList TKey = "AddressPostalCountry", FieldKey = "workorderpostcountry", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcountry" + SqlValueColumnName = "viewworkorder.postcountry" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -195,7 +195,7 @@ namespace AyaNova.DataList TKey = "AddressPostalPostal", FieldKey = "workorderpostcode", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcode" + SqlValueColumnName = "viewworkorder.postcode" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -203,7 +203,7 @@ namespace AyaNova.DataList TKey = "AddressDeliveryAddress", FieldKey = "workorderaddress", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.address" + SqlValueColumnName = "viewworkorder.address" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -211,7 +211,7 @@ namespace AyaNova.DataList TKey = "AddressCity", FieldKey = "workordercity", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.city" + SqlValueColumnName = "viewworkorder.city" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -219,7 +219,7 @@ namespace AyaNova.DataList TKey = "AddressStateProv", FieldKey = "workorderregion", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.region" + SqlValueColumnName = "viewworkorder.region" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -227,7 +227,7 @@ namespace AyaNova.DataList TKey = "AddressCountry", FieldKey = "workordercountry", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.country" + SqlValueColumnName = "viewworkorder.country" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -235,7 +235,7 @@ namespace AyaNova.DataList TKey = "AddressLatitude", FieldKey = "workorderlatitude", UiFieldDataType = (int)UiFieldDataType.Decimal, - SqlValueColumnName = "aworkorder.latitude" + SqlValueColumnName = "viewworkorder.latitude" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -243,90 +243,44 @@ namespace AyaNova.DataList TKey = "AddressLongitude", FieldKey = "workorderlongitude", UiFieldDataType = (int)UiFieldDataType.Decimal, - SqlValueColumnName = "aworkorder.longitude" + SqlValueColumnName = "viewworkorder.longitude" }); - FieldDefinitions.Add(new DataListFieldDefinition - { - TKey = "WorkOrderAge", - FieldKey = "WorkOrderAge", - UiFieldDataType = (int)UiFieldDataType.TimeSpan, - IsFilterable = false, - SqlColumnExpression = "AGE(timezone('UTC', now()), aworkorder.createddate) as expwoage", - SqlValueColumnName = "expwoage" - }); - - - /* - - 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" + SqlValueColumnName = "viewworkorder.closebydate" }); - // FieldDefinitions.Add(new DataListFieldDefinition - // { - // TKey = "XXXX", - // FieldKey = "XXXX", - // UiFieldDataType = (int)UiFieldDataType.Text, - // SqlValueColumnName = "aworkorder.internalreferencenumber" - // }); - // FieldDefinitions.Add(new DataListFieldDefinition - // { - // FieldKey = "WorkOrderWorkOrderOverseerID", - // TKey = "WorkOrderWorkOrderOverseerID", - // UiFieldDataType = (int)UiFieldDataType.Text, - // AType = (int)AyaType.User, - // SqlIdColumnName = "auser.id", - // SqlValueColumnName = "auser.name" - // }); + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderAge", + FieldKey = "WorkOrderAge", + UiFieldDataType = (int)UiFieldDataType.TimeSpan, + SqlValueColumnName = "expwoage" + }); - // FieldDefinitions.Add(new DataListFieldDefinition - // { - // TKey = "WorkOrderDateStarted", - // FieldKey = "WorkOrderDateStarted", - // UiFieldDataType = (int)UiFieldDataType.DateTime, - // SqlValueColumnName = "aworkorder.datestarted" - // }); - // FieldDefinitions.Add(new DataListFieldDefinition - // { - // TKey = "WorkOrderDateCompleted", - // FieldKey = "WorkOrderDateCompleted", - // UiFieldDataType = (int)UiFieldDataType.DateTime, - // SqlValueColumnName = "aworkorder.datecompleted" - // }); - - 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" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom1", FieldKey = "workordercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom2", FieldKey = "workordercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom3", FieldKey = "workordercustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom4", FieldKey = "workordercustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom5", FieldKey = "workordercustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom6", FieldKey = "workordercustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom7", FieldKey = "workordercustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom8", FieldKey = "workordercustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom9", FieldKey = "workordercustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom10", FieldKey = "workordercustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom11", FieldKey = "workordercustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom12", FieldKey = "workordercustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom13", FieldKey = "workordercustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom14", FieldKey = "workordercustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom15", FieldKey = "workordercustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom16", FieldKey = "workordercustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields" }); //META COLUMNS diff --git a/server/AyaNova/DataList/WorkOrderItemDataList.cs b/server/AyaNova/DataList/WorkOrderItemDataList.cs index d01a6b6c..7dd96fbd 100644 --- a/server/AyaNova/DataList/WorkOrderItemDataList.cs +++ b/server/AyaNova/DataList/WorkOrderItemDataList.cs @@ -9,13 +9,13 @@ namespace AyaNova.DataList public WorkOrderItemDataList() { DefaultListAType = AyaType.WorkOrder; - SQLFrom = "from aworkorder " - + "left join aworkorderstatus on (aworkorder.laststatusid = aworkorderstatus.id) " - + "left join acustomer on (aworkorder.customerid=acustomer.id) " + SQLFrom = "from viewworkorder " + + "left join aworkorderstatus on (viewworkorder.laststatusid = aworkorderstatus.id) " + + "left join acustomer on (viewworkorder.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 aproject on (viewworkorder.projectid=aproject.id) " + + "left join acontract on (viewworkorder.contractid=acontract.id)" + + "left join aworkorderitem on viewworkorder.id=aworkorderitem.workorderid " + "left join aworkorderitemstatus on (aworkorderitem.workorderitemstatusid = aworkorderitemstatus.id) " + "left join aworkorderitempriority on (aworkorderitem.workorderitempriorityid = aworkorderitempriority.id) " ; @@ -172,8 +172,8 @@ namespace AyaNova.DataList FieldKey = "WorkOrderSerialNumber", AType = (int)AyaType.WorkOrder, UiFieldDataType = (int)UiFieldDataType.Integer, - SqlIdColumnName = "aworkorder.id", - SqlValueColumnName = "aworkorder.serial" + SqlIdColumnName = "viewworkorder.id", + SqlValueColumnName = "viewworkorder.serial" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -202,7 +202,7 @@ namespace AyaNova.DataList FieldKey = "WorkOrderStatus", UiFieldDataType = (int)UiFieldDataType.Text, AType = (int)AyaType.WorkOrderStatus, - SqlIdColumnName = "aworkorder.laststatusid", + SqlIdColumnName = "viewworkorder.laststatusid", SqlColorColumnName = "aworkorderstatus.color", SqlValueColumnName = "aworkorderstatus.name" }); @@ -212,7 +212,7 @@ namespace AyaNova.DataList TKey = "WorkOrderSummary", FieldKey = "workordernotes", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.notes" + SqlValueColumnName = "viewworkorder.notes" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -220,7 +220,7 @@ namespace AyaNova.DataList TKey = "Tags", FieldKey = "workordertags", UiFieldDataType = (int)UiFieldDataType.Tags, - SqlValueColumnName = "aworkorder.tags" + SqlValueColumnName = "viewworkorder.tags" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -248,7 +248,7 @@ namespace AyaNova.DataList TKey = "WorkOrderInternalReferenceNumber", FieldKey = "WorkOrderInternalReferenceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.internalreferencenumber" + SqlValueColumnName = "viewworkorder.internalreferencenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -256,7 +256,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCustomerReferenceNumber", FieldKey = "WorkOrderCustomerReferenceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.customerreferencenumber" + SqlValueColumnName = "viewworkorder.customerreferencenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -264,7 +264,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCustomerContactName", FieldKey = "WorkOrderCustomerContactName", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.customercontactname" + SqlValueColumnName = "viewworkorder.customercontactname" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -272,7 +272,7 @@ namespace AyaNova.DataList TKey = "WorkOrderServiceDate", FieldKey = "WorkOrderServiceDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.servicedate" + SqlValueColumnName = "viewworkorder.servicedate" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -280,7 +280,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCloseByDate", FieldKey = "WorkOrderCloseByDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.completebydate" + SqlValueColumnName = "viewworkorder.completebydate" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -288,7 +288,7 @@ namespace AyaNova.DataList TKey = "WorkOrderInvoiceNumber", FieldKey = "WorkOrderInvoiceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.invoicenumber" + SqlValueColumnName = "viewworkorder.invoicenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -296,7 +296,7 @@ namespace AyaNova.DataList TKey = "WorkOrderOnsite", FieldKey = "WorkOrderOnsite", UiFieldDataType = (int)UiFieldDataType.Bool, - SqlValueColumnName = "aworkorder.onsite" + SqlValueColumnName = "viewworkorder.onsite" }); @@ -305,7 +305,7 @@ namespace AyaNova.DataList TKey = "AddressPostalDeliveryAddress", FieldKey = "workorderpostaddress", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postaddress" + SqlValueColumnName = "viewworkorder.postaddress" }); @@ -314,7 +314,7 @@ namespace AyaNova.DataList TKey = "AddressPostalCity", FieldKey = "workorderpostcity", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcity" + SqlValueColumnName = "viewworkorder.postcity" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -322,7 +322,7 @@ namespace AyaNova.DataList TKey = "AddressPostalStateProv", FieldKey = "workorderpostregion", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postregion" + SqlValueColumnName = "viewworkorder.postregion" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -330,7 +330,7 @@ namespace AyaNova.DataList TKey = "AddressPostalCountry", FieldKey = "workorderpostcountry", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcountry" + SqlValueColumnName = "viewworkorder.postcountry" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -338,7 +338,7 @@ namespace AyaNova.DataList TKey = "AddressPostalPostal", FieldKey = "workorderpostcode", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcode" + SqlValueColumnName = "viewworkorder.postcode" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -346,7 +346,7 @@ namespace AyaNova.DataList TKey = "AddressDeliveryAddress", FieldKey = "workorderaddress", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.address" + SqlValueColumnName = "viewworkorder.address" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -354,7 +354,7 @@ namespace AyaNova.DataList TKey = "AddressCity", FieldKey = "workordercity", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.city" + SqlValueColumnName = "viewworkorder.city" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -362,7 +362,7 @@ namespace AyaNova.DataList TKey = "AddressStateProv", FieldKey = "workorderregion", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.region" + SqlValueColumnName = "viewworkorder.region" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -370,7 +370,7 @@ namespace AyaNova.DataList TKey = "AddressCountry", FieldKey = "workordercountry", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.country" + SqlValueColumnName = "viewworkorder.country" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -378,7 +378,7 @@ namespace AyaNova.DataList TKey = "AddressLatitude", FieldKey = "workorderlatitude", UiFieldDataType = (int)UiFieldDataType.Decimal, - SqlValueColumnName = "aworkorder.latitude" + SqlValueColumnName = "viewworkorder.latitude" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -386,7 +386,7 @@ namespace AyaNova.DataList TKey = "AddressLongitude", FieldKey = "workorderlongitude", UiFieldDataType = (int)UiFieldDataType.Decimal, - SqlValueColumnName = "aworkorder.longitude" + SqlValueColumnName = "viewworkorder.longitude" }); @@ -396,26 +396,34 @@ namespace AyaNova.DataList TKey = "WorkOrderCloseByDate", FieldKey = "WorkOrderCloseByDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.closebydate" + SqlValueColumnName = "viewworkorder.closebydate" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderAge", + FieldKey = "WorkOrderAge", + UiFieldDataType = (int)UiFieldDataType.TimeSpan, + SqlValueColumnName = "expwoage" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom1", FieldKey = "workordercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom2", FieldKey = "workordercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom3", FieldKey = "workordercustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom4", FieldKey = "workordercustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom5", FieldKey = "workordercustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom6", FieldKey = "workordercustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom7", FieldKey = "workordercustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom8", FieldKey = "workordercustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom9", FieldKey = "workordercustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom10", FieldKey = "workordercustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom11", FieldKey = "workordercustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom12", FieldKey = "workordercustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom13", FieldKey = "workordercustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom14", FieldKey = "workordercustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom15", FieldKey = "workordercustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom16", FieldKey = "workordercustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom1", FieldKey = "workordercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom2", FieldKey = "workordercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom3", FieldKey = "workordercustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom4", FieldKey = "workordercustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom5", FieldKey = "workordercustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom6", FieldKey = "workordercustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom7", FieldKey = "workordercustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom8", FieldKey = "workordercustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom9", FieldKey = "workordercustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom10", FieldKey = "workordercustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom11", FieldKey = "workordercustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom12", FieldKey = "workordercustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom13", FieldKey = "workordercustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom14", FieldKey = "workordercustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom15", FieldKey = "workordercustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom16", FieldKey = "workordercustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); #endregion diff --git a/server/AyaNova/DataList/WorkOrderItemExpenseDataList.cs b/server/AyaNova/DataList/WorkOrderItemExpenseDataList.cs index a4ee74b8..f5d1aacf 100644 --- a/server/AyaNova/DataList/WorkOrderItemExpenseDataList.cs +++ b/server/AyaNova/DataList/WorkOrderItemExpenseDataList.cs @@ -9,13 +9,13 @@ namespace AyaNova.DataList public WorkOrderItemExpenseDataList() { DefaultListAType = AyaType.WorkOrder; - SQLFrom = "from aworkorder " - + "left join aworkorderstatus on (aworkorder.laststatusid = aworkorderstatus.id) " - + "left join acustomer on (aworkorder.customerid=acustomer.id) " + SQLFrom = "from viewworkorder " + + "left join aworkorderstatus on (viewworkorder.laststatusid = aworkorderstatus.id) " + + "left join acustomer on (viewworkorder.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 aproject on (viewworkorder.projectid=aproject.id) " + + "left join acontract on (viewworkorder.contractid=acontract.id)" + + "left join aworkorderitem on viewworkorder.id=aworkorderitem.workorderid " + "left join aworkorderitemstatus on (aworkorderitem.workorderitemstatusid = aworkorderitemstatus.id) " + "left join aworkorderitempriority on (aworkorderitem.workorderitempriorityid = aworkorderitempriority.id) " @@ -270,8 +270,8 @@ namespace AyaNova.DataList FieldKey = "WorkOrderSerialNumber", AType = (int)AyaType.WorkOrder, UiFieldDataType = (int)UiFieldDataType.Integer, - SqlIdColumnName = "aworkorder.id", - SqlValueColumnName = "aworkorder.serial" + SqlIdColumnName = "viewworkorder.id", + SqlValueColumnName = "viewworkorder.serial" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -300,7 +300,7 @@ namespace AyaNova.DataList FieldKey = "WorkOrderStatus", UiFieldDataType = (int)UiFieldDataType.Text, AType = (int)AyaType.WorkOrderStatus, - SqlIdColumnName = "aworkorder.laststatusid", + SqlIdColumnName = "viewworkorder.laststatusid", SqlColorColumnName = "aworkorderstatus.color", SqlValueColumnName = "aworkorderstatus.name" }); @@ -310,7 +310,7 @@ namespace AyaNova.DataList TKey = "WorkOrderSummary", FieldKey = "workordernotes", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.notes" + SqlValueColumnName = "viewworkorder.notes" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -318,7 +318,7 @@ namespace AyaNova.DataList TKey = "Tags", FieldKey = "workordertags", UiFieldDataType = (int)UiFieldDataType.Tags, - SqlValueColumnName = "aworkorder.tags" + SqlValueColumnName = "viewworkorder.tags" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -346,7 +346,7 @@ namespace AyaNova.DataList TKey = "WorkOrderInternalReferenceNumber", FieldKey = "WorkOrderInternalReferenceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.internalreferencenumber" + SqlValueColumnName = "viewworkorder.internalreferencenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -354,7 +354,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCustomerReferenceNumber", FieldKey = "WorkOrderCustomerReferenceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.customerreferencenumber" + SqlValueColumnName = "viewworkorder.customerreferencenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -362,7 +362,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCustomerContactName", FieldKey = "WorkOrderCustomerContactName", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.customercontactname" + SqlValueColumnName = "viewworkorder.customercontactname" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -370,7 +370,7 @@ namespace AyaNova.DataList TKey = "WorkOrderServiceDate", FieldKey = "WorkOrderServiceDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.servicedate" + SqlValueColumnName = "viewworkorder.servicedate" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -378,7 +378,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCloseByDate", FieldKey = "WorkOrderCloseByDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.completebydate" + SqlValueColumnName = "viewworkorder.completebydate" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -386,7 +386,7 @@ namespace AyaNova.DataList TKey = "WorkOrderInvoiceNumber", FieldKey = "WorkOrderInvoiceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.invoicenumber" + SqlValueColumnName = "viewworkorder.invoicenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -394,7 +394,7 @@ namespace AyaNova.DataList TKey = "WorkOrderOnsite", FieldKey = "WorkOrderOnsite", UiFieldDataType = (int)UiFieldDataType.Bool, - SqlValueColumnName = "aworkorder.onsite" + SqlValueColumnName = "viewworkorder.onsite" }); @@ -403,7 +403,7 @@ namespace AyaNova.DataList TKey = "AddressPostalDeliveryAddress", FieldKey = "workorderpostaddress", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postaddress" + SqlValueColumnName = "viewworkorder.postaddress" }); @@ -412,7 +412,7 @@ namespace AyaNova.DataList TKey = "AddressPostalCity", FieldKey = "workorderpostcity", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcity" + SqlValueColumnName = "viewworkorder.postcity" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -420,7 +420,7 @@ namespace AyaNova.DataList TKey = "AddressPostalStateProv", FieldKey = "workorderpostregion", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postregion" + SqlValueColumnName = "viewworkorder.postregion" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -428,7 +428,7 @@ namespace AyaNova.DataList TKey = "AddressPostalCountry", FieldKey = "workorderpostcountry", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcountry" + SqlValueColumnName = "viewworkorder.postcountry" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -436,7 +436,7 @@ namespace AyaNova.DataList TKey = "AddressPostalPostal", FieldKey = "workorderpostcode", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcode" + SqlValueColumnName = "viewworkorder.postcode" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -444,7 +444,7 @@ namespace AyaNova.DataList TKey = "AddressDeliveryAddress", FieldKey = "workorderaddress", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.address" + SqlValueColumnName = "viewworkorder.address" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -452,7 +452,7 @@ namespace AyaNova.DataList TKey = "AddressCity", FieldKey = "workordercity", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.city" + SqlValueColumnName = "viewworkorder.city" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -460,7 +460,7 @@ namespace AyaNova.DataList TKey = "AddressStateProv", FieldKey = "workorderregion", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.region" + SqlValueColumnName = "viewworkorder.region" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -468,7 +468,7 @@ namespace AyaNova.DataList TKey = "AddressCountry", FieldKey = "workordercountry", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.country" + SqlValueColumnName = "viewworkorder.country" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -476,7 +476,7 @@ namespace AyaNova.DataList TKey = "AddressLatitude", FieldKey = "workorderlatitude", UiFieldDataType = (int)UiFieldDataType.Decimal, - SqlValueColumnName = "aworkorder.latitude" + SqlValueColumnName = "viewworkorder.latitude" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -484,7 +484,7 @@ namespace AyaNova.DataList TKey = "AddressLongitude", FieldKey = "workorderlongitude", UiFieldDataType = (int)UiFieldDataType.Decimal, - SqlValueColumnName = "aworkorder.longitude" + SqlValueColumnName = "viewworkorder.longitude" }); @@ -493,26 +493,33 @@ namespace AyaNova.DataList TKey = "WorkOrderCloseByDate", FieldKey = "WorkOrderCloseByDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.closebydate" + SqlValueColumnName = "viewworkorder.closebydate" }); + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderAge", + FieldKey = "WorkOrderAge", + UiFieldDataType = (int)UiFieldDataType.TimeSpan, + SqlValueColumnName = "expwoage" + }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom1", FieldKey = "workordercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom2", FieldKey = "workordercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom3", FieldKey = "workordercustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom4", FieldKey = "workordercustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom5", FieldKey = "workordercustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom6", FieldKey = "workordercustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom7", FieldKey = "workordercustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom8", FieldKey = "workordercustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom9", FieldKey = "workordercustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom10", FieldKey = "workordercustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom11", FieldKey = "workordercustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom12", FieldKey = "workordercustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom13", FieldKey = "workordercustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom14", FieldKey = "workordercustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom15", FieldKey = "workordercustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom16", FieldKey = "workordercustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom1", FieldKey = "workordercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom2", FieldKey = "workordercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom3", FieldKey = "workordercustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom4", FieldKey = "workordercustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom5", FieldKey = "workordercustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom6", FieldKey = "workordercustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom7", FieldKey = "workordercustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom8", FieldKey = "workordercustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom9", FieldKey = "workordercustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom10", FieldKey = "workordercustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom11", FieldKey = "workordercustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom12", FieldKey = "workordercustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom13", FieldKey = "workordercustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom14", FieldKey = "workordercustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom15", FieldKey = "workordercustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom16", FieldKey = "workordercustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); #endregion diff --git a/server/AyaNova/DataList/WorkOrderItemLaborDataList.cs b/server/AyaNova/DataList/WorkOrderItemLaborDataList.cs index 78c0e322..421f47ee 100644 --- a/server/AyaNova/DataList/WorkOrderItemLaborDataList.cs +++ b/server/AyaNova/DataList/WorkOrderItemLaborDataList.cs @@ -10,13 +10,13 @@ namespace AyaNova.DataList public WorkOrderItemLaborDataList() { DefaultListAType = AyaType.WorkOrder; - SQLFrom = "from aworkorder " - + "left join aworkorderstatus on (aworkorder.laststatusid = aworkorderstatus.id) " - + "left join acustomer on (aworkorder.customerid=acustomer.id) " + SQLFrom = "from viewworkorder " + + "left join aworkorderstatus on (viewworkorder.laststatusid = aworkorderstatus.id) " + + "left join acustomer on (viewworkorder.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 aproject on (viewworkorder.projectid=aproject.id) " + + "left join acontract on (viewworkorder.contractid=acontract.id)" + + "left join aworkorderitem on viewworkorder.id=aworkorderitem.workorderid " + "left join aworkorderitemstatus on (aworkorderitem.workorderitemstatusid = aworkorderitemstatus.id) " + "left join aworkorderitempriority on (aworkorderitem.workorderitempriorityid = aworkorderitempriority.id) " @@ -287,8 +287,8 @@ namespace AyaNova.DataList FieldKey = "WorkOrderSerialNumber", AType = (int)AyaType.WorkOrder, UiFieldDataType = (int)UiFieldDataType.Integer, - SqlIdColumnName = "aworkorder.id", - SqlValueColumnName = "aworkorder.serial" + SqlIdColumnName = "viewworkorder.id", + SqlValueColumnName = "viewworkorder.serial" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -317,7 +317,7 @@ namespace AyaNova.DataList FieldKey = "WorkOrderStatus", UiFieldDataType = (int)UiFieldDataType.Text, AType = (int)AyaType.WorkOrderStatus, - SqlIdColumnName = "aworkorder.laststatusid", + SqlIdColumnName = "viewworkorder.laststatusid", SqlColorColumnName = "aworkorderstatus.color", SqlValueColumnName = "aworkorderstatus.name" }); @@ -327,7 +327,7 @@ namespace AyaNova.DataList TKey = "WorkOrderSummary", FieldKey = "workordernotes", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.notes" + SqlValueColumnName = "viewworkorder.notes" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -335,7 +335,7 @@ namespace AyaNova.DataList TKey = "Tags", FieldKey = "workordertags", UiFieldDataType = (int)UiFieldDataType.Tags, - SqlValueColumnName = "aworkorder.tags" + SqlValueColumnName = "viewworkorder.tags" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -363,7 +363,7 @@ namespace AyaNova.DataList TKey = "WorkOrderInternalReferenceNumber", FieldKey = "WorkOrderInternalReferenceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.internalreferencenumber" + SqlValueColumnName = "viewworkorder.internalreferencenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -371,7 +371,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCustomerReferenceNumber", FieldKey = "WorkOrderCustomerReferenceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.customerreferencenumber" + SqlValueColumnName = "viewworkorder.customerreferencenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -379,7 +379,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCustomerContactName", FieldKey = "WorkOrderCustomerContactName", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.customercontactname" + SqlValueColumnName = "viewworkorder.customercontactname" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -387,7 +387,7 @@ namespace AyaNova.DataList TKey = "WorkOrderServiceDate", FieldKey = "WorkOrderServiceDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.servicedate" + SqlValueColumnName = "viewworkorder.servicedate" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -395,7 +395,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCloseByDate", FieldKey = "WorkOrderCloseByDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.completebydate" + SqlValueColumnName = "viewworkorder.completebydate" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -403,7 +403,7 @@ namespace AyaNova.DataList TKey = "WorkOrderInvoiceNumber", FieldKey = "WorkOrderInvoiceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.invoicenumber" + SqlValueColumnName = "viewworkorder.invoicenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -411,7 +411,7 @@ namespace AyaNova.DataList TKey = "WorkOrderOnsite", FieldKey = "WorkOrderOnsite", UiFieldDataType = (int)UiFieldDataType.Bool, - SqlValueColumnName = "aworkorder.onsite" + SqlValueColumnName = "viewworkorder.onsite" }); @@ -420,7 +420,7 @@ namespace AyaNova.DataList TKey = "AddressPostalDeliveryAddress", FieldKey = "workorderpostaddress", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postaddress" + SqlValueColumnName = "viewworkorder.postaddress" }); @@ -429,7 +429,7 @@ namespace AyaNova.DataList TKey = "AddressPostalCity", FieldKey = "workorderpostcity", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcity" + SqlValueColumnName = "viewworkorder.postcity" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -437,7 +437,7 @@ namespace AyaNova.DataList TKey = "AddressPostalStateProv", FieldKey = "workorderpostregion", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postregion" + SqlValueColumnName = "viewworkorder.postregion" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -445,7 +445,7 @@ namespace AyaNova.DataList TKey = "AddressPostalCountry", FieldKey = "workorderpostcountry", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcountry" + SqlValueColumnName = "viewworkorder.postcountry" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -453,7 +453,7 @@ namespace AyaNova.DataList TKey = "AddressPostalPostal", FieldKey = "workorderpostcode", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcode" + SqlValueColumnName = "viewworkorder.postcode" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -461,7 +461,7 @@ namespace AyaNova.DataList TKey = "AddressDeliveryAddress", FieldKey = "workorderaddress", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.address" + SqlValueColumnName = "viewworkorder.address" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -469,7 +469,7 @@ namespace AyaNova.DataList TKey = "AddressCity", FieldKey = "workordercity", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.city" + SqlValueColumnName = "viewworkorder.city" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -477,7 +477,7 @@ namespace AyaNova.DataList TKey = "AddressStateProv", FieldKey = "workorderregion", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.region" + SqlValueColumnName = "viewworkorder.region" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -485,7 +485,7 @@ namespace AyaNova.DataList TKey = "AddressCountry", FieldKey = "workordercountry", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.country" + SqlValueColumnName = "viewworkorder.country" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -493,7 +493,7 @@ namespace AyaNova.DataList TKey = "AddressLatitude", FieldKey = "workorderlatitude", UiFieldDataType = (int)UiFieldDataType.Decimal, - SqlValueColumnName = "aworkorder.latitude" + SqlValueColumnName = "viewworkorder.latitude" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -501,7 +501,7 @@ namespace AyaNova.DataList TKey = "AddressLongitude", FieldKey = "workorderlongitude", UiFieldDataType = (int)UiFieldDataType.Decimal, - SqlValueColumnName = "aworkorder.longitude" + SqlValueColumnName = "viewworkorder.longitude" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -509,25 +509,33 @@ namespace AyaNova.DataList TKey = "WorkOrderCloseByDate", FieldKey = "WorkOrderCloseByDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.closebydate" + SqlValueColumnName = "viewworkorder.closebydate" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom1", FieldKey = "workordercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom2", FieldKey = "workordercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom3", FieldKey = "workordercustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom4", FieldKey = "workordercustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom5", FieldKey = "workordercustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom6", FieldKey = "workordercustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom7", FieldKey = "workordercustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom8", FieldKey = "workordercustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom9", FieldKey = "workordercustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom10", FieldKey = "workordercustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom11", FieldKey = "workordercustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom12", FieldKey = "workordercustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom13", FieldKey = "workordercustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom14", FieldKey = "workordercustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom15", FieldKey = "workordercustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom16", FieldKey = "workordercustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderAge", + FieldKey = "WorkOrderAge", + UiFieldDataType = (int)UiFieldDataType.TimeSpan, + SqlValueColumnName = "expwoage" + }); + + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom1", FieldKey = "workordercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom2", FieldKey = "workordercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom3", FieldKey = "workordercustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom4", FieldKey = "workordercustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom5", FieldKey = "workordercustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom6", FieldKey = "workordercustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom7", FieldKey = "workordercustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom8", FieldKey = "workordercustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom9", FieldKey = "workordercustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom10", FieldKey = "workordercustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom11", FieldKey = "workordercustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom12", FieldKey = "workordercustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom13", FieldKey = "workordercustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom14", FieldKey = "workordercustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom15", FieldKey = "workordercustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom16", FieldKey = "workordercustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); #endregion diff --git a/server/AyaNova/DataList/WorkOrderItemLoanDataList.cs b/server/AyaNova/DataList/WorkOrderItemLoanDataList.cs index 8486f065..e24416f4 100644 --- a/server/AyaNova/DataList/WorkOrderItemLoanDataList.cs +++ b/server/AyaNova/DataList/WorkOrderItemLoanDataList.cs @@ -10,13 +10,13 @@ namespace AyaNova.DataList public WorkOrderItemLoanDataList() { DefaultListAType = AyaType.WorkOrder; - SQLFrom = "from aworkorder " - + "left join aworkorderstatus on (aworkorder.laststatusid = aworkorderstatus.id) " - + "left join acustomer on (aworkorder.customerid=acustomer.id) " + SQLFrom = "from viewworkorder " + + "left join aworkorderstatus on (viewworkorder.laststatusid = aworkorderstatus.id) " + + "left join acustomer on (viewworkorder.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 aproject on (viewworkorder.projectid=aproject.id) " + + "left join acontract on (viewworkorder.contractid=acontract.id)" + + "left join aworkorderitem on viewworkorder.id=aworkorderitem.workorderid " + "left join aworkorderitemstatus on (aworkorderitem.workorderitemstatusid = aworkorderitemstatus.id) " + "left join aworkorderitempriority on (aworkorderitem.workorderitempriorityid = aworkorderitempriority.id) " @@ -275,8 +275,8 @@ namespace AyaNova.DataList FieldKey = "WorkOrderSerialNumber", AType = (int)AyaType.WorkOrder, UiFieldDataType = (int)UiFieldDataType.Integer, - SqlIdColumnName = "aworkorder.id", - SqlValueColumnName = "aworkorder.serial" + SqlIdColumnName = "viewworkorder.id", + SqlValueColumnName = "viewworkorder.serial" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -305,7 +305,7 @@ namespace AyaNova.DataList FieldKey = "WorkOrderStatus", UiFieldDataType = (int)UiFieldDataType.Text, AType = (int)AyaType.WorkOrderStatus, - SqlIdColumnName = "aworkorder.laststatusid", + SqlIdColumnName = "viewworkorder.laststatusid", SqlColorColumnName = "aworkorderstatus.color", SqlValueColumnName = "aworkorderstatus.name" }); @@ -315,7 +315,7 @@ namespace AyaNova.DataList TKey = "WorkOrderSummary", FieldKey = "workordernotes", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.notes" + SqlValueColumnName = "viewworkorder.notes" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -323,7 +323,7 @@ namespace AyaNova.DataList TKey = "Tags", FieldKey = "workordertags", UiFieldDataType = (int)UiFieldDataType.Tags, - SqlValueColumnName = "aworkorder.tags" + SqlValueColumnName = "viewworkorder.tags" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -351,7 +351,7 @@ namespace AyaNova.DataList TKey = "WorkOrderInternalReferenceNumber", FieldKey = "WorkOrderInternalReferenceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.internalreferencenumber" + SqlValueColumnName = "viewworkorder.internalreferencenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -359,7 +359,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCustomerReferenceNumber", FieldKey = "WorkOrderCustomerReferenceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.customerreferencenumber" + SqlValueColumnName = "viewworkorder.customerreferencenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -367,7 +367,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCustomerContactName", FieldKey = "WorkOrderCustomerContactName", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.customercontactname" + SqlValueColumnName = "viewworkorder.customercontactname" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -375,7 +375,7 @@ namespace AyaNova.DataList TKey = "WorkOrderServiceDate", FieldKey = "WorkOrderServiceDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.servicedate" + SqlValueColumnName = "viewworkorder.servicedate" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -383,7 +383,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCloseByDate", FieldKey = "WorkOrderCloseByDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.completebydate" + SqlValueColumnName = "viewworkorder.completebydate" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -391,7 +391,7 @@ namespace AyaNova.DataList TKey = "WorkOrderInvoiceNumber", FieldKey = "WorkOrderInvoiceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.invoicenumber" + SqlValueColumnName = "viewworkorder.invoicenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -399,7 +399,7 @@ namespace AyaNova.DataList TKey = "WorkOrderOnsite", FieldKey = "WorkOrderOnsite", UiFieldDataType = (int)UiFieldDataType.Bool, - SqlValueColumnName = "aworkorder.onsite" + SqlValueColumnName = "viewworkorder.onsite" }); @@ -408,7 +408,7 @@ namespace AyaNova.DataList TKey = "AddressPostalDeliveryAddress", FieldKey = "workorderpostaddress", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postaddress" + SqlValueColumnName = "viewworkorder.postaddress" }); @@ -417,7 +417,7 @@ namespace AyaNova.DataList TKey = "AddressPostalCity", FieldKey = "workorderpostcity", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcity" + SqlValueColumnName = "viewworkorder.postcity" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -425,7 +425,7 @@ namespace AyaNova.DataList TKey = "AddressPostalStateProv", FieldKey = "workorderpostregion", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postregion" + SqlValueColumnName = "viewworkorder.postregion" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -433,7 +433,7 @@ namespace AyaNova.DataList TKey = "AddressPostalCountry", FieldKey = "workorderpostcountry", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcountry" + SqlValueColumnName = "viewworkorder.postcountry" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -441,7 +441,7 @@ namespace AyaNova.DataList TKey = "AddressPostalPostal", FieldKey = "workorderpostcode", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcode" + SqlValueColumnName = "viewworkorder.postcode" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -449,7 +449,7 @@ namespace AyaNova.DataList TKey = "AddressDeliveryAddress", FieldKey = "workorderaddress", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.address" + SqlValueColumnName = "viewworkorder.address" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -457,7 +457,7 @@ namespace AyaNova.DataList TKey = "AddressCity", FieldKey = "workordercity", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.city" + SqlValueColumnName = "viewworkorder.city" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -465,7 +465,7 @@ namespace AyaNova.DataList TKey = "AddressStateProv", FieldKey = "workorderregion", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.region" + SqlValueColumnName = "viewworkorder.region" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -473,7 +473,7 @@ namespace AyaNova.DataList TKey = "AddressCountry", FieldKey = "workordercountry", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.country" + SqlValueColumnName = "viewworkorder.country" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -481,7 +481,7 @@ namespace AyaNova.DataList TKey = "AddressLatitude", FieldKey = "workorderlatitude", UiFieldDataType = (int)UiFieldDataType.Decimal, - SqlValueColumnName = "aworkorder.latitude" + SqlValueColumnName = "viewworkorder.latitude" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -489,7 +489,7 @@ namespace AyaNova.DataList TKey = "AddressLongitude", FieldKey = "workorderlongitude", UiFieldDataType = (int)UiFieldDataType.Decimal, - SqlValueColumnName = "aworkorder.longitude" + SqlValueColumnName = "viewworkorder.longitude" }); @@ -498,25 +498,33 @@ namespace AyaNova.DataList TKey = "WorkOrderCloseByDate", FieldKey = "WorkOrderCloseByDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.closebydate" + SqlValueColumnName = "viewworkorder.closebydate" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom1", FieldKey = "workordercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom2", FieldKey = "workordercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom3", FieldKey = "workordercustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom4", FieldKey = "workordercustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom5", FieldKey = "workordercustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom6", FieldKey = "workordercustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom7", FieldKey = "workordercustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom8", FieldKey = "workordercustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom9", FieldKey = "workordercustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom10", FieldKey = "workordercustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom11", FieldKey = "workordercustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom12", FieldKey = "workordercustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom13", FieldKey = "workordercustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom14", FieldKey = "workordercustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom15", FieldKey = "workordercustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom16", FieldKey = "workordercustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderAge", + FieldKey = "WorkOrderAge", + UiFieldDataType = (int)UiFieldDataType.TimeSpan, + SqlValueColumnName = "expwoage" + }); + + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom1", FieldKey = "workordercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom2", FieldKey = "workordercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom3", FieldKey = "workordercustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom4", FieldKey = "workordercustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom5", FieldKey = "workordercustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom6", FieldKey = "workordercustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom7", FieldKey = "workordercustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom8", FieldKey = "workordercustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom9", FieldKey = "workordercustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom10", FieldKey = "workordercustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom11", FieldKey = "workordercustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom12", FieldKey = "workordercustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom13", FieldKey = "workordercustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom14", FieldKey = "workordercustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom15", FieldKey = "workordercustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom16", FieldKey = "workordercustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); #endregion diff --git a/server/AyaNova/DataList/WorkOrderItemOutsideServiceDataList.cs b/server/AyaNova/DataList/WorkOrderItemOutsideServiceDataList.cs index 9b787026..58202df7 100644 --- a/server/AyaNova/DataList/WorkOrderItemOutsideServiceDataList.cs +++ b/server/AyaNova/DataList/WorkOrderItemOutsideServiceDataList.cs @@ -9,13 +9,13 @@ namespace AyaNova.DataList public WorkOrderItemOutsideServiceDataList() { DefaultListAType = AyaType.WorkOrder; - SQLFrom = "from aworkorder " - + "left join aworkorderstatus on (aworkorder.laststatusid = aworkorderstatus.id) " - + "left join acustomer on (aworkorder.customerid=acustomer.id) " + SQLFrom = "from viewworkorder " + + "left join aworkorderstatus on (viewworkorder.laststatusid = aworkorderstatus.id) " + + "left join acustomer on (viewworkorder.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 aproject on (viewworkorder.projectid=aproject.id) " + + "left join acontract on (viewworkorder.contractid=acontract.id)" + + "left join aworkorderitem on viewworkorder.id=aworkorderitem.workorderid " + "left join aworkorderitemstatus on (aworkorderitem.workorderitemstatusid = aworkorderitemstatus.id) " + "left join aworkorderitempriority on (aworkorderitem.workorderitempriorityid = aworkorderitempriority.id) " @@ -289,8 +289,8 @@ namespace AyaNova.DataList FieldKey = "WorkOrderSerialNumber", AType = (int)AyaType.WorkOrder, UiFieldDataType = (int)UiFieldDataType.Integer, - SqlIdColumnName = "aworkorder.id", - SqlValueColumnName = "aworkorder.serial" + SqlIdColumnName = "viewworkorder.id", + SqlValueColumnName = "viewworkorder.serial" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -319,7 +319,7 @@ namespace AyaNova.DataList FieldKey = "WorkOrderStatus", UiFieldDataType = (int)UiFieldDataType.Text, AType = (int)AyaType.WorkOrderStatus, - SqlIdColumnName = "aworkorder.laststatusid", + SqlIdColumnName = "viewworkorder.laststatusid", SqlColorColumnName = "aworkorderstatus.color", SqlValueColumnName = "aworkorderstatus.name" }); @@ -329,7 +329,7 @@ namespace AyaNova.DataList TKey = "WorkOrderSummary", FieldKey = "workordernotes", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.notes" + SqlValueColumnName = "viewworkorder.notes" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -337,7 +337,7 @@ namespace AyaNova.DataList TKey = "Tags", FieldKey = "workordertags", UiFieldDataType = (int)UiFieldDataType.Tags, - SqlValueColumnName = "aworkorder.tags" + SqlValueColumnName = "viewworkorder.tags" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -365,7 +365,7 @@ namespace AyaNova.DataList TKey = "WorkOrderInternalReferenceNumber", FieldKey = "WorkOrderInternalReferenceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.internalreferencenumber" + SqlValueColumnName = "viewworkorder.internalreferencenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -373,7 +373,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCustomerReferenceNumber", FieldKey = "WorkOrderCustomerReferenceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.customerreferencenumber" + SqlValueColumnName = "viewworkorder.customerreferencenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -381,7 +381,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCustomerContactName", FieldKey = "WorkOrderCustomerContactName", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.customercontactname" + SqlValueColumnName = "viewworkorder.customercontactname" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -389,7 +389,7 @@ namespace AyaNova.DataList TKey = "WorkOrderServiceDate", FieldKey = "WorkOrderServiceDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.servicedate" + SqlValueColumnName = "viewworkorder.servicedate" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -397,7 +397,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCloseByDate", FieldKey = "WorkOrderCloseByDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.completebydate" + SqlValueColumnName = "viewworkorder.completebydate" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -405,7 +405,7 @@ namespace AyaNova.DataList TKey = "WorkOrderInvoiceNumber", FieldKey = "WorkOrderInvoiceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.invoicenumber" + SqlValueColumnName = "viewworkorder.invoicenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -413,7 +413,7 @@ namespace AyaNova.DataList TKey = "WorkOrderOnsite", FieldKey = "WorkOrderOnsite", UiFieldDataType = (int)UiFieldDataType.Bool, - SqlValueColumnName = "aworkorder.onsite" + SqlValueColumnName = "viewworkorder.onsite" }); @@ -422,7 +422,7 @@ namespace AyaNova.DataList TKey = "AddressPostalDeliveryAddress", FieldKey = "workorderpostaddress", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postaddress" + SqlValueColumnName = "viewworkorder.postaddress" }); @@ -431,7 +431,7 @@ namespace AyaNova.DataList TKey = "AddressPostalCity", FieldKey = "workorderpostcity", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcity" + SqlValueColumnName = "viewworkorder.postcity" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -439,7 +439,7 @@ namespace AyaNova.DataList TKey = "AddressPostalStateProv", FieldKey = "workorderpostregion", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postregion" + SqlValueColumnName = "viewworkorder.postregion" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -447,7 +447,7 @@ namespace AyaNova.DataList TKey = "AddressPostalCountry", FieldKey = "workorderpostcountry", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcountry" + SqlValueColumnName = "viewworkorder.postcountry" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -455,7 +455,7 @@ namespace AyaNova.DataList TKey = "AddressPostalPostal", FieldKey = "workorderpostcode", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcode" + SqlValueColumnName = "viewworkorder.postcode" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -463,7 +463,7 @@ namespace AyaNova.DataList TKey = "AddressDeliveryAddress", FieldKey = "workorderaddress", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.address" + SqlValueColumnName = "viewworkorder.address" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -471,7 +471,7 @@ namespace AyaNova.DataList TKey = "AddressCity", FieldKey = "workordercity", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.city" + SqlValueColumnName = "viewworkorder.city" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -479,7 +479,7 @@ namespace AyaNova.DataList TKey = "AddressStateProv", FieldKey = "workorderregion", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.region" + SqlValueColumnName = "viewworkorder.region" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -487,7 +487,7 @@ namespace AyaNova.DataList TKey = "AddressCountry", FieldKey = "workordercountry", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.country" + SqlValueColumnName = "viewworkorder.country" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -495,7 +495,7 @@ namespace AyaNova.DataList TKey = "AddressLatitude", FieldKey = "workorderlatitude", UiFieldDataType = (int)UiFieldDataType.Decimal, - SqlValueColumnName = "aworkorder.latitude" + SqlValueColumnName = "viewworkorder.latitude" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -503,7 +503,7 @@ namespace AyaNova.DataList TKey = "AddressLongitude", FieldKey = "workorderlongitude", UiFieldDataType = (int)UiFieldDataType.Decimal, - SqlValueColumnName = "aworkorder.longitude" + SqlValueColumnName = "viewworkorder.longitude" }); @@ -512,26 +512,33 @@ namespace AyaNova.DataList TKey = "WorkOrderCloseByDate", FieldKey = "WorkOrderCloseByDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.closebydate" + SqlValueColumnName = "viewworkorder.closebydate" }); + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderAge", + FieldKey = "WorkOrderAge", + UiFieldDataType = (int)UiFieldDataType.TimeSpan, + SqlValueColumnName = "expwoage" + }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom1", FieldKey = "workordercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom2", FieldKey = "workordercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom3", FieldKey = "workordercustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom4", FieldKey = "workordercustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom5", FieldKey = "workordercustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom6", FieldKey = "workordercustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom7", FieldKey = "workordercustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom8", FieldKey = "workordercustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom9", FieldKey = "workordercustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom10", FieldKey = "workordercustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom11", FieldKey = "workordercustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom12", FieldKey = "workordercustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom13", FieldKey = "workordercustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom14", FieldKey = "workordercustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom15", FieldKey = "workordercustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom16", FieldKey = "workordercustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom1", FieldKey = "workordercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom2", FieldKey = "workordercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom3", FieldKey = "workordercustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom4", FieldKey = "workordercustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom5", FieldKey = "workordercustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom6", FieldKey = "workordercustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom7", FieldKey = "workordercustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom8", FieldKey = "workordercustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom9", FieldKey = "workordercustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom10", FieldKey = "workordercustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom11", FieldKey = "workordercustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom12", FieldKey = "workordercustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom13", FieldKey = "workordercustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom14", FieldKey = "workordercustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom15", FieldKey = "workordercustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom16", FieldKey = "workordercustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); #endregion diff --git a/server/AyaNova/DataList/WorkOrderItemPartDataList.cs b/server/AyaNova/DataList/WorkOrderItemPartDataList.cs index 279208fe..05b5cb97 100644 --- a/server/AyaNova/DataList/WorkOrderItemPartDataList.cs +++ b/server/AyaNova/DataList/WorkOrderItemPartDataList.cs @@ -10,13 +10,13 @@ namespace AyaNova.DataList public WorkOrderItemPartDataList() { DefaultListAType = AyaType.WorkOrder; - SQLFrom = "from aworkorder " - + "left join aworkorderstatus on (aworkorder.laststatusid = aworkorderstatus.id) " - + "left join acustomer on (aworkorder.customerid=acustomer.id) " + SQLFrom = "from viewworkorder " + + "left join aworkorderstatus on (viewworkorder.laststatusid = aworkorderstatus.id) " + + "left join acustomer on (viewworkorder.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 aproject on (viewworkorder.projectid=aproject.id) " + + "left join acontract on (viewworkorder.contractid=acontract.id)" + + "left join aworkorderitem on viewworkorder.id=aworkorderitem.workorderid " + "left join aworkorderitemstatus on (aworkorderitem.workorderitemstatusid = aworkorderitemstatus.id) " + "left join aworkorderitempriority on (aworkorderitem.workorderitempriorityid = aworkorderitempriority.id) " @@ -277,8 +277,8 @@ namespace AyaNova.DataList FieldKey = "WorkOrderSerialNumber", AType = (int)AyaType.WorkOrder, UiFieldDataType = (int)UiFieldDataType.Integer, - SqlIdColumnName = "aworkorder.id", - SqlValueColumnName = "aworkorder.serial" + SqlIdColumnName = "viewworkorder.id", + SqlValueColumnName = "viewworkorder.serial" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -307,7 +307,7 @@ namespace AyaNova.DataList FieldKey = "WorkOrderStatus", UiFieldDataType = (int)UiFieldDataType.Text, AType = (int)AyaType.WorkOrderStatus, - SqlIdColumnName = "aworkorder.laststatusid", + SqlIdColumnName = "viewworkorder.laststatusid", SqlColorColumnName = "aworkorderstatus.color", SqlValueColumnName = "aworkorderstatus.name" }); @@ -317,7 +317,7 @@ namespace AyaNova.DataList TKey = "WorkOrderSummary", FieldKey = "workordernotes", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.notes" + SqlValueColumnName = "viewworkorder.notes" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -325,7 +325,7 @@ namespace AyaNova.DataList TKey = "Tags", FieldKey = "workordertags", UiFieldDataType = (int)UiFieldDataType.Tags, - SqlValueColumnName = "aworkorder.tags" + SqlValueColumnName = "viewworkorder.tags" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -353,7 +353,7 @@ namespace AyaNova.DataList TKey = "WorkOrderInternalReferenceNumber", FieldKey = "WorkOrderInternalReferenceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.internalreferencenumber" + SqlValueColumnName = "viewworkorder.internalreferencenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -361,7 +361,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCustomerReferenceNumber", FieldKey = "WorkOrderCustomerReferenceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.customerreferencenumber" + SqlValueColumnName = "viewworkorder.customerreferencenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -369,7 +369,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCustomerContactName", FieldKey = "WorkOrderCustomerContactName", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.customercontactname" + SqlValueColumnName = "viewworkorder.customercontactname" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -377,7 +377,7 @@ namespace AyaNova.DataList TKey = "WorkOrderServiceDate", FieldKey = "WorkOrderServiceDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.servicedate" + SqlValueColumnName = "viewworkorder.servicedate" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -385,7 +385,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCloseByDate", FieldKey = "WorkOrderCloseByDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.completebydate" + SqlValueColumnName = "viewworkorder.completebydate" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -393,7 +393,7 @@ namespace AyaNova.DataList TKey = "WorkOrderInvoiceNumber", FieldKey = "WorkOrderInvoiceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.invoicenumber" + SqlValueColumnName = "viewworkorder.invoicenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -401,7 +401,7 @@ namespace AyaNova.DataList TKey = "WorkOrderOnsite", FieldKey = "WorkOrderOnsite", UiFieldDataType = (int)UiFieldDataType.Bool, - SqlValueColumnName = "aworkorder.onsite" + SqlValueColumnName = "viewworkorder.onsite" }); @@ -410,7 +410,7 @@ namespace AyaNova.DataList TKey = "AddressPostalDeliveryAddress", FieldKey = "workorderpostaddress", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postaddress" + SqlValueColumnName = "viewworkorder.postaddress" }); @@ -419,7 +419,7 @@ namespace AyaNova.DataList TKey = "AddressPostalCity", FieldKey = "workorderpostcity", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcity" + SqlValueColumnName = "viewworkorder.postcity" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -427,7 +427,7 @@ namespace AyaNova.DataList TKey = "AddressPostalStateProv", FieldKey = "workorderpostregion", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postregion" + SqlValueColumnName = "viewworkorder.postregion" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -435,7 +435,7 @@ namespace AyaNova.DataList TKey = "AddressPostalCountry", FieldKey = "workorderpostcountry", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcountry" + SqlValueColumnName = "viewworkorder.postcountry" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -443,7 +443,7 @@ namespace AyaNova.DataList TKey = "AddressPostalPostal", FieldKey = "workorderpostcode", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcode" + SqlValueColumnName = "viewworkorder.postcode" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -451,7 +451,7 @@ namespace AyaNova.DataList TKey = "AddressDeliveryAddress", FieldKey = "workorderaddress", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.address" + SqlValueColumnName = "viewworkorder.address" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -459,7 +459,7 @@ namespace AyaNova.DataList TKey = "AddressCity", FieldKey = "workordercity", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.city" + SqlValueColumnName = "viewworkorder.city" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -467,7 +467,7 @@ namespace AyaNova.DataList TKey = "AddressStateProv", FieldKey = "workorderregion", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.region" + SqlValueColumnName = "viewworkorder.region" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -475,7 +475,7 @@ namespace AyaNova.DataList TKey = "AddressCountry", FieldKey = "workordercountry", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.country" + SqlValueColumnName = "viewworkorder.country" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -483,7 +483,7 @@ namespace AyaNova.DataList TKey = "AddressLatitude", FieldKey = "workorderlatitude", UiFieldDataType = (int)UiFieldDataType.Decimal, - SqlValueColumnName = "aworkorder.latitude" + SqlValueColumnName = "viewworkorder.latitude" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -491,7 +491,7 @@ namespace AyaNova.DataList TKey = "AddressLongitude", FieldKey = "workorderlongitude", UiFieldDataType = (int)UiFieldDataType.Decimal, - SqlValueColumnName = "aworkorder.longitude" + SqlValueColumnName = "viewworkorder.longitude" }); @@ -500,25 +500,33 @@ namespace AyaNova.DataList TKey = "WorkOrderCloseByDate", FieldKey = "WorkOrderCloseByDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.closebydate" + SqlValueColumnName = "viewworkorder.closebydate" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom1", FieldKey = "workordercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom2", FieldKey = "workordercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom3", FieldKey = "workordercustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom4", FieldKey = "workordercustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom5", FieldKey = "workordercustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom6", FieldKey = "workordercustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom7", FieldKey = "workordercustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom8", FieldKey = "workordercustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom9", FieldKey = "workordercustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom10", FieldKey = "workordercustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom11", FieldKey = "workordercustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom12", FieldKey = "workordercustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom13", FieldKey = "workordercustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom14", FieldKey = "workordercustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom15", FieldKey = "workordercustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom16", FieldKey = "workordercustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderAge", + FieldKey = "WorkOrderAge", + UiFieldDataType = (int)UiFieldDataType.TimeSpan, + SqlValueColumnName = "expwoage" + }); + + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom1", FieldKey = "workordercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom2", FieldKey = "workordercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom3", FieldKey = "workordercustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom4", FieldKey = "workordercustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom5", FieldKey = "workordercustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom6", FieldKey = "workordercustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom7", FieldKey = "workordercustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom8", FieldKey = "workordercustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom9", FieldKey = "workordercustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom10", FieldKey = "workordercustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom11", FieldKey = "workordercustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom12", FieldKey = "workordercustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom13", FieldKey = "workordercustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom14", FieldKey = "workordercustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom15", FieldKey = "workordercustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom16", FieldKey = "workordercustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); #endregion diff --git a/server/AyaNova/DataList/WorkOrderItemPartRequestDataList.cs b/server/AyaNova/DataList/WorkOrderItemPartRequestDataList.cs index 694ae9d7..1332b8d8 100644 --- a/server/AyaNova/DataList/WorkOrderItemPartRequestDataList.cs +++ b/server/AyaNova/DataList/WorkOrderItemPartRequestDataList.cs @@ -9,13 +9,13 @@ namespace AyaNova.DataList public WorkOrderItemPartRequestDataList() { DefaultListAType = AyaType.WorkOrder; - SQLFrom = "from aworkorder " - + "left join aworkorderstatus on (aworkorder.laststatusid = aworkorderstatus.id) " - + "left join acustomer on (aworkorder.customerid=acustomer.id) " + SQLFrom = "from viewworkorder " + + "left join aworkorderstatus on (viewworkorder.laststatusid = aworkorderstatus.id) " + + "left join acustomer on (viewworkorder.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 aproject on (viewworkorder.projectid=aproject.id) " + + "left join acontract on (viewworkorder.contractid=acontract.id)" + + "left join aworkorderitem on viewworkorder.id=aworkorderitem.workorderid " + "left join aworkorderitemstatus on (aworkorderitem.workorderitemstatusid = aworkorderitemstatus.id) " + "left join aworkorderitempriority on (aworkorderitem.workorderitempriorityid = aworkorderitempriority.id) " @@ -278,8 +278,8 @@ namespace AyaNova.DataList FieldKey = "WorkOrderSerialNumber", AType = (int)AyaType.WorkOrder, UiFieldDataType = (int)UiFieldDataType.Integer, - SqlIdColumnName = "aworkorder.id", - SqlValueColumnName = "aworkorder.serial" + SqlIdColumnName = "viewworkorder.id", + SqlValueColumnName = "viewworkorder.serial" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -308,7 +308,7 @@ namespace AyaNova.DataList FieldKey = "WorkOrderStatus", UiFieldDataType = (int)UiFieldDataType.Text, AType = (int)AyaType.WorkOrderStatus, - SqlIdColumnName = "aworkorder.laststatusid", + SqlIdColumnName = "viewworkorder.laststatusid", SqlColorColumnName = "aworkorderstatus.color", SqlValueColumnName = "aworkorderstatus.name" }); @@ -318,7 +318,7 @@ namespace AyaNova.DataList TKey = "WorkOrderSummary", FieldKey = "workordernotes", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.notes" + SqlValueColumnName = "viewworkorder.notes" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -326,7 +326,7 @@ namespace AyaNova.DataList TKey = "Tags", FieldKey = "workordertags", UiFieldDataType = (int)UiFieldDataType.Tags, - SqlValueColumnName = "aworkorder.tags" + SqlValueColumnName = "viewworkorder.tags" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -354,7 +354,7 @@ namespace AyaNova.DataList TKey = "WorkOrderInternalReferenceNumber", FieldKey = "WorkOrderInternalReferenceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.internalreferencenumber" + SqlValueColumnName = "viewworkorder.internalreferencenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -362,7 +362,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCustomerReferenceNumber", FieldKey = "WorkOrderCustomerReferenceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.customerreferencenumber" + SqlValueColumnName = "viewworkorder.customerreferencenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -370,7 +370,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCustomerContactName", FieldKey = "WorkOrderCustomerContactName", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.customercontactname" + SqlValueColumnName = "viewworkorder.customercontactname" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -378,7 +378,7 @@ namespace AyaNova.DataList TKey = "WorkOrderServiceDate", FieldKey = "WorkOrderServiceDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.servicedate" + SqlValueColumnName = "viewworkorder.servicedate" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -386,7 +386,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCloseByDate", FieldKey = "WorkOrderCloseByDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.completebydate" + SqlValueColumnName = "viewworkorder.completebydate" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -394,7 +394,7 @@ namespace AyaNova.DataList TKey = "WorkOrderInvoiceNumber", FieldKey = "WorkOrderInvoiceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.invoicenumber" + SqlValueColumnName = "viewworkorder.invoicenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -402,7 +402,7 @@ namespace AyaNova.DataList TKey = "WorkOrderOnsite", FieldKey = "WorkOrderOnsite", UiFieldDataType = (int)UiFieldDataType.Bool, - SqlValueColumnName = "aworkorder.onsite" + SqlValueColumnName = "viewworkorder.onsite" }); @@ -411,7 +411,7 @@ namespace AyaNova.DataList TKey = "AddressPostalDeliveryAddress", FieldKey = "workorderpostaddress", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postaddress" + SqlValueColumnName = "viewworkorder.postaddress" }); @@ -420,7 +420,7 @@ namespace AyaNova.DataList TKey = "AddressPostalCity", FieldKey = "workorderpostcity", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcity" + SqlValueColumnName = "viewworkorder.postcity" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -428,7 +428,7 @@ namespace AyaNova.DataList TKey = "AddressPostalStateProv", FieldKey = "workorderpostregion", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postregion" + SqlValueColumnName = "viewworkorder.postregion" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -436,7 +436,7 @@ namespace AyaNova.DataList TKey = "AddressPostalCountry", FieldKey = "workorderpostcountry", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcountry" + SqlValueColumnName = "viewworkorder.postcountry" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -444,7 +444,7 @@ namespace AyaNova.DataList TKey = "AddressPostalPostal", FieldKey = "workorderpostcode", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcode" + SqlValueColumnName = "viewworkorder.postcode" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -452,7 +452,7 @@ namespace AyaNova.DataList TKey = "AddressDeliveryAddress", FieldKey = "workorderaddress", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.address" + SqlValueColumnName = "viewworkorder.address" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -460,7 +460,7 @@ namespace AyaNova.DataList TKey = "AddressCity", FieldKey = "workordercity", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.city" + SqlValueColumnName = "viewworkorder.city" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -468,7 +468,7 @@ namespace AyaNova.DataList TKey = "AddressStateProv", FieldKey = "workorderregion", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.region" + SqlValueColumnName = "viewworkorder.region" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -476,7 +476,7 @@ namespace AyaNova.DataList TKey = "AddressCountry", FieldKey = "workordercountry", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.country" + SqlValueColumnName = "viewworkorder.country" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -484,7 +484,7 @@ namespace AyaNova.DataList TKey = "AddressLatitude", FieldKey = "workorderlatitude", UiFieldDataType = (int)UiFieldDataType.Decimal, - SqlValueColumnName = "aworkorder.latitude" + SqlValueColumnName = "viewworkorder.latitude" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -492,7 +492,7 @@ namespace AyaNova.DataList TKey = "AddressLongitude", FieldKey = "workorderlongitude", UiFieldDataType = (int)UiFieldDataType.Decimal, - SqlValueColumnName = "aworkorder.longitude" + SqlValueColumnName = "viewworkorder.longitude" }); @@ -501,25 +501,33 @@ namespace AyaNova.DataList TKey = "WorkOrderCloseByDate", FieldKey = "WorkOrderCloseByDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.closebydate" + SqlValueColumnName = "viewworkorder.closebydate" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom1", FieldKey = "workordercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom2", FieldKey = "workordercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom3", FieldKey = "workordercustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom4", FieldKey = "workordercustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom5", FieldKey = "workordercustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom6", FieldKey = "workordercustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom7", FieldKey = "workordercustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom8", FieldKey = "workordercustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom9", FieldKey = "workordercustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom10", FieldKey = "workordercustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom11", FieldKey = "workordercustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom12", FieldKey = "workordercustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom13", FieldKey = "workordercustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom14", FieldKey = "workordercustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom15", FieldKey = "workordercustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom16", FieldKey = "workordercustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderAge", + FieldKey = "WorkOrderAge", + UiFieldDataType = (int)UiFieldDataType.TimeSpan, + SqlValueColumnName = "expwoage" + }); + + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom1", FieldKey = "workordercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom2", FieldKey = "workordercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom3", FieldKey = "workordercustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom4", FieldKey = "workordercustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom5", FieldKey = "workordercustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom6", FieldKey = "workordercustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom7", FieldKey = "workordercustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom8", FieldKey = "workordercustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom9", FieldKey = "workordercustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom10", FieldKey = "workordercustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom11", FieldKey = "workordercustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom12", FieldKey = "workordercustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom13", FieldKey = "workordercustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom14", FieldKey = "workordercustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom15", FieldKey = "workordercustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom16", FieldKey = "workordercustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); #endregion diff --git a/server/AyaNova/DataList/WorkOrderItemScheduledUserDataList.cs b/server/AyaNova/DataList/WorkOrderItemScheduledUserDataList.cs index b198157d..bd1196d8 100644 --- a/server/AyaNova/DataList/WorkOrderItemScheduledUserDataList.cs +++ b/server/AyaNova/DataList/WorkOrderItemScheduledUserDataList.cs @@ -10,13 +10,13 @@ namespace AyaNova.DataList public WorkOrderItemScheduledUserDataList() { DefaultListAType = AyaType.WorkOrder; - SQLFrom = "from aworkorder " - + "left join aworkorderstatus on (aworkorder.laststatusid = aworkorderstatus.id) " - + "left join acustomer on (aworkorder.customerid=acustomer.id) " + SQLFrom = "from viewworkorder " + + "left join aworkorderstatus on (viewworkorder.laststatusid = aworkorderstatus.id) " + + "left join acustomer on (viewworkorder.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 aproject on (viewworkorder.projectid=aproject.id) " + + "left join acontract on (viewworkorder.contractid=acontract.id)" + + "left join aworkorderitem on viewworkorder.id=aworkorderitem.workorderid " + "left join aworkorderitemstatus on (aworkorderitem.workorderitemstatusid = aworkorderitemstatus.id) " + "left join aworkorderitempriority on (aworkorderitem.workorderitempriorityid = aworkorderitempriority.id) " //scheduled users @@ -258,8 +258,8 @@ namespace AyaNova.DataList FieldKey = "WorkOrderSerialNumber", AType = (int)AyaType.WorkOrder, UiFieldDataType = (int)UiFieldDataType.Integer, - SqlIdColumnName = "aworkorder.id", - SqlValueColumnName = "aworkorder.serial" + SqlIdColumnName = "viewworkorder.id", + SqlValueColumnName = "viewworkorder.serial" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -288,7 +288,7 @@ namespace AyaNova.DataList FieldKey = "WorkOrderStatus", UiFieldDataType = (int)UiFieldDataType.Text, AType = (int)AyaType.WorkOrderStatus, - SqlIdColumnName = "aworkorder.laststatusid", + SqlIdColumnName = "viewworkorder.laststatusid", SqlColorColumnName = "aworkorderstatus.color", SqlValueColumnName = "aworkorderstatus.name" }); @@ -298,7 +298,7 @@ namespace AyaNova.DataList TKey = "WorkOrderSummary", FieldKey = "workordernotes", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.notes" + SqlValueColumnName = "viewworkorder.notes" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -306,7 +306,7 @@ namespace AyaNova.DataList TKey = "Tags", FieldKey = "workordertags", UiFieldDataType = (int)UiFieldDataType.Tags, - SqlValueColumnName = "aworkorder.tags" + SqlValueColumnName = "viewworkorder.tags" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -334,7 +334,7 @@ namespace AyaNova.DataList TKey = "WorkOrderInternalReferenceNumber", FieldKey = "WorkOrderInternalReferenceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.internalreferencenumber" + SqlValueColumnName = "viewworkorder.internalreferencenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -342,7 +342,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCustomerReferenceNumber", FieldKey = "WorkOrderCustomerReferenceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.customerreferencenumber" + SqlValueColumnName = "viewworkorder.customerreferencenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -350,7 +350,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCustomerContactName", FieldKey = "WorkOrderCustomerContactName", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.customercontactname" + SqlValueColumnName = "viewworkorder.customercontactname" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -358,7 +358,7 @@ namespace AyaNova.DataList TKey = "WorkOrderServiceDate", FieldKey = "WorkOrderServiceDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.servicedate" + SqlValueColumnName = "viewworkorder.servicedate" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -366,7 +366,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCloseByDate", FieldKey = "WorkOrderCloseByDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.completebydate" + SqlValueColumnName = "viewworkorder.completebydate" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -374,7 +374,7 @@ namespace AyaNova.DataList TKey = "WorkOrderInvoiceNumber", FieldKey = "WorkOrderInvoiceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.invoicenumber" + SqlValueColumnName = "viewworkorder.invoicenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -382,7 +382,7 @@ namespace AyaNova.DataList TKey = "WorkOrderOnsite", FieldKey = "WorkOrderOnsite", UiFieldDataType = (int)UiFieldDataType.Bool, - SqlValueColumnName = "aworkorder.onsite" + SqlValueColumnName = "viewworkorder.onsite" }); @@ -391,7 +391,7 @@ namespace AyaNova.DataList TKey = "AddressPostalDeliveryAddress", FieldKey = "workorderpostaddress", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postaddress" + SqlValueColumnName = "viewworkorder.postaddress" }); @@ -400,7 +400,7 @@ namespace AyaNova.DataList TKey = "AddressPostalCity", FieldKey = "workorderpostcity", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcity" + SqlValueColumnName = "viewworkorder.postcity" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -408,7 +408,7 @@ namespace AyaNova.DataList TKey = "AddressPostalStateProv", FieldKey = "workorderpostregion", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postregion" + SqlValueColumnName = "viewworkorder.postregion" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -416,7 +416,7 @@ namespace AyaNova.DataList TKey = "AddressPostalCountry", FieldKey = "workorderpostcountry", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcountry" + SqlValueColumnName = "viewworkorder.postcountry" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -424,7 +424,7 @@ namespace AyaNova.DataList TKey = "AddressPostalPostal", FieldKey = "workorderpostcode", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcode" + SqlValueColumnName = "viewworkorder.postcode" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -432,7 +432,7 @@ namespace AyaNova.DataList TKey = "AddressDeliveryAddress", FieldKey = "workorderaddress", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.address" + SqlValueColumnName = "viewworkorder.address" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -440,7 +440,7 @@ namespace AyaNova.DataList TKey = "AddressCity", FieldKey = "workordercity", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.city" + SqlValueColumnName = "viewworkorder.city" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -448,7 +448,7 @@ namespace AyaNova.DataList TKey = "AddressStateProv", FieldKey = "workorderregion", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.region" + SqlValueColumnName = "viewworkorder.region" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -456,7 +456,7 @@ namespace AyaNova.DataList TKey = "AddressCountry", FieldKey = "workordercountry", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.country" + SqlValueColumnName = "viewworkorder.country" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -464,7 +464,7 @@ namespace AyaNova.DataList TKey = "AddressLatitude", FieldKey = "workorderlatitude", UiFieldDataType = (int)UiFieldDataType.Decimal, - SqlValueColumnName = "aworkorder.latitude" + SqlValueColumnName = "viewworkorder.latitude" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -472,7 +472,7 @@ namespace AyaNova.DataList TKey = "AddressLongitude", FieldKey = "workorderlongitude", UiFieldDataType = (int)UiFieldDataType.Decimal, - SqlValueColumnName = "aworkorder.longitude" + SqlValueColumnName = "viewworkorder.longitude" }); @@ -481,25 +481,33 @@ namespace AyaNova.DataList TKey = "WorkOrderCloseByDate", FieldKey = "WorkOrderCloseByDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.closebydate" + SqlValueColumnName = "viewworkorder.closebydate" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom1", FieldKey = "workordercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom2", FieldKey = "workordercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom3", FieldKey = "workordercustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom4", FieldKey = "workordercustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom5", FieldKey = "workordercustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom6", FieldKey = "workordercustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom7", FieldKey = "workordercustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom8", FieldKey = "workordercustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom9", FieldKey = "workordercustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom10", FieldKey = "workordercustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom11", FieldKey = "workordercustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom12", FieldKey = "workordercustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom13", FieldKey = "workordercustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom14", FieldKey = "workordercustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom15", FieldKey = "workordercustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom16", FieldKey = "workordercustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderAge", + FieldKey = "WorkOrderAge", + UiFieldDataType = (int)UiFieldDataType.TimeSpan, + SqlValueColumnName = "expwoage" + }); + + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom1", FieldKey = "workordercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom2", FieldKey = "workordercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom3", FieldKey = "workordercustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom4", FieldKey = "workordercustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom5", FieldKey = "workordercustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom6", FieldKey = "workordercustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom7", FieldKey = "workordercustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom8", FieldKey = "workordercustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom9", FieldKey = "workordercustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom10", FieldKey = "workordercustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom11", FieldKey = "workordercustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom12", FieldKey = "workordercustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom13", FieldKey = "workordercustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom14", FieldKey = "workordercustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom15", FieldKey = "workordercustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom16", FieldKey = "workordercustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); #endregion diff --git a/server/AyaNova/DataList/WorkOrderItemTaskDataList.cs b/server/AyaNova/DataList/WorkOrderItemTaskDataList.cs index 23ee2b84..82a11097 100644 --- a/server/AyaNova/DataList/WorkOrderItemTaskDataList.cs +++ b/server/AyaNova/DataList/WorkOrderItemTaskDataList.cs @@ -9,13 +9,13 @@ namespace AyaNova.DataList public WorkOrderItemTaskDataList() { DefaultListAType = AyaType.WorkOrder; - SQLFrom = "from aworkorder " - + "left join aworkorderstatus on (aworkorder.laststatusid = aworkorderstatus.id) " - + "left join acustomer on (aworkorder.customerid=acustomer.id) " + SQLFrom = "from viewworkorder " + + "left join aworkorderstatus on (viewworkorder.laststatusid = aworkorderstatus.id) " + + "left join acustomer on (viewworkorder.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 aproject on (viewworkorder.projectid=aproject.id) " + + "left join acontract on (viewworkorder.contractid=acontract.id)" + + "left join aworkorderitem on viewworkorder.id=aworkorderitem.workorderid " + "left join aworkorderitemstatus on (aworkorderitem.workorderitemstatusid = aworkorderitemstatus.id) " + "left join aworkorderitempriority on (aworkorderitem.workorderitempriorityid = aworkorderitempriority.id) " @@ -245,8 +245,8 @@ namespace AyaNova.DataList FieldKey = "WorkOrderSerialNumber", AType = (int)AyaType.WorkOrder, UiFieldDataType = (int)UiFieldDataType.Integer, - SqlIdColumnName = "aworkorder.id", - SqlValueColumnName = "aworkorder.serial" + SqlIdColumnName = "viewworkorder.id", + SqlValueColumnName = "viewworkorder.serial" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -275,7 +275,7 @@ namespace AyaNova.DataList FieldKey = "WorkOrderStatus", UiFieldDataType = (int)UiFieldDataType.Text, AType = (int)AyaType.WorkOrderStatus, - SqlIdColumnName = "aworkorder.laststatusid", + SqlIdColumnName = "viewworkorder.laststatusid", SqlColorColumnName = "aworkorderstatus.color", SqlValueColumnName = "aworkorderstatus.name" }); @@ -285,7 +285,7 @@ namespace AyaNova.DataList TKey = "WorkOrderSummary", FieldKey = "workordernotes", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.notes" + SqlValueColumnName = "viewworkorder.notes" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -293,7 +293,7 @@ namespace AyaNova.DataList TKey = "Tags", FieldKey = "workordertags", UiFieldDataType = (int)UiFieldDataType.Tags, - SqlValueColumnName = "aworkorder.tags" + SqlValueColumnName = "viewworkorder.tags" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -321,7 +321,7 @@ namespace AyaNova.DataList TKey = "WorkOrderInternalReferenceNumber", FieldKey = "WorkOrderInternalReferenceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.internalreferencenumber" + SqlValueColumnName = "viewworkorder.internalreferencenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -329,7 +329,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCustomerReferenceNumber", FieldKey = "WorkOrderCustomerReferenceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.customerreferencenumber" + SqlValueColumnName = "viewworkorder.customerreferencenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -337,7 +337,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCustomerContactName", FieldKey = "WorkOrderCustomerContactName", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.customercontactname" + SqlValueColumnName = "viewworkorder.customercontactname" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -345,7 +345,7 @@ namespace AyaNova.DataList TKey = "WorkOrderServiceDate", FieldKey = "WorkOrderServiceDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.servicedate" + SqlValueColumnName = "viewworkorder.servicedate" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -353,7 +353,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCloseByDate", FieldKey = "WorkOrderCloseByDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.completebydate" + SqlValueColumnName = "viewworkorder.completebydate" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -361,7 +361,7 @@ namespace AyaNova.DataList TKey = "WorkOrderInvoiceNumber", FieldKey = "WorkOrderInvoiceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.invoicenumber" + SqlValueColumnName = "viewworkorder.invoicenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -369,7 +369,7 @@ namespace AyaNova.DataList TKey = "WorkOrderOnsite", FieldKey = "WorkOrderOnsite", UiFieldDataType = (int)UiFieldDataType.Bool, - SqlValueColumnName = "aworkorder.onsite" + SqlValueColumnName = "viewworkorder.onsite" }); @@ -378,7 +378,7 @@ namespace AyaNova.DataList TKey = "AddressPostalDeliveryAddress", FieldKey = "workorderpostaddress", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postaddress" + SqlValueColumnName = "viewworkorder.postaddress" }); @@ -387,7 +387,7 @@ namespace AyaNova.DataList TKey = "AddressPostalCity", FieldKey = "workorderpostcity", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcity" + SqlValueColumnName = "viewworkorder.postcity" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -395,7 +395,7 @@ namespace AyaNova.DataList TKey = "AddressPostalStateProv", FieldKey = "workorderpostregion", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postregion" + SqlValueColumnName = "viewworkorder.postregion" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -403,7 +403,7 @@ namespace AyaNova.DataList TKey = "AddressPostalCountry", FieldKey = "workorderpostcountry", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcountry" + SqlValueColumnName = "viewworkorder.postcountry" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -411,7 +411,7 @@ namespace AyaNova.DataList TKey = "AddressPostalPostal", FieldKey = "workorderpostcode", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcode" + SqlValueColumnName = "viewworkorder.postcode" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -419,7 +419,7 @@ namespace AyaNova.DataList TKey = "AddressDeliveryAddress", FieldKey = "workorderaddress", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.address" + SqlValueColumnName = "viewworkorder.address" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -427,7 +427,7 @@ namespace AyaNova.DataList TKey = "AddressCity", FieldKey = "workordercity", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.city" + SqlValueColumnName = "viewworkorder.city" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -435,7 +435,7 @@ namespace AyaNova.DataList TKey = "AddressStateProv", FieldKey = "workorderregion", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.region" + SqlValueColumnName = "viewworkorder.region" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -443,7 +443,7 @@ namespace AyaNova.DataList TKey = "AddressCountry", FieldKey = "workordercountry", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.country" + SqlValueColumnName = "viewworkorder.country" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -451,7 +451,7 @@ namespace AyaNova.DataList TKey = "AddressLatitude", FieldKey = "workorderlatitude", UiFieldDataType = (int)UiFieldDataType.Decimal, - SqlValueColumnName = "aworkorder.latitude" + SqlValueColumnName = "viewworkorder.latitude" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -459,35 +459,41 @@ namespace AyaNova.DataList TKey = "AddressLongitude", FieldKey = "workorderlongitude", UiFieldDataType = (int)UiFieldDataType.Decimal, - SqlValueColumnName = "aworkorder.longitude" + SqlValueColumnName = "viewworkorder.longitude" }); - - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCloseByDate", FieldKey = "WorkOrderCloseByDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.closebydate" + SqlValueColumnName = "viewworkorder.closebydate" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom1", FieldKey = "workordercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom2", FieldKey = "workordercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom3", FieldKey = "workordercustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom4", FieldKey = "workordercustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom5", FieldKey = "workordercustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom6", FieldKey = "workordercustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom7", FieldKey = "workordercustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom8", FieldKey = "workordercustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom9", FieldKey = "workordercustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom10", FieldKey = "workordercustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom11", FieldKey = "workordercustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom12", FieldKey = "workordercustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom13", FieldKey = "workordercustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom14", FieldKey = "workordercustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom15", FieldKey = "workordercustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom16", FieldKey = "workordercustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderAge", + FieldKey = "WorkOrderAge", + UiFieldDataType = (int)UiFieldDataType.TimeSpan, + SqlValueColumnName = "expwoage" + }); + + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom1", FieldKey = "workordercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom2", FieldKey = "workordercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom3", FieldKey = "workordercustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom4", FieldKey = "workordercustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom5", FieldKey = "workordercustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom6", FieldKey = "workordercustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom7", FieldKey = "workordercustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom8", FieldKey = "workordercustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom9", FieldKey = "workordercustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom10", FieldKey = "workordercustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom11", FieldKey = "workordercustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom12", FieldKey = "workordercustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom13", FieldKey = "workordercustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom14", FieldKey = "workordercustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom15", FieldKey = "workordercustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom16", FieldKey = "workordercustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); #endregion diff --git a/server/AyaNova/DataList/WorkOrderItemTravelDataList.cs b/server/AyaNova/DataList/WorkOrderItemTravelDataList.cs index f99edbfd..27f1b55a 100644 --- a/server/AyaNova/DataList/WorkOrderItemTravelDataList.cs +++ b/server/AyaNova/DataList/WorkOrderItemTravelDataList.cs @@ -9,13 +9,13 @@ namespace AyaNova.DataList public WorkOrderItemTravelDataList() { DefaultListAType = AyaType.WorkOrder; - SQLFrom = "from aworkorder " - + "left join aworkorderstatus on (aworkorder.laststatusid = aworkorderstatus.id) " - + "left join acustomer on (aworkorder.customerid=acustomer.id) " + SQLFrom = "from viewworkorder " + + "left join aworkorderstatus on (viewworkorder.laststatusid = aworkorderstatus.id) " + + "left join acustomer on (viewworkorder.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 aproject on (viewworkorder.projectid=aproject.id) " + + "left join acontract on (viewworkorder.contractid=acontract.id)" + + "left join aworkorderitem on viewworkorder.id=aworkorderitem.workorderid " + "left join aworkorderitemstatus on (aworkorderitem.workorderitemstatusid = aworkorderitemstatus.id) " + "left join aworkorderitempriority on (aworkorderitem.workorderitempriorityid = aworkorderitempriority.id) " @@ -273,8 +273,8 @@ namespace AyaNova.DataList FieldKey = "WorkOrderSerialNumber", AType = (int)AyaType.WorkOrder, UiFieldDataType = (int)UiFieldDataType.Integer, - SqlIdColumnName = "aworkorder.id", - SqlValueColumnName = "aworkorder.serial" + SqlIdColumnName = "viewworkorder.id", + SqlValueColumnName = "viewworkorder.serial" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -303,7 +303,7 @@ namespace AyaNova.DataList FieldKey = "WorkOrderStatus", UiFieldDataType = (int)UiFieldDataType.Text, AType = (int)AyaType.WorkOrderStatus, - SqlIdColumnName = "aworkorder.laststatusid", + SqlIdColumnName = "viewworkorder.laststatusid", SqlColorColumnName = "aworkorderstatus.color", SqlValueColumnName = "aworkorderstatus.name" }); @@ -313,7 +313,7 @@ namespace AyaNova.DataList TKey = "WorkOrderSummary", FieldKey = "workordernotes", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.notes" + SqlValueColumnName = "viewworkorder.notes" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -321,7 +321,7 @@ namespace AyaNova.DataList TKey = "Tags", FieldKey = "workordertags", UiFieldDataType = (int)UiFieldDataType.Tags, - SqlValueColumnName = "aworkorder.tags" + SqlValueColumnName = "viewworkorder.tags" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -349,7 +349,7 @@ namespace AyaNova.DataList TKey = "WorkOrderInternalReferenceNumber", FieldKey = "WorkOrderInternalReferenceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.internalreferencenumber" + SqlValueColumnName = "viewworkorder.internalreferencenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -357,7 +357,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCustomerReferenceNumber", FieldKey = "WorkOrderCustomerReferenceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.customerreferencenumber" + SqlValueColumnName = "viewworkorder.customerreferencenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -365,7 +365,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCustomerContactName", FieldKey = "WorkOrderCustomerContactName", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.customercontactname" + SqlValueColumnName = "viewworkorder.customercontactname" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -373,7 +373,7 @@ namespace AyaNova.DataList TKey = "WorkOrderServiceDate", FieldKey = "WorkOrderServiceDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.servicedate" + SqlValueColumnName = "viewworkorder.servicedate" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -381,7 +381,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCloseByDate", FieldKey = "WorkOrderCloseByDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.completebydate" + SqlValueColumnName = "viewworkorder.completebydate" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -389,7 +389,7 @@ namespace AyaNova.DataList TKey = "WorkOrderInvoiceNumber", FieldKey = "WorkOrderInvoiceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.invoicenumber" + SqlValueColumnName = "viewworkorder.invoicenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -397,7 +397,7 @@ namespace AyaNova.DataList TKey = "WorkOrderOnsite", FieldKey = "WorkOrderOnsite", UiFieldDataType = (int)UiFieldDataType.Bool, - SqlValueColumnName = "aworkorder.onsite" + SqlValueColumnName = "viewworkorder.onsite" }); @@ -406,7 +406,7 @@ namespace AyaNova.DataList TKey = "AddressPostalDeliveryAddress", FieldKey = "workorderpostaddress", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postaddress" + SqlValueColumnName = "viewworkorder.postaddress" }); @@ -415,7 +415,7 @@ namespace AyaNova.DataList TKey = "AddressPostalCity", FieldKey = "workorderpostcity", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcity" + SqlValueColumnName = "viewworkorder.postcity" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -423,7 +423,7 @@ namespace AyaNova.DataList TKey = "AddressPostalStateProv", FieldKey = "workorderpostregion", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postregion" + SqlValueColumnName = "viewworkorder.postregion" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -431,7 +431,7 @@ namespace AyaNova.DataList TKey = "AddressPostalCountry", FieldKey = "workorderpostcountry", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcountry" + SqlValueColumnName = "viewworkorder.postcountry" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -439,7 +439,7 @@ namespace AyaNova.DataList TKey = "AddressPostalPostal", FieldKey = "workorderpostcode", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcode" + SqlValueColumnName = "viewworkorder.postcode" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -447,7 +447,7 @@ namespace AyaNova.DataList TKey = "AddressDeliveryAddress", FieldKey = "workorderaddress", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.address" + SqlValueColumnName = "viewworkorder.address" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -455,7 +455,7 @@ namespace AyaNova.DataList TKey = "AddressCity", FieldKey = "workordercity", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.city" + SqlValueColumnName = "viewworkorder.city" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -463,7 +463,7 @@ namespace AyaNova.DataList TKey = "AddressStateProv", FieldKey = "workorderregion", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.region" + SqlValueColumnName = "viewworkorder.region" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -471,7 +471,7 @@ namespace AyaNova.DataList TKey = "AddressCountry", FieldKey = "workordercountry", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.country" + SqlValueColumnName = "viewworkorder.country" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -479,7 +479,7 @@ namespace AyaNova.DataList TKey = "AddressLatitude", FieldKey = "workorderlatitude", UiFieldDataType = (int)UiFieldDataType.Decimal, - SqlValueColumnName = "aworkorder.latitude" + SqlValueColumnName = "viewworkorder.latitude" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -487,35 +487,42 @@ namespace AyaNova.DataList TKey = "AddressLongitude", FieldKey = "workorderlongitude", UiFieldDataType = (int)UiFieldDataType.Decimal, - SqlValueColumnName = "aworkorder.longitude" + SqlValueColumnName = "viewworkorder.longitude" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCloseByDate", FieldKey = "WorkOrderCloseByDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.closebydate" + SqlValueColumnName = "viewworkorder.closebydate" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderAge", + FieldKey = "WorkOrderAge", + UiFieldDataType = (int)UiFieldDataType.TimeSpan, + SqlValueColumnName = "expwoage" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom1", FieldKey = "workordercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom2", FieldKey = "workordercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom3", FieldKey = "workordercustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom4", FieldKey = "workordercustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom5", FieldKey = "workordercustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom6", FieldKey = "workordercustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom7", FieldKey = "workordercustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom8", FieldKey = "workordercustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom9", FieldKey = "workordercustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom10", FieldKey = "workordercustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom11", FieldKey = "workordercustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom12", FieldKey = "workordercustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom13", FieldKey = "workordercustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom14", FieldKey = "workordercustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom15", FieldKey = "workordercustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom16", FieldKey = "workordercustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom1", FieldKey = "workordercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom2", FieldKey = "workordercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom3", FieldKey = "workordercustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom4", FieldKey = "workordercustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom5", FieldKey = "workordercustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom6", FieldKey = "workordercustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom7", FieldKey = "workordercustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom8", FieldKey = "workordercustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom9", FieldKey = "workordercustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom10", FieldKey = "workordercustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom11", FieldKey = "workordercustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom12", FieldKey = "workordercustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom13", FieldKey = "workordercustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom14", FieldKey = "workordercustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom15", FieldKey = "workordercustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom16", FieldKey = "workordercustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); #endregion diff --git a/server/AyaNova/DataList/WorkOrderItemUnitDataList.cs b/server/AyaNova/DataList/WorkOrderItemUnitDataList.cs index 297c49dd..9c374e1c 100644 --- a/server/AyaNova/DataList/WorkOrderItemUnitDataList.cs +++ b/server/AyaNova/DataList/WorkOrderItemUnitDataList.cs @@ -10,13 +10,13 @@ namespace AyaNova.DataList public WorkOrderItemUnitDataList() { DefaultListAType = AyaType.WorkOrder; - SQLFrom = "from aworkorder " - + "left join aworkorderstatus on (aworkorder.laststatusid = aworkorderstatus.id) " - + "left join acustomer on (aworkorder.customerid=acustomer.id) " + SQLFrom = "from viewworkorder " + + "left join aworkorderstatus on (viewworkorder.laststatusid = aworkorderstatus.id) " + + "left join acustomer on (viewworkorder.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 aproject on (viewworkorder.projectid=aproject.id) " + + "left join acontract on (viewworkorder.contractid=acontract.id)" + + "left join aworkorderitem on viewworkorder.id=aworkorderitem.workorderid " + "left join aworkorderitemstatus on (aworkorderitem.workorderitemstatusid = aworkorderitemstatus.id) " + "left join aworkorderitempriority on (aworkorderitem.workorderitempriorityid = aworkorderitempriority.id) " @@ -243,8 +243,8 @@ namespace AyaNova.DataList FieldKey = "WorkOrderSerialNumber", AType = (int)AyaType.WorkOrder, UiFieldDataType = (int)UiFieldDataType.Integer, - SqlIdColumnName = "aworkorder.id", - SqlValueColumnName = "aworkorder.serial" + SqlIdColumnName = "viewworkorder.id", + SqlValueColumnName = "viewworkorder.serial" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -273,7 +273,7 @@ namespace AyaNova.DataList FieldKey = "WorkOrderStatus", UiFieldDataType = (int)UiFieldDataType.Text, AType = (int)AyaType.WorkOrderStatus, - SqlIdColumnName = "aworkorder.laststatusid", + SqlIdColumnName = "viewworkorder.laststatusid", SqlColorColumnName = "aworkorderstatus.color", SqlValueColumnName = "aworkorderstatus.name" }); @@ -283,7 +283,7 @@ namespace AyaNova.DataList TKey = "WorkOrderSummary", FieldKey = "workordernotes", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.notes" + SqlValueColumnName = "viewworkorder.notes" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -291,7 +291,7 @@ namespace AyaNova.DataList TKey = "Tags", FieldKey = "workordertags", UiFieldDataType = (int)UiFieldDataType.Tags, - SqlValueColumnName = "aworkorder.tags" + SqlValueColumnName = "viewworkorder.tags" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -319,7 +319,7 @@ namespace AyaNova.DataList TKey = "WorkOrderInternalReferenceNumber", FieldKey = "WorkOrderInternalReferenceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.internalreferencenumber" + SqlValueColumnName = "viewworkorder.internalreferencenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -327,7 +327,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCustomerReferenceNumber", FieldKey = "WorkOrderCustomerReferenceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.customerreferencenumber" + SqlValueColumnName = "viewworkorder.customerreferencenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -335,7 +335,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCustomerContactName", FieldKey = "WorkOrderCustomerContactName", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.customercontactname" + SqlValueColumnName = "viewworkorder.customercontactname" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -343,7 +343,7 @@ namespace AyaNova.DataList TKey = "WorkOrderServiceDate", FieldKey = "WorkOrderServiceDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.servicedate" + SqlValueColumnName = "viewworkorder.servicedate" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -351,7 +351,7 @@ namespace AyaNova.DataList TKey = "WorkOrderCloseByDate", FieldKey = "WorkOrderCloseByDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.completebydate" + SqlValueColumnName = "viewworkorder.completebydate" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -359,7 +359,7 @@ namespace AyaNova.DataList TKey = "WorkOrderInvoiceNumber", FieldKey = "WorkOrderInvoiceNumber", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.invoicenumber" + SqlValueColumnName = "viewworkorder.invoicenumber" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -367,7 +367,7 @@ namespace AyaNova.DataList TKey = "WorkOrderOnsite", FieldKey = "WorkOrderOnsite", UiFieldDataType = (int)UiFieldDataType.Bool, - SqlValueColumnName = "aworkorder.onsite" + SqlValueColumnName = "viewworkorder.onsite" }); @@ -376,7 +376,7 @@ namespace AyaNova.DataList TKey = "AddressPostalDeliveryAddress", FieldKey = "workorderpostaddress", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postaddress" + SqlValueColumnName = "viewworkorder.postaddress" }); @@ -385,7 +385,7 @@ namespace AyaNova.DataList TKey = "AddressPostalCity", FieldKey = "workorderpostcity", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcity" + SqlValueColumnName = "viewworkorder.postcity" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -393,7 +393,7 @@ namespace AyaNova.DataList TKey = "AddressPostalStateProv", FieldKey = "workorderpostregion", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postregion" + SqlValueColumnName = "viewworkorder.postregion" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -401,7 +401,7 @@ namespace AyaNova.DataList TKey = "AddressPostalCountry", FieldKey = "workorderpostcountry", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcountry" + SqlValueColumnName = "viewworkorder.postcountry" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -409,7 +409,7 @@ namespace AyaNova.DataList TKey = "AddressPostalPostal", FieldKey = "workorderpostcode", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.postcode" + SqlValueColumnName = "viewworkorder.postcode" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -417,7 +417,7 @@ namespace AyaNova.DataList TKey = "AddressDeliveryAddress", FieldKey = "workorderaddress", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.address" + SqlValueColumnName = "viewworkorder.address" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -425,7 +425,7 @@ namespace AyaNova.DataList TKey = "AddressCity", FieldKey = "workordercity", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.city" + SqlValueColumnName = "viewworkorder.city" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -433,7 +433,7 @@ namespace AyaNova.DataList TKey = "AddressStateProv", FieldKey = "workorderregion", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.region" + SqlValueColumnName = "viewworkorder.region" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -441,7 +441,7 @@ namespace AyaNova.DataList TKey = "AddressCountry", FieldKey = "workordercountry", UiFieldDataType = (int)UiFieldDataType.Text, - SqlValueColumnName = "aworkorder.country" + SqlValueColumnName = "viewworkorder.country" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -449,7 +449,7 @@ namespace AyaNova.DataList TKey = "AddressLatitude", FieldKey = "workorderlatitude", UiFieldDataType = (int)UiFieldDataType.Decimal, - SqlValueColumnName = "aworkorder.latitude" + SqlValueColumnName = "viewworkorder.latitude" }); FieldDefinitions.Add(new DataListFieldDefinition @@ -457,36 +457,42 @@ namespace AyaNova.DataList TKey = "AddressLongitude", FieldKey = "workorderlongitude", UiFieldDataType = (int)UiFieldDataType.Decimal, - SqlValueColumnName = "aworkorder.longitude" + SqlValueColumnName = "viewworkorder.longitude" }); - - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCloseByDate", FieldKey = "WorkOrderCloseByDate", UiFieldDataType = (int)UiFieldDataType.DateTime, - SqlValueColumnName = "aworkorder.closebydate" + SqlValueColumnName = "viewworkorder.closebydate" + }); + + FieldDefinitions.Add(new DataListFieldDefinition + { + TKey = "WorkOrderAge", + FieldKey = "WorkOrderAge", + UiFieldDataType = (int)UiFieldDataType.TimeSpan, + SqlValueColumnName = "expwoage" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom1", FieldKey = "workordercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom2", FieldKey = "workordercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom3", FieldKey = "workordercustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom4", FieldKey = "workordercustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom5", FieldKey = "workordercustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom6", FieldKey = "workordercustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom7", FieldKey = "workordercustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom8", FieldKey = "workordercustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom9", FieldKey = "workordercustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom10", FieldKey = "workordercustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom11", FieldKey = "workordercustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom12", FieldKey = "workordercustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom13", FieldKey = "workordercustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom14", FieldKey = "workordercustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom15", FieldKey = "workordercustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); - FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom16", FieldKey = "workordercustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom1", FieldKey = "workordercustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom2", FieldKey = "workordercustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom3", FieldKey = "workordercustom3", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom4", FieldKey = "workordercustom4", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom5", FieldKey = "workordercustom5", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom6", FieldKey = "workordercustom6", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom7", FieldKey = "workordercustom7", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom8", FieldKey = "workordercustom8", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom9", FieldKey = "workordercustom9", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom10", FieldKey = "workordercustom10", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom11", FieldKey = "workordercustom11", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom12", FieldKey = "workordercustom12", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom13", FieldKey = "workordercustom13", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom14", FieldKey = "workordercustom14", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom15", FieldKey = "workordercustom15", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); + FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderCustom16", FieldKey = "workordercustom16", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "viewworkorder.customfields", TKeySection = "WorkOrder" }); diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs index 2fc67b46..540d1405 100644 --- a/server/AyaNova/util/AySchema.cs +++ b/server/AyaNova/util/AySchema.cs @@ -22,16 +22,16 @@ namespace AyaNova.Util //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!! private const int DESIRED_SCHEMA_LEVEL = 1; - internal const long EXPECTED_COLUMN_COUNT = 963; + internal const long EXPECTED_COLUMN_COUNT = 1000; internal const long EXPECTED_INDEX_COUNT = 138; internal const long EXPECTED_CHECK_CONSTRAINTS = 416; internal const long EXPECTED_FOREIGN_KEY_CONSTRAINTS = 118; - internal const long EXPECTED_VIEWS = 6; + internal const long EXPECTED_VIEWS = 7; internal const long EXPECTED_ROUTINES = 2; //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!! - ///////////////////////////////////////////////////////////////// C963:I138:CC416:FC118:V6:R2 + ///////////////////////////////////////////////////////////////// C1000:I138:CC416:FC118:V7:R2 /* @@ -890,6 +890,10 @@ $BODY$ LANGUAGE PLPGSQL STABLE"); + "left outer join vpartsonordercommitted on (vpartinventorynow.partid = vpartsonordercommitted.partid and vpartinventorynow.partwarehouseid = vpartsonordercommitted.partwarehouseid)" + "left outer join vpartsonorder on (vpartinventorynow.partid = vpartsonorder.partid and vpartinventorynow.partwarehouseid = vpartsonorder.partwarehouseid)"); + + //VIEWWORKORDER - adds AGE expression column for datalist queries + await ExecQueryAsync("CREATE VIEW viewworkorder AS select aworkorder.*, AGE(timezone('UTC', now()), aworkorder.createddate) as expwoage from aworkorder"); + //---------- //WORKORDERTEMPLATE