admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-09-19 19:32:33 +00:00
parent 6c4700029e
commit 5ddfe2abc7
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/AyaNova/Controllers/ScheduleController.cs
View File

@@ -135,6 +135,7 @@ namespace AyaNova.Api.Controllers
s.End = (DateTime)v.StopDate; s.End = (DateTime)v.StopDate;
s.Type = AyaType.WorkOrderItemScheduledUser; s.Type = AyaType.WorkOrderItemScheduledUser;
s.Name = NameFromWOItem(v, p); 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; return s;
} }
@@ -218,6 +219,7 @@ namespace AyaNova.Api.Controllers
public string TextColor { get; set; } public string TextColor { get; set; }
public AyaType Type { get; set; } public AyaType Type { get; set; }
public long Id { get; set; } public long Id { get; set; }
public bool Editable { get; set; }
} }

3
server/AyaNova/models/ViewSchedulePersonalWorkOrder.cs
View File

@@ -14,9 +14,12 @@ namespace AyaNova.Models
public long Serial { get; set; } public long Serial { get; set; }
public string CustomerName { get; set; } public string CustomerName { get; set; }
public string WorkOrderStatusColor { get; set; } public string WorkOrderStatusColor { get; set; }
public bool? WorkOrderStatusCompleted { get; set; }
public bool? WorkOrderStatusLocked { get; set; }
public string WorkOrderItemStatusColor { get; set; } public string WorkOrderItemStatusColor { get; set; }
public string WorkOrderItemPriorityColor { get; set; } public string WorkOrderItemPriorityColor { get; set; }
}//eoc }//eoc
}//eons }//eons

8
server/AyaNova/util/AySchema.cs
View File

@@ -22,7 +22,7 @@ namespace AyaNova.Util
//!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImportingAsync WHEN NEW TABLES ADDED!!!! //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImportingAsync WHEN NEW TABLES ADDED!!!!
private const int DESIRED_SCHEMA_LEVEL = 1; 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_INDEX_COUNT = 144;
internal const long EXPECTED_CHECK_CONSTRAINTS = 514; internal const long EXPECTED_CHECK_CONSTRAINTS = 514;
internal const long EXPECTED_FOREIGN_KEY_CONSTRAINTS = 192; 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!!!! //!!!!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.USERID AS SCHEDUSERID, "
+ "AWORKORDERITEMSCHEDULEDUSER.STARTDATE, " + "AWORKORDERITEMSCHEDULEDUSER.STARTDATE, "
+ "AWORKORDERITEMSCHEDULEDUSER.STOPDATE, " + "AWORKORDERITEMSCHEDULEDUSER.STOPDATE, "
+ "AWORKORDER.SERIAL, ACUSTOMER.NAME AS CUSTOMERNAME, " + "AWORKORDER.SERIAL, ACUSTOMER.NAME AS CUSTOMERNAME, "
+ "AWORKORDERSTATUS.COLOR AS WORKORDERSTATUSCOLOR, " + "AWORKORDERSTATUS.COLOR AS WORKORDERSTATUSCOLOR, "
+ "AWORKORDERSTATUS.COMPLETED AS WORKORDERSTATUSCOMPLETED, "
+ "AWORKORDERSTATUS.LOCKED AS WORKORDERSTATUSLOCKED, "
+ "AWORKORDERITEMSTATUS.COLOR AS WORKORDERITEMSTATUSCOLOR, " + "AWORKORDERITEMSTATUS.COLOR AS WORKORDERITEMSTATUSCOLOR, "
+ "AWORKORDERITEMPRIORITY.COLOR AS WORKORDERITEMPRIORITYCOLOR " + "AWORKORDERITEMPRIORITY.COLOR AS WORKORDERITEMPRIORITYCOLOR "
+ "FROM AWORKORDERITEMSCHEDULEDUSER " + "FROM AWORKORDERITEMSCHEDULEDUSER "