From 940ce07da1a73b10a94d5b2dbde61327a3822e69 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 14 May 2021 22:47:10 +0000 Subject: [PATCH] --- server/AyaNova/biz/ContractBiz.cs | 108 +++++++++++++++--------------- 1 file changed, 55 insertions(+), 53 deletions(-) diff --git a/server/AyaNova/biz/ContractBiz.cs b/server/AyaNova/biz/ContractBiz.cs index f293d61c..f3ef20aa 100644 --- a/server/AyaNova/biz/ContractBiz.cs +++ b/server/AyaNova/biz/ContractBiz.cs @@ -322,29 +322,29 @@ MULTIPLE discount / markup ITEMS //PARTS if (proposedObj.ContractPartOverrideItems.Count > 0) { - List allTags = new List(); + //List allTags = new List(); for (int i = 0; i < proposedObj.ContractPartOverrideItems.Count; i++) { var item = proposedObj.ContractPartOverrideItems[i]; if (item.Tags.Count < 1) AddError(ApiErrorCode.VALIDATION_REQUIRED, $"ContractPartOverrideItems[{i}].Tags"); - else - { - //add to list, check for dupes - foreach (string s in item.Tags) - { - if (allTags.Contains(s)) - { - AddError(ApiErrorCode.VALIDATION_NOT_UNIQUE, $"ContractPartOverrideItems[{i}].Tags"); - break; - } - else - { - allTags.Add(s); - } - } - } + // else + // { + // //add to list, check for dupes + // foreach (string s in item.Tags) + // { + // if (allTags.Contains(s)) + // { + // AddError(ApiErrorCode.VALIDATION_NOT_UNIQUE, $"ContractPartOverrideItems[{i}].Tags"); + // break; + // } + // else + // { + // allTags.Add(s); + // } + // } + // } if (item.OverridePct == 0) AddError(ApiErrorCode.VALIDATION_REQUIRED, $"ContractPartOverrideItems[{i}].OverridePct"); @@ -353,29 +353,33 @@ MULTIPLE discount / markup ITEMS //SERVICE RATES if (proposedObj.ContractServiceRateOverrideItems.Count > 0) { - List allTags = new List(); + // List allTags = new List(); //check for overlapping dupes + //[NO DON"T CHECK FOR DUPES, OR AT LEAST NOT LIKE THIS, REMOVING FOR NOW] + //Not sure what the dupe intent was but it should be entirely duped, not just one tag in common as with this + + //Check for missing tags for (int i = 0; i < proposedObj.ContractServiceRateOverrideItems.Count; i++) { var item = proposedObj.ContractServiceRateOverrideItems[i]; if (item.Tags.Count < 1) AddError(ApiErrorCode.VALIDATION_REQUIRED, $"ContractServiceRateOverrideItems[{i}].Tags"); - else - { - //add to list, check for dupes - foreach (string s in item.Tags) - { - if (allTags.Contains(s)) - { - AddError(ApiErrorCode.VALIDATION_NOT_UNIQUE, $"ContractServiceRateOverrideItems[{i}].Tags"); - break; - } - else - { - allTags.Add(s); - } - } - } + // else + // { + // //add to list, check for dupes + // foreach (string s in item.Tags) + // { + // if (allTags.Contains(s)) + // { + // AddError(ApiErrorCode.VALIDATION_NOT_UNIQUE, $"ContractServiceRateOverrideItems[{i}].Tags"); + // break; + // } + // else + // { + // allTags.Add(s); + // } + // } + // } if (item.OverridePct == 0) AddError(ApiErrorCode.VALIDATION_REQUIRED, $"ContractServiceRateOverrideItems[{i}].OverridePct"); @@ -385,29 +389,27 @@ MULTIPLE discount / markup ITEMS //TRAVEL RATES if (proposedObj.ContractTravelRateOverrideItems.Count > 0) { - List allTags = new List(); - //check for overlapping dupes - for (int i = 0; i < proposedObj.ContractTravelRateOverrideItems.Count; i++) + for (int i = 0; i < proposedObj.ContractTravelRateOverrideItems.Count; i++) { var item = proposedObj.ContractTravelRateOverrideItems[i]; if (item.Tags.Count < 1) AddError(ApiErrorCode.VALIDATION_REQUIRED, $"ContractTravelRateOverrideItems[{i}].Tags"); - else - { - //add to list, check for dupes - foreach (string s in item.Tags) - { - if (allTags.Contains(s)) - { - AddError(ApiErrorCode.VALIDATION_NOT_UNIQUE, $"ContractTravelRateOverrideItems[{i}].Tags"); - break; - } - else - { - allTags.Add(s); - } - } - } + // else + // { + // //add to list, check for dupes + // foreach (string s in item.Tags) + // { + // if (allTags.Contains(s)) + // { + // AddError(ApiErrorCode.VALIDATION_NOT_UNIQUE, $"ContractTravelRateOverrideItems[{i}].Tags"); + // break; + // } + // else + // { + // allTags.Add(s); + // } + // } + // } if (item.OverridePct == 0) AddError(ApiErrorCode.VALIDATION_REQUIRED, $"ContractTravelRateOverrideItems[{i}].OverridePct");