diff --git a/SanSystem/UCInliner.Designer.cs b/SanSystem/UCInliner.Designer.cs index 170ccfe..2db90c6 100644 --- a/SanSystem/UCInliner.Designer.cs +++ b/SanSystem/UCInliner.Designer.cs @@ -30,6 +30,7 @@ { this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage2 = new System.Windows.Forms.TabPage(); + this.cb_preliner = new System.Windows.Forms.CheckBox(); this.txt_besatzung = new System.Windows.Forms.TextBox(); this.label2 = new System.Windows.Forms.Label(); this.groupBox1 = new System.Windows.Forms.GroupBox(); @@ -53,7 +54,7 @@ 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.cb_preliner = new System.Windows.Forms.CheckBox(); + this.btn_open_file = new System.Windows.Forms.Button(); this.tabControl1.SuspendLayout(); this.tabPage2.SuspendLayout(); this.groupBox1.SuspendLayout(); @@ -76,6 +77,7 @@ // // tabPage2 // + this.tabPage2.Controls.Add(this.btn_open_file); this.tabPage2.Controls.Add(this.cb_preliner); this.tabPage2.Controls.Add(this.txt_besatzung); this.tabPage2.Controls.Add(this.label2); @@ -101,6 +103,20 @@ this.tabPage2.Text = "Vorraussetzungen"; this.tabPage2.UseVisualStyleBackColor = true; // + // cb_preliner + // + this.cb_preliner.AutoSize = true; + this.cb_preliner.Checked = true; + this.cb_preliner.CheckState = System.Windows.Forms.CheckState.Checked; + this.cb_preliner.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.cb_preliner.Location = new System.Drawing.Point(8, 130); + this.cb_preliner.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.cb_preliner.Name = "cb_preliner"; + this.cb_preliner.Size = new System.Drawing.Size(253, 29); + this.cb_preliner.TabIndex = 38; + this.cb_preliner.Text = "Preliner wurde verwendet"; + this.cb_preliner.UseVisualStyleBackColor = true; + // // txt_besatzung // this.txt_besatzung.Location = new System.Drawing.Point(551, 192); @@ -338,19 +354,15 @@ this.cb_genehmigung.Text = "Genehmigung wurde eingeholt"; this.cb_genehmigung.UseVisualStyleBackColor = true; // - // cb_preliner + // btn_open_file // - this.cb_preliner.AutoSize = true; - this.cb_preliner.Checked = true; - this.cb_preliner.CheckState = System.Windows.Forms.CheckState.Checked; - this.cb_preliner.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.cb_preliner.Location = new System.Drawing.Point(8, 130); - this.cb_preliner.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.cb_preliner.Name = "cb_preliner"; - this.cb_preliner.Size = new System.Drawing.Size(253, 29); - this.cb_preliner.TabIndex = 38; - this.cb_preliner.Text = "Preliner wurde verwendet"; - this.cb_preliner.UseVisualStyleBackColor = true; + this.btn_open_file.Location = new System.Drawing.Point(535, 311); + this.btn_open_file.Name = "btn_open_file"; + this.btn_open_file.Size = new System.Drawing.Size(172, 71); + this.btn_open_file.TabIndex = 39; + this.btn_open_file.Text = "Öffnen vom Ordner"; + this.btn_open_file.UseVisualStyleBackColor = true; + this.btn_open_file.Click += new System.EventHandler(this.Btn_open_file_Click); // // UCInliner // @@ -401,5 +413,6 @@ private System.Windows.Forms.Label label2; private System.Windows.Forms.TextBox txt_besatzung; private System.Windows.Forms.CheckBox cb_preliner; + private System.Windows.Forms.Button btn_open_file; } } diff --git a/SanSystem/UCInliner.cs b/SanSystem/UCInliner.cs index d710bc2..4e8e4e3 100644 --- a/SanSystem/UCInliner.cs +++ b/SanSystem/UCInliner.cs @@ -256,5 +256,22 @@ namespace SanSystem BerichtGen.FrmOptions options = new BerichtGen.FrmOptions("JUME", "liner_einbau.docx", speicherpfad,inliner.Inspektionsobjekt.Objektbezeichnung, hashtable, new List()); options.ShowDialog(); } + + private void Btn_open_file_Click(object sender, EventArgs e) + { + Process prozess = new Process(); + prozess.StartInfo.FileName = "explorer"; + try + { + DirectoryInfo directory = Directory.GetParent(destinationPath); + + prozess.StartInfo.Arguments = Directory.GetParent(destinationPath).FullName; + prozess.Start(); + } + catch (Exception ex) + { + MessageBox.Show("Es ist ein fehler aufgetreten beim öffnen vom Leitungsordner " + ex.Message); + } + } } } diff --git a/SanSystem/documents/JUME/KalibrierungAuflistung.docx b/SanSystem/documents/JUME/KalibrierungAuflistung.docx index 34fb5df..5599ec9 100644 Binary files a/SanSystem/documents/JUME/KalibrierungAuflistung.docx and b/SanSystem/documents/JUME/KalibrierungAuflistung.docx differ diff --git a/SanSystem/frmMain.Designer.cs b/SanSystem/frmMain.Designer.cs index 8c48ddb..057c032 100644 --- a/SanSystem/frmMain.Designer.cs +++ b/SanSystem/frmMain.Designer.cs @@ -41,6 +41,7 @@ this.massenstatistikToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.toolStripStatus_projekt_Label = new System.Windows.Forms.ToolStripStatusLabel(); + this.projektordnerÖffnenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mainmenu.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.SuspendLayout(); @@ -52,7 +53,8 @@ this.mainmenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.projektToolStripMenuItem, this.speichernToolStripMenuItem, - this.massenstatistikToolStripMenuItem}); + this.massenstatistikToolStripMenuItem, + this.projektordnerÖffnenToolStripMenuItem}); this.mainmenu.Location = new System.Drawing.Point(0, 0); this.mainmenu.Name = "mainmenu"; this.mainmenu.Padding = new System.Windows.Forms.Padding(8, 2, 0, 2); @@ -68,49 +70,48 @@ this.stammdatenImportierenToolStripMenuItem, this.auftraggeberToolStripMenuItem}); this.projektToolStripMenuItem.Name = "projektToolStripMenuItem"; - this.projektToolStripMenuItem.Size = new System.Drawing.Size(86, 32); + this.projektToolStripMenuItem.Size = new System.Drawing.Size(88, 32); this.projektToolStripMenuItem.Text = "Projekt"; // // neuToolStripMenuItem // this.neuToolStripMenuItem.Name = "neuToolStripMenuItem"; - this.neuToolStripMenuItem.Size = new System.Drawing.Size(310, 32); + this.neuToolStripMenuItem.Size = new System.Drawing.Size(318, 32); 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(310, 32); + this.öffnenToolStripMenuItem.Size = new System.Drawing.Size(318, 32); this.öffnenToolStripMenuItem.Text = "Öffnen"; this.öffnenToolStripMenuItem.Click += new System.EventHandler(this.öffnenToolStripMenuItem_Click); // // stammdatenImportierenToolStripMenuItem // this.stammdatenImportierenToolStripMenuItem.Name = "stammdatenImportierenToolStripMenuItem"; - this.stammdatenImportierenToolStripMenuItem.Size = new System.Drawing.Size(310, 32); + this.stammdatenImportierenToolStripMenuItem.Size = new System.Drawing.Size(318, 32); this.stammdatenImportierenToolStripMenuItem.Text = "Stammdaten importieren"; this.stammdatenImportierenToolStripMenuItem.Click += new System.EventHandler(this.stammdatenImportierenToolStripMenuItem_Click); // // auftraggeberToolStripMenuItem // this.auftraggeberToolStripMenuItem.Name = "auftraggeberToolStripMenuItem"; - this.auftraggeberToolStripMenuItem.Size = new System.Drawing.Size(310, 32); + this.auftraggeberToolStripMenuItem.Size = new System.Drawing.Size(318, 32); this.auftraggeberToolStripMenuItem.Text = "Auftraggeber"; this.auftraggeberToolStripMenuItem.Click += new System.EventHandler(this.auftraggeberToolStripMenuItem_Click); // // speichernToolStripMenuItem // this.speichernToolStripMenuItem.Name = "speichernToolStripMenuItem"; - this.speichernToolStripMenuItem.Size = new System.Drawing.Size(110, 32); + this.speichernToolStripMenuItem.Size = new System.Drawing.Size(112, 32); this.speichernToolStripMenuItem.Text = "Speichern"; this.speichernToolStripMenuItem.Click += new System.EventHandler(this.speichernToolStripMenuItem_Click); // // massenstatistikToolStripMenuItem // - this.massenstatistikToolStripMenuItem.Enabled = false; this.massenstatistikToolStripMenuItem.Name = "massenstatistikToolStripMenuItem"; - this.massenstatistikToolStripMenuItem.Size = new System.Drawing.Size(156, 32); + this.massenstatistikToolStripMenuItem.Size = new System.Drawing.Size(158, 32); this.massenstatistikToolStripMenuItem.Text = "Massenstatistik"; this.massenstatistikToolStripMenuItem.Click += new System.EventHandler(this.massenstatistikToolStripMenuItem_Click); // @@ -119,10 +120,10 @@ 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, 434); + this.statusStrip1.Location = new System.Drawing.Point(0, 433); this.statusStrip1.Name = "statusStrip1"; this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 19, 0); - this.statusStrip1.Size = new System.Drawing.Size(795, 25); + this.statusStrip1.Size = new System.Drawing.Size(795, 26); this.statusStrip1.TabIndex = 3; this.statusStrip1.Text = "statusStrip1"; // @@ -132,6 +133,13 @@ this.toolStripStatus_projekt_Label.Size = new System.Drawing.Size(55, 20); this.toolStripStatus_projekt_Label.Text = "Projekt"; // + // projektordnerÖffnenToolStripMenuItem + // + this.projektordnerÖffnenToolStripMenuItem.Name = "projektordnerÖffnenToolStripMenuItem"; + this.projektordnerÖffnenToolStripMenuItem.Size = new System.Drawing.Size(211, 32); + this.projektordnerÖffnenToolStripMenuItem.Text = "Projektordner Öffnen"; + this.projektordnerÖffnenToolStripMenuItem.Click += new System.EventHandler(this.ProjektordnerÖffnenToolStripMenuItem_Click); + // // frmMain // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); @@ -167,6 +175,7 @@ private System.Windows.Forms.ToolStripMenuItem massenstatistikToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem stammdatenImportierenToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem auftraggeberToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem projektordnerÖffnenToolStripMenuItem; } } diff --git a/SanSystem/frmMain.cs b/SanSystem/frmMain.cs index 1e53cd6..992c045 100644 --- a/SanSystem/frmMain.cs +++ b/SanSystem/frmMain.cs @@ -166,5 +166,20 @@ namespace SanSystem frmAuftraggeberEdit frmAuftraggeberEdit = new frmAuftraggeberEdit(Datenbank.Instance.loadedProjekt.Auftraggeber); frmAuftraggeberEdit.ShowDialog(); } + + private void ProjektordnerÖffnenToolStripMenuItem_Click(object sender, EventArgs e) + { + Process prozess = new Process(); + prozess.StartInfo.FileName = "explorer"; + try + { + prozess.StartInfo.Arguments = Path.Combine(Environment.CurrentDirectory, Global.Instance.Projektpfad); + prozess.Start(); + } + catch(Exception ex) + { + MessageBox.Show("Es ist ein fehler aufgetreten beim öffnen vom Baustellenordner " + ex.Message); + } + } } } diff --git a/SanSystem/frmObjekteList.cs b/SanSystem/frmObjekteList.cs index 08a65d6..4ff6d91 100644 --- a/SanSystem/frmObjekteList.cs +++ b/SanSystem/frmObjekteList.cs @@ -284,13 +284,14 @@ namespace SanSystem dr["liner_laenge"] = obj.Haltungslaenge; dr["schacht_laenge"] = obj.Schachtlaenge; dr["liner_gesamt"] = linergesamt; + dr["dn"] = obj.Kanalrohrweite; dr["bemerkung"] = obj.Bemerkung; linerges += linergesamt; linereintraege.Rows.Add(dr); } grundDaten["gesamt_liner"] = linerges; grundDaten["harzmenge"] = linerges * 1.8; - BerichtGen.FrmOptions options = new BerichtGen.FrmOptions("JUME", "KalibrierungAuflistung.docx", "","", grundDaten, null, linereintraege); + BerichtGen.FrmOptions options = new BerichtGen.FrmOptions("JUME", "KalibrierungAuflistung.docx", string.Format("./{0}/KalibrierDokumente/",Global.Instance.Projektpfad),txt_strasse.Text, grundDaten, null, linereintraege); options.ShowDialog(); } @@ -305,6 +306,8 @@ namespace SanSystem dataTable.Columns.Add(dataColumn); dataColumn = new DataColumn("liner_gesamt") { MaxLength = 50 }; dataTable.Columns.Add(dataColumn); + dataColumn = new DataColumn("dn") { MaxLength = 10 }; + dataTable.Columns.Add(dataColumn); dataColumn = new DataColumn("bemerkung") { MaxLength = 255 }; dataTable.Columns.Add(dataColumn); return dataTable;