michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

User.UserNumber and BenchPath.StopFBValve introduced and used, database 2.4

Browse Source
This commit is contained in:
Milan Hanajik
2016-03-18 12:44:25 +08:00
parent b006e36d52
commit 0c2c9bb1e2
8 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Config/Entities/User.cs
+11
View File
@@ -14,6 +14,7 @@ namespace Config.Entities
{
public virtual int Id { get; protected set; }
public virtual string Name { get; set; }
public virtual int Number { get; set; }
public virtual string Password { get; set; }
public virtual string Description { get; set; }
public virtual DateTime LastPwChange { get; set; }
@@ -37,6 +38,16 @@ namespace Config.Entities
{
this.powerUser = true;
Name = name;
Number = 0;
Groups = new List<Group>();
Description = "Power user";
}
public User(string name, int number)
{
this.powerUser = true;
Name = name;
Number = number;
Groups = new List<Group>();
Description = "Power user";
}
Config/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.4.247.0")]
[assembly: AssemblyFileVersion("2.4.247.0")]
[assembly: AssemblyVersion("2.5.250.0")]
[assembly: AssemblyFileVersion("2.5.250.0")]
Results/BatchResults.cs
+2 -1
View File
@@ -27,7 +27,7 @@ namespace Results
public Batch Batch;
public WaterMeter[] WaterMeters;
public static BatchResults NewFromProcedure(int batchNr, int benchId, string user, string programVer,
public static BatchResults NewFromProcedure(int batchNr, int benchId, string user, int userNr, string programVer,
Config.Entities.Procedure procedure,
WaterMeterData[] waterMeterDatas, int[] waterMeterParts)
{
@@ -40,6 +40,7 @@ namespace Results
BatchNr = batchNr,
ProgramVersion = programVer,
UserName = user,
UserNumber = userNr,
ProcedureName = procedure.Name,
ProcedureDescription = procedure.Description,
WatermetersStr = procedure.Watermeters,
Results/Entities/Batch.cs
+1
View File
@@ -13,6 +13,7 @@ namespace Results.Entities
public virtual int TestBenchId { get; set; }
public virtual string ProgramVersion { get; set; }
public virtual string UserName { get; set; }
public virtual int UserNumber { get; set; }
public virtual string ProcedureName { get; set; }
public virtual string ProcedureDescription { get; set; } /// CEVAK, not mapped to DB
public virtual int ProcedureRevision { get; set; }
Results/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.3.228.0")]
[assembly: AssemblyFileVersion("2.3.228.0")]
[assembly: AssemblyVersion("2.4.250.0")]
[assembly: AssemblyFileVersion("2.4.250.0")]
TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs
+4 -3
View File
@@ -1097,6 +1097,7 @@ namespace TBF.BenchControl.DB.SensusOracle
static void SaveOrUpdateWM(OracleConnection conn, Results.Entities.WaterMeter wm, int max_Pruefindex, int hydr_Pruefung)
{
int sekundaere_Adr = wm.Passed ? 1 : 0;
int idBenutzer = wm.Batch.UserNumber;
if (max_Pruefindex % 100 == 1)
{
@@ -1110,7 +1111,7 @@ namespace TBF.BenchControl.DB.SensusOracle
parm = new OracleParameter("Zaehlernummer", OracleDbType.Int32); parm.Value = -1; cmd.Parameters.Add(parm);
parm = new OracleParameter("Sekundaere_Adr", OracleDbType.Int32); parm.Value = sekundaere_Adr; cmd.Parameters.Add(parm);
parm = new OracleParameter("Hydr_Pruefung", OracleDbType.Int32); parm.Value = hydr_Pruefung; cmd.Parameters.Add(parm);
parm = new OracleParameter("ID_Benutzer", OracleDbType.Int32); parm.Value = 6; cmd.Parameters.Add(parm);
parm = new OracleParameter("ID_Benutzer", OracleDbType.Int32); parm.Value = idBenutzer; cmd.Parameters.Add(parm);
parm = new OracleParameter("ANBID", OracleDbType.Int32); parm.Value = Anbid_StaraTura; cmd.Parameters.Add(parm);
parm = new OracleParameter("Baujahr", OracleDbType.Int32); parm.Value = DBCfg.Baujahr; cmd.Parameters.Add(parm);
@@ -1126,7 +1127,7 @@ namespace TBF.BenchControl.DB.SensusOracle
parm = new OracleParameter("VT_Identnummer", OracleDbType.Varchar2); parm.Value = "IPBATMXX"; cmd.Parameters.Add(parm);
parm = new OracleParameter("Max_Pruefindex", OracleDbType.Int32); parm.Value = max_Pruefindex; cmd.Parameters.Add(parm);
parm = new OracleParameter("Hydr_Pruefung", OracleDbType.Int32); parm.Value = hydr_Pruefung; cmd.Parameters.Add(parm);
parm = new OracleParameter("ID_Benutzer", OracleDbType.Int32); parm.Value = 6; cmd.Parameters.Add(parm);
parm = new OracleParameter("ID_Benutzer", OracleDbType.Int32); parm.Value = idBenutzer; cmd.Parameters.Add(parm);
parm = new OracleParameter("Baujahr", OracleDbType.Int32); parm.Value = DBCfg.Baujahr; cmd.Parameters.Add(parm);
parm = new OracleParameter("VT_Fernum", OracleDbType.Varchar2); parm.Value = wm.SerialNr; cmd.Parameters.Add(parm);
parm = new OracleParameter("ANBID", OracleDbType.Int32); parm.Value = Anbid_StaraTura; cmd.Parameters.Add(parm);
@@ -1157,7 +1158,7 @@ namespace TBF.BenchControl.DB.SensusOracle
// Zaehlerstand
parm = new OracleParameter("WT_Platz_NR", OracleDbType.Int32); parm.Value = wm.WMPosition; cmd.Parameters.Add(parm);
parm = new OracleParameter("WZgut", OracleDbType.Int32); parm.Value = wm.Passed ? 1 : 0; cmd.Parameters.Add(parm);
parm = new OracleParameter("ID_Benutzer", OracleDbType.Int32); parm.Value = 6; cmd.Parameters.Add(parm);
parm = new OracleParameter("ID_Benutzer", OracleDbType.Int32); parm.Value = idBenutzer; cmd.Parameters.Add(parm);
parm = new OracleParameter("AnzahlPruefungen", OracleDbType.Int32); parm.Value = 3; cmd.Parameters.Add(parm);
cmd.ExecuteNonQuery();
TestBenchFramework/BenchControl/Sequences/MainSeq.cs
+1 -1
View File
@@ -262,7 +262,7 @@ namespace TBF.BenchControl.Sequences
/// Prepare empty results
BatchRslts = Results.BatchResults.NewFromProcedure(Program.LocalSettings.BatchNr,
(BenchInfo != null) ? BenchInfo.TestBenchId : 1,
User.CurrentUser.Name, Program.Version,
User.CurrentUser.Name, User.CurrentUser.Number, Program.Version,
StateMachine.Procedure, waterMeterData, waterMeterParts);
StateMachine.CycleStartTimeStamp = BatchRslts.Batch.StartTime;
TestBenchFramework/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.4.248.1")]
[assembly: AssemblyFileVersion("2.4.248.1")]
[assembly: AssemblyVersion("2.5.250.1")]
[assembly: AssemblyFileVersion("2.5.250.1")]