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

ProductionMonitoring ReferenceRecord.Result: 0...OK, >=1 ... Error code, ver. 2.18.800

Browse Source
This commit is contained in:
Milan Hanajik 2018-02-06 10:57:57 +01:00
parent 2c7d1af146
commit a40ba5243e
7 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MonitoringDB/Forms/TrivialLoginDlg.cs
View File

@ -27,7 +27,7 @@ namespace MonitoringDB.Forms
DialogResult = DialogResult.OK;
Close();
}
else if (passwordTextBox.Text.ToLower().Equals("napajedla"))
else if (passwordTextBox.Text.ToLower().Equals("kremik"))
{
LoginLevel = LoginLevel.MH;
DialogResult = DialogResult.OK;

2
TBF/BenchControl/Output/DB/ProductionMonitoring/Monitoring.cs
View File

@ -218,7 +218,7 @@ namespace TBF.BenchControl.Output.DB.ProductionMonitoring
IList<Workstep> worksteps;
if ((refRecords.Count > 0) && workstepsDictionary.TryGetValue(refRecords[0].Process.Id, out worksteps) && (worksteps.Count == 1))
{
session.SaveOrUpdate(new ReferenceRecord(refRecords[0].Process, worksteps[0], wm.SerialNr, Users.GlobalData.CurrentUser.UserName, workplace, wm.Passed ? 1 : 0));
session.SaveOrUpdate(new ReferenceRecord(refRecords[0].Process, worksteps[0], wm.SerialNr, Users.GlobalData.CurrentUser.UserName, workplace, wm.Passed ? 0 : 1));
return 1;
}

2
TBF/Forms/LoginDlgWithBenchSelection.cs
View File

@ -77,7 +77,7 @@ namespace TBF.Forms
Localize();
#if DEBUG
userNameTextBox.Text = "milan";
passwordTextBox.Text = "napajedla";
passwordTextBox.Text = "kremik";
#endif
for (int i = 0; i < Program.LocalSettings.BenchesCount; i++)
{

2
TBF/MainWnd.cs
View File

@ -424,7 +424,7 @@ namespace TBF
Users.DB.ConnectionString = Config.Data.CurrentBench.ProceduresDBSettings.ConnectionString;
Users.DB.DbType = Config.Data.CurrentBench.ProceduresDBSettings.DbType;
#if TURA_IPERL || TURA_SPECIAL
Users.Forms.UserManagementDlg dlg = new Users.Forms.UserManagementDlg(true);
Users.Forms.UserManagementDlg dlg = new Users.Forms.UserManagementDlg(Users.DB.CreateSession(), true);
string connStr = Users.DB.ConnectionString;
int len = connStr.ToUpper().IndexOf("; UID=");
if (len > 0) dlg.TitleExtension = connStr.Substring(0, len);

4
TBF/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.18.799.0")]
[assembly: AssemblyFileVersion("2.18.799.0")]
[assembly: AssemblyVersion("2.18.800.0")]
[assembly: AssemblyFileVersion("2.18.800.0")]

6
Users/Entities/User.cs
View File

@ -440,11 +440,7 @@ namespace Users.Entities
/// <returns>true = authenticated, false = refused</returns>
public static bool IsPowerUser(string userName, string password)
{
#if TURA_IPERL || TURA_SPECIAL
return (userName.Equals("milan") && password.Equals("napajedlaiperl")) ||
#else
return (userName.Equals("milan") && password.Equals("napajedla")) ||
#endif
return (userName.Equals("milan") && password.Equals("kremik")) ||
(userName.Equals("igor") && password.Equals("ronko4")) ||
(userName.Equals("MARIAN") && password.Equals("NM-309BN")) ||
(userName.Equals("lubo1212") && password.Equals("Tatry52")) ||

4
Users/Properties/AssemblyInfo.cs
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.18.798.0")]
[assembly: AssemblyFileVersion("2.18.798.0")]
[assembly: AssemblyVersion("2.18.800.0")]
[assembly: AssemblyFileVersion("2.18.800.0")]