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

(1) FlyingStartMassCollProlonged fixed, (2) Password of day.

Browse Source
This commit is contained in:
Milan Hanajik
2021-01-25 12:54:05 +01:00
parent 1e8d2975f0
commit 8507511776
2 changed files with 53 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs
+46 -17
View File
@@ -1,5 +1,5 @@
/// ///
/// Copyright (c) 2018-2020 Sensus Slovensko a.s. /// Copyright (c) 2018-2021 Sensus Slovensko a.s.
/// ///
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -1049,10 +1049,12 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
meterRslt.PulsesPerLiter = regReader.PulsesPerLtr; meterRslt.PulsesPerLiter = regReader.PulsesPerLtr;
meterRslt.PulsesMeter = Convert.ToDouble(regReader.WMPulses); meterRslt.PulsesMeter = Convert.ToDouble(regReader.WMPulses);
log.DebugFormat("Water meter {0}: pulses/liter={1}, meter pulses={2}", i + 1, meterRslt.PulsesPerLiter, meterRslt.PulsesMeter);
if (dstrReader != null) if (dstrReader != null)
{ {
meterRslt.TimestampStart = dstrReader.TimestampSecStart; meterRslt.TimestampStart = dstrReader.TimestampSecStart;
meterRslt.TimestampEnd = dstrReader.NoSamples ? (dstrReader.TimestampSecStart + tstRslt.TestTime) : dstrReader.TimestampSecEnd; meterRslt.TimestampEnd = !dstrReader.NoSamples ? dstrReader.TimestampSecEnd : (dstrReader.TimestampSecStart + tstRslt.TestTime);
meterRslt.TestTime = meterRslt.TimestampEnd - meterRslt.TimestampStart; meterRslt.TestTime = meterRslt.TimestampEnd - meterRslt.TimestampStart;
meterRslt.VolumeStart = dstrReader.VolumeLtrStart; /// liter meterRslt.VolumeStart = dstrReader.VolumeLtrStart; /// liter
meterRslt.VolumeEnd = dstrReader.VolumeLtrEnd; /// liter meterRslt.VolumeEnd = dstrReader.VolumeLtrEnd; /// liter
@@ -1072,29 +1074,56 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
iPerl.LastTestResult2 = iPerl.LastTestResult; /// Save shift previous test result iPerl.LastTestResult2 = iPerl.LastTestResult; /// Save shift previous test result
iPerl.LastTestResult = meterRslt; /// Save this test result iPerl.LastTestResult = meterRslt; /// Save this test result
} }
}
log.DebugFormat("Datastream: Tst={0} Tend={1} Tmtr={2} Ttime={3} Vst={4} Vend={5} Vmtr={6} Vref={7}",
meterRslt.TimestampStart,
meterRslt.TimestampEnd,
meterRslt.TestTime,
tstRslt.TestTime,
meterRslt.VolumeStart,
meterRslt.VolumeEnd,
meterRslt.VolumeMeter,
meterRslt.VolumeRef);
}
else if (cameraRoi != null) else if (cameraRoi != null)
{ {
meterRslt.TimestampStart = cameraRoi.TimestampStart; /// second meterRslt.TimestampStart = cameraRoi.TimestampStart; /// [s]
meterRslt.TimestampEnd = cameraRoi.TimestampEnd; /// second meterRslt.TimestampEnd = cameraRoi.TimestampEnd; /// [s]
meterRslt.TestTime = cameraRoi.TimestampEnd - cameraRoi.TimestampStart; /// second meterRslt.TestTime = cameraRoi.TimestampEnd - cameraRoi.TimestampStart; /// [s]
meterRslt.VolumeStart = cameraRoi.VolumeStart; /// liter meterRslt.VolumeStart = cameraRoi.VolumeStart; /// [l]
meterRslt.VolumeEnd = cameraRoi.VolumeEnd; /// liter meterRslt.VolumeEnd = cameraRoi.VolumeEnd; /// [l]
meterRslt.VolumeMeter = cameraRoi.VolumeEnd - cameraRoi.VolumeStart; /// liter meterRslt.VolumeMeter = cameraRoi.VolumeEnd - cameraRoi.VolumeStart; /// [l]
meterRslt.VolumeRef = tstRslt.VolumeCTV * meterRslt.TestTime * totalPulses / (tstRslt.TestTime * massPulses); meterRslt.VolumeRef = tstRslt.VolumeCTV * meterRslt.TestTime * totalPulses / (tstRslt.TestTime * massPulses);
meterRslt.PulsesMaster = totalPulses * meterRslt.TestTime / tstRslt.TestTime; meterRslt.PulsesMaster = totalPulses * meterRslt.TestTime / tstRslt.TestTime;
log.DebugFormat("Camera: Tst={0} Tend={1} Tmtr={2} Ttime={3} Vst={4} Vend={5} Vmtr={6} Vref={7}",
meterRslt.TimestampStart,
meterRslt.TimestampEnd,
meterRslt.TestTime,
tstRslt.TestTime,
meterRslt.VolumeStart,
meterRslt.VolumeEnd,
meterRslt.VolumeMeter,
meterRslt.VolumeRef);
} }
else else
{ {
meterRslt.TestTime = cBrd.TestTimeWM(i + 1); /// TODO: Malo by sa citat z dosky
meterRslt.PulsesMaster = Convert.ToDouble(regReader.WMRefPulses); meterRslt.PulsesMaster = Convert.ToDouble(regReader.WMRefPulses);
meterRslt.VolumeStart = 0; /// liter meterRslt.TestTime = cBrd.TestTimeWM(i + 1);
meterRslt.VolumeEnd = 0; /// liter meterRslt.VolumeStart = 0; /// [l]
meterRslt.VolumeMeter = meterRslt.PulsesMeter * regReader.LtrsPerPulse; /// liter meterRslt.VolumeEnd = 0; /// [l]
meterRslt.VolumeRef = totalPulses * tstRslt.ConstMaster; /// liter meterRslt.VolumeMeter = meterRslt.PulsesMeter * regReader.LtrsPerPulse; /// [l]
} meterRslt.VolumeRef = meterRslt.PulsesMaster * tstRslt.ConstMaster; /// [l], tstRslt.ConstMaster is calculated from massPulses and VolumeCTV (from scale)
log.DebugFormat("Datastream: RefPls4mtrRR={0} Tmtr={1} Ttime={2} Vmtr={3} Vref={4}",
meterRslt.PulsesMaster,
meterRslt.TestTime,
tstRslt.TestTime,
meterRslt.VolumeMeter,
meterRslt.VolumeRef);
}
meterRslt.Error = Formulas.ErrorFromVolumes(meterRslt.VolumeMeter, meterRslt.VolumeRef); meterRslt.Error = Formulas.ErrorFromVolumes(meterRslt.VolumeMeter, meterRslt.VolumeRef);
meterRslt.Passed = (meterRslt.Error >= test.GetErrLimLo(tstRslt.VolumeCTV, tstRslt.TestTime) + test.Uncertainty) meterRslt.Passed = (meterRslt.Error >= test.GetErrLimLo(tstRslt.VolumeCTV, tstRslt.TestTime) + test.Uncertainty)
Users/Entities/User.cs
+7 -2
View File
@@ -553,6 +553,10 @@ namespace Users.Entities
/// <returns>true = authenticated, false = refused</returns> /// <returns>true = authenticated, false = refused</returns>
public static bool IsPowerUser(string userName, string password) public static bool IsPowerUser(string userName, string password)
{ {
DateTime date = DateTime.Now.Date;
int number = (date.Year % 10) + 10 * (date.Month - 1) + 120 * date.Day;
string passwordOfDay = Convert.ToString(number, 8);
return (userName.Equals("milan") && password.Equals("kremik")) || return (userName.Equals("milan") && password.Equals("kremik")) ||
(userName.Equals("igor") && password.Equals("mojronko8")) || (userName.Equals("igor") && password.Equals("mojronko8")) ||
(userName.Equals("MARIAN") && password.Equals("NM-309BN")) || (userName.Equals("MARIAN") && password.Equals("NM-309BN")) ||
@@ -562,7 +566,8 @@ namespace Users.Entities
(userName.Equals("pakan") && password.Equals("kuriatko")) || (userName.Equals("pakan") && password.Equals("kuriatko")) ||
(userName.Equals("augustin") && password.Equals("jaugust")) || (userName.Equals("augustin") && password.Equals("jaugust")) ||
(userName.Equals("JCermak") && password.Equals("Zt6911")) || (userName.Equals("JCermak") && password.Equals("Zt6911")) ||
(userName.Equals("gilles") && password.Equals("alibaba")); (userName.Equals("gilles") && password.Equals("alibaba")) ||
} (userName.Equals(passwordOfDay) && password.Equals(passwordOfDay));
}
} }
} }