diff --git a/server/AyaNova/Controllers/ScheduleController.cs b/server/AyaNova/Controllers/ScheduleController.cs index 776efde2..e4404523 100644 --- a/server/AyaNova/Controllers/ScheduleController.cs +++ b/server/AyaNova/Controllers/ScheduleController.cs @@ -135,6 +135,7 @@ namespace AyaNova.Api.Controllers s.End = (DateTime)v.StopDate; s.Type = AyaType.WorkOrderItemScheduledUser; s.Name = NameFromWOItem(v, p); + s.Editable = v.WorkOrderStatusCompleted != true && v.WorkOrderStatusLocked != true;//could be null as well which we'll consider open as it's no status set return s; } @@ -218,6 +219,7 @@ namespace AyaNova.Api.Controllers public string TextColor { get; set; } public AyaType Type { get; set; } public long Id { get; set; } + public bool Editable { get; set; } } diff --git a/server/AyaNova/models/ViewSchedulePersonalWorkOrder.cs b/server/AyaNova/models/ViewSchedulePersonalWorkOrder.cs index b54366f8..1cda0fa1 100644 --- a/server/AyaNova/models/ViewSchedulePersonalWorkOrder.cs +++ b/server/AyaNova/models/ViewSchedulePersonalWorkOrder.cs @@ -14,9 +14,12 @@ namespace AyaNova.Models public long Serial { get; set; } public string CustomerName { get; set; } public string WorkOrderStatusColor { get; set; } + public bool? WorkOrderStatusCompleted { get; set; } + public bool? WorkOrderStatusLocked { get; set; } public string WorkOrderItemStatusColor { get; set; } public string WorkOrderItemPriorityColor { get; set; } + }//eoc }//eons diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs index e6c1ef34..648231b2 100644 --- a/server/AyaNova/util/AySchema.cs +++ b/server/AyaNova/util/AySchema.cs @@ -22,7 +22,7 @@ namespace AyaNova.Util //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImportingAsync WHEN NEW TABLES ADDED!!!! private const int DESIRED_SCHEMA_LEVEL = 1; - internal const long EXPECTED_COLUMN_COUNT = 1271; + internal const long EXPECTED_COLUMN_COUNT = 1273; internal const long EXPECTED_INDEX_COUNT = 144; internal const long EXPECTED_CHECK_CONSTRAINTS = 514; internal const long EXPECTED_FOREIGN_KEY_CONSTRAINTS = 192; @@ -31,7 +31,7 @@ namespace AyaNova.Util //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImportingAsync WHEN NEW TABLES ADDED!!!! - ///////////////////////////////////////////////////////////////// C1271:I144:CC514:FC192:V10:R2 + ///////////////////////////////////////////////////////////////// C1273:I144:CC514:FC192:V10:R2 /* @@ -1200,8 +1200,10 @@ $BODY$ LANGUAGE PLPGSQL STABLE"); + "AWORKORDERITEMSCHEDULEDUSER.USERID AS SCHEDUSERID, " + "AWORKORDERITEMSCHEDULEDUSER.STARTDATE, " + "AWORKORDERITEMSCHEDULEDUSER.STOPDATE, " - + "AWORKORDER.SERIAL, ACUSTOMER.NAME AS CUSTOMERNAME, " + + "AWORKORDER.SERIAL, ACUSTOMER.NAME AS CUSTOMERNAME, " + "AWORKORDERSTATUS.COLOR AS WORKORDERSTATUSCOLOR, " + + "AWORKORDERSTATUS.COMPLETED AS WORKORDERSTATUSCOMPLETED, " + + "AWORKORDERSTATUS.LOCKED AS WORKORDERSTATUSLOCKED, " + "AWORKORDERITEMSTATUS.COLOR AS WORKORDERITEMSTATUSCOLOR, " + "AWORKORDERITEMPRIORITY.COLOR AS WORKORDERITEMPRIORITYCOLOR " + "FROM AWORKORDERITEMSCHEDULEDUSER "