diff --git a/DE/DE.cs b/DE/DE.cs index 9ef2ffd..6e14c81 100644 --- a/DE/DE.cs +++ b/DE/DE.cs @@ -29,6 +29,7 @@ namespace Language labels.Add("projekt", "Projektnummer"); labels.Add("street", "Strassenname"); labels.Add("add_objekt", "Neues Objekt hinzufügen"); + labels.Add("add_san", "Sanierung hinzufügen"); labels.Add("btn_close", "Schließen"); labels.Add("error_messages", "Fehlermeldungsarten"); labels.Add("error_projwrong", "Projektnummer nicht vergeben"); @@ -37,6 +38,10 @@ namespace Language labels.Add("mainmenu_projekt_new", "&Neu"); labels.Add("mainmenu_projekt_open", "Ö&ffnen"); + labels.Add("inliner", "Inliner"); + labels.Add("schacht_an", "Schachtanbindung"); + labels.Add("kurzliner", "kurzliner"); + labels.Add("hut", "Hutprofil"); } } diff --git a/KlassenBIB/InlinerSanierung.cs b/KlassenBIB/InlinerSanierung.cs index 97a7ddf..a656cea 100644 --- a/KlassenBIB/InlinerSanierung.cs +++ b/KlassenBIB/InlinerSanierung.cs @@ -15,6 +15,8 @@ namespace KlassenBIB DateTime datumKalibrierung; string harzChargenummer; string linerChargenummer; + string harzTyp; + string linerTyp; double harzbedarf = 1.8; uint rueckholgeschwindigkeit = 24; bool geschlosseneEnde = false; @@ -56,5 +58,7 @@ namespace KlassenBIB public uint Rueckholgeschwindigkeit { get => rueckholgeschwindigkeit; set => rueckholgeschwindigkeit = value; } public bool GeschlosseneEnde { get => geschlosseneEnde; set => geschlosseneEnde = value; } public double HarzBedarf { get => harzbedarf; set => harzbedarf = value; } + public string HarzTyp { get => harzTyp; set => harzTyp = value; } + public string LinerTyp { get => linerTyp; set => linerTyp = value; } } } diff --git a/KlassenBIB/Inspektionsobjekt.cs b/KlassenBIB/Inspektionsobjekt.cs index 17ce84c..e099120 100644 --- a/KlassenBIB/Inspektionsobjekt.cs +++ b/KlassenBIB/Inspektionsobjekt.cs @@ -22,6 +22,7 @@ namespace KlassenBIB public string RohrMaterial { get; set; } public uint Kanalrohrweite { get; set; } public double Haltungslaenge { get; set; } + public double Schachtlaenge { get; set; } public DateTime HaltungGemessen { get; set; } public InspektionskuerzelnCollection Schadenskuerzeln { get; private set; } diff --git a/KlassenBIB/Sanierung.cs b/KlassenBIB/Sanierung.cs index 4574a3a..1211bf5 100644 --- a/KlassenBIB/Sanierung.cs +++ b/KlassenBIB/Sanierung.cs @@ -22,7 +22,7 @@ namespace KlassenBIB bool sTVOAbsicherung; bool hDReinigung; DateTime hDReinigungDatum; - DateTime sanierungsDatum; + //DateTime sanierungsDatum; //public Guid Guid { get => guid; set => guid = value; } @@ -46,7 +46,7 @@ namespace KlassenBIB public bool STVOAbsicherung { get => sTVOAbsicherung; set => sTVOAbsicherung = value; } public bool HDReinigung { get => hDReinigung; set => hDReinigung = value; } public DateTime HDReinigungDatum { get => hDReinigungDatum; set => hDReinigungDatum = value; } - public DateTime SanierungsDatum { get => sanierungsDatum; set => sanierungsDatum = value; } + //public DateTime SanierungsDatum { get => sanierungsDatum; set => sanierungsDatum = value; } public event PropertyChangedEventHandler PropertyChanged; private void NotifyPropertyChanged([CallerMemberName] string propertyName = null) diff --git a/SanSystem/FrmSelectNewSan.Designer.cs b/SanSystem/FrmSelectNewSan.Designer.cs new file mode 100644 index 0000000..e750eb7 --- /dev/null +++ b/SanSystem/FrmSelectNewSan.Designer.cs @@ -0,0 +1,99 @@ +namespace SanSystem +{ + partial class FrmSelectNewSan + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.btn_inliner = new System.Windows.Forms.Button(); + this.btn_schacht_anb = new System.Windows.Forms.Button(); + this.btn_kurzliner = new System.Windows.Forms.Button(); + this.btn_hut = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // btn_inliner + // + this.btn_inliner.Location = new System.Drawing.Point(12, 12); + this.btn_inliner.Name = "btn_inliner"; + this.btn_inliner.Size = new System.Drawing.Size(187, 58); + this.btn_inliner.TabIndex = 0; + this.btn_inliner.Text = "button1"; + this.btn_inliner.UseVisualStyleBackColor = true; + this.btn_inliner.Click += new System.EventHandler(this.btn_inliner_Click); + // + // btn_schacht_anb + // + this.btn_schacht_anb.Location = new System.Drawing.Point(212, 12); + this.btn_schacht_anb.Name = "btn_schacht_anb"; + this.btn_schacht_anb.Size = new System.Drawing.Size(187, 58); + this.btn_schacht_anb.TabIndex = 1; + this.btn_schacht_anb.Text = "button2"; + this.btn_schacht_anb.UseVisualStyleBackColor = true; + this.btn_schacht_anb.Click += new System.EventHandler(this.btn_schacht_anb_Click); + // + // btn_kurzliner + // + this.btn_kurzliner.Location = new System.Drawing.Point(412, 12); + this.btn_kurzliner.Name = "btn_kurzliner"; + this.btn_kurzliner.Size = new System.Drawing.Size(187, 58); + this.btn_kurzliner.TabIndex = 2; + this.btn_kurzliner.Text = "button3"; + this.btn_kurzliner.UseVisualStyleBackColor = true; + // + // btn_hut + // + this.btn_hut.Location = new System.Drawing.Point(612, 12); + this.btn_hut.Name = "btn_hut"; + this.btn_hut.Size = new System.Drawing.Size(187, 58); + this.btn_hut.TabIndex = 3; + this.btn_hut.Text = "button4"; + this.btn_hut.UseVisualStyleBackColor = true; + // + // FrmSelectNewSan + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(814, 87); + this.ControlBox = false; + this.Controls.Add(this.btn_hut); + this.Controls.Add(this.btn_kurzliner); + this.Controls.Add(this.btn_schacht_anb); + this.Controls.Add(this.btn_inliner); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; + this.Name = "FrmSelectNewSan"; + this.Text = "FrmSelectNewSan"; + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Button btn_inliner; + private System.Windows.Forms.Button btn_schacht_anb; + private System.Windows.Forms.Button btn_kurzliner; + private System.Windows.Forms.Button btn_hut; + } +} \ No newline at end of file diff --git a/SanSystem/FrmSelectNewSan.cs b/SanSystem/FrmSelectNewSan.cs new file mode 100644 index 0000000..9605979 --- /dev/null +++ b/SanSystem/FrmSelectNewSan.cs @@ -0,0 +1,52 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace SanSystem +{ + public partial class FrmSelectNewSan : Form + { + public event EventHandler AddInlinerClicked; + public event EventHandler AddSchachtAnbindungClicked; + + protected virtual void OnAddSchachtAnbindungClicked(EventArgs e) + { + EventHandler handler = AddSchachtAnbindungClicked; + if (handler != null) handler(this, e); + } + protected virtual void OnAddInlinerClicked(EventArgs e) + { + EventHandler handler = AddInlinerClicked; + if (handler != null) handler(this, e); + } + public FrmSelectNewSan() + { + InitializeComponent(); + + btn_inliner.Text = Global.Instance.language.Labels["inliner"]; + btn_hut.Text = Global.Instance.language.Labels["hut"]; + btn_kurzliner.Text = Global.Instance.language.Labels["kurzliner"]; + btn_schacht_anb.Text = Global.Instance.language.Labels["schacht_an"]; + + btn_hut.Enabled = btn_kurzliner.Enabled = false; + } + + private void btn_inliner_Click(object sender, EventArgs e) + { + OnAddInlinerClicked(EventArgs.Empty); + this.Close(); + } + + private void btn_schacht_anb_Click(object sender, EventArgs e) + { + OnAddSchachtAnbindungClicked(EventArgs.Empty); + this.Close(); + } + } +} diff --git a/SanSystem/FrmSelectNewSan.resx b/SanSystem/FrmSelectNewSan.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/SanSystem/FrmSelectNewSan.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SanSystem/SanSystem.csproj b/SanSystem/SanSystem.csproj index c3df1d8..f66b18d 100644 --- a/SanSystem/SanSystem.csproj +++ b/SanSystem/SanSystem.csproj @@ -60,6 +60,12 @@ frmObjekteList.cs + + Form + + + FrmSelectNewSan.cs + Form @@ -75,12 +81,21 @@ + + UserControl + + + UCInliner.cs + frmObjektEdit.cs frmObjekteList.cs + + FrmSelectNewSan.cs + frmStrassenList.cs @@ -96,6 +111,9 @@ True Resources.resx + + UCInliner.cs + diff --git a/SanSystem/UCInliner.Designer.cs b/SanSystem/UCInliner.Designer.cs new file mode 100644 index 0000000..69303c0 --- /dev/null +++ b/SanSystem/UCInliner.Designer.cs @@ -0,0 +1,555 @@ +namespace SanSystem +{ + partial class UCInliner + { + /// + /// Erforderliche Designervariable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Verwendete Ressourcen bereinigen. + /// + /// True, wenn verwaltete Ressourcen gelöscht werden sollen; andernfalls False. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Vom Komponenten-Designer generierter Code + + /// + /// Erforderliche Methode für die Designerunterstützung. + /// Der Inhalt der Methode darf nicht mit dem Code-Editor geändert werden. + /// + private void InitializeComponent() + { + this.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.btn_get_temp = new System.Windows.Forms.Button(); + this.txt_temp_kanal = new System.Windows.Forms.TextBox(); + this.txt_temp_aussen = new System.Windows.Forms.TextBox(); + this.label23 = new System.Windows.Forms.Label(); + this.label22 = new System.Windows.Forms.Label(); + this.label8 = new System.Windows.Forms.Label(); + this.label7 = new System.Windows.Forms.Label(); + this.cb_lb_vorbereitung = new System.Windows.Forms.CheckedListBox(); + 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.tabPage3 = new System.Windows.Forms.TabPage(); + this.txt_liner = new System.Windows.Forms.TextBox(); + this.txt_harzbedarf = new System.Windows.Forms.TextBox(); + this.txt_harz = new System.Windows.Forms.TextBox(); + 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.dt_kalibrierdatum = new System.Windows.Forms.DateTimePicker(); + this.txt_vakuum = new System.Windows.Forms.TextBox(); + this.txt_temp_harz = new System.Windows.Forms.TextBox(); + this.txt_walze_distance = new System.Windows.Forms.TextBox(); + this.label17 = new System.Windows.Forms.Label(); + this.label14 = new System.Windows.Forms.Label(); + this.label16 = new System.Windows.Forms.Label(); + this.label15 = new System.Windows.Forms.Label(); + this.label13 = new System.Windows.Forms.Label(); + this.label12 = new System.Windows.Forms.Label(); + this.label11 = new System.Windows.Forms.Label(); + this.label10 = new System.Windows.Forms.Label(); + this.label9 = new System.Windows.Forms.Label(); + this.cbb_wetter = new System.Windows.Forms.ComboBox(); + this.label24 = new System.Windows.Forms.Label(); + this.cb_fertig = new System.Windows.Forms.CheckBox(); + this.tabControl1.SuspendLayout(); + this.tabPage2.SuspendLayout(); + this.groupBox3.SuspendLayout(); + this.tabPage3.SuspendLayout(); + this.groupBox1.SuspendLayout(); + this.SuspendLayout(); + // + // tabControl1 + // + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Controls.Add(this.tabPage3); + 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.TabIndex = 0; + this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged); + // + // tabPage2 + // + this.tabPage2.Controls.Add(this.cb_fertig); + this.tabPage2.Controls.Add(this.cbb_wetter); + this.tabPage2.Controls.Add(this.label24); + this.tabPage2.Controls.Add(this.groupBox3); + this.tabPage2.Controls.Add(this.label8); + this.tabPage2.Controls.Add(this.label7); + this.tabPage2.Controls.Add(this.cb_lb_vorbereitung); + 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.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.TabIndex = 1; + this.tabPage2.Text = "Vorraussetzungen"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // groupBox3 + // + this.groupBox3.Controls.Add(this.btn_get_temp); + this.groupBox3.Controls.Add(this.txt_temp_kanal); + this.groupBox3.Controls.Add(this.txt_temp_aussen); + this.groupBox3.Controls.Add(this.label23); + this.groupBox3.Controls.Add(this.label22); + this.groupBox3.Location = new System.Drawing.Point(396, 23); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(485, 131); + this.groupBox3.TabIndex = 7; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "groupBox3"; + // + // btn_get_temp + // + this.btn_get_temp.Location = new System.Drawing.Point(236, 29); + this.btn_get_temp.Name = "btn_get_temp"; + this.btn_get_temp.Size = new System.Drawing.Size(174, 36); + this.btn_get_temp.TabIndex = 4; + this.btn_get_temp.Text = "Von Anlage holen"; + this.btn_get_temp.UseVisualStyleBackColor = true; + // + // txt_temp_kanal + // + 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.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.TabIndex = 17; + // + // label23 + // + 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.TabIndex = 1; + this.label23.Text = "Kanal"; + // + // label22 + // + 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.TabIndex = 0; + this.label22.Text = "Aussen"; + // + // label8 + // + this.label8.AutoSize = true; + this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + 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.TabIndex = 6; + this.label8.Text = "Vorbereitet"; + // + // 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(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.TabIndex = 5; + this.label7.Text = "Leitung wurde mit"; + // + // cb_lb_vorbereitung + // + this.cb_lb_vorbereitung.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cb_lb_vorbereitung.FormattingEnabled = true; + this.cb_lb_vorbereitung.Items.AddRange(new object[] { + "HD - Reinigung", + "Mechanisch", + "Roboter"}); + 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.TabIndex = 19; + // + // cb_stvo + // + this.cb_stvo.AutoSize = true; + 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.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.TabIndex = 16; + this.cb_stvo.Text = "Es wurde nach StVO abgesichert"; + this.cb_stvo.UseVisualStyleBackColor = true; + // + // cb_wasserhaltung + // + this.cb_wasserhaltung.AutoSize = true; + 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.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.TabIndex = 15; + this.cb_wasserhaltung.Text = "Wasserhaltung wurde eingerichtet"; + this.cb_wasserhaltung.UseVisualStyleBackColor = true; + // + // cb_genehmigung + // + this.cb_genehmigung.AutoSize = true; + 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(245, 24); + this.cb_genehmigung.TabIndex = 14; + this.cb_genehmigung.Text = "Genehmigung wurde eingeholt"; + this.cb_genehmigung.UseVisualStyleBackColor = true; + // + // tabPage3 + // + this.tabPage3.Controls.Add(this.txt_liner); + this.tabPage3.Controls.Add(this.txt_harzbedarf); + this.tabPage3.Controls.Add(this.txt_harz); + this.tabPage3.Controls.Add(this.txt_charge_liner); + this.tabPage3.Controls.Add(this.txt_charge_harz); + this.tabPage3.Controls.Add(this.groupBox1); + this.tabPage3.Controls.Add(this.label13); + this.tabPage3.Controls.Add(this.label12); + this.tabPage3.Controls.Add(this.label11); + this.tabPage3.Controls.Add(this.label10); + this.tabPage3.Controls.Add(this.label9); + this.tabPage3.Location = new System.Drawing.Point(4, 29); + this.tabPage3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tabPage3.Name = "tabPage3"; + this.tabPage3.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tabPage3.Size = new System.Drawing.Size(1123, 579); + this.tabPage3.TabIndex = 2; + this.tabPage3.Text = "LinerGrundlagen"; + this.tabPage3.UseVisualStyleBackColor = true; + // + // 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(162, 148); + 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); + this.txt_liner.TabIndex = 23; + // + // 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(162, 97); + 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); + this.txt_harzbedarf.TabIndex = 22; + // + // txt_harz + // + this.txt_harz.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_harz.Location = new System.Drawing.Point(162, 43); + this.txt_harz.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.txt_harz.Name = "txt_harz"; + this.txt_harz.Size = new System.Drawing.Size(148, 26); + this.txt_harz.TabIndex = 20; + // + // 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(558, 148); + 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); + this.txt_charge_liner.TabIndex = 24; + // + // txt_charge_harz + // + this.txt_charge_harz.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_charge_harz.Location = new System.Drawing.Point(558, 46); + this.txt_charge_harz.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.txt_charge_harz.Name = "txt_charge_harz"; + this.txt_charge_harz.Size = new System.Drawing.Size(300, 26); + this.txt_charge_harz.TabIndex = 21; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.dt_kalibrierdatum); + this.groupBox1.Controls.Add(this.txt_vakuum); + this.groupBox1.Controls.Add(this.txt_temp_harz); + this.groupBox1.Controls.Add(this.txt_walze_distance); + this.groupBox1.Controls.Add(this.label17); + this.groupBox1.Controls.Add(this.label14); + 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(40, 228); + 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); + this.groupBox1.Size = new System.Drawing.Size(688, 278); + this.groupBox1.TabIndex = 9; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Kalibrierung"; + // + // dt_kalibrierdatum + // + this.dt_kalibrierdatum.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.dt_kalibrierdatum.Location = new System.Drawing.Point(212, 48); + this.dt_kalibrierdatum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.dt_kalibrierdatum.Name = "dt_kalibrierdatum"; + this.dt_kalibrierdatum.Size = new System.Drawing.Size(283, 26); + this.dt_kalibrierdatum.TabIndex = 25; + // + // 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(518, 118); + 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); + this.txt_vakuum.TabIndex = 27; + // + // 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(212, 232); + 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); + this.txt_temp_harz.TabIndex = 28; + // + // 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(212, 118); + 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); + this.txt_walze_distance.TabIndex = 26; + // + // label17 + // + 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(406, 123); + 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); + this.label17.TabIndex = 8; + this.label17.Text = "Vakuum"; + // + // label14 + // + 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(9, 235); + 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); + this.label14.TabIndex = 5; + this.label14.Text = "Temperatur Harz"; + // + // label16 + // + 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(3, 123); + 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); + this.label16.TabIndex = 7; + this.label16.Text = "Walzen-Abstand"; + // + // label15 + // + this.label15.AutoSize = true; + this.label15.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label15.Location = new System.Drawing.Point(3, 48); + this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(166, 20); + this.label15.TabIndex = 6; + this.label15.Text = "Datum der Kalibierung"; + // + // 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(368, 154); + 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); + this.label13.TabIndex = 4; + this.label13.Text = "Charge-Nummer"; + // + // 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(36, 154); + 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); + this.label12.TabIndex = 3; + this.label12.Text = "Liner"; + // + // 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(36, 100); + 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); + this.label11.TabIndex = 2; + this.label11.Text = "Harzbedarf /m"; + // + // 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(368, 46); + this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(126, 20); + this.label10.TabIndex = 1; + this.label10.Text = "Charge-Nummer"; + // + // label9 + // + 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(36, 46); + this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(43, 20); + this.label9.TabIndex = 0; + this.label9.Text = "Harz"; + // + // cbb_wetter + // + this.cbb_wetter.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cbb_wetter.FormattingEnabled = true; + this.cbb_wetter.Items.AddRange(new object[] { + "Trocken", + "Niederschlag", + "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.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.Name = "label24"; + this.label24.Size = new System.Drawing.Size(57, 20); + this.label24.TabIndex = 24; + this.label24.Text = "Wetter"; + // + // cb_fertig + // + 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.Name = "cb_fertig"; + 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; + // + // UCInliner + // + 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))); + this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.Name = "UCInliner"; + this.Size = new System.Drawing.Size(1131, 702); + this.Load += new System.EventHandler(this.UCInliner_Load); + this.tabControl1.ResumeLayout(false); + this.tabPage2.ResumeLayout(false); + this.tabPage2.PerformLayout(); + this.groupBox3.ResumeLayout(false); + this.groupBox3.PerformLayout(); + this.tabPage3.ResumeLayout(false); + this.tabPage3.PerformLayout(); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.TabControl tabControl1; + private System.Windows.Forms.TabPage tabPage2; + private System.Windows.Forms.CheckedListBox cb_lb_vorbereitung; + private System.Windows.Forms.CheckBox cb_stvo; + private System.Windows.Forms.CheckBox cb_wasserhaltung; + private System.Windows.Forms.CheckBox cb_genehmigung; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.TabPage tabPage3; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.Label label17; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.Label label16; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.Label label12; + private System.Windows.Forms.Label label11; + private System.Windows.Forms.Label label10; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.TextBox txt_liner; + private System.Windows.Forms.TextBox txt_harzbedarf; + private System.Windows.Forms.TextBox txt_harz; + private System.Windows.Forms.TextBox txt_charge_liner; + private System.Windows.Forms.TextBox txt_charge_harz; + private System.Windows.Forms.DateTimePicker dt_kalibrierdatum; + private System.Windows.Forms.TextBox txt_vakuum; + private System.Windows.Forms.TextBox txt_temp_harz; + private System.Windows.Forms.TextBox txt_walze_distance; + private System.Windows.Forms.GroupBox groupBox3; + private System.Windows.Forms.Button btn_get_temp; + private System.Windows.Forms.TextBox txt_temp_kanal; + private System.Windows.Forms.TextBox txt_temp_aussen; + private System.Windows.Forms.Label label23; + private System.Windows.Forms.Label label22; + private System.Windows.Forms.ComboBox cbb_wetter; + private System.Windows.Forms.Label label24; + private System.Windows.Forms.CheckBox cb_fertig; + } +} diff --git a/SanSystem/UCInliner.cs b/SanSystem/UCInliner.cs new file mode 100644 index 0000000..5ef5996 --- /dev/null +++ b/SanSystem/UCInliner.cs @@ -0,0 +1,78 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using KlassenBIB; + +namespace SanSystem +{ + + public partial class UCInliner : UserControl + { + enum TabPages + { + VORRAUSSETZUNGEN = 0, + LINERGRUNDLAGEN + } + InlinerSanierung inliner = null; + public UCInliner(InlinerSanierung san) + { + InitializeComponent(); + inliner = san; + } + + private void tabControl1_SelectedIndexChanged(object sender, EventArgs e) + { + if (inliner == null) throw new Exception("Inliner is null"); + TabControl tb = (TabControl)sender; + if (tb == null) return; + switch (tb.SelectedIndex) + { + + case (int)TabPages.LINERGRUNDLAGEN: + txt_walze_distance.DataBindings.Clear(); + txt_vakuum.DataBindings.Clear(); + txt_temp_harz.DataBindings.Clear(); + txt_charge_harz.DataBindings.Clear(); + txt_charge_liner.DataBindings.Clear(); + dt_kalibrierdatum.DataBindings.Clear(); + txt_liner.DataBindings.Clear(); + txt_harz.DataBindings.Clear(); + + txt_harz.DataBindings.Add(new Binding("Text", inliner, "HarzTyp")); + txt_liner.DataBindings.Add(new Binding("Text", inliner, "LinerTyp")); + txt_walze_distance.DataBindings.Add(new Binding("Text", inliner, "KalibierWalzenAbstand")); + txt_vakuum.DataBindings.Add(new Binding("Text", inliner, "KalibrierUnterdruck")); + txt_temp_harz.DataBindings.Add(new Binding("Text", inliner, "HarzKalibrierTemperatur")); + txt_charge_harz.DataBindings.Add(new Binding("Text", inliner, "HarzChargenummer")); + txt_charge_liner.DataBindings.Add(new Binding("Text", inliner, "LinerChargenummer")); + dt_kalibrierdatum.DataBindings.Add(new Binding("Value", inliner, "DatumKalibrierung")); + break; + } + } + + private void UCInliner_Load(object sender, EventArgs e) + { + cb_genehmigung.DataBindings.Clear(); + cb_stvo.DataBindings.Clear(); + cb_wasserhaltung.DataBindings.Clear(); + txt_temp_aussen.DataBindings.Clear(); + txt_temp_kanal.DataBindings.Clear(); + cbb_wetter.DataBindings.Clear(); + + cb_fertig.DataBindings.Add(new Binding("Checked", inliner, "fertig")); + cbb_wetter.DataBindings.Add(new Binding("Text", inliner, "Wetter")); + 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")); + txt_temp_aussen.DataBindings.Add(new Binding("Text", inliner, "TempAusen", false, DataSourceUpdateMode.OnPropertyChanged)); + txt_temp_kanal.DataBindings.Add(new Binding("Text", inliner, "TempKanal")); + + } + } +} diff --git a/SanSystem/UCInliner.resx b/SanSystem/UCInliner.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/SanSystem/UCInliner.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SanSystem/frmMain.cs b/SanSystem/frmMain.cs index ddafb83..5292260 100644 --- a/SanSystem/frmMain.cs +++ b/SanSystem/frmMain.cs @@ -17,6 +17,8 @@ namespace SanSystem public frmMain() { InitializeComponent(); + + Datenbank.Instance.LoadProjekt("./temp/18-850.xaml"); //Datenbank.Instance.CreateProjekt(""); this.Width = Screen.PrimaryScreen.WorkingArea.Width; @@ -34,6 +36,7 @@ namespace SanSystem private void frm_main_Load(object sender, EventArgs e) { + frmStrassenList strassenList = new frmStrassenList(); strassenList.MdiParent = this; strassenList.Show(); @@ -45,6 +48,7 @@ namespace SanSystem private void frm_main_FormClosing(object sender, FormClosingEventArgs e) { + Datenbank.Instance.SaveProjekt(); } diff --git a/SanSystem/frmObjektEdit.Designer.cs b/SanSystem/frmObjektEdit.Designer.cs index 05051b9..ccac597 100644 --- a/SanSystem/frmObjektEdit.Designer.cs +++ b/SanSystem/frmObjektEdit.Designer.cs @@ -30,9 +30,9 @@ { this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); + this.txt_objekt_name = new System.Windows.Forms.TextBox(); + this.lbl_objektname = new System.Windows.Forms.Label(); this.cb_material = new System.Windows.Forms.ComboBox(); - this.cbb_wetter = new System.Windows.Forms.ComboBox(); - this.label24 = new System.Windows.Forms.Label(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.txt_haltungslaenge = new System.Windows.Forms.MaskedTextBox(); this.txt_laenge_schacht = new System.Windows.Forms.MaskedTextBox(); @@ -54,56 +54,16 @@ this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); - this.tabPage2 = new System.Windows.Forms.TabPage(); - this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.btn_get_temp = new System.Windows.Forms.Button(); - this.txt_temp_kanal = new System.Windows.Forms.TextBox(); - this.txt_temp_aussen = new System.Windows.Forms.TextBox(); - this.label23 = new System.Windows.Forms.Label(); - this.label22 = new System.Windows.Forms.Label(); - this.label8 = new System.Windows.Forms.Label(); - this.label7 = new System.Windows.Forms.Label(); - this.cb_lb_vorbereitung = new System.Windows.Forms.CheckedListBox(); - 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.tabPage3 = new System.Windows.Forms.TabPage(); - this.txt_liner = new System.Windows.Forms.TextBox(); - this.txt_harzbedarf = new System.Windows.Forms.TextBox(); - this.txt_harz = new System.Windows.Forms.TextBox(); - 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.dt_kalibrierdatum = new System.Windows.Forms.DateTimePicker(); - this.txt_vakuum = new System.Windows.Forms.TextBox(); - this.txt_temp_harz = new System.Windows.Forms.TextBox(); - this.txt_walze_distance = new System.Windows.Forms.TextBox(); - this.label17 = new System.Windows.Forms.Label(); - this.label14 = new System.Windows.Forms.Label(); - this.label16 = new System.Windows.Forms.Label(); - this.label15 = new System.Windows.Forms.Label(); - this.label13 = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); - this.label11 = new System.Windows.Forms.Label(); - this.label10 = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); this.btn_close = new System.Windows.Forms.Button(); - this.lbl_objektname = new System.Windows.Forms.Label(); - this.txt_objekt_name = new System.Windows.Forms.TextBox(); + this.btn_add_san = new System.Windows.Forms.Button(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.groupBox2.SuspendLayout(); - this.tabPage2.SuspendLayout(); - this.groupBox3.SuspendLayout(); - this.tabPage3.SuspendLayout(); - this.groupBox1.SuspendLayout(); this.SuspendLayout(); // // tabControl1 // this.tabControl1.Controls.Add(this.tabPage1); - this.tabControl1.Controls.Add(this.tabPage2); - this.tabControl1.Controls.Add(this.tabPage3); this.tabControl1.Location = new System.Drawing.Point(13, 14); this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.tabControl1.Name = "tabControl1"; @@ -117,8 +77,6 @@ this.tabPage1.Controls.Add(this.txt_objekt_name); this.tabPage1.Controls.Add(this.lbl_objektname); this.tabPage1.Controls.Add(this.cb_material); - this.tabPage1.Controls.Add(this.cbb_wetter); - this.tabPage1.Controls.Add(this.label24); this.tabPage1.Controls.Add(this.groupBox2); this.tabPage1.Controls.Add(this.dt_haltunggemessen_datum); this.tabPage1.Controls.Add(this.label20); @@ -145,6 +103,24 @@ this.tabPage1.Text = "Grunddaten"; this.tabPage1.UseVisualStyleBackColor = true; // + // txt_objekt_name + // + 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.TabIndex = 2; + // + // lbl_objektname + // + this.lbl_objektname.AutoSize = true; + 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.TabIndex = 25; + this.lbl_objektname.Text = "Objektname"; + // // cb_material // this.cb_material.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -189,29 +165,6 @@ this.cb_material.Size = new System.Drawing.Size(323, 28); this.cb_material.TabIndex = 6; // - // cbb_wetter - // - this.cbb_wetter.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cbb_wetter.FormattingEnabled = true; - this.cbb_wetter.Items.AddRange(new object[] { - "Trocken", - "Niederschlag", - "Schnee - Eisschmelze"}); - this.cbb_wetter.Location = new System.Drawing.Point(758, 154); - this.cbb_wetter.Name = "cbb_wetter"; - this.cbb_wetter.Size = new System.Drawing.Size(282, 28); - this.cbb_wetter.TabIndex = 9; - // - // 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(561, 157); - this.label24.Name = "label24"; - this.label24.Size = new System.Drawing.Size(57, 20); - this.label24.TabIndex = 22; - this.label24.Text = "Wetter"; - // // groupBox2 // this.groupBox2.Controls.Add(this.txt_haltungslaenge); @@ -428,374 +381,6 @@ this.label1.TabIndex = 0; this.label1.Text = "Projektnummer"; // - // tabPage2 - // - this.tabPage2.Controls.Add(this.groupBox3); - this.tabPage2.Controls.Add(this.label8); - this.tabPage2.Controls.Add(this.label7); - this.tabPage2.Controls.Add(this.cb_lb_vorbereitung); - 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.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(1093, 579); - this.tabPage2.TabIndex = 1; - this.tabPage2.Text = "Vorraussetzungen"; - this.tabPage2.UseVisualStyleBackColor = true; - // - // groupBox3 - // - this.groupBox3.Controls.Add(this.btn_get_temp); - this.groupBox3.Controls.Add(this.txt_temp_kanal); - this.groupBox3.Controls.Add(this.txt_temp_aussen); - this.groupBox3.Controls.Add(this.label23); - this.groupBox3.Controls.Add(this.label22); - this.groupBox3.Location = new System.Drawing.Point(396, 23); - this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(485, 131); - this.groupBox3.TabIndex = 7; - this.groupBox3.TabStop = false; - this.groupBox3.Text = "groupBox3"; - // - // btn_get_temp - // - this.btn_get_temp.Location = new System.Drawing.Point(236, 29); - this.btn_get_temp.Name = "btn_get_temp"; - this.btn_get_temp.Size = new System.Drawing.Size(174, 36); - this.btn_get_temp.TabIndex = 4; - this.btn_get_temp.Text = "Von Anlage holen"; - this.btn_get_temp.UseVisualStyleBackColor = true; - this.btn_get_temp.Click += new System.EventHandler(this.btn_get_temp_Click); - // - // txt_temp_kanal - // - 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.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.TabIndex = 17; - // - // label23 - // - 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.TabIndex = 1; - this.label23.Text = "Kanal"; - // - // label22 - // - 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.TabIndex = 0; - this.label22.Text = "Aussen"; - // - // label8 - // - this.label8.AutoSize = true; - this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - 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.TabIndex = 6; - this.label8.Text = "Vorbereitet"; - // - // 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(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.TabIndex = 5; - this.label7.Text = "Leitung wurde mit"; - // - // cb_lb_vorbereitung - // - this.cb_lb_vorbereitung.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cb_lb_vorbereitung.FormattingEnabled = true; - this.cb_lb_vorbereitung.Items.AddRange(new object[] { - "HD - Reinigung", - "Mechanisch", - "Roboter"}); - 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.TabIndex = 19; - // - // cb_stvo - // - this.cb_stvo.AutoSize = true; - 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.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.TabIndex = 16; - this.cb_stvo.Text = "Es wurde nach StVO abgesichert"; - this.cb_stvo.UseVisualStyleBackColor = true; - // - // cb_wasserhaltung - // - this.cb_wasserhaltung.AutoSize = true; - 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.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.TabIndex = 15; - this.cb_wasserhaltung.Text = "Wasserhaltung wurde eingerichtet"; - this.cb_wasserhaltung.UseVisualStyleBackColor = true; - // - // cb_genehmigung - // - this.cb_genehmigung.AutoSize = true; - 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(245, 24); - this.cb_genehmigung.TabIndex = 14; - this.cb_genehmigung.Text = "Genehmigung wurde eingeholt"; - this.cb_genehmigung.UseVisualStyleBackColor = true; - // - // tabPage3 - // - this.tabPage3.Controls.Add(this.txt_liner); - this.tabPage3.Controls.Add(this.txt_harzbedarf); - this.tabPage3.Controls.Add(this.txt_harz); - this.tabPage3.Controls.Add(this.txt_charge_liner); - this.tabPage3.Controls.Add(this.txt_charge_harz); - this.tabPage3.Controls.Add(this.groupBox1); - this.tabPage3.Controls.Add(this.label13); - this.tabPage3.Controls.Add(this.label12); - this.tabPage3.Controls.Add(this.label11); - this.tabPage3.Controls.Add(this.label10); - this.tabPage3.Controls.Add(this.label9); - this.tabPage3.Location = new System.Drawing.Point(4, 29); - this.tabPage3.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.tabPage3.Name = "tabPage3"; - this.tabPage3.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.tabPage3.Size = new System.Drawing.Size(1093, 579); - this.tabPage3.TabIndex = 2; - this.tabPage3.Text = "LinerGrundlagen"; - this.tabPage3.UseVisualStyleBackColor = true; - // - // 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(162, 148); - 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); - this.txt_liner.TabIndex = 23; - // - // 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(162, 97); - 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); - this.txt_harzbedarf.TabIndex = 22; - // - // txt_harz - // - this.txt_harz.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txt_harz.Location = new System.Drawing.Point(162, 43); - this.txt_harz.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txt_harz.Name = "txt_harz"; - this.txt_harz.Size = new System.Drawing.Size(148, 26); - this.txt_harz.TabIndex = 20; - // - // 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(558, 148); - 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); - this.txt_charge_liner.TabIndex = 24; - // - // txt_charge_harz - // - this.txt_charge_harz.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txt_charge_harz.Location = new System.Drawing.Point(558, 46); - this.txt_charge_harz.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.txt_charge_harz.Name = "txt_charge_harz"; - this.txt_charge_harz.Size = new System.Drawing.Size(300, 26); - this.txt_charge_harz.TabIndex = 21; - // - // groupBox1 - // - this.groupBox1.Controls.Add(this.dt_kalibrierdatum); - this.groupBox1.Controls.Add(this.txt_vakuum); - this.groupBox1.Controls.Add(this.txt_temp_harz); - this.groupBox1.Controls.Add(this.txt_walze_distance); - this.groupBox1.Controls.Add(this.label17); - this.groupBox1.Controls.Add(this.label14); - 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(40, 228); - 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); - this.groupBox1.Size = new System.Drawing.Size(688, 278); - this.groupBox1.TabIndex = 9; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Kalibrierung"; - // - // dt_kalibrierdatum - // - this.dt_kalibrierdatum.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.dt_kalibrierdatum.Location = new System.Drawing.Point(212, 48); - this.dt_kalibrierdatum.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.dt_kalibrierdatum.Name = "dt_kalibrierdatum"; - this.dt_kalibrierdatum.Size = new System.Drawing.Size(283, 26); - this.dt_kalibrierdatum.TabIndex = 25; - // - // 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(518, 118); - 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); - this.txt_vakuum.TabIndex = 27; - // - // 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(212, 232); - 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); - this.txt_temp_harz.TabIndex = 28; - // - // 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(212, 118); - 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); - this.txt_walze_distance.TabIndex = 26; - // - // label17 - // - 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(406, 123); - 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); - this.label17.TabIndex = 8; - this.label17.Text = "Vakuum"; - // - // label14 - // - 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(9, 235); - 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); - this.label14.TabIndex = 5; - this.label14.Text = "Temperatur Harz"; - // - // label16 - // - 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(3, 123); - 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); - this.label16.TabIndex = 7; - this.label16.Text = "Walzen-Abstand"; - // - // label15 - // - this.label15.AutoSize = true; - this.label15.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label15.Location = new System.Drawing.Point(3, 48); - this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(166, 20); - this.label15.TabIndex = 6; - this.label15.Text = "Datum der Kalibierung"; - // - // 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(368, 154); - 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); - this.label13.TabIndex = 4; - this.label13.Text = "Charge-Nummer"; - // - // 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(36, 154); - 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); - this.label12.TabIndex = 3; - this.label12.Text = "Liner"; - // - // 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(36, 100); - 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); - this.label11.TabIndex = 2; - this.label11.Text = "Harzbedarf /m"; - // - // 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(368, 46); - this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(126, 20); - this.label10.TabIndex = 1; - this.label10.Text = "Charge-Nummer"; - // - // label9 - // - 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(36, 46); - this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(43, 20); - this.label9.TabIndex = 0; - this.label9.Text = "Harz"; - // // btn_close // this.btn_close.Location = new System.Drawing.Point(37, 641); @@ -806,23 +391,15 @@ this.btn_close.UseVisualStyleBackColor = true; this.btn_close.Click += new System.EventHandler(this.btn_close_Click); // - // lbl_objektname + // btn_add_san // - this.lbl_objektname.AutoSize = true; - 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.TabIndex = 25; - this.lbl_objektname.Text = "Objektname"; - // - // txt_objekt_name - // - 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.TabIndex = 2; + this.btn_add_san.Location = new System.Drawing.Point(230, 643); + this.btn_add_san.Name = "btn_add_san"; + this.btn_add_san.Size = new System.Drawing.Size(202, 47); + this.btn_add_san.TabIndex = 30; + this.btn_add_san.Text = "Add San"; + this.btn_add_san.UseVisualStyleBackColor = true; + this.btn_add_san.Click += new System.EventHandler(this.btn_add_san_Click); // // frmObjektEdit // @@ -830,6 +407,7 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1131, 702); this.ControlBox = false; + this.Controls.Add(this.btn_add_san); this.Controls.Add(this.btn_close); 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))); @@ -843,14 +421,6 @@ this.tabPage1.PerformLayout(); this.groupBox2.ResumeLayout(false); this.groupBox2.PerformLayout(); - this.tabPage2.ResumeLayout(false); - this.tabPage2.PerformLayout(); - this.groupBox3.ResumeLayout(false); - this.groupBox3.PerformLayout(); - this.tabPage3.ResumeLayout(false); - this.tabPage3.PerformLayout(); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); this.ResumeLayout(false); } @@ -859,7 +429,6 @@ private System.Windows.Forms.TabControl tabControl1; private System.Windows.Forms.TabPage tabPage1; - private System.Windows.Forms.TabPage tabPage2; private System.Windows.Forms.Label label6; private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label4; @@ -870,54 +439,21 @@ private System.Windows.Forms.TextBox txt_punkt_bis; private System.Windows.Forms.TextBox txt_punkt_von; private System.Windows.Forms.TextBox txt_pro_nr; - private System.Windows.Forms.CheckedListBox cb_lb_vorbereitung; - private System.Windows.Forms.CheckBox cb_stvo; - private System.Windows.Forms.CheckBox cb_wasserhaltung; - private System.Windows.Forms.CheckBox cb_genehmigung; - private System.Windows.Forms.Label label8; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.TabPage tabPage3; - private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.Label label17; - private System.Windows.Forms.Label label14; - private System.Windows.Forms.Label label16; - private System.Windows.Forms.Label label15; - private System.Windows.Forms.Label label13; - private System.Windows.Forms.Label label12; - private System.Windows.Forms.Label label11; - private System.Windows.Forms.Label label10; - private System.Windows.Forms.Label label9; private System.Windows.Forms.Label label18; private System.Windows.Forms.Label label19; private System.Windows.Forms.TextBox txt_hausnummer; private System.Windows.Forms.TextBox txt_strasse; private System.Windows.Forms.DateTimePicker dt_haltunggemessen_datum; private System.Windows.Forms.Label label20; - private System.Windows.Forms.TextBox txt_liner; - private System.Windows.Forms.TextBox txt_harzbedarf; - private System.Windows.Forms.TextBox txt_harz; - private System.Windows.Forms.TextBox txt_charge_liner; - private System.Windows.Forms.TextBox txt_charge_harz; - private System.Windows.Forms.DateTimePicker dt_kalibrierdatum; - private System.Windows.Forms.TextBox txt_vakuum; - private System.Windows.Forms.TextBox txt_temp_harz; - private System.Windows.Forms.TextBox txt_walze_distance; private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.MaskedTextBox txt_haltungslaenge; private System.Windows.Forms.MaskedTextBox txt_laenge_schacht; private System.Windows.Forms.Label label21; private System.Windows.Forms.CheckBox checkBox1; - private System.Windows.Forms.GroupBox groupBox3; - private System.Windows.Forms.Button btn_get_temp; - private System.Windows.Forms.TextBox txt_temp_kanal; - private System.Windows.Forms.TextBox txt_temp_aussen; - private System.Windows.Forms.Label label23; - private System.Windows.Forms.Label label22; - private System.Windows.Forms.ComboBox cbb_wetter; - private System.Windows.Forms.Label label24; private System.Windows.Forms.ComboBox cb_material; private System.Windows.Forms.Button btn_close; private System.Windows.Forms.TextBox txt_objekt_name; private System.Windows.Forms.Label lbl_objektname; + private System.Windows.Forms.Button btn_add_san; } } \ No newline at end of file diff --git a/SanSystem/frmObjektEdit.cs b/SanSystem/frmObjektEdit.cs index bf1d3ec..f0e5f41 100644 --- a/SanSystem/frmObjektEdit.cs +++ b/SanSystem/frmObjektEdit.cs @@ -12,33 +12,39 @@ using SanShared; namespace SanSystem { - enum TabPages - { - GRUNDDATEN = 0, - VORRAUSSETZUNGEN, - LINERGRUNDLAGEN - } + public partial class frmObjektEdit : Form { Inspektionsobjekt inspektionsobjekt = null; - InlinerSanierung inliner = null; + public frmObjektEdit(Inspektionsobjekt inspektion) { InitializeComponent(); + + + btn_add_san.Text = Global.Instance.language.Labels["add_san"]; btn_close.Text = Global.Instance.language.Labels["btn_close"]; this.inspektionsobjekt = inspektion; + foreach(Sanierung san in inspektion.Sanierung) { - if (san is InlinerSanierung) inliner = (InlinerSanierung)san; + TabPage tab = new TabPage(); + if(san is InlinerSanierung) + { + tab.Text = "InlinerSanierung"; + UCInliner uCInliner = new UCInliner(san as InlinerSanierung); + uCInliner.Dock = DockStyle.Fill; + tab.Controls.Add(uCInliner); + tabControl1.TabPages.Add(tab); + } } - if (inliner == null) inliner = new InlinerSanierung(); - inspektionsobjekt.Sanierung.Add(inliner); - //if (inspektion.Sanierung == null) inspektion.Sanierung = new InlinerSanierung(); - //this.inliner = (InlinerSanierung)inspektion.Sanierung; + + } private void frmObjektEdit_Load(object sender, EventArgs e) { + txt_laenge_schacht.DataBindings.Add(new Binding("Text", inspektionsobjekt, "Schachtlaenge")); txt_objekt_name.DataBindings.Add(new Binding("Text", inspektionsobjekt, "Objektbezeichnung")); txt_punkt_von.DataBindings.Add(new Binding("Text", inspektionsobjekt, "VonPunkt")); txt_punkt_bis.DataBindings.Add(new Binding("Text", inspektionsobjekt, "BisPunkt")); @@ -49,48 +55,17 @@ 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")); - cbb_wetter.DataBindings.Add(new Binding("Text", inliner, "Wetter")); } private void tabControl1_SelectedIndexChanged(object sender, EventArgs e) { - TabControl tb = (TabControl)sender; - if (tb == null) return; - switch(tb.SelectedIndex) - { - case (int)TabPages.VORRAUSSETZUNGEN: - cb_genehmigung.DataBindings.Clear(); - cb_stvo.DataBindings.Clear(); - cb_wasserhaltung.DataBindings.Clear(); - txt_temp_aussen.DataBindings.Clear(); - txt_temp_kanal.DataBindings.Clear(); - 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")); - txt_temp_aussen.DataBindings.Add(new Binding("Text", inliner, "TempAusen",false, DataSourceUpdateMode.OnPropertyChanged)); - txt_temp_kanal.DataBindings.Add(new Binding("Text", inliner, "TempKanal")); - break; - case (int)TabPages.LINERGRUNDLAGEN: - txt_walze_distance.DataBindings.Clear(); - txt_vakuum.DataBindings.Clear(); - txt_temp_harz.DataBindings.Clear(); - txt_charge_harz.DataBindings.Clear(); - txt_charge_liner.DataBindings.Clear(); - dt_kalibrierdatum.DataBindings.Clear(); - - txt_walze_distance.DataBindings.Add(new Binding("Text", inliner, "KalibierWalzenAbstand")); - txt_vakuum.DataBindings.Add(new Binding("Text", inliner, "KalibrierUnterdruck")); - txt_temp_harz.DataBindings.Add(new Binding("Text", inliner, "HarzKalibrierTemperatur")); - txt_charge_harz.DataBindings.Add(new Binding("Text", inliner, "HarzChargenummer")); - txt_charge_liner.DataBindings.Add(new Binding("Text", inliner, "LinerChargenummer")); - dt_kalibrierdatum.DataBindings.Add(new Binding("Value", inliner, "DatumKalibrierung")); - break; - } - //throw new Exception(sender.GetType().ToString()); + + } private void btn_get_temp_Click(object sender, EventArgs e) { + /* ITemperature temperature = TempCAN.TemperaturBuilder.Temperatur(TempCAN.TemperaturSchnittstellen.TINKERFORGE); double temperatur = temperature.GetTemperatur(); @@ -98,11 +73,44 @@ namespace SanSystem //var x = txt_temp_aussen.DataBindings; txt_temp_aussen.Update(); + */ } private void btn_close_Click(object sender, EventArgs e) { this.Close(); } + + private void btn_add_san_Click(object sender, EventArgs e) + { + FrmSelectNewSan frmSelectNewSan = new FrmSelectNewSan(); + + frmSelectNewSan.AddInlinerClicked += FrmSelectNewSan_AddInlinerClicked; + + frmSelectNewSan.ShowDialog(); + } + + private void FrmSelectNewSan_AddInlinerClicked(object sender, EventArgs e) + { + if(inspektionsobjekt.Sanierung.Count > 0) + { + foreach(Sanierung xsan in inspektionsobjekt.Sanierung) + { + if(xsan is InlinerSanierung) + { + MessageBox.Show("Lustig Sie wollen einen Inliner in einem Inliner setzen?", "Lustig", MessageBoxButtons.OK, MessageBoxIcon.Question); + return; + } + } + } + InlinerSanierung san = new InlinerSanierung(); + inspektionsobjekt.Sanierung.Add(san); + TabPage tab = new TabPage(); + tab.Text = "InlinerSanierung"; + UCInliner uCInliner = new UCInliner(san); + uCInliner.Dock = DockStyle.Fill; + tab.Controls.Add(uCInliner); + tabControl1.TabPages.Add(tab); + } } } diff --git a/SanSystem/frmObjekteList.Designer.cs b/SanSystem/frmObjekteList.Designer.cs index acca91e..a978ce2 100644 --- a/SanSystem/frmObjekteList.Designer.cs +++ b/SanSystem/frmObjekteList.Designer.cs @@ -256,13 +256,6 @@ private System.Windows.Forms.DataGridView dGObjekte; private System.Windows.Forms.Button btn_add; - private System.Windows.Forms.DataGridViewTextBoxColumn objektbezeichnungDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn vonPunktDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn bisPunktDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn rohrMaterialDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn kanalrohrweiteDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn haltungslaengeDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn sanierungDataGridViewTextBoxColumn; private System.Windows.Forms.BindingSource strasseBindingSource; private System.Windows.Forms.Label lbl_street; private System.Windows.Forms.Label lbl_projekt; diff --git a/SanSystem/frmObjekteList.cs b/SanSystem/frmObjekteList.cs index 088e3bd..250a447 100644 --- a/SanSystem/frmObjekteList.cs +++ b/SanSystem/frmObjekteList.cs @@ -34,6 +34,18 @@ namespace SanSystem Inspektionsobjekt tmp = (Inspektionsobjekt)dgvw.DataBoundItem; if (tmp == null) continue; dgvw.DefaultCellStyle.BackColor = Color.White; + + int anzahlSan = tmp.Sanierung.Count; + int anzahlfertig = 0; + int counter = 0; + foreach(Sanierung san in tmp.Sanierung) + { + Sanieren _san = (san as Sanieren); + if (_san.Fertig) anzahlfertig++; + counter++; + } + if (counter != 0 && (anzahlfertig == anzahlSan)) + dgvw.DefaultCellStyle.BackColor = Color.Green; if ( (tmp.BisPunkt== null || tmp.BisPunkt.Equals("")) || (tmp.VonPunkt == null || tmp.VonPunkt.Equals(""))