From 3ec648da97e8fbe47c62867871916c538fd5ba07 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 3 May 2021 18:52:35 +0000 Subject: [PATCH] --- server/AyaNova/biz/FormFieldReference.cs | 14 +++++++++----- server/AyaNova/biz/WorkOrderBiz.cs | 7 +++++++ 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/server/AyaNova/biz/FormFieldReference.cs b/server/AyaNova/biz/FormFieldReference.cs index daadb486..fb93cdbd 100644 --- a/server/AyaNova/biz/FormFieldReference.cs +++ b/server/AyaNova/biz/FormFieldReference.cs @@ -858,11 +858,11 @@ namespace AyaNova.Biz //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 = "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 = "Wiki", FieldKey = "WorkOrderItemWiki", TKeySection = "WorkOrderItem" }); l.Add(new FormField { TKey = "Attachments", FieldKey = "WorkOrderItemAttachments", TKeySection = "WorkOrderItem" }); @@ -1003,7 +1003,10 @@ namespace AyaNova.Biz public string TKeySection { get; set; } //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 public bool IsCustomField { get; set; } @@ -1012,7 +1015,8 @@ namespace AyaNova.Biz public FormField() { //most common defaults - // Hideable = true; + Hideable = true; + Requireable = true; IsCustomField = false; } }//eoc diff --git a/server/AyaNova/biz/WorkOrderBiz.cs b/server/AyaNova/biz/WorkOrderBiz.cs index 1c739515..098c295a 100644 --- a/server/AyaNova/biz/WorkOrderBiz.cs +++ b/server/AyaNova/biz/WorkOrderBiz.cs @@ -1140,6 +1140,13 @@ namespace AyaNova.Biz 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 // if (proposedObj.Notes.Contains("blah"))