diff --git a/BerichtGen/FrmOptions.cs b/BerichtGen/FrmOptions.cs
index 9da8a66..abb60bc 100644
--- a/BerichtGen/FrmOptions.cs
+++ b/BerichtGen/FrmOptions.cs
@@ -45,7 +45,7 @@ namespace BerichtGen
{
InitializeComponent();
- Syncfusion.Licensing.SyncfusionLicenseProvider.RegisterLicense("MTU0ODAyQDMxMzcyZTMzMmUzMFNsK0VsVStJUHA5NzFMQUphWTRBNmcvWU5xdGpsUmpkN0h4UGVMM083RFE9");
+ Syncfusion.Licensing.SyncfusionLicenseProvider.RegisterLicense("MjIzODk3QDMxMzcyZTM0MmUzMGVHTVVQaDV1OHZncmo0N2hEcXM1Z2ppK3RCeldIQVl5dlVRT3J3cEdtVFE9");
this.firma = firma;
diff --git a/BerichtGen/makeGraphic.cs b/BerichtGen/makeGraphic.cs
index bbaf596..c8a2b77 100644
--- a/BerichtGen/makeGraphic.cs
+++ b/BerichtGen/makeGraphic.cs
@@ -95,7 +95,7 @@ namespace BerichtGen
///
public static bool GetGraphics(List struktures,string destinationPath)
{
- Syncfusion.Licensing.SyncfusionLicenseProvider.RegisterLicense("MTU0ODAyQDMxMzcyZTMzMmUzMFNsK0VsVStJUHA5NzFMQUphWTRBNmcvWU5xdGpsUmpkN0h4UGVMM083RFE9");
+ Syncfusion.Licensing.SyncfusionLicenseProvider.RegisterLicense("MjIzODk3QDMxMzcyZTM0MmUzMGVHTVVQaDV1OHZncmo0N2hEcXM1Z2ppK3RCeldIQVl5dlVRT3J3cEdtVFE9");
ChartControl tempChart = getGraph(struktures, "Temperatur");
if (tempChart == null) return false;
diff --git a/CSVParser/BlueLight.cs b/CSVParser/BlueLight.cs
index 7e5b54c..fcc6e36 100644
--- a/CSVParser/BlueLight.cs
+++ b/CSVParser/BlueLight.cs
@@ -21,7 +21,7 @@ namespace CSVParser
DateTime zeit;
double temperatur;
double druck;
- int geschwindigkeit;
+ double geschwindigkeit;
bool gestarted = false;
@@ -40,13 +40,20 @@ namespace CSVParser
throw new CSVImportException("Konnte die datum uhrzeit nicht konventieren");
double.TryParse(parts[3].Replace("\"","").Replace('.', ','), out temperatur);
- int.TryParse(parts[4].Replace("\"",""), out geschwindigkeit);
+ double.TryParse(parts[4].Replace("\"",""), out geschwindigkeit);
double.TryParse(parts[5].Replace("\"","").Replace('.', ','), out druck);
+
string x = (druck*1000).ToString();
if (geschwindigkeit > 100) geschwindigkeit = 0;
if (geschwindigkeit > 50) geschwindigkeit = 1;
+ /*
+ *
+ * Geschwindigkeit wird in Meter angegeben pro stunde
+ * : 60 :60 * 100 = 36;
+ */
+ geschwindigkeit = geschwindigkeit / 36.00;
strukture.Zeitstempel = zeit;
strukture.Druck = int.Parse(x);
diff --git a/KlassenBIB/Sanierung/Renovation/AbstractImprägnier.cs b/KlassenBIB/Sanierung/Renovation/AbstractImprägnier.cs
index 72d63c4..8eb43e5 100644
--- a/KlassenBIB/Sanierung/Renovation/AbstractImprägnier.cs
+++ b/KlassenBIB/Sanierung/Renovation/AbstractImprägnier.cs
@@ -28,5 +28,6 @@ namespace KlassenBIB
public double Vakuum { get; set; }
public string HarzTyp { get; set; }
public double Walzenabstand { get; set; }
+
}
}
diff --git a/KlassenBIB/Sanierung/Renovation/InlinerSanierung.cs b/KlassenBIB/Sanierung/Renovation/InlinerSanierung.cs
index d4d2618..8ac5609 100644
--- a/KlassenBIB/Sanierung/Renovation/InlinerSanierung.cs
+++ b/KlassenBIB/Sanierung/Renovation/InlinerSanierung.cs
@@ -139,11 +139,14 @@ namespace KlassenBIB
{"UVImageSpeed","" },
{"liner_type","" },
{"rueckhol_speed","" },
- {"harz_type","" }
+ {"harz_type","" },
+ {"preliner_verwendet","" },
+ {"geschlossene_ende","" },
+ {"schlauch_dn","" }
};
double LaengeGesamt = this.Inspektionsobjekt.Haltungslaenge + this.Inspektionsobjekt.Schachtlaenge;
-
+
grunddaten["hausnummer"] = Inspektionsobjekt.Hausnummer;
grunddaten["AG_Vorname"] = projekt.Auftraggeber.Name;
grunddaten["KLP_Nummer"] = Inspektionsobjekt.Sanierungsnummer;
@@ -177,9 +180,13 @@ namespace KlassenBIB
grunddaten["temperatur_harz"] = this.imprägnierungsbericht == null ? this.HarzKalibrierTemperatur : this.imprägnierungsbericht.HarzTemperatur;
grunddaten["datum_kalibrierung"] = this.imprägnierungsbericht == null ? this.DatumKalibrierung.ToShortDateString() : this.imprägnierungsbericht.ImprägnierDatum;
grunddaten["walzen_abstand"] = this.imprägnierungsbericht == null ? this.KalibierWalzenAbstand : this.imprägnierungsbericht.Walzenabstand;
+ grunddaten["schlauch_dn"] = this.Imprägnierungsbericht != null ? this.imprägnierungsbericht.DN : 0;
grunddaten["vakuum"] = this.imprägnierungsbericht == null ? this.KalibrierUnterdruck : this.imprägnierungsbericht.Vakuum;
grunddaten["time_start"] = this.AnfangAushaertung;
grunddaten["time_ende"] = this.EndeAushaertung;
+ grunddaten["preliner_verwendet"] = this.Preliner ? "ja" : "nein";
+ grunddaten["geschlossene_ende"] = this.GeschlosseneEnde ? "Geschlossenes" : "Offenes";
+
grunddaten["UVImageTemp"] = Path.Combine(destinationPath, "linerGraph_temp.jpg");
grunddaten["UVImageDruck"] = Path.Combine(destinationPath, "linerGraph_druck.jpg");
grunddaten["UVImageSpeed"] = Path.Combine(destinationPath, "linerGraph_speed.jpg");
diff --git a/KlassenBIB/Sanierung/Renovation/WerkseitigImprägniert.cs b/KlassenBIB/Sanierung/Renovation/WerkseitigImprägniert.cs
index 3648a89..b090a7c 100644
--- a/KlassenBIB/Sanierung/Renovation/WerkseitigImprägniert.cs
+++ b/KlassenBIB/Sanierung/Renovation/WerkseitigImprägniert.cs
@@ -12,6 +12,7 @@ namespace KlassenBIB
public string Imprägniernummer { get; set; }
public bool LagerungKorrekt { get; set; }
public string LängeCode { get; set; }
+
public override string ToString()
{
diff --git a/SanShared/UVcsvStrukture.cs b/SanShared/UVcsvStrukture.cs
index c8bba70..e84a3a6 100644
--- a/SanShared/UVcsvStrukture.cs
+++ b/SanShared/UVcsvStrukture.cs
@@ -14,7 +14,7 @@ namespace SanShared
DateTime zeitstempel;
double temperatur;
int druck;
- int geschwindigkeit;
+ double geschwindigkeit;
///
/// Zeitstempel vom Eintrag
///
@@ -30,6 +30,6 @@ namespace SanShared
///
/// Geschwindigkeit vom Eintrag
///
- public int Geschwindigkeit { get => geschwindigkeit; set => geschwindigkeit = value; }
+ public double Geschwindigkeit { get => geschwindigkeit; set => geschwindigkeit = value; }
}
}
diff --git a/SanSystem/documents/JUME/liner_einbauBlueLight.docx b/SanSystem/documents/JUME/liner_einbauBlueLight.docx
index 28d13bc..6c7163a 100644
Binary files a/SanSystem/documents/JUME/liner_einbauBlueLight.docx and b/SanSystem/documents/JUME/liner_einbauBlueLight.docx differ
diff --git a/SanSystem/frmImprägnierBerichtEdit.Designer.cs b/SanSystem/frmImprägnierBerichtEdit.Designer.cs
index 8901138..a93bc9b 100644
--- a/SanSystem/frmImprägnierBerichtEdit.Designer.cs
+++ b/SanSystem/frmImprägnierBerichtEdit.Designer.cs
@@ -29,40 +29,18 @@
private void InitializeComponent()
{
this.label1 = new System.Windows.Forms.Label();
- this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
- this.label5 = new System.Windows.Forms.Label();
- this.label6 = new System.Windows.Forms.Label();
- this.label7 = new System.Windows.Forms.Label();
- this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.txt_harzmenge = new System.Windows.Forms.TextBox();
- this.txt_harzTemperatur = new System.Windows.Forms.TextBox();
- this.txt_mischungtyp = new System.Windows.Forms.TextBox();
- this.label12 = new System.Windows.Forms.Label();
this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.label9 = new System.Windows.Forms.Label();
+ this.mtxt_impanfang_datum = new System.Windows.Forms.MaskedTextBox();
this.label8 = new System.Windows.Forms.Label();
- this.groupBox3 = new System.Windows.Forms.GroupBox();
- this.label10 = new System.Windows.Forms.Label();
- this.label11 = new System.Windows.Forms.Label();
- this.label13 = new System.Windows.Forms.Label();
this.txt_imprägniernr = new System.Windows.Forms.TextBox();
- this.txt_vakuum = new System.Windows.Forms.TextBox();
this.txt_schlauchnummer = new System.Windows.Forms.TextBox();
this.txt_wanddicke = new System.Windows.Forms.TextBox();
- this.txt_walzenabstand = new System.Windows.Forms.TextBox();
- this.txt_bediener = new System.Windows.Forms.TextBox();
this.btn_save = new System.Windows.Forms.Button();
- this.label14 = new System.Windows.Forms.Label();
- this.txt_laengeCode = new System.Windows.Forms.TextBox();
- this.mtxt_impanfang_datum = new System.Windows.Forms.MaskedTextBox();
- this.mtxt_impanfang_uhrzeit = new System.Windows.Forms.MaskedTextBox();
- this.mtxt_impende_datum = new System.Windows.Forms.MaskedTextBox();
- this.mtxt_impende_uhrzeit = new System.Windows.Forms.MaskedTextBox();
- this.groupBox1.SuspendLayout();
+ this.label2 = new System.Windows.Forms.Label();
+ this.txt_dn = new System.Windows.Forms.TextBox();
this.groupBox2.SuspendLayout();
- this.groupBox3.SuspendLayout();
this.SuspendLayout();
//
// label1
@@ -75,21 +53,11 @@
this.label1.TabIndex = 0;
this.label1.Text = "Imprägnier-Nr";
//
- // label2
- //
- this.label2.AutoSize = true;
- this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label2.Location = new System.Drawing.Point(14, 45);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(85, 25);
- this.label2.TabIndex = 1;
- this.label2.Text = "Vakuum";
- //
// label3
//
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label3.Location = new System.Drawing.Point(14, 81);
+ this.label3.Location = new System.Drawing.Point(12, 52);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(136, 25);
this.label3.TabIndex = 2;
@@ -99,115 +67,32 @@
//
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label4.Location = new System.Drawing.Point(14, 117);
+ this.label4.Location = new System.Drawing.Point(12, 88);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(111, 25);
this.label4.TabIndex = 3;
this.label4.Text = "Wanddicke";
//
- // label5
- //
- this.label5.AutoSize = true;
- this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label5.Location = new System.Drawing.Point(14, 153);
- this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(149, 25);
- this.label5.TabIndex = 4;
- this.label5.Text = "Walzenabstand";
- //
- // label6
- //
- this.label6.AutoSize = true;
- this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label6.Location = new System.Drawing.Point(11, 31);
- this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(46, 25);
- this.label6.TabIndex = 5;
- this.label6.Text = "Typ";
- //
- // label7
- //
- this.label7.AutoSize = true;
- this.label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label7.Location = new System.Drawing.Point(11, 68);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(113, 25);
- this.label7.TabIndex = 6;
- this.label7.Text = "Harzmenge";
- //
- // groupBox1
- //
- this.groupBox1.Controls.Add(this.txt_harzmenge);
- this.groupBox1.Controls.Add(this.txt_harzTemperatur);
- this.groupBox1.Controls.Add(this.txt_mischungtyp);
- this.groupBox1.Controls.Add(this.label6);
- this.groupBox1.Controls.Add(this.label7);
- this.groupBox1.Controls.Add(this.label12);
- this.groupBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.groupBox1.Location = new System.Drawing.Point(23, 186);
- this.groupBox1.Name = "groupBox1";
- this.groupBox1.Size = new System.Drawing.Size(411, 203);
- this.groupBox1.TabIndex = 7;
- this.groupBox1.TabStop = false;
- this.groupBox1.Text = "Mischung";
- //
- // txt_harzmenge
- //
- this.txt_harzmenge.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.txt_harzmenge.Location = new System.Drawing.Point(192, 65);
- this.txt_harzmenge.Name = "txt_harzmenge";
- this.txt_harzmenge.Size = new System.Drawing.Size(150, 30);
- this.txt_harzmenge.TabIndex = 8;
- //
- // txt_harzTemperatur
- //
- this.txt_harzTemperatur.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.txt_harzTemperatur.Location = new System.Drawing.Point(192, 101);
- this.txt_harzTemperatur.Name = "txt_harzTemperatur";
- this.txt_harzTemperatur.Size = new System.Drawing.Size(150, 30);
- this.txt_harzTemperatur.TabIndex = 17;
- //
- // txt_mischungtyp
- //
- this.txt_mischungtyp.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.txt_mischungtyp.Location = new System.Drawing.Point(192, 29);
- this.txt_mischungtyp.Name = "txt_mischungtyp";
- this.txt_mischungtyp.Size = new System.Drawing.Size(150, 30);
- this.txt_mischungtyp.TabIndex = 7;
- //
- // label12
- //
- this.label12.AutoSize = true;
- this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label12.Location = new System.Drawing.Point(11, 104);
- this.label12.Name = "label12";
- this.label12.Size = new System.Drawing.Size(159, 25);
- this.label12.TabIndex = 10;
- this.label12.Text = "Harz Temperatur";
- //
// groupBox2
//
- this.groupBox2.Controls.Add(this.mtxt_impanfang_uhrzeit);
this.groupBox2.Controls.Add(this.mtxt_impanfang_datum);
- this.groupBox2.Controls.Add(this.label9);
this.groupBox2.Controls.Add(this.label8);
this.groupBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.groupBox2.Location = new System.Drawing.Point(460, 9);
+ this.groupBox2.Location = new System.Drawing.Point(12, 193);
this.groupBox2.Name = "groupBox2";
- this.groupBox2.Size = new System.Drawing.Size(315, 203);
+ this.groupBox2.Size = new System.Drawing.Size(315, 91);
this.groupBox2.TabIndex = 8;
this.groupBox2.TabStop = false;
- this.groupBox2.Text = "Imprägnier Anfang";
+ this.groupBox2.Text = "Imprägnier";
//
- // label9
+ // mtxt_impanfang_datum
//
- this.label9.AutoSize = true;
- this.label9.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label9.Location = new System.Drawing.Point(15, 79);
- this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(73, 25);
- this.label9.TabIndex = 1;
- this.label9.Text = "Uhrzeit";
+ this.mtxt_impanfang_datum.Location = new System.Drawing.Point(117, 41);
+ this.mtxt_impanfang_datum.Mask = "00/00/0000";
+ this.mtxt_impanfang_datum.Name = "mtxt_impanfang_datum";
+ this.mtxt_impanfang_datum.Size = new System.Drawing.Size(192, 30);
+ this.mtxt_impanfang_datum.TabIndex = 5;
+ this.mtxt_impanfang_datum.ValidatingType = typeof(System.DateTime);
//
// label8
//
@@ -219,194 +104,79 @@
this.label8.TabIndex = 0;
this.label8.Text = "Datum";
//
- // groupBox3
- //
- this.groupBox3.Controls.Add(this.mtxt_impende_uhrzeit);
- this.groupBox3.Controls.Add(this.mtxt_impende_datum);
- this.groupBox3.Controls.Add(this.label10);
- this.groupBox3.Controls.Add(this.label11);
- this.groupBox3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.groupBox3.Location = new System.Drawing.Point(460, 218);
- this.groupBox3.Name = "groupBox3";
- this.groupBox3.Size = new System.Drawing.Size(315, 203);
- this.groupBox3.TabIndex = 9;
- this.groupBox3.TabStop = false;
- this.groupBox3.Text = "Imprägnier Ende";
- //
- // label10
- //
- this.label10.AutoSize = true;
- this.label10.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label10.Location = new System.Drawing.Point(6, 67);
- this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(73, 25);
- this.label10.TabIndex = 1;
- this.label10.Text = "Uhrzeit";
- //
- // label11
- //
- this.label11.AutoSize = true;
- this.label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label11.Location = new System.Drawing.Point(6, 33);
- this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(69, 25);
- this.label11.TabIndex = 0;
- this.label11.Text = "Datum";
- //
- // label13
- //
- this.label13.AutoSize = true;
- this.label13.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label13.Location = new System.Drawing.Point(14, 458);
- this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(90, 25);
- this.label13.TabIndex = 11;
- this.label13.Text = "Bediener";
- //
// txt_imprägniernr
//
this.txt_imprägniernr.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txt_imprägniernr.Location = new System.Drawing.Point(215, 6);
this.txt_imprägniernr.Name = "txt_imprägniernr";
this.txt_imprägniernr.Size = new System.Drawing.Size(219, 30);
- this.txt_imprägniernr.TabIndex = 12;
- //
- // txt_vakuum
- //
- this.txt_vakuum.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.txt_vakuum.Location = new System.Drawing.Point(215, 42);
- this.txt_vakuum.Name = "txt_vakuum";
- this.txt_vakuum.Size = new System.Drawing.Size(219, 30);
- this.txt_vakuum.TabIndex = 13;
+ this.txt_imprägniernr.TabIndex = 1;
//
// txt_schlauchnummer
//
this.txt_schlauchnummer.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.txt_schlauchnummer.Location = new System.Drawing.Point(215, 78);
+ this.txt_schlauchnummer.Location = new System.Drawing.Point(213, 49);
this.txt_schlauchnummer.Name = "txt_schlauchnummer";
this.txt_schlauchnummer.Size = new System.Drawing.Size(219, 30);
- this.txt_schlauchnummer.TabIndex = 14;
+ this.txt_schlauchnummer.TabIndex = 2;
//
// txt_wanddicke
//
this.txt_wanddicke.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.txt_wanddicke.Location = new System.Drawing.Point(215, 114);
+ this.txt_wanddicke.Location = new System.Drawing.Point(213, 85);
this.txt_wanddicke.Name = "txt_wanddicke";
this.txt_wanddicke.Size = new System.Drawing.Size(219, 30);
- this.txt_wanddicke.TabIndex = 15;
- //
- // txt_walzenabstand
- //
- this.txt_walzenabstand.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.txt_walzenabstand.Location = new System.Drawing.Point(215, 150);
- this.txt_walzenabstand.Name = "txt_walzenabstand";
- this.txt_walzenabstand.Size = new System.Drawing.Size(219, 30);
- this.txt_walzenabstand.TabIndex = 16;
- //
- // txt_bediener
- //
- this.txt_bediener.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.txt_bediener.Location = new System.Drawing.Point(215, 458);
- this.txt_bediener.Name = "txt_bediener";
- this.txt_bediener.Size = new System.Drawing.Size(219, 30);
- this.txt_bediener.TabIndex = 18;
+ this.txt_wanddicke.TabIndex = 3;
//
// btn_save
//
- this.btn_save.Location = new System.Drawing.Point(827, 36);
+ this.btn_save.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.btn_save.Location = new System.Drawing.Point(440, 6);
this.btn_save.Name = "btn_save";
- this.btn_save.Size = new System.Drawing.Size(209, 384);
- this.btn_save.TabIndex = 19;
- this.btn_save.Text = "button1";
+ this.btn_save.Size = new System.Drawing.Size(209, 278);
+ this.btn_save.TabIndex = 6;
+ this.btn_save.Text = "Speichern";
this.btn_save.UseVisualStyleBackColor = true;
this.btn_save.Click += new System.EventHandler(this.Btn_save_Click);
//
- // label14
+ // label2
//
- this.label14.AutoSize = true;
- this.label14.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label14.Location = new System.Drawing.Point(14, 411);
- this.label14.Name = "label14";
- this.label14.Size = new System.Drawing.Size(122, 25);
- this.label14.TabIndex = 20;
- this.label14.Text = "Länge-Code";
+ this.label2.AutoSize = true;
+ this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label2.Location = new System.Drawing.Point(12, 131);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(40, 25);
+ this.label2.TabIndex = 20;
+ this.label2.Text = "DN";
//
- // txt_laengeCode
+ // txt_dn
//
- this.txt_laengeCode.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.txt_laengeCode.Location = new System.Drawing.Point(215, 411);
- this.txt_laengeCode.Name = "txt_laengeCode";
- this.txt_laengeCode.Size = new System.Drawing.Size(219, 30);
- this.txt_laengeCode.TabIndex = 21;
- //
- // mtxt_impanfang_datum
- //
- this.mtxt_impanfang_datum.Location = new System.Drawing.Point(117, 41);
- this.mtxt_impanfang_datum.Mask = "00/00/0000";
- this.mtxt_impanfang_datum.Name = "mtxt_impanfang_datum";
- this.mtxt_impanfang_datum.Size = new System.Drawing.Size(192, 30);
- this.mtxt_impanfang_datum.TabIndex = 4;
- this.mtxt_impanfang_datum.ValidatingType = typeof(System.DateTime);
- //
- // mtxt_impanfang_uhrzeit
- //
- this.mtxt_impanfang_uhrzeit.Location = new System.Drawing.Point(117, 77);
- this.mtxt_impanfang_uhrzeit.Mask = "90:00";
- this.mtxt_impanfang_uhrzeit.Name = "mtxt_impanfang_uhrzeit";
- this.mtxt_impanfang_uhrzeit.Size = new System.Drawing.Size(100, 30);
- this.mtxt_impanfang_uhrzeit.TabIndex = 5;
- this.mtxt_impanfang_uhrzeit.ValidatingType = typeof(System.DateTime);
- //
- // mtxt_impende_datum
- //
- this.mtxt_impende_datum.Location = new System.Drawing.Point(145, 31);
- this.mtxt_impende_datum.Mask = "00/00/0000";
- this.mtxt_impende_datum.Name = "mtxt_impende_datum";
- this.mtxt_impende_datum.Size = new System.Drawing.Size(153, 30);
- this.mtxt_impende_datum.TabIndex = 2;
- this.mtxt_impende_datum.ValidatingType = typeof(System.DateTime);
- //
- // mtxt_impende_uhrzeit
- //
- this.mtxt_impende_uhrzeit.Location = new System.Drawing.Point(145, 64);
- this.mtxt_impende_uhrzeit.Mask = "90:00";
- this.mtxt_impende_uhrzeit.Name = "mtxt_impende_uhrzeit";
- this.mtxt_impende_uhrzeit.Size = new System.Drawing.Size(153, 30);
- this.mtxt_impende_uhrzeit.TabIndex = 3;
- this.mtxt_impende_uhrzeit.ValidatingType = typeof(System.DateTime);
+ this.txt_dn.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txt_dn.Location = new System.Drawing.Point(213, 131);
+ this.txt_dn.Name = "txt_dn";
+ this.txt_dn.Size = new System.Drawing.Size(100, 30);
+ this.txt_dn.TabIndex = 4;
//
// frmImprägnierBerichtEdit
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1056, 558);
- this.Controls.Add(this.txt_laengeCode);
- this.Controls.Add(this.label14);
+ this.ClientSize = new System.Drawing.Size(671, 294);
+ this.Controls.Add(this.txt_dn);
+ this.Controls.Add(this.label2);
this.Controls.Add(this.btn_save);
- this.Controls.Add(this.txt_bediener);
- this.Controls.Add(this.txt_walzenabstand);
this.Controls.Add(this.txt_wanddicke);
this.Controls.Add(this.txt_schlauchnummer);
- this.Controls.Add(this.txt_vakuum);
this.Controls.Add(this.txt_imprägniernr);
- this.Controls.Add(this.label13);
- this.Controls.Add(this.groupBox3);
this.Controls.Add(this.groupBox2);
- this.Controls.Add(this.groupBox1);
- this.Controls.Add(this.label5);
this.Controls.Add(this.label4);
this.Controls.Add(this.label3);
- this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.Name = "frmImprägnierBerichtEdit";
this.Text = "frmImprägnierBerichtEdit";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmImprägnierBerichtEdit_FormClosing);
- this.groupBox1.ResumeLayout(false);
- this.groupBox1.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
- this.groupBox3.ResumeLayout(false);
- this.groupBox3.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@@ -415,36 +185,16 @@
#endregion
private System.Windows.Forms.Label label1;
- private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label4;
- private System.Windows.Forms.Label label5;
- private System.Windows.Forms.Label label6;
- private System.Windows.Forms.Label label7;
- private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.GroupBox groupBox2;
- private System.Windows.Forms.Label label9;
private System.Windows.Forms.Label label8;
- private System.Windows.Forms.GroupBox groupBox3;
- private System.Windows.Forms.Label label10;
- private System.Windows.Forms.Label label11;
- private System.Windows.Forms.Label label12;
- private System.Windows.Forms.Label label13;
- private System.Windows.Forms.TextBox txt_harzmenge;
- private System.Windows.Forms.TextBox txt_mischungtyp;
private System.Windows.Forms.TextBox txt_imprägniernr;
- private System.Windows.Forms.TextBox txt_vakuum;
private System.Windows.Forms.TextBox txt_schlauchnummer;
private System.Windows.Forms.TextBox txt_wanddicke;
- private System.Windows.Forms.TextBox txt_walzenabstand;
- private System.Windows.Forms.TextBox txt_harzTemperatur;
- private System.Windows.Forms.TextBox txt_bediener;
private System.Windows.Forms.Button btn_save;
- private System.Windows.Forms.Label label14;
- private System.Windows.Forms.TextBox txt_laengeCode;
- private System.Windows.Forms.MaskedTextBox mtxt_impanfang_uhrzeit;
private System.Windows.Forms.MaskedTextBox mtxt_impanfang_datum;
- private System.Windows.Forms.MaskedTextBox mtxt_impende_uhrzeit;
- private System.Windows.Forms.MaskedTextBox mtxt_impende_datum;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.TextBox txt_dn;
}
}
\ No newline at end of file
diff --git a/SanSystem/frmImprägnierBerichtEdit.cs b/SanSystem/frmImprägnierBerichtEdit.cs
index af1b600..be4acc3 100644
--- a/SanSystem/frmImprägnierBerichtEdit.cs
+++ b/SanSystem/frmImprägnierBerichtEdit.cs
@@ -20,38 +20,25 @@ namespace SanSystem
this.werkseitigImprägniert = werkseitigImprägniert;
txt_imprägniernr.DataBindings.Add("Text", werkseitigImprägniert, "Imprägniernummer");
- txt_laengeCode.DataBindings.Add("Text", werkseitigImprägniert, "LängeCode");
+
txt_schlauchnummer.DataBindings.Add("Text", werkseitigImprägniert, "Schlauchnummer");
txt_wanddicke.DataBindings.Add("Text", werkseitigImprägniert, "Wanddicke");
- txt_harzmenge.DataBindings.Add("Text", werkseitigImprägniert, "Harzmenge");
- txt_harzTemperatur.DataBindings.Add("Text", werkseitigImprägniert, "HarzTemperatur");
- txt_bediener.DataBindings.Add("Text", werkseitigImprägniert, "Bediener");
- txt_mischungtyp.DataBindings.Add("Text", werkseitigImprägniert, "HarzTyp");
- txt_vakuum.DataBindings.Add("Text", werkseitigImprägniert, "Vakuum");
- txt_walzenabstand.DataBindings.Add("Text", werkseitigImprägniert, "Walzenabstand");
-
+ txt_dn.DataBindings.Add("Text", werkseitigImprägniert, "DN");
if(werkseitigImprägniert.ImprägnierungBeginn != null)
{
mtxt_impanfang_datum.Text = werkseitigImprägniert.ImprägnierungBeginn.Zeitstempel.ToShortDateString();
- mtxt_impanfang_uhrzeit.Text = werkseitigImprägniert.ImprägnierungBeginn.Zeitstempel.ToShortTimeString();
- }
- if(werkseitigImprägniert.ImprägnierungEnde != null)
- {
- mtxt_impende_datum.Text = werkseitigImprägniert.ImprägnierungEnde.Zeitstempel.ToShortDateString();
- mtxt_impende_uhrzeit.Text = werkseitigImprägniert.ImprägnierungEnde.Zeitstempel.ToShortTimeString();
}
+
}
private void save()
{
DateTime timestampAnfang;
- DateTime timestampEnde;
-
- string anfang = string.Format("{0} {1}", mtxt_impanfang_datum.Text, mtxt_impanfang_uhrzeit.Text);
- string ende = string.Format("{0} {1}", mtxt_impende_datum.Text, mtxt_impende_uhrzeit.Text);
-
- if (!DateTime.TryParse(anfang, out timestampAnfang) || !DateTime.TryParse(ende, out timestampEnde))
+
+ string anfang = string.Format("{0}", mtxt_impanfang_datum.Text);
+
+ if (!DateTime.TryParse(anfang, out timestampAnfang))
{
MessageBox.Show("Sorry konnte Datum und Uhrzeit nicht parsen");
return;
@@ -61,13 +48,9 @@ namespace SanSystem
{
Zeitstempel = timestampAnfang
};
- ImprägnierungStrukture endeStrukture = new ImprägnierungStrukture()
- {
- Zeitstempel = timestampEnde
- };
-
+
werkseitigImprägniert.ImprägnierungBeginn = anfangStrukture;
- werkseitigImprägniert.ImprägnierungEnde = endeStrukture;
+
}
private void Btn_save_Click(object sender, EventArgs e)