From e63929f4035903e6fac2e3f64c181cc23ad9bf87 Mon Sep 17 00:00:00 2001 From: Husky Date: Sun, 15 Jul 2018 15:44:48 +0200 Subject: [PATCH] Man kann jetzt im objekt ansicht die Massenstatistik erzeugen --- BerichtGen/FrmOptions.Designer.cs | 6 +-- SanSystem/FrmSelectMassenDate.Designer.cs | 2 +- SanSystem/FrmSelectMassenDate.cs | 16 +++++++- SanSystem/MassenStatistik.cs | 2 +- SanSystem/documents/JUME/Massenstatistik.docx | Bin 14531 -> 14587 bytes SanSystem/frmObjektEdit.Designer.cs | 36 ++++++++++++++++-- SanSystem/frmObjektEdit.cs | 18 ++++++++- SanSystem/frmObjekteList.Designer.cs | 25 ++++++++++-- SanSystem/frmObjekteList.cs | 6 +++ SanSystem/frmStrassenList.Designer.cs | 7 ++-- 10 files changed, 101 insertions(+), 17 deletions(-) diff --git a/BerichtGen/FrmOptions.Designer.cs b/BerichtGen/FrmOptions.Designer.cs index ef3f04c..8e73558 100644 --- a/BerichtGen/FrmOptions.Designer.cs +++ b/BerichtGen/FrmOptions.Designer.cs @@ -41,9 +41,9 @@ this.btn_start.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btn_start.Location = new System.Drawing.Point(374, 12); this.btn_start.Name = "btn_start"; - this.btn_start.Size = new System.Drawing.Size(75, 67); + this.btn_start.Size = new System.Drawing.Size(91, 74); this.btn_start.TabIndex = 0; - this.btn_start.Text = "button1"; + this.btn_start.Text = "Bericht erzeugen"; this.btn_start.UseVisualStyleBackColor = true; this.btn_start.Click += new System.EventHandler(this.btn_start_Click); // @@ -109,7 +109,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(477, 113); + this.ClientSize = new System.Drawing.Size(477, 97); this.Controls.Add(this.label1); this.Controls.Add(this.rb_no); this.Controls.Add(this.rb_yes); diff --git a/SanSystem/FrmSelectMassenDate.Designer.cs b/SanSystem/FrmSelectMassenDate.Designer.cs index 25f55f8..f001bad 100644 --- a/SanSystem/FrmSelectMassenDate.Designer.cs +++ b/SanSystem/FrmSelectMassenDate.Designer.cs @@ -70,7 +70,7 @@ this.Controls.Add(this.dt_targetDatum); this.Controls.Add(this.label1); this.Name = "FrmSelectMassenDate"; - this.Text = "FrmSelectMassenDate"; + this.Text = "Datum auswählen"; this.ResumeLayout(false); this.PerformLayout(); diff --git a/SanSystem/FrmSelectMassenDate.cs b/SanSystem/FrmSelectMassenDate.cs index 9b29208..47068fd 100644 --- a/SanSystem/FrmSelectMassenDate.cs +++ b/SanSystem/FrmSelectMassenDate.cs @@ -1,4 +1,5 @@ using Database; +using KlassenBIB; using System; using System.Collections.Generic; using System.ComponentModel; @@ -13,14 +14,25 @@ namespace SanSystem { public partial class FrmSelectMassenDate : Form { - public FrmSelectMassenDate() + + List inspektionsobjekts = null; + /// + /// + /// + public FrmSelectMassenDate(List objekte = null) { InitializeComponent(); + if (objekte != null) + inspektionsobjekts = objekte; } private void btn_gen_Click(object sender, EventArgs e) { - MassenStatistik massenStatistik = new MassenStatistik(Datenbank.Instance.loadedProjekt.Objekte, dt_targetDatum.Value); + MassenStatistik massenStatistik = null; + if (inspektionsobjekts == null) + massenStatistik = new MassenStatistik(Datenbank.Instance.loadedProjekt.Objekte, dt_targetDatum.Value); + else + massenStatistik = new MassenStatistik(inspektionsobjekts, dt_targetDatum.Value); } } diff --git a/SanSystem/MassenStatistik.cs b/SanSystem/MassenStatistik.cs index d4eaf01..200084f 100644 --- a/SanSystem/MassenStatistik.cs +++ b/SanSystem/MassenStatistik.cs @@ -47,7 +47,7 @@ namespace SanSystem } else { - dr["vorbereitet"] = "nein wurde am " + objekt.HaltungGemessen.ToShortDateString(); + dr["vorbereitet"] = "nein am " + objekt.HaltungGemessen.ToShortDateString(); } int schachtanbindungen = 0; foreach (Sanieren mainsan in objekt.Sanierung) diff --git a/SanSystem/documents/JUME/Massenstatistik.docx b/SanSystem/documents/JUME/Massenstatistik.docx index c8a07099a294c90546400cdb4eb130441681ac35..b3a0b9e1e2e1b38c85ceb214c73194a15411a70a 100644 GIT binary patch delta 3692 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 K22nKt0002;SoMPd delta 3671 zcmZ8kXEdCP7S($lLewFnMDH!G-oeYonbh(RUC>sa5(EBdbqJFIp=n>{LISU^;yrZ z#|kq0UMc!P ztYah5R230Xb#~gqbee_yY-Q|}rS?Ki?3ArG&O*Z)$bhv7`>{SINP!HhW6=G!5KXUq z&00Kp^(F8{)Tl514=}*!^ zek~2$JbshAlIs4NZ74pnUqlvd%r5l=6iwkq_=sZI)~|+|L6>CAl3;u8CN^V4+)TO) zT$kUI09VKjCSh2KZ75YvS?a6&kvYzjhdxi$2v@YZgdH)8MrBp`JmD_e+S={|eFb=tQpu!I#Xqx~E4ct~UfS<}%S3dvSf8-fy0e8Yx#h47inLr;q+a6b$2+JWsS6eyO)t zhvD>OV13#hD@5cWH(EK_WSAG{ztN~+c=`5=LX6If>=nBeZSik(?R6Csg?G>qpa38^ z#dk)&xB%=>$XV2(^c*Phc>Sn|1A{c4e10q7edG766A-x``rh>2HyMJV>m$wqN3MlC z+z1}u9G}kc5ix9~PuBaeQe?g)$(brxt2I8o>KEkMQl99SXMQ2yay3De{bZWWzR5yrJQGK)9Zyyeu?&U{+68cAIJ)wfD%p zYT75Tdf8kbYP0!^wC5(FFQ4aeyp;fNcG@z`V~?EJ{4o59hf?h;3ig~kjUvFg*&NZw z;mz@*8$skpE$htTlyZ4(Zd$|#B^M@(A8KzsgLtO-jpEtVa>i?go}AcY%B-Cb$qhop zcAR$Zh>=uM|IH_4D#8~jjJ9LEkt?72{Y!;MxujPj1z)m_is&m-O*|ZQC973x#wS@P zry#kIVeM|G;;RF1=2n_fMQ{Od^;EpnGxE3S_(RoZ>+Gq9gRrlS3`1wi^-6;z58_Bn zNME*Bi>iw<1rc1%Mt#EteVFi#9RGNn4n*Mu%o^J{V8Q8~3Uc=kjyRVmVz!`=Tat2L zr{eSp_$F$8A%_l9guTk3Ff*Ytw$78`oZuqI3czLx&HF`T3OTseHh|L9DjtQTf&8R> zffEk+ZucGWOtBPg{)m1Nix7)PIlFdf>-v%Y<7ko^h7-(R{gSgXsCTdenAbRO4*U~`OQXq*zXlUXUw#F^W;PI}Nd#h!E)u=J3b}q3B%iY&eQ~}zNP4KyJ zSz{l&GKutMn&{JB0r+Nk7G_>ObCAUSou_1(d&-TVxUFECbAx?RWIWT@e8RM79|>A~ zH`1!?)Z!RAE&5x+x&m%?+&J`8-N3dwg0($}|1$jpx9i+i?&nH{X`w}prapR>3yjrO zReLUo=E1Vh$xSBR2^=1b;ilwB>T#=d{=z`|6layFUU!4g2WZojECh!yqPH%NxvCk8Xh-ZS_o-F zRHx^lgihvhYca~tDzk{TJOV``F;%9{7~$Ng;SK-e-pAHr2p__~UHLCJD~h>&r^T=- z^FYr2H7ODw%-CQ@M@&i{)u-#BON56eV}OSZS+s_ALif#$njcQ0Dhi-9cRsO?@{HjbY)V5nVy2wwXpuV&q0_($UP8 z`k`Ff-jOAo?4+adg$RepgPX)yiXo-heBc#?)hEh*Pl>-xyaFyAkyquB@{5@3D3{mX&lh*x@;d1T(bNZOLo zSYZtQe%C-6?*RL*QJrFnVct<6O3B0saa`eNi@GbFnspZidQ?%0^Zb^^qI z+(bngzC)gZ^^It~2lA60m?bq>gVTS7ZGm=}r$5j*f+bx4BGdk-X59G}O% zrZw9}MFj(QojbEQcAzz05Bdp&C`qi`UA}WARSQo@&gocwu?E5;nVNJ&YUN82sb5j} z03R-ctGS}VTD2qSHA9cpw~Q+M>KpWFScN3)>F)`L@ht%lRJI#i%LZ{2jYhLxsxX< zBUfJO7dt8u$OZ6W&Mm>e0|mJ$OVhBzc7{)^{o}jq8ghxl3J98Th1#uUmX(d|&N)7s zg@ZJ_NEZb-o*XF06|}7zt|8Mp!RB%8EaTAgHw7+fwUVlX`m;|Lr9uJ4b&fZ5FTJtb z)lQBa?6|G+D(XuMP5R;!94Jez5)J$0N8$i&{p#_2fX<6(~w4vg1;50;@K4terBH=sdLhz}na zHtZ3ni#gEk(AWrfYA-d`@<_w`n+OEb;_~VJ))afD)5N{856_V09V2YE8{Nwpp2Pmg zsmd_&vuFLJDh;`hKb(>l)}WgD&gFql0<8h11q(IhRHRPMj~%@(?~#-j;cmh$TwVO> zB@rY01l}5T3cZECY7#|Saj(`ECII+@YM#6>o$O(aBl2p%H|f7whN*nUF8h@E_E$jGc`^GW-G$v5)EApEY1? z{0Me%&^X_h0DkXy=J_5S(s4Tp@Xxj3_q_4%HfKX_aQpEujOII&Gcrabe_=(po-5Gl z4e=jLE(sY;?xLnaSq$o10>J&wp!-3J;GS?|+AZ84oYS*WXzz0GTh(_Q#{F_=!k- zISICZO!^0Dj*o|T_kS69X-KG?7R?yve~5w4yj+muvUk}3S^OXPA;JHv90?-F<&^MI gNLqPS{C1?Vyb69DGEH6$pBy