From b8c8a6cbfa4737d60b70500733556b8e2fe903cd Mon Sep 17 00:00:00 2001 From: Husky Date: Mon, 16 Jul 2018 21:29:44 +0200 Subject: [PATCH] Bug behoben, wegen datum MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit es wird jetzt die gesamtliner maße und harzmenge ausgegeben --- SanSystem/UCInliner.Designer.cs | 43 ++++++++++-------- SanSystem/UCInliner.cs | 10 ++-- .../JUME/KalibrierungAuflistung.docx | Bin 14220 -> 13965 bytes SanSystem/frmObjekteList.cs | 13 +++++- 4 files changed, 41 insertions(+), 25 deletions(-) diff --git a/SanSystem/UCInliner.Designer.cs b/SanSystem/UCInliner.Designer.cs index d4e9980..2358a21 100644 --- a/SanSystem/UCInliner.Designer.cs +++ b/SanSystem/UCInliner.Designer.cs @@ -57,12 +57,15 @@ // // tabControl1 // + this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.tabControl1.Controls.Add(this.tabPage2); this.tabControl1.Location = new System.Drawing.Point(4, 0); this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(1131, 612); + this.tabControl1.Size = new System.Drawing.Size(1336, 612); this.tabControl1.TabIndex = 0; this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged); // @@ -83,11 +86,11 @@ 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, 29); + this.tabPage2.Location = new System.Drawing.Point(4, 34); 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(1123, 579); + this.tabPage2.Size = new System.Drawing.Size(1328, 574); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "Vorraussetzungen"; this.tabPage2.UseVisualStyleBackColor = true; @@ -124,7 +127,7 @@ this.label1.AutoSize = true; this.label1.Location = new System.Drawing.Point(47, 439); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(108, 20); + this.label1.Size = new System.Drawing.Size(132, 25); this.label1.TabIndex = 27; this.label1.Text = "Eingebaut am"; // @@ -132,7 +135,7 @@ // this.dt_eingebaut.Location = new System.Drawing.Point(205, 434); this.dt_eingebaut.Name = "dt_eingebaut"; - this.dt_eingebaut.Size = new System.Drawing.Size(291, 26); + this.dt_eingebaut.Size = new System.Drawing.Size(291, 30); this.dt_eingebaut.TabIndex = 26; // // cb_fertig @@ -142,7 +145,7 @@ 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.Name = "cb_fertig"; - this.cb_fertig.Size = new System.Drawing.Size(100, 35); + this.cb_fertig.Size = new System.Drawing.Size(122, 43); this.cb_fertig.TabIndex = 25; this.cb_fertig.Text = "Fertig"; this.cb_fertig.UseVisualStyleBackColor = true; @@ -158,7 +161,7 @@ "Schnee - Eisschmelze"}); this.cbb_wetter.Location = new System.Drawing.Point(205, 348); this.cbb_wetter.Name = "cbb_wetter"; - this.cbb_wetter.Size = new System.Drawing.Size(282, 28); + this.cbb_wetter.Size = new System.Drawing.Size(282, 33); this.cbb_wetter.TabIndex = 23; // // label24 @@ -167,7 +170,7 @@ 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.Name = "label24"; - this.label24.Size = new System.Drawing.Size(57, 20); + this.label24.Size = new System.Drawing.Size(70, 25); this.label24.TabIndex = 24; this.label24.Text = "Wetter"; // @@ -199,14 +202,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, 26); + this.txt_temp_kanal.Size = new System.Drawing.Size(100, 30); 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, 26); + this.txt_temp_aussen.Size = new System.Drawing.Size(100, 30); this.txt_temp_aussen.TabIndex = 17; // // label23 @@ -214,7 +217,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(49, 20); + this.label23.Size = new System.Drawing.Size(63, 25); this.label23.TabIndex = 1; this.label23.Text = "Kanal"; // @@ -223,7 +226,7 @@ this.label22.AutoSize = true; this.label22.Location = new System.Drawing.Point(15, 34); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(63, 20); + this.label22.Size = new System.Drawing.Size(79, 25); this.label22.TabIndex = 0; this.label22.Text = "Aussen"; // @@ -234,7 +237,7 @@ this.label8.Location = new System.Drawing.Point(468, 221); this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(88, 20); + this.label8.Size = new System.Drawing.Size(107, 25); this.label8.TabIndex = 6; this.label8.Text = "Vorbereitet"; // @@ -245,7 +248,7 @@ this.label7.Location = new System.Drawing.Point(8, 221); this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(134, 20); + this.label7.Size = new System.Drawing.Size(164, 25); this.label7.TabIndex = 5; this.label7.Text = "Leitung wurde mit"; // @@ -260,7 +263,7 @@ this.cb_lb_vorbereitung.Location = new System.Drawing.Point(218, 221); this.cb_lb_vorbereitung.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cb_lb_vorbereitung.Name = "cb_lb_vorbereitung"; - this.cb_lb_vorbereitung.Size = new System.Drawing.Size(211, 88); + this.cb_lb_vorbereitung.Size = new System.Drawing.Size(211, 79); this.cb_lb_vorbereitung.TabIndex = 19; // // cb_stvo @@ -270,7 +273,7 @@ this.cb_stvo.Location = new System.Drawing.Point(8, 130); 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(263, 24); + this.cb_stvo.Size = new System.Drawing.Size(323, 29); this.cb_stvo.TabIndex = 16; this.cb_stvo.Text = "Es wurde nach StVO abgesichert"; this.cb_stvo.UseVisualStyleBackColor = true; @@ -282,7 +285,7 @@ this.cb_wasserhaltung.Location = new System.Drawing.Point(8, 79); 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(269, 24); + this.cb_wasserhaltung.Size = new System.Drawing.Size(329, 29); this.cb_wasserhaltung.TabIndex = 15; this.cb_wasserhaltung.Text = "Wasserhaltung wurde eingerichtet"; this.cb_wasserhaltung.UseVisualStyleBackColor = true; @@ -294,20 +297,20 @@ 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(245, 24); + this.cb_genehmigung.Size = new System.Drawing.Size(299, 29); this.cb_genehmigung.TabIndex = 14; this.cb_genehmigung.Text = "Genehmigung wurde eingeholt"; this.cb_genehmigung.UseVisualStyleBackColor = true; // // UCInliner // - this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); + this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 25F); 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))); this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.Name = "UCInliner"; - this.Size = new System.Drawing.Size(1131, 702); + this.Size = new System.Drawing.Size(1344, 702); this.Load += new System.EventHandler(this.UCInliner_Load); this.tabControl1.ResumeLayout(false); this.tabPage2.ResumeLayout(false); diff --git a/SanSystem/UCInliner.cs b/SanSystem/UCInliner.cs index f493a0a..ea899b8 100644 --- a/SanSystem/UCInliner.cs +++ b/SanSystem/UCInliner.cs @@ -69,9 +69,13 @@ namespace SanSystem cb_fertig.DataBindings.Add(new Binding("Checked", inliner, "fertig")); cbb_wetter.DataBindings.Add(new Binding("Text", inliner, "Wetter")); if (inliner.Datum != null) - dt_eingebaut.DataBindings.Add(new Binding("Value", inliner, "Datum")); - else - dt_eingebaut.Enabled = false; + { + if (inliner.Datum <= DateTime.MinValue || inliner.Datum >= DateTime.MaxValue) + inliner.Datum = new DateTime(2018, 01, 01, 12, 0, 0); + } + dt_eingebaut.DataBindings.Add(new Binding("Value", inliner, "Datum")); + /*else + dt_eingebaut.Enabled = false;*/ cb_genehmigung.DataBindings.Add(new Binding("Checked", inliner, "genehmigungVorhanden")); cb_stvo.DataBindings.Add(new Binding("Checked", inliner, "sTVOAbsicherung")); cb_wasserhaltung.DataBindings.Add(new Binding("Checked", inliner, "wasserhaltungEingerichtet")); diff --git a/SanSystem/documents/JUME/KalibrierungAuflistung.docx b/SanSystem/documents/JUME/KalibrierungAuflistung.docx index 5157b1db9e56b45e8d8832d1d7a591cc0cf1271f..9859345b5c6b48f1d173370a907142d30282ad30 100644 GIT binary patch delta 7885 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 diff --git a/SanSystem/frmObjekteList.cs b/SanSystem/frmObjekteList.cs index 674bac5..6b62479 100644 --- a/SanSystem/frmObjekteList.cs +++ b/SanSystem/frmObjekteList.cs @@ -251,7 +251,9 @@ namespace SanSystem { {"Ausdruck_datum","" }, {"Strasse","" }, - {"Ort","" } + {"Ort","" }, + {"gesamt_liner","" }, + {"harzmenge","" } }; grundDaten["Ausdruck_datum"] = DateTime.Now.ToLongDateString(); @@ -260,16 +262,21 @@ namespace SanSystem grundDaten["Ort"] = txt_ort.Text; DataTable linereintraege = getLinerTable(); - + double linerges = 0; foreach(Inspektionsobjekt obj in ausdruck) { DataRow dr = linereintraege.NewRow(); + double linergesamt = obj.Haltungslaenge + obj.Schachtlaenge; dr["hausnummer"] = obj.Hausnummer; dr["liner_laenge"] = obj.Haltungslaenge; dr["schacht_laenge"] = obj.Schachtlaenge; + dr["liner_gesamt"] = linergesamt; dr["bemerkung"] = obj.Bemerkung; + linerges += linergesamt; linereintraege.Rows.Add(dr); } + grundDaten["gesamt_liner"] = linerges; + grundDaten["harzmenge"] = linerges * 1.8; BerichtGen.FrmOptions options = new BerichtGen.FrmOptions("JUME", "KalibrierungAuflistung.docx", "","", grundDaten, null, linereintraege); options.ShowDialog(); } @@ -283,6 +290,8 @@ namespace SanSystem dataTable.Columns.Add(dataColumn); dataColumn = new DataColumn("schacht_laenge") { MaxLength = 50 }; dataTable.Columns.Add(dataColumn); + dataColumn = new DataColumn("liner_gesamt") { MaxLength = 50 }; + dataTable.Columns.Add(dataColumn); dataColumn = new DataColumn("bemerkung") { MaxLength = 255 }; dataTable.Columns.Add(dataColumn); return dataTable;