From 7b626f9b618620e9e31ca58722af5a4e4ddd4b12 Mon Sep 17 00:00:00 2001 From: Husky Date: Sat, 14 Jul 2018 11:21:40 +0200 Subject: [PATCH] Die datenbank kann jetzt gespeichert werden --- BerichtGen/BerichtGen.csproj | 4 +-- SanSystem/Global.cs | 10 ++++++++ SanSystem/frmMain.Designer.cs | 36 ++++++++++++++++++--------- SanSystem/frmMain.cs | 5 ++++ SanSystem/frmObjektEdit.Designer.cs | 38 +++++++++++++++++++++++------ SanSystem/frmObjektEdit.cs | 4 +-- SanSystem/frmObjekteList.cs | 2 ++ 7 files changed, 76 insertions(+), 23 deletions(-) diff --git a/BerichtGen/BerichtGen.csproj b/BerichtGen/BerichtGen.csproj index 0a50aaa..951ae21 100644 --- a/BerichtGen/BerichtGen.csproj +++ b/BerichtGen/BerichtGen.csproj @@ -70,9 +70,7 @@ - - Form - + Options.cs diff --git a/SanSystem/Global.cs b/SanSystem/Global.cs index 4d1145a..1bb94ce 100644 --- a/SanSystem/Global.cs +++ b/SanSystem/Global.cs @@ -32,6 +32,16 @@ namespace SanSystem } } + void LadeRegistry() + { + string userroot = "HKEY_CURRENT_USER\\Software"; + string firmkey = "Cosysda"; + string subkey = "SanManager"; + string keyName = userroot + "\\" + firmkey + "\\" + subkey; + + + } + public void LoadLanguage() diff --git a/SanSystem/frmMain.Designer.cs b/SanSystem/frmMain.Designer.cs index b0d955a..ef01819 100644 --- a/SanSystem/frmMain.Designer.cs +++ b/SanSystem/frmMain.Designer.cs @@ -34,17 +34,21 @@ this.öffnenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.toolStripStatus_projekt_Label = new System.Windows.Forms.ToolStripStatusLabel(); + this.speichernToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mainmenu.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.SuspendLayout(); // // mainmenu // + this.mainmenu.ImageScalingSize = new System.Drawing.Size(20, 20); this.mainmenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.projektToolStripMenuItem}); + this.projektToolStripMenuItem, + this.speichernToolStripMenuItem}); this.mainmenu.Location = new System.Drawing.Point(0, 0); this.mainmenu.Name = "mainmenu"; - this.mainmenu.Size = new System.Drawing.Size(596, 24); + this.mainmenu.Padding = new System.Windows.Forms.Padding(8, 2, 0, 2); + this.mainmenu.Size = new System.Drawing.Size(795, 28); this.mainmenu.TabIndex = 1; this.mainmenu.Text = "menuStrip1"; // @@ -54,49 +58,58 @@ this.neuToolStripMenuItem, this.öffnenToolStripMenuItem}); this.projektToolStripMenuItem.Name = "projektToolStripMenuItem"; - this.projektToolStripMenuItem.Size = new System.Drawing.Size(56, 20); + this.projektToolStripMenuItem.Size = new System.Drawing.Size(67, 24); this.projektToolStripMenuItem.Text = "Projekt"; // // neuToolStripMenuItem // this.neuToolStripMenuItem.Name = "neuToolStripMenuItem"; - this.neuToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.neuToolStripMenuItem.Size = new System.Drawing.Size(181, 26); this.neuToolStripMenuItem.Text = "Neu"; this.neuToolStripMenuItem.Click += new System.EventHandler(this.neuToolStripMenuItem_Click); // // öffnenToolStripMenuItem // this.öffnenToolStripMenuItem.Name = "öffnenToolStripMenuItem"; - this.öffnenToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.öffnenToolStripMenuItem.Size = new System.Drawing.Size(181, 26); this.öffnenToolStripMenuItem.Text = "Öffnen"; this.öffnenToolStripMenuItem.Click += new System.EventHandler(this.öffnenToolStripMenuItem_Click); // // statusStrip1 // + this.statusStrip1.ImageScalingSize = new System.Drawing.Size(20, 20); this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripStatus_projekt_Label}); - this.statusStrip1.Location = new System.Drawing.Point(0, 351); + this.statusStrip1.Location = new System.Drawing.Point(0, 434); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(596, 22); + this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 19, 0); + this.statusStrip1.Size = new System.Drawing.Size(795, 25); this.statusStrip1.TabIndex = 3; this.statusStrip1.Text = "statusStrip1"; // // toolStripStatus_projekt_Label // this.toolStripStatus_projekt_Label.Name = "toolStripStatus_projekt_Label"; - this.toolStripStatus_projekt_Label.Size = new System.Drawing.Size(44, 17); + this.toolStripStatus_projekt_Label.Size = new System.Drawing.Size(55, 20); this.toolStripStatus_projekt_Label.Text = "Projekt"; // + // speichernToolStripMenuItem + // + this.speichernToolStripMenuItem.Name = "speichernToolStripMenuItem"; + this.speichernToolStripMenuItem.Size = new System.Drawing.Size(86, 24); + this.speichernToolStripMenuItem.Text = "Speichern"; + this.speichernToolStripMenuItem.Click += new System.EventHandler(this.speichernToolStripMenuItem_Click); + // // frmMain // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(596, 373); + this.ClientSize = new System.Drawing.Size(795, 459); this.Controls.Add(this.statusStrip1); this.Controls.Add(this.mainmenu); this.IsMdiContainer = true; this.MainMenuStrip = this.mainmenu; - this.Margin = new System.Windows.Forms.Padding(2); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.Name = "frmMain"; this.Text = "Kanalsanierungsverwaltung"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frm_main_FormClosing); @@ -118,6 +131,7 @@ private System.Windows.Forms.ToolStripMenuItem öffnenToolStripMenuItem; private System.Windows.Forms.StatusStrip statusStrip1; private System.Windows.Forms.ToolStripStatusLabel toolStripStatus_projekt_Label; + private System.Windows.Forms.ToolStripMenuItem speichernToolStripMenuItem; } } diff --git a/SanSystem/frmMain.cs b/SanSystem/frmMain.cs index 26620c4..40ecabf 100644 --- a/SanSystem/frmMain.cs +++ b/SanSystem/frmMain.cs @@ -73,5 +73,10 @@ namespace SanSystem frmProjektList frmProjektList = new frmProjektList(); frmProjektList.ShowDialog(); } + + private void speichernToolStripMenuItem_Click(object sender, EventArgs e) + { + Datenbank.Instance.SaveProjekt(); + } } } diff --git a/SanSystem/frmObjektEdit.Designer.cs b/SanSystem/frmObjektEdit.Designer.cs index 2e291e9..6e20396 100644 --- a/SanSystem/frmObjektEdit.Designer.cs +++ b/SanSystem/frmObjektEdit.Designer.cs @@ -30,6 +30,7 @@ { this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); + this.txt_bemerkung = new System.Windows.Forms.TextBox(); 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(); @@ -57,7 +58,8 @@ 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.label7 = new System.Windows.Forms.Label(); + this.txt_ort = new System.Windows.Forms.TextBox(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.groupBox2.SuspendLayout(); @@ -79,6 +81,8 @@ // // tabPage1 // + this.tabPage1.Controls.Add(this.txt_ort); + this.tabPage1.Controls.Add(this.label7); this.tabPage1.Controls.Add(this.txt_bemerkung); this.tabPage1.Controls.Add(this.txt_objekt_name); this.tabPage1.Controls.Add(this.lbl_objektname); @@ -109,6 +113,14 @@ this.tabPage1.Text = "Grunddaten"; this.tabPage1.UseVisualStyleBackColor = true; // + // 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; + // // 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))); @@ -419,13 +431,23 @@ this.btn_delete.UseVisualStyleBackColor = true; this.btn_delete.Click += new System.EventHandler(this.btn_delete_Click); // - // txt_bemerkung + // label7 // - 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; + 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(584, 136); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(39, 25); + this.label7.TabIndex = 27; + this.label7.Text = "Ort"; + // + // txt_ort + // + this.txt_ort.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.txt_ort.Location = new System.Drawing.Point(745, 139); + this.txt_ort.Name = "txt_ort"; + this.txt_ort.Size = new System.Drawing.Size(191, 30); + this.txt_ort.TabIndex = 28; // // frmObjektEdit // @@ -485,5 +507,7 @@ private System.Windows.Forms.Button btn_add_san; private System.Windows.Forms.Button btn_delete; private System.Windows.Forms.TextBox txt_bemerkung; + private System.Windows.Forms.TextBox txt_ort; + private System.Windows.Forms.Label label7; } } \ No newline at end of file diff --git a/SanSystem/frmObjektEdit.cs b/SanSystem/frmObjektEdit.cs index 7af318a..0a99d7a 100644 --- a/SanSystem/frmObjektEdit.cs +++ b/SanSystem/frmObjektEdit.cs @@ -62,7 +62,7 @@ namespace SanSystem txt_laenge_schacht.DataBindings.Add(new Binding("Text", inspektionsobjekt, "Schachtlaenge")); txt_objekt_name.DataBindings.Add(new Binding("Text", inspektionsobjekt, "Objektbezeichnung")); - + txt_ort.DataBindings.Add(new Binding("Text", inspektionsobjekt, "OrtName")); txt_punkt_von.DataBindings.Add(new Binding("Text", inspektionsobjekt, "VonPunkt")); txt_punkt_bis.DataBindings.Add(new Binding("Text", inspektionsobjekt, "BisPunkt")); txt_strasse.DataBindings.Add(new Binding("Text", inspektionsobjekt, "StrasseName")); @@ -113,7 +113,7 @@ namespace SanSystem txt_pro_nr.DataBindings.Clear(); dt_haltunggemessen_datum.DataBindings.Clear(); txt_bemerkung.DataBindings.Clear(); - + txt_ort.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 c0618cd..35765fb 100644 --- a/SanSystem/frmObjekteList.cs +++ b/SanSystem/frmObjekteList.cs @@ -44,6 +44,8 @@ namespace SanSystem if (_san.Fertig) anzahlfertig++; counter++; } + if (!tmp.Haltungslaenge.Equals(0)) + dgvw.DefaultCellStyle.BackColor = Color.Aquamarine; if (counter != 0 && (anzahlfertig == anzahlSan)) dgvw.DefaultCellStyle.BackColor = Color.Green; if (