From d4c192831f8ecb7bd2d25f55377a918239d29382 Mon Sep 17 00:00:00 2001 From: Husky Date: Thu, 12 Jul 2018 14:07:15 +0200 Subject: [PATCH] Man kann jetzt Bemerkungen los werden --- KlassenBIB/Inspektionsobjekt.cs | 2 +- SanSystem/frmObjektEdit.Designer.cs | 63 +++++++++++++++++------------ SanSystem/frmObjektEdit.cs | 3 +- SanSystem/frmObjekteList.cs | 1 + 4 files changed, 41 insertions(+), 28 deletions(-) diff --git a/KlassenBIB/Inspektionsobjekt.cs b/KlassenBIB/Inspektionsobjekt.cs index e099120..7490d69 100644 --- a/KlassenBIB/Inspektionsobjekt.cs +++ b/KlassenBIB/Inspektionsobjekt.cs @@ -25,7 +25,7 @@ namespace KlassenBIB public double Schachtlaenge { get; set; } public DateTime HaltungGemessen { get; set; } public InspektionskuerzelnCollection Schadenskuerzeln { get; private set; } - + public string Bemerkung { get; set; } public SanierungCollection Sanierung { get;set; } public Inspektionsobjekt() diff --git a/SanSystem/frmObjektEdit.Designer.cs b/SanSystem/frmObjektEdit.Designer.cs index 12a473c..2e291e9 100644 --- a/SanSystem/frmObjektEdit.Designer.cs +++ b/SanSystem/frmObjektEdit.Designer.cs @@ -57,6 +57,7 @@ this.btn_close = new System.Windows.Forms.Button(); this.btn_add_san = new System.Windows.Forms.Button(); this.btn_delete = new System.Windows.Forms.Button(); + this.txt_bemerkung = new System.Windows.Forms.TextBox(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.groupBox2.SuspendLayout(); @@ -78,6 +79,7 @@ // // tabPage1 // + this.tabPage1.Controls.Add(this.txt_bemerkung); this.tabPage1.Controls.Add(this.txt_objekt_name); this.tabPage1.Controls.Add(this.lbl_objektname); this.tabPage1.Controls.Add(this.cb_material); @@ -98,11 +100,11 @@ this.tabPage1.Controls.Add(this.label2); this.tabPage1.Controls.Add(this.label1); this.tabPage1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tabPage1.Location = new System.Drawing.Point(4, 29); + this.tabPage1.Location = new System.Drawing.Point(4, 34); this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.tabPage1.Size = new System.Drawing.Size(1256, 579); + this.tabPage1.Size = new System.Drawing.Size(1256, 574); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "Grunddaten"; this.tabPage1.UseVisualStyleBackColor = true; @@ -112,7 +114,7 @@ this.txt_objekt_name.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txt_objekt_name.Location = new System.Drawing.Point(192, 67); this.txt_objekt_name.Name = "txt_objekt_name"; - this.txt_objekt_name.Size = new System.Drawing.Size(330, 26); + this.txt_objekt_name.Size = new System.Drawing.Size(330, 30); this.txt_objekt_name.TabIndex = 2; // // lbl_objektname @@ -121,7 +123,7 @@ this.lbl_objektname.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lbl_objektname.Location = new System.Drawing.Point(9, 70); this.lbl_objektname.Name = "lbl_objektname"; - this.lbl_objektname.Size = new System.Drawing.Size(95, 20); + this.lbl_objektname.Size = new System.Drawing.Size(118, 25); this.lbl_objektname.TabIndex = 25; this.lbl_objektname.Text = "Objektname"; // @@ -166,7 +168,7 @@ "Ziegelwerk"}); this.cb_material.Location = new System.Drawing.Point(192, 252); this.cb_material.Name = "cb_material"; - this.cb_material.Size = new System.Drawing.Size(323, 28); + this.cb_material.Size = new System.Drawing.Size(323, 33); this.cb_material.TabIndex = 6; // // groupBox2 @@ -188,7 +190,7 @@ this.txt_haltungslaenge.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txt_haltungslaenge.Location = new System.Drawing.Point(188, 21); this.txt_haltungslaenge.Name = "txt_haltungslaenge"; - this.txt_haltungslaenge.Size = new System.Drawing.Size(136, 26); + this.txt_haltungslaenge.Size = new System.Drawing.Size(136, 30); this.txt_haltungslaenge.TabIndex = 11; // // txt_laenge_schacht @@ -196,7 +198,7 @@ this.txt_laenge_schacht.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txt_laenge_schacht.Location = new System.Drawing.Point(188, 112); this.txt_laenge_schacht.Name = "txt_laenge_schacht"; - this.txt_laenge_schacht.Size = new System.Drawing.Size(136, 26); + this.txt_laenge_schacht.Size = new System.Drawing.Size(136, 30); this.txt_laenge_schacht.TabIndex = 13; // // label21 @@ -205,7 +207,7 @@ this.label21.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label21.Location = new System.Drawing.Point(6, 114); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(107, 20); + this.label21.Size = new System.Drawing.Size(132, 25); this.label21.TabIndex = 21; this.label21.Text = "Schachtlänge"; // @@ -215,7 +217,7 @@ this.checkBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.checkBox1.Location = new System.Drawing.Point(9, 75); this.checkBox1.Name = "checkBox1"; - this.checkBox1.Size = new System.Drawing.Size(172, 24); + this.checkBox1.Size = new System.Drawing.Size(210, 29); this.checkBox1.TabIndex = 12; this.checkBox1.Text = "Geschlossene Ende"; this.checkBox1.UseVisualStyleBackColor = true; @@ -227,7 +229,7 @@ this.label6.Location = new System.Drawing.Point(5, 26); this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(112, 20); + this.label6.Size = new System.Drawing.Size(137, 25); this.label6.TabIndex = 5; this.label6.Text = "Haltungslänge"; // @@ -240,7 +242,7 @@ this.dt_haltunggemessen_datum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.dt_haltunggemessen_datum.Name = "dt_haltunggemessen_datum"; this.dt_haltunggemessen_datum.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.dt_haltunggemessen_datum.Size = new System.Drawing.Size(354, 26); + this.dt_haltunggemessen_datum.Size = new System.Drawing.Size(354, 30); this.dt_haltunggemessen_datum.TabIndex = 10; // // label20 @@ -250,7 +252,7 @@ this.label20.Location = new System.Drawing.Point(8, 300); this.label20.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(216, 20); + this.label20.Size = new System.Drawing.Size(265, 25); this.label20.TabIndex = 16; this.label20.Text = "Haltungslänge gemessen am"; // @@ -260,7 +262,7 @@ this.txt_hausnummer.Location = new System.Drawing.Point(758, 85); this.txt_hausnummer.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txt_hausnummer.Name = "txt_hausnummer"; - this.txt_hausnummer.Size = new System.Drawing.Size(148, 26); + this.txt_hausnummer.Size = new System.Drawing.Size(148, 30); this.txt_hausnummer.TabIndex = 8; // // txt_strasse @@ -269,7 +271,7 @@ this.txt_strasse.Location = new System.Drawing.Point(758, 35); this.txt_strasse.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txt_strasse.Name = "txt_strasse"; - this.txt_strasse.Size = new System.Drawing.Size(320, 26); + this.txt_strasse.Size = new System.Drawing.Size(320, 30); this.txt_strasse.TabIndex = 7; // // label19 @@ -279,7 +281,7 @@ this.label19.Location = new System.Drawing.Point(560, 89); this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(105, 20); + this.label19.Size = new System.Drawing.Size(129, 25); this.label19.TabIndex = 13; this.label19.Text = "Hausnummer"; // @@ -290,7 +292,7 @@ this.label18.Location = new System.Drawing.Point(560, 40); this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(64, 20); + this.label18.Size = new System.Drawing.Size(79, 25); this.label18.TabIndex = 12; this.label18.Text = "Strasse"; // @@ -300,7 +302,7 @@ this.txt_dn.Location = new System.Drawing.Point(192, 201); this.txt_dn.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txt_dn.Name = "txt_dn"; - this.txt_dn.Size = new System.Drawing.Size(330, 26); + this.txt_dn.Size = new System.Drawing.Size(330, 30); this.txt_dn.TabIndex = 5; // // txt_punkt_bis @@ -309,7 +311,7 @@ this.txt_punkt_bis.Location = new System.Drawing.Point(192, 153); this.txt_punkt_bis.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txt_punkt_bis.Name = "txt_punkt_bis"; - this.txt_punkt_bis.Size = new System.Drawing.Size(330, 26); + this.txt_punkt_bis.Size = new System.Drawing.Size(330, 30); this.txt_punkt_bis.TabIndex = 4; // // txt_punkt_von @@ -318,7 +320,7 @@ this.txt_punkt_von.Location = new System.Drawing.Point(192, 107); this.txt_punkt_von.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txt_punkt_von.Name = "txt_punkt_von"; - this.txt_punkt_von.Size = new System.Drawing.Size(330, 26); + this.txt_punkt_von.Size = new System.Drawing.Size(330, 30); this.txt_punkt_von.TabIndex = 3; // // txt_pro_nr @@ -327,7 +329,7 @@ this.txt_pro_nr.Location = new System.Drawing.Point(192, 31); this.txt_pro_nr.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.txt_pro_nr.Name = "txt_pro_nr"; - this.txt_pro_nr.Size = new System.Drawing.Size(330, 26); + this.txt_pro_nr.Size = new System.Drawing.Size(330, 30); this.txt_pro_nr.TabIndex = 1; // // label5 @@ -337,7 +339,7 @@ this.label5.Location = new System.Drawing.Point(9, 255); this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(65, 20); + this.label5.Size = new System.Drawing.Size(81, 25); this.label5.TabIndex = 4; this.label5.Text = "Material"; // @@ -348,7 +350,7 @@ this.label4.Location = new System.Drawing.Point(9, 204); this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(104, 20); + this.label4.Size = new System.Drawing.Size(128, 25); this.label4.TabIndex = 3; this.label4.Text = "Durchmesser"; // @@ -359,7 +361,7 @@ this.label3.Location = new System.Drawing.Point(9, 156); this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(76, 20); + this.label3.Size = new System.Drawing.Size(94, 25); this.label3.TabIndex = 2; this.label3.Text = "Bis Punkt"; // @@ -370,7 +372,7 @@ this.label2.Location = new System.Drawing.Point(9, 110); this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(83, 20); + this.label2.Size = new System.Drawing.Size(103, 25); this.label2.TabIndex = 1; this.label2.Text = "Von Punkt"; // @@ -381,7 +383,7 @@ this.label1.Location = new System.Drawing.Point(9, 35); this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(116, 20); + this.label1.Size = new System.Drawing.Size(143, 25); this.label1.TabIndex = 0; this.label1.Text = "Projektnummer"; // @@ -417,9 +419,17 @@ this.btn_delete.UseVisualStyleBackColor = true; this.btn_delete.Click += new System.EventHandler(this.btn_delete_Click); // + // txt_bemerkung + // + this.txt_bemerkung.Location = new System.Drawing.Point(730, 191); + this.txt_bemerkung.Multiline = true; + this.txt_bemerkung.Name = "txt_bemerkung"; + this.txt_bemerkung.Size = new System.Drawing.Size(333, 253); + this.txt_bemerkung.TabIndex = 26; + // // frmObjektEdit // - this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); + this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 25F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoSize = true; this.ClientSize = new System.Drawing.Size(1290, 702); @@ -474,5 +484,6 @@ private System.Windows.Forms.Label lbl_objektname; private System.Windows.Forms.Button btn_add_san; private System.Windows.Forms.Button btn_delete; + private System.Windows.Forms.TextBox txt_bemerkung; } } \ No newline at end of file diff --git a/SanSystem/frmObjektEdit.cs b/SanSystem/frmObjektEdit.cs index 2351002..7af318a 100644 --- a/SanSystem/frmObjektEdit.cs +++ b/SanSystem/frmObjektEdit.cs @@ -72,6 +72,7 @@ namespace SanSystem txt_dn.DataBindings.Add(new Binding("Text", inspektionsobjekt, "Kanalrohrweite")); txt_pro_nr.DataBindings.Add(new Binding("Text", inspektionsobjekt, "ProjektNummer")); dt_haltunggemessen_datum.DataBindings.Add(new Binding("Value", inspektionsobjekt, "HaltungGemessen")); + txt_bemerkung.DataBindings.Add(new Binding("Text", inspektionsobjekt, "Bemerkung")); } @@ -111,7 +112,7 @@ namespace SanSystem txt_dn.DataBindings.Clear(); txt_pro_nr.DataBindings.Clear(); dt_haltunggemessen_datum.DataBindings.Clear(); - + txt_bemerkung.DataBindings.Clear(); //MessageBox.Show(string.Format("width: {0} height: {1}", width, height)); this.Close(); diff --git a/SanSystem/frmObjekteList.cs b/SanSystem/frmObjekteList.cs index a698502..c0618cd 100644 --- a/SanSystem/frmObjekteList.cs +++ b/SanSystem/frmObjekteList.cs @@ -189,6 +189,7 @@ namespace SanSystem dGObjekte.Columns["Schachtlaenge"].Visible = false; dGObjekte.Columns["Objektbezeichnung"].Visible = false; dGObjekte.Columns["Haltunggemessen"].Visible = false; + dGObjekte.Columns["Bemerkung"].Visible = false; //dGObjekte.Columns["Sanierung"].Visible = false; }