ORACLE_DB : entities Test and TestData contain OraId, OraIdRepetMulti, OraDesignation, RawDataId, ... ver. 2.31.1994

Config/Entities/Test.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
 using System;
 using System.Collections.Generic;
@@ -57,7 +57,14 @@ namespace Config.Entities
         public virtual string TransBefore { get; set; }
 		public virtual string TransBetween { get; set; }
 		public virtual string TransAfter { get; set; }
-
+#if ORACLE_DB
+        public virtual int OraId { get; set; }
+        public virtual int OraIdRepetMulti { get; set; }
+        public virtual string OraDesignation { get; set; }
+        public virtual int RawDataId { get; set; }
+        public virtual int RawDataIdRepetMulti { get; set; }
+        public virtual string RawDataDesignation { get; set; }
+#endif
         public virtual bool IsOuterLoopStart { get; set; }   /// Not mapped to database
         public virtual bool IsOuterLoopEnd { get; set; }     /// Not mapped to database
 
@@ -112,7 +119,15 @@ namespace Config.Entities
 			TransBefore = string.Empty;
 			TransBetween = string.Empty;
 			TransAfter = string.Empty;
-		}
+#if ORACLE_DB
+            OraId = 0;
+            OraIdRepetMulti = 0;
+            OraDesignation = string.Empty;
+            RawDataId = 0;
+            RawDataIdRepetMulti = 0;
+            RawDataDesignation = string.Empty;
+#endif
+        }
 
 		public Test(string name, int itemNr, Procedure procedure)
 			: this()
@@ -192,6 +207,14 @@ namespace Config.Entities
 			result.TransBefore = TransBefore;
 			result.TransBetween = TransBetween;
 			result.TransAfter = TransAfter;
+#if ORACLE_DB
+            result.OraId = OraId;
+            result.OraIdRepetMulti = OraIdRepetMulti;
+            result.OraDesignation = OraDesignation;
+            result.RawDataId = RawDataId;
+            result.RawDataIdRepetMulti = RawDataIdRepetMulti;
+            result.RawDataDesignation = RawDataDesignation;
+#endif
             result.VolumeUnit = VolumeUnit;
             result.FlowUnit = FlowUnit;
             result.MassUnit = MassUnit;
@@ -242,7 +265,14 @@ namespace Config.Entities
             output.WriteLine(TransBetween);
             output.WriteLine(Profile);
             output.WriteLine(TransAfter);
-
+#if ORACLE_DB
+            output.WriteLine(OraId);
+            output.WriteLine(OraIdRepetMulti);
+            output.WriteLine(OraDesignation);
+            output.WriteLine(RawDataId);
+            output.WriteLine(RawDataIdRepetMulti);
+            output.WriteLine(RawDataDesignation);
+#endif
             foreach (var prms in MoreParams) { prms.Export(output); }
             output.WriteLine();
         }
@@ -296,6 +326,14 @@ namespace Config.Entities
                           : line.Equals(TestProfile.UserDefinedHeatMeter.ToString()) ? TestProfile.UserDefinedHeatMeter
                           : line.Equals(TestProfile.Protected.ToString()) ? TestProfile.Protected : TestProfile.UserDefined;  /// UserDefined is the default
             tst.TransAfter = input.ReadLine();
+#if ORACLE_DB
+            tst.OraId = int.Parse(input.ReadLine(), ci);
+            tst.OraIdRepetMulti = int.Parse(input.ReadLine(), ci);
+            tst.OraDesignation = input.ReadLine();
+            tst.RawDataId = int.Parse(input.ReadLine(), ci);
+            tst.RawDataIdRepetMulti = int.Parse(input.ReadLine(), ci);
+            tst.RawDataDesignation = input.ReadLine();
+#endif
 
             while (true)
             {
@@ -355,7 +393,14 @@ namespace Config.Entities
             ln = inp.ReadLine(); if (ln != TransBetween)                    { diff.AppendFormat(fmt, "RelTransBetween", TransBetween, ln); };
             ln = inp.ReadLine(); if (ln != Profile.ToString())              { diff.AppendFormat(fmt, "RelTransAfter", Profile, ln); };
             ln = inp.ReadLine(); if (ln != TransAfter)                      { diff.AppendFormat(fmt, "TransitionAfter", TransAfter, ln); };
-
+#if ORACLE_DB
+            ln = inp.ReadLine(); if (ln != OraId.ToString(ci))              { diff.AppendFormat(fmt, "OraId", OraId.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != OraIdRepetMulti.ToString(ci))    { diff.AppendFormat(fmt, "OraIdRepetMulti", OraIdRepetMulti.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != OraDesignation)                  { diff.AppendFormat(fmt, "OraDesignation", OraDesignation, ln); };
+            ln = inp.ReadLine(); if (ln != RawDataId.ToString(ci))          { diff.AppendFormat(fmt, "RawDataId", RawDataId.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != RawDataIdRepetMulti.ToString(ci)){ diff.AppendFormat(fmt, "RawDataIdRepetMulti", RawDataIdRepetMulti.ToString(ci), ln); };
+            ln = inp.ReadLine(); if (ln != RawDataDesignation)              { diff.AppendFormat(fmt, "RawDataDesignation", RawDataDesignation, ln); };
+#endif
             return diff.ToString();
         }
 

Config/Mappings/TestMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2013-2017 Sensus Metering Systems
+/// Copyright (c) 2013-2022 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Config.Entities;
@@ -62,6 +62,14 @@ namespace Config.Mappings
                 .Column("RelTransBetween");
 			Map(x => x.TransAfter)
                 .Column("TransitionAfter");
+#if ORACLE_DB
+            Map(x => x.OraId);
+            Map(x => x.OraIdRepetMulti);
+            Map(x => x.OraDesignation);
+            Map(x => x.RawDataId);
+            Map(x => x.RawDataIdRepetMulti);
+            Map(x => x.RawDataDesignation);
+#endif
 
             HasMany(x => x.MoreParams)
 				.Cascade.All();

Results/Entities/TestData.cs

@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.IO;
+using Common;
 using Config.Entities;
 
 namespace Results.Entities
@@ -31,7 +32,14 @@ namespace Results.Entities
         public virtual string TempControl           { get; set; }
         public virtual sbyte  Publish               { get; set; }   /// 0=no, 1=in all protocols, 2=on screen, 3=internal
 		public virtual bool   Evaluate				{ get; set; }
-
+#if ORACLE_DB
+        public virtual int    OraId                 { get; set; }
+        public virtual int    OraIdRepetMulti       { get; set; }
+        public virtual string OraDesignation        { get; set; } 
+        public virtual int    RawDataId             { get; set; }
+        public virtual int    RawDataIdRepetMulti   { get; set; }
+        public virtual string RawDataDesignation    { get; set; } 
+#endif
 
         /// <summary>
         /// Default constructor, safe values
@@ -61,7 +69,15 @@ namespace Results.Entities
             TempControl    = test.TempControl;
             Publish        = test.Publish;
 			Evaluate       = test.DoEvaluate;
-		}
+#if ORACLE_DB
+            OraId               = test.OraId;
+            OraIdRepetMulti     = test.OraIdRepetMulti;
+            OraDesignation      = test.OraDesignation;
+            RawDataId           = test.RawDataId;
+            RawDataIdRepetMulti = test.RawDataIdRepetMulti;
+            RawDataDesignation  = test.RawDataDesignation;
+#endif
+        }
 
         /// <summary>
         /// Copy constructor, copies all except of Id
@@ -84,6 +100,14 @@ namespace Results.Entities
             TempControl     = oriTestData.TempControl;
             Publish			= oriTestData.Publish;
             Evaluate        = oriTestData.Evaluate;
+#if ORACLE_DB
+            OraId               = oriTestData.OraId;
+            OraIdRepetMulti     = oriTestData.OraIdRepetMulti;
+            OraDesignation      = oriTestData.OraDesignation;
+            RawDataId           = oriTestData.RawDataId;
+            RawDataIdRepetMulti = oriTestData.RawDataIdRepetMulti;
+            RawDataDesignation  = oriTestData.RawDataDesignation;
+#endif
         }
 
 
@@ -110,7 +134,14 @@ namespace Results.Entities
             if (TempControl != td.TempControl) return false;
             if (Publish != td.Publish) return false;
 			if (Evaluate != td.Evaluate) return false;
-
+#if ORACLE_DB
+            if (OraId != td.OraId) return false;
+            if (OraIdRepetMulti != td.OraIdRepetMulti) return false;
+            if (OraDesignation != td.OraDesignation) return false;
+            if (RawDataId != td.RawDataId) return false;
+            if (RawDataIdRepetMulti != td.RawDataIdRepetMulti) return false;
+            if (RawDataDesignation != td.RawDataDesignation) return false;
+#endif
 			return true;
 		}
 
@@ -152,6 +183,14 @@ namespace Results.Entities
             writer.Write((TempControl != null) ? TempControl : string.Empty);
             writer.Write(Publish);
             writer.Write(Evaluate);
+#if ORACLE_DB
+            writer.Write(OraId);
+            writer.Write(OraIdRepetMulti);
+            writer.Write((OraDesignation != null) ? OraDesignation : string.Empty);
+            writer.Write(RawDataId);
+            writer.Write(RawDataIdRepetMulti);
+            writer.Write((RawDataDesignation != null) ? RawDataDesignation : string.Empty);
+#endif
         }
 
         public virtual void ReadBinary(BinaryReader reader)
@@ -173,6 +212,19 @@ namespace Results.Entities
             TempControl = reader.ReadString();
             Publish = reader.ReadSByte();
             Evaluate = reader.ReadBoolean();
+#if ORACLE_DB
+            OraId = reader.ReadInt32();
+            OraIdRepetMulti = reader.ReadInt32();
+            OraDesignation = reader.ReadString();
+            RawDataId = reader.ReadInt32();
+            RawDataIdRepetMulti = reader.ReadInt32();
+            RawDataDesignation = reader.ReadString();
+#endif
+        }
+
+        public override string ToString()
+        {
+            return string.Format("{0} (P.{1},{2})", Name, ((Publish)Publish).ToString(), Evaluate ? "E" : "-");
         }
     }
 }

Results/Entities/TestRslt.cs

@@ -164,6 +164,15 @@ namespace Results.Entities
         public virtual bool IsDiverter()     { return (MethodClass != null) ? ((MethodClass.Contains("FlyingStart") && MethodClass.Contains("MassColl")) || MethodClass.Contains("DiverterTest")) : true; }
         public virtual bool IsVolumeMethod() { return (MethodClass != null) ? (MethodClass.Contains("TestMethods.FixedStart.") || MethodClass.Contains("TestMethods.FlyingStart.")) : false; }
 
+#if ORACLE_DB
+        public virtual int    OraId()               { return TestData.OraId; }
+        public virtual int    OraIdRepetMulti()     { return TestData.OraIdRepetMulti; }
+        public virtual string OraDesignation()      { return TestData.OraDesignation; }
+        public virtual int    RawDataId()           { return TestData.RawDataId; }
+        public virtual int    RawDataIdRepetMulti() { return TestData.RawDataIdRepetMulti; }
+        public virtual string RawDataDesignation()  { return TestData.RawDataDesignation; }
+#endif
+
         public virtual string MethodElde()
         {
             if (MethodClass == null) return string.Empty;

Results/Mappings/TestDataMap.cs

@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2019 Sensus Slovensko a.s.
+/// Copyright (c) 2015-2022 Sensus Slovensko a.s.
 ///
 using FluentNHibernate.Mapping;
 using Results.Entities;
@@ -24,6 +24,14 @@ namespace Results.Mappings
             Map(x => x.ErrLimMargin).Column("Uncertainty");
 			Map(x => x.Publish);
 			Map(x => x.Evaluate);
-		}
+#if ORACLE_DB
+            Map(x => x.OraId);
+            Map(x => x.OraIdRepetMulti);
+            Map(x => x.OraDesignation);
+            Map(x => x.RawDataId);
+            Map(x => x.RawDataIdRepetMulti);
+            Map(x => x.RawDataDesignation);
+#endif
+        }
 	}
 }

TBF/Properties/AssemblyInfo.cs

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

TBF/UI/Procedures/ProcedureDlg.cs

@@ -1214,7 +1214,15 @@ namespace TBF.UI.Procedures
 			ShortPulses,
 			Publish,
 			Evaluate,
-			ColumnsCount
+#if ORACLE_DB
+            OraId,
+            OraIdRepetM,
+            OraDesig,
+            RawDataId,
+            RawDataIdRepetM,
+            RawDataDesig,
+#endif
+            ColumnsCount
 		}
 
 		Control[] metrology2Editors;
@@ -1229,8 +1237,16 @@ namespace TBF.UI.Procedures
             lv.Columns.Add(new ColumnHeader { Text = "Unit", Width = 50 });
             lv.Columns.Add(new ColumnHeader { Text = Strings.Control_water_temp_chdr, Width = 110 });
 			lv.Columns.Add(new ColumnHeader { Text = Strings.Short_pulses, Width = 100 });          /// Strings.Tol_red_pct_chdr
-			lv.Columns.Add(new ColumnHeader { Text = Strings.Publish, Width = 100 });
+			lv.Columns.Add(new ColumnHeader { Text = Strings.Publish, Width = 80 });
-			lv.Columns.Add(new ColumnHeader { Text = Strings.Evaluate, Width = 100 });
+			lv.Columns.Add(new ColumnHeader { Text = Strings.Evaluate, Width = 80 });
+#if ORACLE_DB
+            lv.Columns.Add(new ColumnHeader { Text = "Ora Id", Width = 45 });
+            lv.Columns.Add(new ColumnHeader { Text = "+ (m) * repet.#", Width = 80 });
+            lv.Columns.Add(new ColumnHeader { Text = "Ora name", Width = 70 });
+            lv.Columns.Add(new ColumnHeader { Text = "Raw data Id", Width = 70 });
+            lv.Columns.Add(new ColumnHeader { Text = "+ (m) * repet.#", Width = 80 });
+            lv.Columns.Add(new ColumnHeader { Text = "Raw data name", Width = 95 });
+#endif
 
             ComboBox publishCBox = new ComboBox();   /// control for Publish
 			for (Publish pb = 0; pb < Publish.Count; pb++)
@@ -1263,7 +1279,15 @@ namespace TBF.UI.Procedures
 					new TextBox(),      /// Short pulses
 					publishCBox,		/// Publish
 					yesNo3CBox,			/// Evaluate
-				};
+#if ORACLE_DB
+					new TextBox(),      /// Ora Id
+					new TextBox(),      /// Ora Id repet multi
+					new TextBox(),      /// Ora name
+					new TextBox(),      /// Raw data Id
+					new TextBox(),      /// Raw data Id repet multi
+					new TextBox(),      /// Raw data name
+#endif
+                };
 
 			foreach (var ctrl in metrology2Editors)
 			{
@@ -1297,7 +1321,14 @@ namespace TBF.UI.Procedures
             lvi.SubItems.Add(test.ShortPulses.ToString());
             lvi.SubItems.Add(((Publish)test.Publish).ToDescription());
             lvi.SubItems.Add(test.DoEvaluate ? Strings.yes : Strings.no);
-
+#if ORACLE_DB
+            lvi.SubItems.Add(test.OraId.ToString());
+            lvi.SubItems.Add(test.OraIdRepetMulti.ToString());
+            lvi.SubItems.Add((test.OraDesignation != null) ? test.OraDesignation : string.Empty);
+            lvi.SubItems.Add(test.RawDataId.ToString());
+            lvi.SubItems.Add(test.RawDataIdRepetMulti.ToString());
+            lvi.SubItems.Add((test.RawDataDesignation != null) ? test.RawDataDesignation : string.Empty);
+#endif
             metrology2ListViewEx.Items.Add(lvi);
         }
 
@@ -1334,6 +1365,14 @@ namespace TBF.UI.Procedures
                             break;
                         }
                     }
+#if ORACLE_DB
+                    entity.OraId = int.Parse(lvi.SubItems[(int)Mtrlgy2Clmn.OraId].Text);
+                    entity.OraIdRepetMulti = int.Parse(lvi.SubItems[(int)Mtrlgy2Clmn.OraId].Text);
+                    entity.OraDesignation = lvi.SubItems[(int)Mtrlgy2Clmn.OraDesig].Text;
+                    entity.RawDataId = int.Parse(lvi.SubItems[(int)Mtrlgy2Clmn.RawDataId].Text);
+                    entity.RawDataIdRepetMulti = int.Parse(lvi.SubItems[(int)Mtrlgy2Clmn.RawDataId].Text);
+                    entity.RawDataDesignation = lvi.SubItems[(int)Mtrlgy2Clmn.RawDataDesig].Text;
+#endif
                 }
                 catch (Exception exc)
                 {
@@ -1447,6 +1486,18 @@ namespace TBF.UI.Procedures
                     /// Combo boxes
                     if ((metrology2Editors[e.SubItem] as ComboBox).Items.Contains(e.DisplayText)) return;   /// OK
                     break;
+#if ORACLE_DB
+                case Mtrlgy2Clmn.OraId:
+                case Mtrlgy2Clmn.OraIdRepetM:
+                case Mtrlgy2Clmn.RawDataId:
+                case Mtrlgy2Clmn.RawDataIdRepetM:
+                    if (int.TryParse(e.DisplayText, out dummy)) return;   /// OK
+                    break;
+
+                case Mtrlgy2Clmn.OraDesig:
+                case Mtrlgy2Clmn.RawDataDesig:
+                    return;                         /// Always OK
+#endif
             }
 
             /// Display text was not OK, revert to the original one