diff --git a/KlassenBIB/InlinerSanierung.cs b/KlassenBIB/InlinerSanierung.cs index b2ee6b1..b86d27a 100644 --- a/KlassenBIB/InlinerSanierung.cs +++ b/KlassenBIB/InlinerSanierung.cs @@ -29,6 +29,10 @@ namespace KlassenBIB bool geschlosseneEnde = false; DateTime anfangAushaertung; DateTime endeAushaertung; + string ort; + string bediener; + DateTime anfangKalibrierung; + DateTime endeKalibirierung; /// /// Gibt den kompletten Harzbedarf auf die Haltungslänge bezogen zurück @@ -97,7 +101,10 @@ namespace KlassenBIB {"vakuum","" }, {"time_start","" }, {"time_ende","" }, - {"UVImage","" } + {"UVImage","" }, + {"liner_type","" }, + {"rueckhol_speed","" }, + {"harz_type","" } }; double LaengeGesamt = this.Inspektionsobjekt.Haltungslaenge + this.Inspektionsobjekt.Schachtlaenge; @@ -139,7 +146,9 @@ namespace KlassenBIB grunddaten["time_start"] = this.AnfangAushaertung; grunddaten["time_ende"] = this.EndeAushaertung; grunddaten["UVImage"] = Path.Combine(destinationPath, "linerGraph.jpg"); - + grunddaten["rueckhol_speed"] = rueckholgeschwindigkeit; + grunddaten["liner_type"] = LinerTyp; + grunddaten["harz_type"] = HarzTyp; return grunddaten; } /// @@ -219,5 +228,21 @@ namespace KlassenBIB /// /// public DateTime EndeAushaertung { get => endeAushaertung; set => endeAushaertung = value; } + /// + /// + /// + public string Ort { get => ort; set => ort = value; } + /// + /// + /// + public string Bediener { get => bediener; set => bediener = value; } + /// + /// + /// + public DateTime AnfangKalibrierung { get => anfangKalibrierung; set => anfangKalibrierung = value; } + /// + /// + /// + public DateTime EndeKalibirierung { get => endeKalibirierung; set => endeKalibirierung = value; } } } diff --git a/SanSystem/UCInliner.Designer.cs b/SanSystem/UCInliner.Designer.cs index 9dc13f1..ae367ab 100644 --- a/SanSystem/UCInliner.Designer.cs +++ b/SanSystem/UCInliner.Designer.cs @@ -30,6 +30,8 @@ { this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage2 = new System.Windows.Forms.TabPage(); + this.txt_besatzung = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.cb_mech = new System.Windows.Forms.CheckBox(); this.cb_roboter = new System.Windows.Forms.CheckBox(); @@ -51,8 +53,6 @@ this.cb_stvo = new System.Windows.Forms.CheckBox(); this.cb_wasserhaltung = new System.Windows.Forms.CheckBox(); this.cb_genehmigung = new System.Windows.Forms.CheckBox(); - this.label2 = new System.Windows.Forms.Label(); - this.txt_besatzung = new System.Windows.Forms.TextBox(); this.tabControl1.SuspendLayout(); this.tabPage2.SuspendLayout(); this.groupBox1.SuspendLayout(); @@ -90,21 +90,37 @@ this.tabPage2.Controls.Add(this.cb_stvo); this.tabPage2.Controls.Add(this.cb_wasserhaltung); this.tabPage2.Controls.Add(this.cb_genehmigung); - this.tabPage2.Location = new System.Drawing.Point(4, 34); + this.tabPage2.Location = new System.Drawing.Point(4, 29); this.tabPage2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.tabPage2.Size = new System.Drawing.Size(1328, 574); + this.tabPage2.Size = new System.Drawing.Size(1328, 579); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "Vorraussetzungen"; this.tabPage2.UseVisualStyleBackColor = true; // + // txt_besatzung + // + this.txt_besatzung.Location = new System.Drawing.Point(551, 192); + this.txt_besatzung.Name = "txt_besatzung"; + this.txt_besatzung.Size = new System.Drawing.Size(296, 26); + this.txt_besatzung.TabIndex = 37; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(392, 195); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(86, 20); + this.label2.TabIndex = 36; + this.label2.Text = "Besatzung"; + // // groupBox1 // this.groupBox1.Controls.Add(this.cb_mech); this.groupBox1.Controls.Add(this.cb_roboter); this.groupBox1.Controls.Add(this.cb_hd); - this.groupBox1.Location = new System.Drawing.Point(13, 198); + this.groupBox1.Location = new System.Drawing.Point(8, 123); this.groupBox1.Name = "groupBox1"; this.groupBox1.Size = new System.Drawing.Size(357, 125); this.groupBox1.TabIndex = 35; @@ -116,7 +132,7 @@ this.cb_mech.AutoSize = true; this.cb_mech.Location = new System.Drawing.Point(6, 90); this.cb_mech.Name = "cb_mech"; - this.cb_mech.Size = new System.Drawing.Size(140, 29); + this.cb_mech.Size = new System.Drawing.Size(113, 24); this.cb_mech.TabIndex = 2; this.cb_mech.Text = "Mechanisch"; this.cb_mech.UseVisualStyleBackColor = true; @@ -126,7 +142,7 @@ this.cb_roboter.AutoSize = true; this.cb_roboter.Location = new System.Drawing.Point(6, 60); this.cb_roboter.Name = "cb_roboter"; - this.cb_roboter.Size = new System.Drawing.Size(102, 29); + this.cb_roboter.Size = new System.Drawing.Size(86, 24); this.cb_roboter.TabIndex = 1; this.cb_roboter.Text = "Roboter"; this.cb_roboter.UseVisualStyleBackColor = true; @@ -134,16 +150,18 @@ // cb_hd // this.cb_hd.AutoSize = true; + this.cb_hd.Checked = true; + this.cb_hd.CheckState = System.Windows.Forms.CheckState.Checked; this.cb_hd.Location = new System.Drawing.Point(6, 29); this.cb_hd.Name = "cb_hd"; - this.cb_hd.Size = new System.Drawing.Size(67, 29); + this.cb_hd.Size = new System.Drawing.Size(56, 24); this.cb_hd.TabIndex = 0; this.cb_hd.Text = "HD "; this.cb_hd.UseVisualStyleBackColor = true; // // btn_create_protokol // - this.btn_create_protokol.Location = new System.Drawing.Point(626, 484); + this.btn_create_protokol.Location = new System.Drawing.Point(393, 311); this.btn_create_protokol.Name = "btn_create_protokol"; this.btn_create_protokol.Size = new System.Drawing.Size(107, 69); this.btn_create_protokol.TabIndex = 33; @@ -153,14 +171,14 @@ // // ftpProgress // - this.ftpProgress.Location = new System.Drawing.Point(782, 487); + this.ftpProgress.Location = new System.Drawing.Point(141, 412); this.ftpProgress.Name = "ftpProgress"; this.ftpProgress.Size = new System.Drawing.Size(280, 37); this.ftpProgress.TabIndex = 29; // // btn_transfer_ftp // - this.btn_transfer_ftp.Location = new System.Drawing.Point(820, 317); + this.btn_transfer_ftp.Location = new System.Drawing.Point(141, 254); this.btn_transfer_ftp.Name = "btn_transfer_ftp"; this.btn_transfer_ftp.Size = new System.Drawing.Size(224, 126); this.btn_transfer_ftp.TabIndex = 28; @@ -171,17 +189,17 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(47, 439); + this.label1.Location = new System.Drawing.Point(392, 165); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(132, 25); + this.label1.Size = new System.Drawing.Size(108, 20); this.label1.TabIndex = 27; this.label1.Text = "Eingebaut am"; // // dt_eingebaut // - this.dt_eingebaut.Location = new System.Drawing.Point(205, 434); + this.dt_eingebaut.Location = new System.Drawing.Point(556, 160); this.dt_eingebaut.Name = "dt_eingebaut"; - this.dt_eingebaut.Size = new System.Drawing.Size(291, 30); + this.dt_eingebaut.Size = new System.Drawing.Size(291, 26); this.dt_eingebaut.TabIndex = 26; // // cb_fertig @@ -189,9 +207,9 @@ this.cb_fertig.AutoSize = true; this.cb_fertig.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.cb_fertig.Font = new System.Drawing.Font("Microsoft Sans Serif", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cb_fertig.Location = new System.Drawing.Point(573, 347); + this.cb_fertig.Location = new System.Drawing.Point(14, 281); this.cb_fertig.Name = "cb_fertig"; - this.cb_fertig.Size = new System.Drawing.Size(122, 43); + this.cb_fertig.Size = new System.Drawing.Size(100, 35); this.cb_fertig.TabIndex = 25; this.cb_fertig.Text = "Fertig"; this.cb_fertig.UseVisualStyleBackColor = true; @@ -205,18 +223,18 @@ "Trocken", "Niederschlag", "Schnee - Eisschmelze"}); - this.cbb_wetter.Location = new System.Drawing.Point(205, 348); + this.cbb_wetter.Location = new System.Drawing.Point(551, 224); this.cbb_wetter.Name = "cbb_wetter"; - this.cbb_wetter.Size = new System.Drawing.Size(282, 33); + this.cbb_wetter.Size = new System.Drawing.Size(282, 28); this.cbb_wetter.TabIndex = 23; // // label24 // this.label24.AutoSize = true; this.label24.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label24.Location = new System.Drawing.Point(8, 351); + this.label24.Location = new System.Drawing.Point(392, 228); this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(70, 25); + this.label24.Size = new System.Drawing.Size(57, 20); this.label24.TabIndex = 24; this.label24.Text = "Wetter"; // @@ -248,14 +266,14 @@ // this.txt_temp_kanal.Location = new System.Drawing.Point(114, 77); this.txt_temp_kanal.Name = "txt_temp_kanal"; - this.txt_temp_kanal.Size = new System.Drawing.Size(100, 30); + this.txt_temp_kanal.Size = new System.Drawing.Size(100, 26); this.txt_temp_kanal.TabIndex = 18; // // txt_temp_aussen // this.txt_temp_aussen.Location = new System.Drawing.Point(114, 34); this.txt_temp_aussen.Name = "txt_temp_aussen"; - this.txt_temp_aussen.Size = new System.Drawing.Size(100, 30); + this.txt_temp_aussen.Size = new System.Drawing.Size(100, 26); this.txt_temp_aussen.TabIndex = 17; // // label23 @@ -263,7 +281,7 @@ this.label23.AutoSize = true; this.label23.Location = new System.Drawing.Point(15, 80); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(63, 25); + this.label23.Size = new System.Drawing.Size(49, 20); this.label23.TabIndex = 1; this.label23.Text = "Kanal"; // @@ -272,18 +290,20 @@ this.label22.AutoSize = true; this.label22.Location = new System.Drawing.Point(15, 34); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(79, 25); + this.label22.Size = new System.Drawing.Size(63, 20); this.label22.TabIndex = 0; this.label22.Text = "Aussen"; // // cb_stvo // this.cb_stvo.AutoSize = true; + this.cb_stvo.Checked = true; + this.cb_stvo.CheckState = System.Windows.Forms.CheckState.Checked; this.cb_stvo.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cb_stvo.Location = new System.Drawing.Point(8, 130); + this.cb_stvo.Location = new System.Drawing.Point(8, 91); this.cb_stvo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cb_stvo.Name = "cb_stvo"; - this.cb_stvo.Size = new System.Drawing.Size(323, 29); + this.cb_stvo.Size = new System.Drawing.Size(263, 24); this.cb_stvo.TabIndex = 16; this.cb_stvo.Text = "Es wurde nach StVO abgesichert"; this.cb_stvo.UseVisualStyleBackColor = true; @@ -291,11 +311,13 @@ // cb_wasserhaltung // this.cb_wasserhaltung.AutoSize = true; + this.cb_wasserhaltung.Checked = true; + this.cb_wasserhaltung.CheckState = System.Windows.Forms.CheckState.Checked; this.cb_wasserhaltung.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cb_wasserhaltung.Location = new System.Drawing.Point(8, 79); + this.cb_wasserhaltung.Location = new System.Drawing.Point(8, 57); this.cb_wasserhaltung.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cb_wasserhaltung.Name = "cb_wasserhaltung"; - this.cb_wasserhaltung.Size = new System.Drawing.Size(329, 29); + this.cb_wasserhaltung.Size = new System.Drawing.Size(269, 24); this.cb_wasserhaltung.TabIndex = 15; this.cb_wasserhaltung.Text = "Wasserhaltung wurde eingerichtet"; this.cb_wasserhaltung.UseVisualStyleBackColor = true; @@ -303,34 +325,20 @@ // cb_genehmigung // this.cb_genehmigung.AutoSize = true; + this.cb_genehmigung.Checked = true; + this.cb_genehmigung.CheckState = System.Windows.Forms.CheckState.Checked; this.cb_genehmigung.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.cb_genehmigung.Location = new System.Drawing.Point(8, 23); this.cb_genehmigung.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cb_genehmigung.Name = "cb_genehmigung"; - this.cb_genehmigung.Size = new System.Drawing.Size(299, 29); + this.cb_genehmigung.Size = new System.Drawing.Size(245, 24); this.cb_genehmigung.TabIndex = 14; this.cb_genehmigung.Text = "Genehmigung wurde eingeholt"; this.cb_genehmigung.UseVisualStyleBackColor = true; // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(515, 204); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(105, 25); - this.label2.TabIndex = 36; - this.label2.Text = "Besatzung"; - // - // txt_besatzung - // - this.txt_besatzung.Location = new System.Drawing.Point(658, 199); - this.txt_besatzung.Name = "txt_besatzung"; - this.txt_besatzung.Size = new System.Drawing.Size(296, 30); - this.txt_besatzung.TabIndex = 37; - // // UCInliner // - this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 25F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.tabControl1); this.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); diff --git a/SanSystem/UCLinerGrundlagen.Designer.cs b/SanSystem/UCLinerGrundlagen.Designer.cs index 5af7e4f..cdcd72c 100644 --- a/SanSystem/UCLinerGrundlagen.Designer.cs +++ b/SanSystem/UCLinerGrundlagen.Designer.cs @@ -34,6 +34,7 @@ this.txt_charge_liner = new System.Windows.Forms.TextBox(); this.txt_charge_harz = new System.Windows.Forms.TextBox(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.btn_save_for_liners = new System.Windows.Forms.Button(); this.dt_kalibrierdatum = new System.Windows.Forms.DateTimePicker(); this.txt_vakuum = new System.Windows.Forms.TextBox(); this.txt_temp_harz = new System.Windows.Forms.TextBox(); @@ -47,14 +48,18 @@ this.label11 = new System.Windows.Forms.Label(); this.label10 = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label(); - this.btn_save_for_liners = new System.Windows.Forms.Button(); + 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.groupBox1.SuspendLayout(); this.SuspendLayout(); // // txt_liner // this.txt_liner.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txt_liner.Location = new System.Drawing.Point(134, 117); + this.txt_liner.Location = new System.Drawing.Point(134, 84); this.txt_liner.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txt_liner.Name = "txt_liner"; this.txt_liner.Size = new System.Drawing.Size(148, 26); @@ -63,7 +68,7 @@ // txt_harzbedarf // this.txt_harzbedarf.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txt_harzbedarf.Location = new System.Drawing.Point(134, 66); + this.txt_harzbedarf.Location = new System.Drawing.Point(134, 49); this.txt_harzbedarf.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txt_harzbedarf.Name = "txt_harzbedarf"; this.txt_harzbedarf.Size = new System.Drawing.Size(148, 26); @@ -81,7 +86,7 @@ // txt_charge_liner // this.txt_charge_liner.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txt_charge_liner.Location = new System.Drawing.Point(422, 117); + this.txt_charge_liner.Location = new System.Drawing.Point(422, 84); this.txt_charge_liner.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txt_charge_liner.Name = "txt_charge_liner"; this.txt_charge_liner.Size = new System.Drawing.Size(300, 26); @@ -98,6 +103,11 @@ // // groupBox1 // + this.groupBox1.Controls.Add(this.label5); + this.groupBox1.Controls.Add(this.label4); + this.groupBox1.Controls.Add(this.label3); + this.groupBox1.Controls.Add(this.label2); + this.groupBox1.Controls.Add(this.label1); this.groupBox1.Controls.Add(this.btn_save_for_liners); this.groupBox1.Controls.Add(this.dt_kalibrierdatum); this.groupBox1.Controls.Add(this.txt_vakuum); @@ -108,7 +118,7 @@ this.groupBox1.Controls.Add(this.label16); this.groupBox1.Controls.Add(this.label15); this.groupBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.groupBox1.Location = new System.Drawing.Point(12, 153); + this.groupBox1.Location = new System.Drawing.Point(12, 120); this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.groupBox1.Name = "groupBox1"; this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); @@ -117,6 +127,16 @@ this.groupBox1.TabStop = false; this.groupBox1.Text = "Kalibrierung"; // + // btn_save_for_liners + // + this.btn_save_for_liners.Location = new System.Drawing.Point(546, 44); + this.btn_save_for_liners.Name = "btn_save_for_liners"; + this.btn_save_for_liners.Size = new System.Drawing.Size(113, 166); + this.btn_save_for_liners.TabIndex = 29; + this.btn_save_for_liners.Text = "button1"; + this.btn_save_for_liners.UseVisualStyleBackColor = true; + this.btn_save_for_liners.Click += new System.EventHandler(this.btn_save_for_liners_Click); + // // dt_kalibrierdatum // this.dt_kalibrierdatum.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -129,7 +149,7 @@ // 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(375, 93); + this.txt_vakuum.Location = new System.Drawing.Point(376, 55); this.txt_vakuum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txt_vakuum.Name = "txt_vakuum"; this.txt_vakuum.Size = new System.Drawing.Size(148, 26); @@ -138,7 +158,7 @@ // txt_temp_harz // this.txt_temp_harz.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txt_temp_harz.Location = new System.Drawing.Point(145, 143); + this.txt_temp_harz.Location = new System.Drawing.Point(146, 105); this.txt_temp_harz.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txt_temp_harz.Name = "txt_temp_harz"; this.txt_temp_harz.Size = new System.Drawing.Size(148, 26); @@ -147,7 +167,7 @@ // txt_walze_distance // this.txt_walze_distance.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txt_walze_distance.Location = new System.Drawing.Point(143, 93); + this.txt_walze_distance.Location = new System.Drawing.Point(144, 55); this.txt_walze_distance.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txt_walze_distance.Name = "txt_walze_distance"; this.txt_walze_distance.Size = new System.Drawing.Size(148, 26); @@ -157,7 +177,7 @@ // this.label17.AutoSize = true; this.label17.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label17.Location = new System.Drawing.Point(299, 96); + this.label17.Location = new System.Drawing.Point(300, 58); this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label17.Name = "label17"; this.label17.Size = new System.Drawing.Size(68, 20); @@ -168,7 +188,7 @@ // 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(8, 146); + this.label14.Location = new System.Drawing.Point(9, 108); this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(129, 20); @@ -179,7 +199,7 @@ // this.label16.AutoSize = true; this.label16.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label16.Location = new System.Drawing.Point(8, 96); + this.label16.Location = new System.Drawing.Point(9, 58); this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(127, 20); @@ -201,7 +221,7 @@ // 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(290, 120); + this.label13.Location = new System.Drawing.Point(290, 87); this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(126, 20); @@ -212,7 +232,7 @@ // 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(8, 123); + this.label12.Location = new System.Drawing.Point(8, 90); this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(44, 20); @@ -223,7 +243,7 @@ // 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(8, 69); + this.label11.Location = new System.Drawing.Point(8, 52); this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(110, 20); @@ -252,15 +272,55 @@ this.label9.TabIndex = 25; this.label9.Text = "Harz"; // - // btn_save_for_liners + // label1 // - this.btn_save_for_liners.Location = new System.Drawing.Point(546, 44); - this.btn_save_for_liners.Name = "btn_save_for_liners"; - this.btn_save_for_liners.Size = new System.Drawing.Size(113, 166); - this.btn_save_for_liners.TabIndex = 29; - this.btn_save_for_liners.Text = "button1"; - this.btn_save_for_liners.UseVisualStyleBackColor = true; - this.btn_save_for_liners.Click += new System.EventHandler(this.btn_save_for_liners_Click); + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(9, 130); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(31, 20); + this.label1.TabIndex = 30; + this.label1.Text = "Ort"; + // + // 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(9, 161); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(73, 20); + this.label2.TabIndex = 31; + this.label2.Text = "Bediener"; + // + // 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(339, 130); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(150, 20); + this.label3.TabIndex = 32; + this.label3.Text = "Zeit der Kalibrierung"; + // + // label4 + // + 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(339, 161); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(38, 20); + this.label4.TabIndex = 33; + this.label4.Text = "Von"; + // + // 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(339, 199); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(31, 20); + this.label5.TabIndex = 34; + this.label5.Text = "Bis"; // // UCLinerGrundlagen // @@ -279,7 +339,7 @@ this.Controls.Add(this.label10); this.Controls.Add(this.label9); this.Name = "UCLinerGrundlagen"; - this.Size = new System.Drawing.Size(731, 456); + this.Size = new System.Drawing.Size(845, 534); this.Load += new System.EventHandler(this.UCLinerGrundlagen_Load); this.groupBox1.ResumeLayout(false); this.groupBox1.PerformLayout(); @@ -310,5 +370,10 @@ private System.Windows.Forms.Label label10; private System.Windows.Forms.Label label9; private System.Windows.Forms.Button btn_save_for_liners; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label1; } } diff --git a/SanSystem/documents/JUME/liner_einbau.docx b/SanSystem/documents/JUME/liner_einbau.docx index 7761f42..d315c64 100644 Binary files a/SanSystem/documents/JUME/liner_einbau.docx and b/SanSystem/documents/JUME/liner_einbau.docx differ