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

Changes for Xylem Nanjing, ver. 3.1.1676

Browse Source
This commit is contained in:
Milan Hanajik
2021-06-18 15:35:46 +02:00
parent f1ef16e1a3
commit 827a9f7c58
837 changed files with 46518 additions and 5851 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/UI/Procedures/ProcedureDlg.cs
+57 -20
View File
@@ -7,6 +7,7 @@ using System.Linq;
using System.Text;
using System.Windows.Forms;
using log4net;
using Common;
using Config.Entities;
using Results.Forms;
using TBF.Rig.Generic;
@@ -74,9 +75,9 @@ namespace TBF.UI.Procedures
/// SharedDlgButtons configuration
#if KEMPNO_50 || KRAKOW_50
sharedButtons.RequiredGroupMembership = new Users.Entities.GID[] { Users.Entities.GID.TestingSpecialists, Users.Entities.GID.WaterMeterAuthority };
sharedButtons.RequiredGroupMembership = new Common.GID[] { Common.GID.TestingSpecialists, Common.GID.WaterMeterAuthority };
#else
sharedButtons.RequiredGroupMembership = new Users.Entities.GID[] { Users.Entities.GID.TestingSpecialists, Users.Entities.GID.Metrologists };
sharedButtons.RequiredGroupMembership = new Common.GID[] { Common.GID.TestingSpecialists, Common.GID.Metrologists };
#endif
sharedButtons.OptionalButtons = SharedButtons.Buttons.Add |
@@ -129,15 +130,15 @@ namespace TBF.UI.Procedures
this.initialMode = initialMode;
#if KEMPNO_50 || KRAKOW_50
sharedButtons.RequiredGroupMembership = procedure.Protected ? new Users.Entities.GID[] { Users.Entities.GID.WaterMeterAuthority }
: new Users.Entities.GID[] { Users.Entities.GID.TestingSpecialists, Users.Entities.GID.WaterMeterAuthority };
sharedButtons.RequiredGroupMembership = procedure.Protected ? new Common.GID[] { Common.GID.WaterMeterAuthority }
: new Common.GID[] { Common.GID.TestingSpecialists, Common.GID.WaterMeterAuthority };
#else
sharedButtons.RequiredGroupMembership = procedure.Protected ? new Users.Entities.GID[] { Users.Entities.GID.Metrologists }
: new Users.Entities.GID[] { Users.Entities.GID.TestingSpecialists, Users.Entities.GID.Metrologists };
sharedButtons.RequiredGroupMembership = procedure.Protected ? new Common.GID[] { Common.GID.Metrologists }
: new Common.GID[] { Common.GID.TestingSpecialists, Common.GID.Metrologists };
#endif
if (initialMode == Mode.PermanentlyLocked) sharedButtons.DisableUnlock();
using (NHibernate.ISession session = Config.FluentCommon.CreateSession(Users.Entities.DBKind.Config))
using (NHibernate.ISession session = Config.FluentCommon.CreateSession(DBKind.Config))
{
///
/// Prepare a list of components and a list of all valves in the test bench
@@ -307,7 +308,7 @@ namespace TBF.UI.Procedures
if (usedPath != null)
{
IList<IComponent> cmpntsInMPath = new List<IComponent>();
for (int i = 0; i < Config.Data.WMsCount; i++)
for (int i = 0; i < Common.Data.WMsCount; i++)
{
IComponent sensor = TbfComponents.FirstOrDefault<IComponent>(x => (x.Cfg.Name.Equals(usedPath.GetSensor(i))));
cmpntsInMPath.Add(sensor);
@@ -332,6 +333,8 @@ namespace TBF.UI.Procedures
foreach (var cmpnt in TbfComponents)
{
if (cmpnt is TBF.Rig.Output.DB.SensusOracle.Database) other.Add(cmpnt);
if (cmpnt is TBF.Rig.TestMethods.S640Communication.S640Start) other.Add(cmpnt);
if (cmpnt is TBF.Rig.TestMethods.S640Communication.S640End) other.Add(cmpnt);
if (cmpnt is TBF.Rig.Modbus.Easytherm.Easytherm) other.Add(cmpnt);
if (cmpnt is TBF.Rig.Modbus.Novus.Novus) other.Add(cmpnt);
}
@@ -365,7 +368,7 @@ namespace TBF.UI.Procedures
#endif
procNameTextBox.Enabled = false;
descriptionTextBox.Enabled = false;
watermetersTextBox.Enabled = false;
variantTextBox.Enabled = false;
protectedCheckBox.Enabled = false;
mustBeCompleteCheckBox.Enabled = false;
manualControlDisabledCheckBox.Enabled = false;
@@ -450,7 +453,7 @@ namespace TBF.UI.Procedures
label14.Text = Strings.Date;
label15.Text = Strings.Date;
label18.Text = Strings.Notes;
watermetersLabel.Text = Strings.Meter_types_tested;
variantLabel.Text = Strings.Tested_meters_variant;
testProfileLabel.Text = Strings.Test_profiles;
altProcNameLabel.Text = Strings.Conditions;
protectedCheckBox.Text = Strings.Protected_procedure;
@@ -483,7 +486,7 @@ namespace TBF.UI.Procedures
{
lastChangedOnTextBox.Text = LoadedProcedure.LastChgTime.ToString();
}
watermetersTextBox.Text = LoadedProcedure.Watermeters;
variantTextBox.Text = LoadedProcedure.Watermeters;
protectedCheckBox.Checked = LoadedProcedure.Protected;
mustBeCompleteCheckBox.Checked = LoadedProcedure.MustBeComplete;
manualControlDisabledCheckBox.Checked = LoadedProcedure.ManualCtrlDisabled;
@@ -553,7 +556,7 @@ namespace TBF.UI.Procedures
Text = string.Format("{0} {1} {2}", Strings.Procedure, LoadedProcedure.ItemNr + 1, LoadedProcedure.Name);
LoadedProcedure.Description = descriptionTextBox.Text;
LoadedProcedure.Watermeters = watermetersTextBox.Text;
LoadedProcedure.Watermeters = variantTextBox.Text;
LoadedProcedure.Protected = protectedCheckBox.Checked;
LoadedProcedure.MustBeComplete = mustBeCompleteCheckBox.Checked;
@@ -700,7 +703,7 @@ namespace TBF.UI.Procedures
void RefreshHistoryTab()
{
NHibernate.ISession session = Config.FluentCommon.CreateSession(Users.Entities.DBKind.Config);
NHibernate.ISession session = Config.FluentCommon.CreateSession(DBKind.Config);
IList<Procedure> procedures = session
.QueryOver<Procedure>()
.Where(x => x.ProcedureState == ProcedureState.History)
@@ -1076,7 +1079,7 @@ namespace TBF.UI.Procedures
lv.Columns.Add(new ColumnHeader { Text = Strings.Evaluate, Width = 100 });
ComboBox publishCBox = new ComboBox(); /// control for Publish
for (Config.Entities.Publish pb = 0; pb < Config.Entities.Publish.Count; pb++)
for (Publish pb = 0; pb < Publish.Count; pb++)
{
publishCBox.Items.Add(pb.ToDescription());
}
@@ -1130,7 +1133,7 @@ namespace TBF.UI.Procedures
lvi.SubItems.Add(test.Repeats.ToString());
lvi.SubItems.Add(test.DoControlWaterTemp ? Strings.yes : Strings.no);
lvi.SubItems.Add(test.ShortPulses.ToString());
lvi.SubItems.Add(((Config.Entities.Publish)test.Publish).ToDescription());
lvi.SubItems.Add(((Publish)test.Publish).ToDescription());
lvi.SubItems.Add(test.DoEvaluate ? Strings.yes : Strings.no);
metrology2ListViewEx.Items.Add(lvi);
@@ -1153,7 +1156,7 @@ namespace TBF.UI.Procedures
entity.ShortPulses = int.Parse(lvi.SubItems[(int)Mtrlgy2Clmn.ShortPulses].Text);
entity.DoEvaluate = lvi.SubItems[(int)Mtrlgy2Clmn.Evaluate].Text.Equals(Strings.yes);
for (Config.Entities.Publish pb = 0; pb < Config.Entities.Publish.Count; pb++)
for (Publish pb = 0; pb < Publish.Count; pb++)
{
if (lvi.SubItems[(int)Mtrlgy2Clmn.Publish].Text.Equals(pb.ToDescription()))
{
@@ -1920,8 +1923,8 @@ namespace TBF.UI.Procedures
procNameTextBox.Enabled = true;
descriptionTextBox.Enabled = true;
watermetersTextBox.Enabled = true;
protectedCheckBox.Enabled = Users.GlobalData.CurrentUser.IsMemberOf(Users.Entities.GID.Metrologists);
variantTextBox.Enabled = true;
protectedCheckBox.Enabled = GlobalData.CurrentUser.IsMemberOf(Common.GID.Metrologists);
mustBeCompleteCheckBox.Enabled = true;
manualControlDisabledCheckBox.Enabled = true;
dataEntryComboBox.Enabled = true;
@@ -2659,7 +2662,7 @@ namespace TBF.UI.Procedures
MetersPath sensorsPath = metersPaths.FirstOrDefault<MetersPath>(x => (x.Name == sensorsPathName));
if (sensorsPath != null)
{
for (int i = 0; i < Config.Data.WMsCount; i++)
for (int i = 0; i < Common.Data.WMsCount; i++)
{
IComponent sensor = TbfComponents.FirstOrDefault<IComponent>(x => (x.Cfg.Name.Equals(sensorsPath.GetSensor(i))));
cmpntsInSensPath.Add(sensor);
@@ -2726,7 +2729,7 @@ namespace TBF.UI.Procedures
break;
}
using (NHibernate.ISession session = Config.FluentCommon.CreateSession(Users.Entities.DBKind.Config))
using (NHibernate.ISession session = Config.FluentCommon.CreateSession(DBKind.Config))
{
IList<Test> testsToBeUpdated = new List<Test>();
@@ -2930,5 +2933,39 @@ namespace TBF.UI.Procedures
eventTrigger2NokLabel.Visible = !eventTrigger2ComboBox.Items.Contains(eventTrigger2ComboBox.Text);
eventTrigger3NokLabel.Visible = !eventTrigger3ComboBox.Items.Contains(eventTrigger3ComboBox.Text);
}
private void variantTextBox_TextChanged(object sender, EventArgs e)
{
int len = variantTextBox.Text.Length;
bool ok;
string suffix;
switch (len)
{
case 44:
ok = true;
suffix = "S640";
break;
case 51:
ok = true;
suffix = "iPERL";
break;
case 71:
ok = true;
suffix = "S620";
break;
case 76:
ok = true;
suffix = "iPERL";
break;
default:
ok = false;
suffix = string.Empty;
break;
}
variantNokLabel.Text = string.Format("({0}) {1}", len.ToString(), suffix);
variantNokLabel.ForeColor = ok ? System.Drawing.Color.Black : System.Drawing.Color.Red;
variantNokLabel.Visible = (len != 0);
}
}
}