3.0.1.9 Portal styling. Interfaces controller/model.
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
using Sarand.BusinessMgr.Net.Standard.Base.App;
|
||||
using Sarand.BusinessMgr.Net.Standard.Base.Core;
|
||||
using Sarand.Net.Standard.Base.Bus;
|
||||
using Sarand.Net.Standard.Base.Core;
|
||||
using Sarand.Net.Standard.Base.Utils;
|
||||
@@ -550,10 +549,13 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Bus
|
||||
}
|
||||
|
||||
// Association type.
|
||||
public static bool TypeIsValid(Sbm.AssociationType associationType)
|
||||
{
|
||||
return (associationType > 0);
|
||||
}
|
||||
public bool TypeIsValid()
|
||||
{
|
||||
if (AssociationType > 0) return true;
|
||||
return false;
|
||||
return TypeIsValid(AssociationType);
|
||||
}
|
||||
public bool IsOfType(Sbm.AssociationType associationType)
|
||||
{
|
||||
|
||||
@@ -1870,7 +1870,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Bus
|
||||
if (IdsIncluded.Count > 0) values.Add("Included commodities", IdsIncluded.Count.ToString());
|
||||
if (IdsExcluded.Count > 0) values.Add("Excluded commodities", IdsExcluded.Count.ToString());
|
||||
// Commodity type.
|
||||
if (CommodityType > 0) values.Add("Type", SbmSystem.GetSystemCodes(Sbm.SystemCode.CommodityType).GetDescForType(CommodityType, CommodityType.ToString()));
|
||||
if (CommodityType > 0) values.Add("Type", SbmSystem.GetSystemCodes(Sbm.ApplicationCode.CommodityType).GetDescForType(CommodityType, CommodityType.ToString()));
|
||||
else if (CommodityType == Sbm.CommodityType.AnyProduct) values.Add("Type", "Any product");
|
||||
if (StockItemsOnly) values.Add("Stock items only", "True");
|
||||
// Commodity code.
|
||||
|
||||
@@ -284,7 +284,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Bus
|
||||
PurchaseCostsPopulated = true;
|
||||
int decimalsPercent = 2;
|
||||
|
||||
List<TypeCodeDesc> ItemLinkDataTypes = SbmSystem.GetSystemCodes(Sbm.SystemCode.ItemLinkData);
|
||||
List<TypeCodeDesc> ItemLinkDataTypes = SbmSystem.GetSystemCodes(Sbm.ApplicationCode.ItemLinkData);
|
||||
String dataTypeCostProportion = ItemLinkDataTypes.GetCodeForType(Sbm.ItemLinkData.Requirement_AssocItem_PurchaseCostProportion);
|
||||
if (itemLinks == null)
|
||||
{
|
||||
|
||||
@@ -1,15 +1,11 @@
|
||||
using Sarand.BusinessMgr.Net.Standard.Base.App;
|
||||
using Sarand.BusinessMgr.Net.Standard.Base.Consoles;
|
||||
using Sarand.BusinessMgr.Net.Standard.Base.Core;
|
||||
using Sarand.Net.Standard.Base.Bus;
|
||||
using Sarand.Net.Standard.Base.Core;
|
||||
using Sarand.Net.Standard.Base.Dbas;
|
||||
using Sarand.Net.Standard.Base.Utils;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Transactions;
|
||||
|
||||
namespace Sarand.BusinessMgr.Net.Standard.Base.Bus
|
||||
{
|
||||
@@ -801,7 +797,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Bus
|
||||
public static List<TypeCodeDesc> GetTransactionStatusCats(Sbm.TransactionType transactionType)
|
||||
{
|
||||
List<TypeCodeDesc> statusCats = new List<TypeCodeDesc>();
|
||||
List<TypeCodeDesc> statusCatsFull = SbmSystem.GetSystemCodes(Sbm.SystemCode.TransactionStatusCat);
|
||||
List<TypeCodeDesc> statusCatsFull = SbmSystem.GetSystemCodes(Sbm.ApplicationCode.TransactionStatusCat);
|
||||
switch (transactionType)
|
||||
{
|
||||
// NB Changes here may also need to be made in GetTaxEffectiveDate()
|
||||
@@ -1023,7 +1019,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Bus
|
||||
bool updateRequired = true;
|
||||
if (messageConsole != null)
|
||||
{
|
||||
String transactionType = SbmSystem.GetSystemCodes(Sbm.SystemCode.TransactionStatusCat).GetDescForType(TransactionType);
|
||||
String transactionType = SbmSystem.GetSystemCodes(Sbm.ApplicationCode.TransactionStatusCat).GetDescForType(TransactionType);
|
||||
if (StringUtil.IsEmpty(transactionType)) transactionType = "Transaction";
|
||||
String message =
|
||||
"The earliest 'Required' date against unclosed\nrequirements for this " + transactionType + " is " +
|
||||
@@ -1060,7 +1056,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Bus
|
||||
bool completeTransaction = true;
|
||||
if (messageConsole != null)
|
||||
{
|
||||
String transactionType = SbmSystem.GetSystemCodes(Sbm.SystemCode.TransactionStatusCat).GetDescForType(TransactionType);
|
||||
String transactionType = SbmSystem.GetSystemCodes(Sbm.ApplicationCode.TransactionStatusCat).GetDescForType(TransactionType);
|
||||
if (StringUtil.IsEmpty(transactionType)) transactionType = "Transaction";
|
||||
String message =
|
||||
"All of the requirements against this " + transactionType + "\nhave been completed.\n\nSet the status to 'Completed'?";
|
||||
@@ -1651,6 +1647,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Base.Bus
|
||||
// Test each 'significant' element of the filter and return 'false' if any of the values are set.
|
||||
// NB Elements without a test in the list below are not regarded as 'significant'.
|
||||
if (ForceFullResults) return false;
|
||||
if (ResultsPaging.Paged) return false;
|
||||
if (IdsIncluded.Count > 0) return false;
|
||||
if (SysId.IsValid(TransIdSource)) return false;
|
||||
if (StatusCat == StatusCat.Pending || StatusCat == StatusCat.Open) return false;
|
||||
|
||||
Reference in New Issue
Block a user