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

(1) Results are redrawn when iPerlCommForm is closed, (2) 'Stop draining' is password protected, (3) PW-s updated, ver. 2.18.901

Browse Source
This commit is contained in:
Milan Hanajik 2018-05-21 14:49:27 +02:00
parent e150624f4d
commit 2e593d11eb
7 changed files with 51 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs
View File

@ -1857,6 +1857,8 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication
}
}
}
UiBridge.Bridge.OnTestCompleted(this, new UiBridge.TestCompletedEventArgs(string.Empty, null));
}
private void checkBoxImage1_Click(object sender, EventArgs e) { ckbState[ckbIndex[0]] = checkBoxImage1.Checked; }

4
TBF/Properties/AssemblyInfo.cs
View File

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

2
TBF/UiBridge/TestCompletedEventArgs.cs
View File

@ -9,7 +9,7 @@ namespace TBF.UiBridge
public class TestCompletedEventArgs : EventArgs
{
public string TestName;
public Results.Entities.TestRslt TestRslt;
public Results.Entities.TestRslt TestRslt; /// If null => just redraw results
public TestCompletedEventArgs(string testName, Results.Entities.TestRslt testRslt)
{

40
TBF/UiControls/BenchControlPanel.cs
View File

@ -248,17 +248,53 @@ namespace TBF.UiControls
private void emptyTank1Btn_Click(object sender, EventArgs e)
{
#if TURA_IPERL || TURA_SPECIAL
/// Prevent 'Stop draining' by password
if (drain1Highlighted && !Users.GlobalData.CurrentUser.IsMemberOf(Users.Grp.GID.TestingSpecialists))
{
if ((new Users.Forms.LoginDlg(Users.Grp.GID.TestingSpecialists)).ShowDialog() != DialogResult.OK)
return;
if (Program.MainWnd != null) Program.MainWnd.UpdateUser();
Bridge.Ui2Bench(UI2BenchCmd.StopDrainingTank1);
return;
}
#endif
Bridge.Ui2Bench(drain1Highlighted ? UI2BenchCmd.StopDrainingTank1 : UI2BenchCmd.DrainTank1);
}
private void emptyTank2Btn_Click(object sender, EventArgs e)
{
Bridge.Ui2Bench(drain2Highlighted ? UI2BenchCmd.StopDrainingTank2 : UI2BenchCmd.DrainTank2);
#if TURA_IPERL || TURA_SPECIAL
/// Prevent 'Stop draining' by password
if (drain1Highlighted && !Users.GlobalData.CurrentUser.IsMemberOf(Users.Grp.GID.TestingSpecialists))
{
if ((new Users.Forms.LoginDlg(Users.Grp.GID.TestingSpecialists)).ShowDialog() != DialogResult.OK)
return;
if (Program.MainWnd != null) Program.MainWnd.UpdateUser();
Bridge.Ui2Bench(UI2BenchCmd.StopDrainingTank2);
return;
}
#endif
Bridge.Ui2Bench(drain2Highlighted ? UI2BenchCmd.StopDrainingTank2 : UI2BenchCmd.DrainTank2);
}
private void emptyTank3Btn_Click(object sender, EventArgs e)
{
Bridge.Ui2Bench(drain3Highlighted ? UI2BenchCmd.StopDrainingTank3 : UI2BenchCmd.DrainTank3);
#if TURA_IPERL || TURA_SPECIAL
/// Prevent 'Stop draining' by password
if (drain1Highlighted && !Users.GlobalData.CurrentUser.IsMemberOf(Users.Grp.GID.TestingSpecialists))
{
if ((new Users.Forms.LoginDlg(Users.Grp.GID.TestingSpecialists)).ShowDialog() != DialogResult.OK)
return;
if (Program.MainWnd != null) Program.MainWnd.UpdateUser();
Bridge.Ui2Bench(UI2BenchCmd.StopDrainingTank3);
return;
}
#endif
Bridge.Ui2Bench(drain3Highlighted ? UI2BenchCmd.StopDrainingTank3 : UI2BenchCmd.DrainTank3);
}

4
TODO.txt
View File

@ -1,3 +1,7 @@
Vyroba:
- Zobrazit vysledok 1. testu ihned
- Odlogovat zo zvysenej urovne po 10 min.
Igor
- cerveny RV
- testovanie citlivosti vodomera

4
Users/Entities/User.cs
View File

@ -517,14 +517,14 @@ namespace Users.Entities
public static bool IsPowerUser(string userName, string password)
{
return (userName.Equals("milan") && password.Equals("kremik")) ||
(userName.Equals("igor") && password.Equals("ronko4")) ||
(userName.Equals("igor") && password.Equals("mojronko8")) ||
(userName.Equals("MARIAN") && password.Equals("NM-309BN")) ||
(userName.Equals("lubo1212") && password.Equals("Tatry52")) ||
(userName.Equals("Michal") && password.Equals("1236natahA8")) ||
(userName.Equals("martin") && password.Equals("vaclavek84")) ||
(userName.Equals("pakan") && password.Equals("kuriatko")) ||
(userName.Equals("augustin") && password.Equals("jaugust")) ||
(userName.Equals("evinic") && password.Equals("stivik55")) ||
(userName.Equals("JCermak") && password.Equals("Zt6911")) ||
(userName.Equals("leos") && password.Equals("velka")) ||
(userName.Equals("gilles") && password.Equals("alibaba"));
}

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.895.0")]
[assembly: AssemblyFileVersion("2.18.895.0")]
[assembly: AssemblyVersion("2.18.901.0")]
[assembly: AssemblyFileVersion("2.18.901.0")]