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-05-03 18:52:35 +00:00
parent aa5119670c
commit 3ec648da97
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/AyaNova/biz/FormFieldReference.cs
View File

@@ -858,11 +858,11 @@ namespace AyaNova.Biz
//WORKORDER ITEM //WORKORDER ITEM
//required not hideable
//l.Add(new FormField { TKey = "WorkOrderItemSummary", FieldKey = "WorkOrderItemSummary", TKeySection = "WorkOrderItem", Hideable = false }); l.Add(new FormField { TKey = "WorkOrderItemSummary", FieldKey = "WorkOrderItemSummary", TKeySection = "WorkOrderItem", Hideable = false });
l.Add(new FormField { TKey = "Sequence", FieldKey = "WorkOrderItemSequence", TKeySection = "WorkOrderItem" }); l.Add(new FormField { TKey = "Sequence", FieldKey = "WorkOrderItemSequence", TKeySection = "WorkOrderItem" });
l.Add(new FormField { TKey = "WorkOrderItemTechNotes", FieldKey = "WorkOrderItemTechNotes", TKeySection = "WorkOrderItem" }); l.Add(new FormField { TKey = "WorkOrderItemTechNotes", FieldKey = "WorkOrderItemTechNotes", TKeySection = "WorkOrderItem" });
l.Add(new FormField { TKey = "WorkOrderItemScheduledUserList", FieldKey = "WorkOrderItemScheduledUserList", TKeySection = "WorkOrderItem" }); l.Add(new FormField { TKey = "WorkOrderItemScheduledUserList", FieldKey = "WorkOrderItemScheduledUserList", TKeySection = "WorkOrderItem", Requireable=false });
l.Add(new FormField { TKey = "Tags", FieldKey = "WorkOrderItemTags", TKeySection = "WorkOrderItem" }); l.Add(new FormField { TKey = "Tags", FieldKey = "WorkOrderItemTags", TKeySection = "WorkOrderItem" });
l.Add(new FormField { TKey = "Wiki", FieldKey = "WorkOrderItemWiki", TKeySection = "WorkOrderItem" }); l.Add(new FormField { TKey = "Wiki", FieldKey = "WorkOrderItemWiki", TKeySection = "WorkOrderItem" });
l.Add(new FormField { TKey = "Attachments", FieldKey = "WorkOrderItemAttachments", TKeySection = "WorkOrderItem" }); l.Add(new FormField { TKey = "Attachments", FieldKey = "WorkOrderItemAttachments", TKeySection = "WorkOrderItem" });
@@ -1003,7 +1003,10 @@ namespace AyaNova.Biz
public string TKeySection { get; set; } public string TKeySection { get; set; }
//CLIENT form customization //CLIENT form customization
// public bool Hideable { get; set; } public bool Hideable { get; set; }
//CLIENT form customization
public bool Requireable { get; set; }
//CLIENT / SERVER - client display server validation purposes //CLIENT / SERVER - client display server validation purposes
public bool IsCustomField { get; set; } public bool IsCustomField { get; set; }
@@ -1012,7 +1015,8 @@ namespace AyaNova.Biz
public FormField() public FormField()
{ {
//most common defaults //most common defaults
// Hideable = true; Hideable = true;
Requireable = true;
IsCustomField = false; IsCustomField = false;
} }
}//eoc }//eoc

7
server/AyaNova/biz/WorkOrderBiz.cs
View File

@@ -1140,6 +1140,13 @@ namespace AyaNova.Biz
AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "WorkOrderId"); AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "WorkOrderId");
} }
//summary is required now, this is a change from v7
//I did this because it is required in terms of hiding on the form so it also
//is required to have a value. This is really because the form field customization I took away the hideable field
//maybe I should add that feature back?
if (proposedObj.WorkOrderId == 0)
AddError(ApiErrorCode.VALIDATION_REQUIRED, "WorkOrderId");
// // //TEST TEST TEST // // //TEST TEST TEST
// if (proposedObj.Notes.Contains("blah")) // if (proposedObj.Notes.Contains("blah"))