From 841763885fab710fa40be27081e86dcff1492149 Mon Sep 17 00:00:00 2001 From: Husky Date: Fri, 9 Aug 2019 11:50:00 +0200 Subject: [PATCH] DN wird in Kalibrierungsauflistung dargestellt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Kalibrierungsauflistung wird seperat gespeichert Baustellen ordner lässt sich nun öffnen LinerOrdner lässt sich nun öffnen --- SanSystem/UCInliner.Designer.cs | 39 ++++++++++++------ SanSystem/UCInliner.cs | 17 ++++++++ .../JUME/KalibrierungAuflistung.docx | Bin 14062 -> 14817 bytes SanSystem/frmMain.Designer.cs | 31 +++++++++----- SanSystem/frmMain.cs | 15 +++++++ SanSystem/frmObjekteList.cs | 5 ++- 6 files changed, 82 insertions(+), 25 deletions(-) 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 34fb5dfb8bb93d5728624a3c2c0b3c6117fdac8e..5599ec98bc39bf6ccfd3821e9a6773a51116fbf8 100644 GIT binary patch delta 8729 zcmZWv1ymi&vONTMcXxMp2~KdA;O_2laQ8!S3GObzJrFzuhv4q+_Q`$k{`=qiGi&zh zvZ<=+)!nPB=hSY)rFH=dE^&z1w+0#j5Mc)~!QudQm+hCiaJq_X^197 zLUe5}@E8gM91MH4`C~MT*3>Y<&xC%+9*EUB9BT^{Ricpzri3~02-(uIb|r5M8aeYy z_kb9Ek>pvVq(x+_ct;Ik3OnrK)9}JGGTs+pg8OgU6*tG^{uuWO6a}!ncu%GhfC2NB z1qKf^Mb4nir&F3@V|5miiE1B~{DwK0G9ow0+8qoDmZ<_b$ZUiZ9{k9M$+;`s8)aSt zy>i@^*ykM#0}5!S))*r(x4?R1)V(7Z#i#tK2?nLm1KhLpNX$ zcq_@1HwG9#7WC0p^*L_p)LD-TG|Lx*DfQT+n13&5k;6yZxf*Ic!Id2Ckc=h{zim?x zqt`%k?Lj+TLm1w4GG)RdDQTrel&aYS;`SM4C`rzwQy#{neFHqnkB=}tW39?Epdu(( zJ+Mhk5w`C(4&m$og6C&k)a2nAOl*-o>E&NTnwB=ho8v6YF#LFMX`;?(UL9NPFE<; zPsWw6YQ`?okv)5yyxPTlQ-ZI%J_fCL<4HdX!Oah7mqA>?iKFOd{YXrz4*NBO!)72uIm<#DmuBsnIeREg2p4Rb z*u({k4kbaiDH6u7p?%BR93hK?F_FN&D8d zSseb-^=$JOa0&f;x>Z>q@aRbt-cxf{KE6tx|2)4WFOyv>AX)nN(r~J9Lk({G%aWMO zj6~Kh>(TR$4iTd^oFlYj z;4i^g)o#-O7iu2fG}^_-Tk^98oadyt-keal%Ztg1#G};e42$xxla2&+%eG zk$SaLwiQo0>eB?LKpQSK3xkFtU7rlM{(2jCOxnJ~xF(=Y&SojuxcY|CVzYVK1o-e7 z8uxB$j~LiJX3QSEIlet$d^ev3Yc`_x`Lm$f>R&j(N%wi|8tP|npQ+n^-6P-i^f06hAE1cgV+p{Wv=j8bbw5iI3`WeZH z$hA?S=$pKU|83fQYk0+d+}KoSmeCaHnPkT?+o6opsf<0-h)qPj&OdY^}+A zO;Xu!vcRY{r<3F6$fodWhqk3&q{g@@kK)<5M`=Qf@iSm!-KNh7Npu`=tDWlMnsuDX zEb~67&TZW^v#W#_`k{rE{r*GPcGksm&d{1*_dUfNquY2X$n z^BGd;2xJnh^H^eDA7j57Tgbug_IVqybO$^z}kNbwO*Xve%K z!MC!)pHwT9V;Gk5kp;#NxZT8Id^np#%_xzZCoj31yYRsS?c9=lByV9Ak)9{^g12H|F__CP6o z!uf>Lbr5iW@ecFe{+nf4kHGoKAt9c+Z^;7 zw7Pyy6NBHeKo$uXyHhU)xot$(k`lz%sp5;l7b-+TDz6K_jM+9@f52kciyAzhj5OO*a`aLQJsQ&{4ugP z;tt#2H0~9Z!piZhNf?PO#B6#`+X!AoyMwo`L!ET!zTK0BxR-b3Dg?3EfhNBaZpMSJ z746WX6$gawCGZf0UNsXbCMpw{_Foe?qay&ft}DmihPa5Iu7obdkr3j<>IqH2czDL;y=|D7YVRQ(-{Fg}id#Wp z9|M+0wN%j5$1j$u4?Yab4=r2&Xi(V?B+hC5y(dWWVi-^%laBuYoF?*<%b zq)>h6dr-;adQ4uryHk?gxHm&MDKwSf-+UrKk~t_pJ@E2im$|FPBpW|*YfuL*m`_>}0-hXv1w#g+CV61s?M`7K%ji*GS;_2+O{HiL70Dd@WbmPdUe zC^iOx3MM7_T#AP88^>kSSG8j&ulWriv-mh^DP#G0N4jc)em-hru-uJ1tbb5om|Xq_ zu5Mxysi!l9zvXoOZ1FycwO_ssOMzZCTe38{<|*|c*Y`K{==5C3Kvz8?t<~60gNz

q%uBfa7krqDi=x|Gkj!+7dEc;Z$hI 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

;t-n%rWeR9d0Gr4Zd8bYRV&Y@F)uQH5@TmMPX z-8q~lliqx8+XQw5*+P?$ESHX35PL`UeW4Cf`p~;KFR100h6=Gx`(Ri-<7eQpmq^r|KnQ~lqDogyXzQJDRX8Ar zoK}ii4Z+M@Eih;eTao#uW>8FBn^nYXQ2Q{HnPl?32;s}JpFh~uxYKe-hW1zeWnamn zuXGvK6M0&sw1afw*@LSnT3p_mLp%)uu_?~+tE%1lWWWSGP0l7p#zr7m$SgnO< znM1Sf{-vqrMcQ3+?seq|YP&uGdWYblMd!FnAsHfLwir;mSyCZ*656G5)qHw4V8<%( zEwUgDV&76m(h9ghnFA&-wnCi&1phPSAQpajRW*pSu!8|Z8bvsqLRIpJ0whP81@X^p zjW?PYmt%GO1-DkrodVE>I=R`2x*u5dgzt*^j3bs7IWs4%HS*M}XWhHa@5c9{kt?HQ zmNf7zoW}K8>TND=5p9F7aFPbKl;QB_j}wv%oQP(@d~hwco3{`2_RYxfZhyOFYj|$W zsK#?$NPGqwIQc4A>e@0tCnv<>Y7Sj@%jlNWcisQ&@EoE3+PjLMuH-w)JznWn1}&tW z=OmLMc}HW-rU=pO9IreU7!M%&Y#GU%+9L&%8H}JpdHD672MFD<2PhQ*Jwnmm5qC{s9fd(4p$NwKCvoFtb%2L zqHlniR^$!aog>6vAUG}uijbxhGfs>L;cUt)sk?p@AxDe~Ja19`G(OODrDau4?qvr( zAL>mu;;zey+ly1*$J3sn__cJ}Xs>9*M#Vrs1zxGeP)ftrDt}su3jDVUZ0|Poe)Wop zPt?P5qUNE|bCt0_XT<>mzia&z)u%P-=MR6KXz=2_SG6SBBMAQaO922teXnZ$bB#cO zI5@~b6YO{&N|8W^>`Wj{4!jT7C?F43WPw-FK697Q} z$H99`l>h|JMM>~i5%HZ=f1llP{zJiu5G2Y;NATaZw|{i%h(O_-qy+ygvH$?aKhpQs zIvps4i;Cc%#RC99`ws;<29P)x1;Jla%e()x5C5HwBNJ$Vll-r-0IKG~LLp`a08AZB wl$;$LU6_p=9YKNY7@$QCJP1|}001O|M}(y$2MP7Z2h#hU3=RNrbN!+I2m6qBH~;_u delta 8170 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 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;