From 3b6b3a9080c0c3678094e631db23e01b33a6ad36 Mon Sep 17 00:00:00 2001 From: Husky Date: Mon, 30 Jul 2018 12:54:39 +0200 Subject: [PATCH] Auftraggeber wird in protokoll mit abgebildet --- KlassenBIB/Auftraggeber.cs | 5 +++-- KlassenBIB/InlinerSanierung.cs | 14 ++++++------ KlassenBIB/Projekt.cs | 7 +++--- SanShared/IAuftraggeber.cs | 25 +++++++++++++++++++++ SanShared/IMakeProtokol.cs | 3 ++- SanShared/IProjekt.cs | 13 +++++++++++ SanShared/SanShared.csproj | 2 ++ SanSystem/FrmAuftraggeberEdit.cs | 3 ++- SanSystem/MassenStatistik.cs | 4 ++-- SanSystem/UCInliner.cs | 2 +- SanSystem/documents/JUME/liner_einbau.docx | Bin 51042 -> 50924 bytes 11 files changed, 61 insertions(+), 17 deletions(-) create mode 100644 SanShared/IAuftraggeber.cs create mode 100644 SanShared/IProjekt.cs diff --git a/KlassenBIB/Auftraggeber.cs b/KlassenBIB/Auftraggeber.cs index d1886a8..e06e88d 100644 --- a/KlassenBIB/Auftraggeber.cs +++ b/KlassenBIB/Auftraggeber.cs @@ -1,4 +1,5 @@ -using System; +using SanShared; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -9,7 +10,7 @@ namespace KlassenBIB /// /// /// - public class Auftraggeber + public class Auftraggeber :IAuftraggeber { /// /// diff --git a/KlassenBIB/InlinerSanierung.cs b/KlassenBIB/InlinerSanierung.cs index 6f82e82..9a95c62 100644 --- a/KlassenBIB/InlinerSanierung.cs +++ b/KlassenBIB/InlinerSanierung.cs @@ -56,9 +56,9 @@ namespace KlassenBIB /// /// /// + /// Projekt /// - - public Hashtable MakeProtokoll(string destinationPath) + public Hashtable MakeProtokoll(string destinationPath, IProjekt projekt) { Hashtable grunddaten = new Hashtable() { @@ -101,14 +101,14 @@ namespace KlassenBIB }; double LaengeGesamt = this.Inspektionsobjekt.Haltungslaenge + this.Inspektionsobjekt.Schachtlaenge; - - grunddaten["AG_Vorname"] = ""; + + grunddaten["AG_Vorname"] = projekt.Auftraggeber.Name; grunddaten["KLP_Nummer"] = ""; grunddaten["KLP_Datum"] = DateTime.Now.ToShortDateString(); - grunddaten["AG_Ort"] = ""; - grunddaten["AG_Strasse"] = ""; - grunddaten["AG_Ansprechpartner"] = ""; + grunddaten["AG_Ort"] = projekt.Auftraggeber.Ort; + grunddaten["AG_Strasse"] = projekt.Auftraggeber.Strasse; + grunddaten["AG_Ansprechpartner"] = projekt.Auftraggeber.Ansprechpartner; grunddaten["BM_Ort"] = Inspektionsobjekt.OrtName; grunddaten["BM_Strasse"] = Inspektionsobjekt.StrasseName; grunddaten["BM_Schacht_von"] = Inspektionsobjekt.VonPunkt; diff --git a/KlassenBIB/Projekt.cs b/KlassenBIB/Projekt.cs index 3736576..3e06119 100644 --- a/KlassenBIB/Projekt.cs +++ b/KlassenBIB/Projekt.cs @@ -1,4 +1,5 @@ -using System; +using SanShared; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -12,7 +13,7 @@ namespace KlassenBIB /// /// [ContentProperty("Objekte")] - public class Projekt + public class Projekt :IProjekt { /// /// @@ -25,7 +26,7 @@ namespace KlassenBIB /// /// /// - public Auftraggeber Auftraggeber { get; set; } + public IAuftraggeber Auftraggeber { get; set; } /// /// /// diff --git a/SanShared/IAuftraggeber.cs b/SanShared/IAuftraggeber.cs new file mode 100644 index 0000000..2c91104 --- /dev/null +++ b/SanShared/IAuftraggeber.cs @@ -0,0 +1,25 @@ +namespace SanShared +{ + /// + /// + /// + public interface IAuftraggeber + { + /// + /// + /// + string Name { get; set; } + /// + /// + /// + string Strasse { get; set; } + /// + /// + /// + string Ort { get; set; } + /// + /// + /// + string Ansprechpartner { get; set; } + } +} \ No newline at end of file diff --git a/SanShared/IMakeProtokol.cs b/SanShared/IMakeProtokol.cs index f423bdf..37deeec 100644 --- a/SanShared/IMakeProtokol.cs +++ b/SanShared/IMakeProtokol.cs @@ -16,7 +16,8 @@ namespace SanShared /// /// /// + /// Projekt /// - Hashtable MakeProtokoll(string destinationPath); + Hashtable MakeProtokoll(string destinationPath, IProjekt projekt); } } diff --git a/SanShared/IProjekt.cs b/SanShared/IProjekt.cs new file mode 100644 index 0000000..b6a676b --- /dev/null +++ b/SanShared/IProjekt.cs @@ -0,0 +1,13 @@ +namespace SanShared +{ + /// + /// + /// + public interface IProjekt + { + /// + /// + /// + IAuftraggeber Auftraggeber { get; set; } + } +} \ No newline at end of file diff --git a/SanShared/SanShared.csproj b/SanShared/SanShared.csproj index f394d1b..a790043 100644 --- a/SanShared/SanShared.csproj +++ b/SanShared/SanShared.csproj @@ -43,8 +43,10 @@ + + diff --git a/SanSystem/FrmAuftraggeberEdit.cs b/SanSystem/FrmAuftraggeberEdit.cs index 83d535a..a3372b1 100644 --- a/SanSystem/FrmAuftraggeberEdit.cs +++ b/SanSystem/FrmAuftraggeberEdit.cs @@ -1,4 +1,5 @@ using KlassenBIB; +using SanShared; using System; using System.Collections.Generic; using System.ComponentModel; @@ -19,7 +20,7 @@ namespace SanSystem /// /// /// - public FrmAuftraggeberEdit(Auftraggeber auftraggeber) + public FrmAuftraggeberEdit(IAuftraggeber auftraggeber) { InitializeComponent(); txt_name.DataBindings.Add("Text", auftraggeber, "Name"); diff --git a/SanSystem/MassenStatistik.cs b/SanSystem/MassenStatistik.cs index 78b8720..76a1d0c 100644 --- a/SanSystem/MassenStatistik.cs +++ b/SanSystem/MassenStatistik.cs @@ -32,7 +32,7 @@ namespace SanSystem void BuildBericht(List list) { - Hashtable grundDaten = MakeProtokoll(""); + Hashtable grundDaten = MakeProtokoll("",null); DataTable inliner = getMassenTableInliner(); @@ -95,7 +95,7 @@ namespace SanSystem frmOptions.ShowDialog(); } - public Hashtable MakeProtokoll(string destinationPath) + public Hashtable MakeProtokoll(string destinationPath, IProjekt projekt) { Hashtable grundDaten = new Hashtable() { diff --git a/SanSystem/UCInliner.cs b/SanSystem/UCInliner.cs index f91d405..4728792 100644 --- a/SanSystem/UCInliner.cs +++ b/SanSystem/UCInliner.cs @@ -307,7 +307,7 @@ namespace SanSystem { MessageBox.Show("Warnung, es wurden keine Daten von der Anlage geladen, Grafik konnte nicht erstellt werden"); } - Hashtable hashtable = inliner.MakeProtokoll(destinationPath); + Hashtable hashtable = inliner.MakeProtokoll(destinationPath,Database.Datenbank.Instance.loadedProjekt); DirectoryInfo directory = Directory.GetParent(destinationPath); string speicherpfad = directory.FullName; BerichtGen.FrmOptions options = new BerichtGen.FrmOptions("JUME", "liner_einbau.docx", speicherpfad,inliner.Inspektionsobjekt.Objektbezeichnung, hashtable, new List()); diff --git a/SanSystem/documents/JUME/liner_einbau.docx b/SanSystem/documents/JUME/liner_einbau.docx index ab56059d9a51b8c0812a1f6f24b5222a1ebf59fb..7761f42ee87c13b575d5f0459cba3e4eb65f6d7c 100644 GIT binary patch delta 8812 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

u4?IiPbX%7GGBzXCk|2Rq6lr3ij z*oB7fH+r3vdSW>6Syw466`4dZk6{!-M8oQTn@F{BKob~$N=dst9~ zSLgIwA^bscO@5bp^Tguh(w7xIkrRjK7OmoIclWp@y?~_RdWrJn&As3bOS6^7bGI~^ z7S`MT+D4L)!mFeQn;Jt7#*7qFejR{fv3F2&%^r;?V8qslUKHJDO?T}9G0a#?PhfHH z@le=nG{x*3++I&zn^d{bXndgkfnA$43X8c@=A{m>W&e_=@qujRO&Cm@83kEm+C~Fk z`F)5%o8Q^&M_BNkApHP`$O2K;)`H;@sA;&s#Niqh}dco{th!{F~~G>>lP z-8>NvE*%eOVHcf-VzrIJS^(Y65vbA4r$%_c1Z}u=n-O8D^S)(J%#yMz-27xP;g+?z zcTr336Y9Q&-aX0iKDy!}=+}?m+4-!?I=^==m6R`=v)yGM!`I!4G{?{JgKV}6rWu@( z1q&a>+{S>d;E~vE@q0+e^c~uE{JAgnC94R0T`XZGy!_zu=qFE95$RJR&33S37&;>V zxLTl4VtNCI3ENatK)b4&^ki)RyspOF?Aa=zcrNvPO6w$@g50ayuUm6JvG6inY$e@S z=zk$CG=!ooGz|E>o3OT@^c4nnLkh~U9Xvoq28`M5kfRS=Bs`UmpfAB@DYra z7R&2kXzQTik818vtdL7+i|9%<;MN@lBLH&iu7kv?#+>493rY&j+ z$w$P(HI}_Dt#!RTwNUo;8fMRa4h*u)10oH2j6!m9eHb`L=qtaCsb4dl6^-)!b+_$p z$JX}?)b*j|)}dFo>$dqlY*wSpzUK;buO!atp0QMczOCzPam$a&(vYkPm(~oxW+hc} zGUUY3)SXDXmo3>`3`s9DRS$m%JR;- z!v#@f<{7-;roZhSEr%5C)(r%YHpAXT^%eH;oSC10AWR9*2qCassD_c@K3Ud?{d#~i zyhr=bvtmQQK_L9|FHHe46l( zUP~>G7*vMgGVaD(l{(j#WSVM850Q(CNI`B={)4B~$c5lQM0I)iYomlGvPOS1AUaab z6gl1cP5&}T>YI=gX#%SM^_tA$a3@@vue?~HKd$VpnncPoO5?N;r=5fgU9KlbeJGz% z_z6Y;k2Svuw2>S7Y>(RoERn>h>z8zEsWyc~su;f+w%FT*Hr;;Z|O!+9{T&KCp7R~eR-*z`)CqsPs>N?P8c#L1W_AB zH{$~6z{#VVz(PP6qeJ{>1))CvgQmt_+8daE-)Npn2!futF~ zY+GxqSjgg=OS6ni84C5Svi8gK1Sw`cYqm ze}1m@T<%mo&|B^AW7!qqgIADRsg4^7c2R{H{K$Sy^-K5ULEA>>`j6iM42pF3U%k$G zUI4hmNdF2id1|WLidD;O$qYHeSx*M^1^4&IZz4C!#YCX>K zd`Xg+=&YZ0VC+w~@-m>rf5(#sc9BmK{)?5t0TY2sAS)CkYGkF%tv>@lYb+=A@q%AoB?FTl#lnNaPO(iNH+Mc5Bp zYggjfmeC2FwuDtnwbozstwavWTuLmou>4b-K$zO~RPOnCc^L3l?`!ko7gDMx#A}N1 z>CR-kksRF2dEEN7s>Z5rxwPCiO6pCRBpNY-eC;_?`$(4a=EyQYD>rHKAj&G5n$6 zd4H%ehkZm0i})~qlD(oeQ-fIWex#{zEQ}a`k}1Wpev&$+u>DVJ4I!lDoxzCe?j3{A?MFluA zUD+iw5DVDfdCB9DoBB-6;4Bc&w|Y+!tmY5aLz6s&dw|fPLN?_mx8q*jVL{)Ag-jti z_g)p_88(iCv&i$=Y4MQYG3OU2=w?rCDS|IP%Y(UtU>=zi(@bDX++31|-p;c?ot|{# z(aMbfK{R0@VTqZeUod*Z{t9CbiFCzBy%H0@!walZc=)oNKfyG@g*wAks#C#i9P=I% z-L!k+OA@#!hkMORiMP$5sdq zzzEPXW5;LBIms>*@Lm3DC6~0uS$ddQ7+yR=fT6v5M5DaQ5|i`wp;ejG1K5%MkQkEPJiISn*VRMch;&pn zh5zD$6pfO58{sQt5GXSHR zoY(K4meKtKs&+Q}76n#HKkR-JJXR?Wh{*PSMGw08^+7S(mfBQtR>Pqi!C9rQv}g^I zUl9f~NPiA{+>pPjBNafgC%tJOm>odligm}z`8Kg-*Ygv0-V zb%#rYf&Ke}^X=>((tUwlX>pF!EH)X1i9HKD6|F!~gX)ybP*{4=uqgjf8Vz-+rWQlq zq7VQ*WRYo18N!-gEu0VJ3z09UA-XqdJ5pq7ezw;iG2GNK`U7k71jN^3DM z*s;J;5WV13-T?EWKisEB8!o1J^N3hid_*=|QmHrf3Q>DgMGp-dmX$(+T1#H{0tsmj zCTc=g2sq-tgJplFF;5ecYc-^0~CLZ3u|k z2;h%6FzVmQ8RTy`y#KTr%0ES3W7y}Q;n#MFe;Ue{2%=frCnoHVTh0mM02oo# zd-=$|?AAmO;R>(yz%8ZSz}Ef|5rdnDF8zvegjhTmh}^P>0#T0dW-+zb+bdT^XWwrz zQwke!9Ws;RgYa15icR-m%m#Ms*qFG#Gx+iZ`{MU@G~zHf+|;iAso198s%D5}cmkhX zbiL21`t-tg0V6WD%)oqWK>=Pn90+`UoTxO#Y7`Rr7I>Qbs^N4gLgfDZf7z49?9CA=P8evD|`p6<}X zN@0e(KvZ4^FV%QLa!>nh%gOf}k^;8g)5QEQuDk8Qm(q7c3x(L4+l~LY})q?G7wzaCkq({e(0km{&$)D zlXoB(2#9|W?SJS`EtsdD66Rm&2iEV$g<5R@yY~w~6*Yq!`UN3nz<2#3P|KY{|l&y!sq}1 delta 8943 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 CjU!J0