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-14 22:47:10 +00:00
parent 33ff117578
commit 940ce07da1
1 changed files with 55 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
server/AyaNova/biz/ContractBiz.cs
View File

@@ -322,29 +322,29 @@ MULTIPLE discount / markup ITEMS
//PARTS //PARTS
if (proposedObj.ContractPartOverrideItems.Count > 0) if (proposedObj.ContractPartOverrideItems.Count > 0)
{ {
List<string> allTags = new List<string>(); //List<string> allTags = new List<string>();
for (int i = 0; i < proposedObj.ContractPartOverrideItems.Count; i++) for (int i = 0; i < proposedObj.ContractPartOverrideItems.Count; i++)
{ {
var item = proposedObj.ContractPartOverrideItems[i]; var item = proposedObj.ContractPartOverrideItems[i];
if (item.Tags.Count < 1) if (item.Tags.Count < 1)
AddError(ApiErrorCode.VALIDATION_REQUIRED, $"ContractPartOverrideItems[{i}].Tags"); AddError(ApiErrorCode.VALIDATION_REQUIRED, $"ContractPartOverrideItems[{i}].Tags");
else // else
{ // {
//add to list, check for dupes // //add to list, check for dupes
foreach (string s in item.Tags) // foreach (string s in item.Tags)
{ // {
if (allTags.Contains(s)) // if (allTags.Contains(s))
{ // {
AddError(ApiErrorCode.VALIDATION_NOT_UNIQUE, $"ContractPartOverrideItems[{i}].Tags"); // AddError(ApiErrorCode.VALIDATION_NOT_UNIQUE, $"ContractPartOverrideItems[{i}].Tags");
break; // break;
} // }
else // else
{ // {
allTags.Add(s); // allTags.Add(s);
} // }
} // }
} // }
if (item.OverridePct == 0) if (item.OverridePct == 0)
AddError(ApiErrorCode.VALIDATION_REQUIRED, $"ContractPartOverrideItems[{i}].OverridePct"); AddError(ApiErrorCode.VALIDATION_REQUIRED, $"ContractPartOverrideItems[{i}].OverridePct");
@@ -353,29 +353,33 @@ MULTIPLE discount / markup ITEMS
//SERVICE RATES //SERVICE RATES
if (proposedObj.ContractServiceRateOverrideItems.Count > 0) if (proposedObj.ContractServiceRateOverrideItems.Count > 0)
{ {
List<string> allTags = new List<string>(); // List<string> allTags = new List<string>();
//check for overlapping dupes //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++) for (int i = 0; i < proposedObj.ContractServiceRateOverrideItems.Count; i++)
{ {
var item = proposedObj.ContractServiceRateOverrideItems[i]; var item = proposedObj.ContractServiceRateOverrideItems[i];
if (item.Tags.Count < 1) if (item.Tags.Count < 1)
AddError(ApiErrorCode.VALIDATION_REQUIRED, $"ContractServiceRateOverrideItems[{i}].Tags"); AddError(ApiErrorCode.VALIDATION_REQUIRED, $"ContractServiceRateOverrideItems[{i}].Tags");
else // else
{ // {
//add to list, check for dupes // //add to list, check for dupes
foreach (string s in item.Tags) // foreach (string s in item.Tags)
{ // {
if (allTags.Contains(s)) // if (allTags.Contains(s))
{ // {
AddError(ApiErrorCode.VALIDATION_NOT_UNIQUE, $"ContractServiceRateOverrideItems[{i}].Tags"); // AddError(ApiErrorCode.VALIDATION_NOT_UNIQUE, $"ContractServiceRateOverrideItems[{i}].Tags");
break; // break;
} // }
else // else
{ // {
allTags.Add(s); // allTags.Add(s);
} // }
} // }
} // }
if (item.OverridePct == 0) if (item.OverridePct == 0)
AddError(ApiErrorCode.VALIDATION_REQUIRED, $"ContractServiceRateOverrideItems[{i}].OverridePct"); AddError(ApiErrorCode.VALIDATION_REQUIRED, $"ContractServiceRateOverrideItems[{i}].OverridePct");
@@ -385,29 +389,27 @@ MULTIPLE discount / markup ITEMS
//TRAVEL RATES //TRAVEL RATES
if (proposedObj.ContractTravelRateOverrideItems.Count > 0) if (proposedObj.ContractTravelRateOverrideItems.Count > 0)
{ {
List<string> allTags = new List<string>(); for (int i = 0; i < proposedObj.ContractTravelRateOverrideItems.Count; i++)
//check for overlapping dupes
for (int i = 0; i < proposedObj.ContractTravelRateOverrideItems.Count; i++)
{ {
var item = proposedObj.ContractTravelRateOverrideItems[i]; var item = proposedObj.ContractTravelRateOverrideItems[i];
if (item.Tags.Count < 1) if (item.Tags.Count < 1)
AddError(ApiErrorCode.VALIDATION_REQUIRED, $"ContractTravelRateOverrideItems[{i}].Tags"); AddError(ApiErrorCode.VALIDATION_REQUIRED, $"ContractTravelRateOverrideItems[{i}].Tags");
else // else
{ // {
//add to list, check for dupes // //add to list, check for dupes
foreach (string s in item.Tags) // foreach (string s in item.Tags)
{ // {
if (allTags.Contains(s)) // if (allTags.Contains(s))
{ // {
AddError(ApiErrorCode.VALIDATION_NOT_UNIQUE, $"ContractTravelRateOverrideItems[{i}].Tags"); // AddError(ApiErrorCode.VALIDATION_NOT_UNIQUE, $"ContractTravelRateOverrideItems[{i}].Tags");
break; // break;
} // }
else // else
{ // {
allTags.Add(s); // allTags.Add(s);
} // }
} // }
} // }
if (item.OverridePct == 0) if (item.OverridePct == 0)
AddError(ApiErrorCode.VALIDATION_REQUIRED, $"ContractTravelRateOverrideItems[{i}].OverridePct"); AddError(ApiErrorCode.VALIDATION_REQUIRED, $"ContractTravelRateOverrideItems[{i}].OverridePct");