Config - Departments - in progress

This commit is contained in:
2019-12-04 13:59:00 +00:00
parent 15541b77aa
commit 114aa49535
90 changed files with 3430 additions and 660 deletions
@@ -59,7 +59,7 @@ namespace Sarand.PatientMgr.Win.Dbas.Mgr
}
SpmAdmissionData admissionData = null;
// Query data.
using (var dbConnection = db.CreateConnection())
using (var dbConnection = Database.CreateConnection())
using (var dbCommand = dbConnection.CreateCommand())
{
try
@@ -94,7 +94,7 @@ namespace Sarand.PatientMgr.Win.Dbas.Mgr
ClearErrorState();
if (!IsValidAdmissionData(admissionData)) return false;
if (SysId.IsValid(admissionData.Id)) return SetErrorState(ErrorMessage.ValiditemId);
using (var dbConnection = db.CreateConnection())
using (var dbConnection = Database.CreateConnection())
using (var dbCommand = dbConnection.CreateCommand())
{
try
@@ -105,7 +105,7 @@ namespace Sarand.PatientMgr.Win.Dbas.Mgr
if (SwmAdmissionData_Db.FieldsNonId.Contains("Id"))
{
// Generate next Id.
//dbAdmissionData._Id = SysId.ToInt(db.GetNextId("AdmissionData", dbUpdateInfo));
//dbAdmissionData._Id = SysId.ToInt(Database.GetNextId("AdmissionData", dbUpdateInfo));
}
dbAdmissionData.ExecuteInsertCommand(dbCommand);
//admissionData.Id = new SysId(dbAdmissionData._Id);
@@ -122,7 +122,7 @@ namespace Sarand.PatientMgr.Win.Dbas.Mgr
ClearErrorState();
if (!IsValidAdmissionData(admissionData)) return false;
if (!SysId.IsValid(admissionData.Id)) return SetErrorState(ErrorMessage.InvalidItemId);
using (var dbConnection = db.CreateConnection())
using (var dbConnection = Database.CreateConnection())
using (var dbCommand = dbConnection.CreateCommand())
{
try
@@ -158,7 +158,7 @@ namespace Sarand.PatientMgr.Win.Dbas.Mgr
{
ClearErrorState();
if (!AdmissionDataCanBeDeleted(admissionData)) return false;
using (var dbConnection = db.CreateConnection())
using (var dbConnection = Database.CreateConnection())
using (var dbCommand = dbConnection.CreateCommand())
{
try
@@ -360,7 +360,7 @@ namespace Sarand.PatientMgr.Win.Dbas.Mgr
private long GetAdmissionDataCount(String filter)
{
ClearErrorState();
return db.GetRowCount(SpmDbDfn.GetTableName(SpmDbDfn.TableIdx.SwmAdmissionData) + " As " + aliasAdmissionData, filter);
return Database.GetRowCount(SpmDbDfn.GetTableName(SpmDbDfn.TableIdx.SwmAdmissionData) + " As " + aliasAdmissionData, filter);
}
public override long GetAdmissionDataCount(SpmAdmissionData.Params prm)
{
@@ -373,12 +373,12 @@ namespace Sarand.PatientMgr.Win.Dbas.Mgr
public override List<SpmAdmissionData> GetAdmissionDataList(SpmAdmissionData.Params prm)
{
List<SpmAdmissionData> AdmissionDataes = new List<SpmAdmissionData>();
DbQuery qry = new DbQuery(db.DbmsType);
DbQuery qry = new DbQuery(Database.DbmsType);
qry.Tables.Add(SpmDbDfn.GetTableName(SpmDbDfn.TableIdx.SwmAdmissionData), aliasAdmissionData);
qry.Columns.AddRange(SwmAdmissionData_Db.Fields);
qry.Filters.AddRange(GetAdmissionDataQueryFilter(prm));
// Query data.
using (var dbConnection = db.CreateConnection())
using (var dbConnection = Database.CreateConnection())
using (var dbCommand = dbConnection.CreateCommand())
{
try
@@ -411,7 +411,7 @@ namespace Sarand.PatientMgr.Win.Dbas.Mgr
//---------------------------------------------------------------
// Construct query.
DbQuery query = new DbQuery(db.DbmsType);
DbQuery query = new DbQuery(Database.DbmsType);
query.Tables.Add(SpmDbDfn.GetTableName(SpmDbDfn.TableIdx.SwmAdmissionData), aliasAdmissionData);
// AdmissionData Properties - add columns as defined in query list.
@@ -446,8 +446,8 @@ namespace Sarand.PatientMgr.Win.Dbas.Mgr
}
//---------------------------------------------------------------
//return new DbResultSet_DataTableReader(db, query.BuildQuery());
return new Sarand.Win.Dbas.Data.DbResultSet_DataReader(db, query.BuildQuery());
//return new DbResultSet_DataTableReader(Database, query.BuildQuery());
return new Sarand.Win.Dbas.Data.DbResultSet_DataReader(Database, query.BuildQuery());
}
//-------------------------------------------------------------------
}