Rationalise business objects.
This commit is contained in:
@@ -17,12 +17,12 @@ using System.Linq;
|
||||
|
||||
namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
|
||||
{
|
||||
//=======================================================================
|
||||
// Asset manager - Asset Vehicles.
|
||||
//=======================================================================
|
||||
partial class SbmAssetMgr_Dbas
|
||||
{
|
||||
//*******************************************************************
|
||||
// V e h i c l e
|
||||
//*******************************************************************
|
||||
//-------------------------------------------------------------------
|
||||
// Utilities.
|
||||
private List<StringPair> GetLogProperties(SbmVehicle vehicle)
|
||||
{
|
||||
@@ -117,7 +117,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
|
||||
if (SaVehicle_Db.FieldsNonId.Contains("Id"))
|
||||
{
|
||||
// Generate next Id.
|
||||
dbVehicle._Id = SysId.ToInt(Database.GetNextId("Vehicle", dbUpdateInfo));
|
||||
dbVehicle._Id = SysId.ToInt(Database.GetNextId("SaVehicle", dbUpdateInfo));
|
||||
}
|
||||
dbVehicle.ExecuteInsertCommand(dbCommand);
|
||||
vehicle.Id = new SysId(dbVehicle._Id);
|
||||
@@ -667,32 +667,32 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
|
||||
// Vehicle Properties - add columns as defined in query list.
|
||||
query.Columns.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.SaVehicle_Id, aliasVehicle));
|
||||
query.Columns.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.SaVehicle_RegNumber, aliasVehicle));
|
||||
if (columns.HasId((int)SbmVehicle.Column.RegNumberPrev))
|
||||
if (columns.HasId(SbmVehicle.Column.RegNumberPrev))
|
||||
query.Columns.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.SaVehicle_RegNumberPrev, aliasVehicle));
|
||||
if (columns.HasId((int)SbmVehicle.Column.Vin))
|
||||
if (columns.HasId(SbmVehicle.Column.Vin))
|
||||
query.Columns.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.SaVehicle_VIN, aliasVehicle));
|
||||
if (columns.HasId((int)SbmVehicle.Column.CapCode))
|
||||
if (columns.HasId(SbmVehicle.Column.CapCode))
|
||||
query.Columns.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.SaVehicle_CapCode, aliasVehicle));
|
||||
if (columns.HasId((int)SbmVehicle.Column.KeyNumber))
|
||||
if (columns.HasId(SbmVehicle.Column.KeyNumber))
|
||||
query.Columns.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.SaVehicle_KeyNumber, aliasVehicle));
|
||||
if (columns.HasId((int)SbmVehicle.Column.KeyLocation))
|
||||
if (columns.HasId(SbmVehicle.Column.KeyLocation))
|
||||
query.Columns.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.SaVehicle_KeyLocation, aliasVehicle));
|
||||
|
||||
//---------------------------------------------------------------
|
||||
// Vehicle Category.
|
||||
bool hasVehicleClassCols = false;
|
||||
if (!hasVehicleClassCols) hasVehicleClassCols = columns.HasId((int)SbmVehicle.Column.VehicleClass_MakeCode);
|
||||
if (!hasVehicleClassCols) hasVehicleClassCols = columns.HasId((int)SbmVehicle.Column.VehicleClass_MakeDesc);
|
||||
if (!hasVehicleClassCols) hasVehicleClassCols = columns.HasId((int)SbmVehicle.Column.VehicleClass_Model);
|
||||
if (!hasVehicleClassCols) hasVehicleClassCols = columns.HasId((int)SbmVehicle.Column.VehicleClass_Derivative);
|
||||
if (!hasVehicleClassCols) hasVehicleClassCols = columns.HasId((int)SbmVehicle.Column.VehicleClass_DescBrief);
|
||||
if (!hasVehicleClassCols) hasVehicleClassCols = columns.HasId((int)SbmVehicle.Column.VehicleClass_Type);
|
||||
if (!hasVehicleClassCols) hasVehicleClassCols = columns.HasId((int)SbmVehicle.Column.VehicleClass_TypeDesc);
|
||||
if (!hasVehicleClassCols) hasVehicleClassCols = columns.HasId((int)SbmVehicle.Column.VehicleClass_CategoryCode);
|
||||
if (!hasVehicleClassCols) hasVehicleClassCols = columns.HasId((int)SbmVehicle.Column.VehicleClass_CategoryDesc);
|
||||
if (!hasVehicleClassCols) hasVehicleClassCols = columns.HasId((int)SbmVehicle.Column.VehicleClass_FuelTypeDesc);
|
||||
if (!hasVehicleClassCols) hasVehicleClassCols = columns.HasId((int)SbmVehicle.Column.VehicleClass_OdometerUnitsDesc);
|
||||
if (!hasVehicleClassCols) hasVehicleClassCols = columns.HasId((int)SbmVehicle.Column.VehicleClass_Notes);
|
||||
if (!hasVehicleClassCols) hasVehicleClassCols = columns.HasId(SbmVehicle.Column.VehicleClass_MakeCode);
|
||||
if (!hasVehicleClassCols) hasVehicleClassCols = columns.HasId(SbmVehicle.Column.VehicleClass_MakeDesc);
|
||||
if (!hasVehicleClassCols) hasVehicleClassCols = columns.HasId(SbmVehicle.Column.VehicleClass_Model);
|
||||
if (!hasVehicleClassCols) hasVehicleClassCols = columns.HasId(SbmVehicle.Column.VehicleClass_Derivative);
|
||||
if (!hasVehicleClassCols) hasVehicleClassCols = columns.HasId(SbmVehicle.Column.VehicleClass_DescBrief);
|
||||
if (!hasVehicleClassCols) hasVehicleClassCols = columns.HasId(SbmVehicle.Column.VehicleClass_Type);
|
||||
if (!hasVehicleClassCols) hasVehicleClassCols = columns.HasId(SbmVehicle.Column.VehicleClass_TypeDesc);
|
||||
if (!hasVehicleClassCols) hasVehicleClassCols = columns.HasId(SbmVehicle.Column.VehicleClass_CategoryCode);
|
||||
if (!hasVehicleClassCols) hasVehicleClassCols = columns.HasId(SbmVehicle.Column.VehicleClass_CategoryDesc);
|
||||
if (!hasVehicleClassCols) hasVehicleClassCols = columns.HasId(SbmVehicle.Column.VehicleClass_FuelTypeDesc);
|
||||
if (!hasVehicleClassCols) hasVehicleClassCols = columns.HasId(SbmVehicle.Column.VehicleClass_OdometerUnitsDesc);
|
||||
if (!hasVehicleClassCols) hasVehicleClassCols = columns.HasId(SbmVehicle.Column.VehicleClass_Notes);
|
||||
if (hasVehicleClassCols)
|
||||
{
|
||||
DbQueryJoin joinVehCat = new DbQueryJoin(DbJoinType.LeftOuter);
|
||||
@@ -703,13 +703,13 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
|
||||
List<SbmDbDfn.ColumnIdx> dbColumns = new List<SbmDbDfn.ColumnIdx>();
|
||||
dbColumns.Add(SbmDbDfn.ColumnIdx.SaVehicleClass_MakeCode);
|
||||
dbColumns.Add(SbmDbDfn.ColumnIdx.SaVehicleClass_Model);
|
||||
if (columns.HasId((int)SbmVehicle.Column.VehicleClass_Derivative)) dbColumns.Add(SbmDbDfn.ColumnIdx.SaVehicleClass_Derivative);
|
||||
if (columns.HasId((int)SbmVehicle.Column.VehicleClass_DescBrief)) dbColumns.Add(SbmDbDfn.ColumnIdx.SaVehicleClass_DescBrief);
|
||||
if (columns.HasId(SbmVehicle.Column.VehicleClass_Derivative)) dbColumns.Add(SbmDbDfn.ColumnIdx.SaVehicleClass_Derivative);
|
||||
if (columns.HasId(SbmVehicle.Column.VehicleClass_DescBrief)) dbColumns.Add(SbmDbDfn.ColumnIdx.SaVehicleClass_DescBrief);
|
||||
dbColumns.Add(SbmDbDfn.ColumnIdx.SaVehicleClass_VehicleType);
|
||||
dbColumns.Add(SbmDbDfn.ColumnIdx.SaVehicleClass_VehicleCategoryCode);
|
||||
if (columns.HasId((int)SbmVehicle.Column.VehicleClass_FuelTypeDesc)) dbColumns.Add(SbmDbDfn.ColumnIdx.SaVehicleClass_FuelType);
|
||||
if (columns.HasId((int)SbmVehicle.Column.VehicleClass_OdometerUnitsDesc)) dbColumns.Add(SbmDbDfn.ColumnIdx.SaVehicleClass_OdometerUnits);
|
||||
if (columns.HasId((int)SbmVehicle.Column.VehicleClass_Notes)) dbColumns.Add(SbmDbDfn.ColumnIdx.SaVehicleClass_Notes);
|
||||
if (columns.HasId(SbmVehicle.Column.VehicleClass_FuelTypeDesc)) dbColumns.Add(SbmDbDfn.ColumnIdx.SaVehicleClass_FuelType);
|
||||
if (columns.HasId(SbmVehicle.Column.VehicleClass_OdometerUnitsDesc)) dbColumns.Add(SbmDbDfn.ColumnIdx.SaVehicleClass_OdometerUnits);
|
||||
if (columns.HasId(SbmVehicle.Column.VehicleClass_Notes)) dbColumns.Add(SbmDbDfn.ColumnIdx.SaVehicleClass_Notes);
|
||||
dbColumns.Add(SbmDbDfn.ColumnIdx.SaVehicleClass_Flags);
|
||||
foreach (SbmDbDfn.ColumnIdx dbColumn in dbColumns)
|
||||
query.Columns.Add(SbmDbDfn.GetColumnNameQual(dbColumn, aliasVehicle_VehicleClass), prefixVehicle_VehicleClass + SbmDbDfn.GetColumnName(dbColumn, false));
|
||||
@@ -719,7 +719,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
|
||||
// Event count.
|
||||
if (Database.TableExists(SbmDbDfn.GetTableName(SbmDbDfn.TableIdx.SaVehicleEvent)))
|
||||
{
|
||||
bool countVehicles = columns.HasId((int)SbmVehicle.Column.EventCount);
|
||||
bool countVehicles = columns.HasId(SbmVehicle.Column.EventCount);
|
||||
if (countVehicles)
|
||||
{
|
||||
// Build sub query to directly return the number of associated Events:
|
||||
@@ -733,7 +733,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
|
||||
}
|
||||
//---------------------------------------------------------------
|
||||
// Feature count.
|
||||
bool bCountFeatures = columns.HasId((int)SbmVehicle.Column.FeatureCount);
|
||||
bool bCountFeatures = columns.HasId(SbmVehicle.Column.FeatureCount);
|
||||
if (bCountFeatures)
|
||||
{
|
||||
if (Database.TableExists(SbmDbDfn.GetTableName(SbmDbDfn.TableIdx.SaVehicleFeature)))
|
||||
@@ -750,7 +750,7 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
|
||||
|
||||
//---------------------------------------------------------------
|
||||
// HpiCheck count.
|
||||
bool bCountHpiChecks = columns.HasId((int)SbmVehicle.Column.HpiCheckCount);
|
||||
bool bCountHpiChecks = columns.HasId(SbmVehicle.Column.HpiCheckCount);
|
||||
if (bCountHpiChecks)
|
||||
{
|
||||
SaItemDataConsole itemDataConsole = Internals.ItemDataConsole;
|
||||
@@ -769,15 +769,15 @@ namespace Sarand.BusinessMgr.Net.Standard.Dbas.Mgr
|
||||
}
|
||||
}
|
||||
// Common Properties
|
||||
if (columns.HasId((int)SbmVehicle.Column.Notes))
|
||||
if (columns.HasId(SbmVehicle.Column.Notes))
|
||||
query.Columns.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.SaVehicle_Notes, aliasVehicle));
|
||||
if (columns.HasId((int)SbmVehicle.Column.Flag))
|
||||
if (columns.HasId(SbmVehicle.Column.Flag))
|
||||
query.Columns.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.SaVehicle_Flags, aliasVehicle));
|
||||
if (columns.HasId((int)SbmVehicle.Column.Status) || columns.HasId((int)SbmVehicle.Column.Status_Desc) || columns.HasId((int)SbmVehicle.Column.Status_Ind))
|
||||
if (columns.HasId(SbmVehicle.Column.Status) || columns.HasId(SbmVehicle.Column.Status_Desc) || columns.HasId(SbmVehicle.Column.Status_Ind))
|
||||
query.Columns.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.SaVehicle_Status, aliasVehicle));
|
||||
if (columns.HasId((int)SbmVehicle.Column.CreateOn_Date))
|
||||
if (columns.HasId(SbmVehicle.Column.CreateOn_Date))
|
||||
query.Columns.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.SaVehicle_CreateOn, aliasVehicle));
|
||||
if (columns.HasId((int)SbmVehicle.Column.UpdateOn_Date))
|
||||
if (columns.HasId(SbmVehicle.Column.UpdateOn_Date))
|
||||
query.Columns.Add(SbmDbDfn.GetColumnNameQual(SbmDbDfn.ColumnIdx.SaVehicle_UpdateOn, aliasVehicle));
|
||||
|
||||
//---------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user