From 32263df3ee8ba0d316a278f44d1c0dee9e0822c0 Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Fri, 20 Nov 2020 10:20:02 +0100 Subject: [PATCH 1/3] Diakonie Herne Belegsanpassung + DokumenteView --- BeWo/BeWo.csproj | 7 + BeWo/MainControl.xaml | 14 + BeWo/MainControl.xaml.cs | 21 +- BeWo/Ressources/Icons/MainControlFolder.png | Bin 0 -> 3120 bytes BeWo/Styles/OrangeBlack.xaml | 19 +- BeWo/View/BeWoFileView.xaml | 10 +- BeWo/View/Master/AdministrationView.xaml | 2 +- BeWo/View/Master/DokumenteView.xaml | 160 +++ BeWo/View/Master/DokumenteView.xaml.cs | 1011 +++++++++++++++++ BeWo/ViewModel/DocumentTreeItemVM.cs | 85 ++ BeWo/ViewModel/VMFactory.cs | 98 +- .../Quittierungsbeleg.Designer.cs | 171 ++- .../QuittierungsbelegBlanko.Designer.cs | 64 +- Service/Plugins/TranslationDictionary.cs | 1 + Shared/DataContracts/DocumentTreeItemDC.cs | 39 + Shared/Shared.csproj | 1 + 16 files changed, 1610 insertions(+), 93 deletions(-) create mode 100644 BeWo/Ressources/Icons/MainControlFolder.png create mode 100644 BeWo/View/Master/DokumenteView.xaml create mode 100644 BeWo/View/Master/DokumenteView.xaml.cs create mode 100644 BeWo/ViewModel/DocumentTreeItemVM.cs create mode 100644 Shared/DataContracts/DocumentTreeItemDC.cs diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 6d1210159..51edf485c 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -401,6 +401,9 @@ MSBuild:Compile Designer + + MSBuild:UpdateDesignTimeXaml + Designer MSBuild:Compile @@ -855,6 +858,7 @@ + @@ -1047,6 +1051,9 @@ HomeView.xaml + + DokumenteView.xaml + KilometerauslastungsView.xaml diff --git a/BeWo/MainControl.xaml b/BeWo/MainControl.xaml index 384a0998d..4f72f82a4 100644 --- a/BeWo/MainControl.xaml +++ b/BeWo/MainControl.xaml @@ -448,6 +448,20 @@ + + + + + + + + + + FLIME~@P>l&1B`gbZ@eJ!kOv+S4+w;W z6alhGh!RJN2(lvqA(6p}NQ{#B7JJw0U2k^RyX&2uo$2Z7s^XkeRo$J%_KZCyC}WkT zx2LE3eCK@Mxzt!#YvI%UlJF^i#drI#d+qtFdVOlr8g(OzD~n0 zTLLiixv@%s0SgpOfnGts2mvm(0(5TpZ-J++wh&_Of{%Y&0eP+=w+2*CLz?9u$>7{!e_0KFtlcL{WN7If!= zF})eQ`%SITY6Qptj6~xIU;qIBI{@kOnRc9HqcR?c_R=+I&Hf8)x&(1jN1JOHkOZW} z71u$;O%PENk4NymfyQdYldTD1Z{UT~LdXT7HioJj*@iVX&+;5J z0m<;WN)HU+t`q{J@z!mCNWzv!_rmD*&%*lR9JH>Tfmm&zkw_dXL1@M9w0RFq)Z|9c8))Nu)ue^l;(zW=Ihu05aNg1URFU{M>^%`U=uc7uHwWu>Fx5YC-U|(gQH$ zdFfcg=cFjat{+2mXgLD8K2@;wWjvoSz?e;Rbd}R^3 znErNc-wMr<1{jQn5EVOv-AJE8m)3n?DWJK47`ZoE8^QXx$UvwPL|})F00J;bA59T3 zEH*2=7>PQz$Cj)kU$4xpK)a)0@1BQYd~Bq!Q5bh^0HQrE84y}myR$5VUbhWnk%6G? zL5e{?5u?*E0;B^?mSm1V6b|OTDtMaX=LO)pLo0QoF4R>OKLe&YVp~>Lg~Si^ae)o2_-uGx$JFBDYK_jcr1zu%hBQDsoP_ zIRm!b4%v_#il9(LA_PDYX*8Rl(~R%O7>132(OrCS;yld)R*n|T3l{;y4?`~+l#4X} z*l=3pmM5f6pYAOP{wup0A?raF@IJyBP}49KBA5wLz4uExw=;j0t&I+`d%5irhR zgZ&a+kM$eD*pef@j)2#u@1|XJcyx$dBq<6A!~_R`9iBquVSyP!MwT;?mDI;Xd~>Ta z&QRfjM)+%(LYAp+h3`DcyCD(TN+-d0auMK&QOdUL|AAWSK6Su2PmqDyy_1KWXCxZ0 zoZ)^6X}zd{-(AKPOg9p#@GVHG1s7$U0`Rt&P_dXvbXbHbDV9|9#IO+vWgU%{#tE96 z0_DA?SRaNxPW*QC;f&-xtwqT9;BtI$zHv3eMG5cSxd>8IVN9_bk5nzjmOQ%i$WHaB zmc)GkfGyIZ@W>Fw;hKzh268koVw{m6 zfDonebRXd(<4;F1X-d4Ox~->_XmYkoD&8k5HEJm^X$=hj~!>ea5 z!;7chhqLdm+>3}qK{8GQl?R7+(t`1|KzO=o7NX=j!eX!`-+kpO3W0MHrDy5#5mxN+ zu^MCDGS+~%-kXDCKRO9(o%_l{epsQ@2&O^<&U9>G;c+iqW5A!&OdZMFC{Xl9!iMZ_ zN~KYyN0L%QNbyaOQcY|MfBoEB@XW8y4p+z^3>VTF{4ovSB2Q~dtyI9MuVFn{2I8u) zam+y=ASBW7 z&C$ah<3nMjxdBI>Ji^z~0GDe=1qR^@T4;|MI1AiB7w$0Vz|Z>wc5UiJ7Leb|-}-87XP*w_8LQ<%OeWncD?io?3-xetGu6 zZtijw)-<;YU;a(mAbK3sDyW{~4P46C?M?=>^DVBDqa(EfL=;MM(TDoh!gUJ@bx7+|>U-;GiOKz)uVt7`BbiyS>q!lgkxk&>gZvet#kRtn8V;q{|>^kS=%HOd({KVKi-x`|Ko&)`GGSwHJaT!CWF5 z`J0rnamgV!d9(?@W@9%~N>SkAJ~?)bQX=gIk&sR3fr^bO2ZVl*$dEP-8}aBb!+=An z6vFNtb!}mucbUl8ayC$kHd<~AKyNx`#`%@s6+o8fu>dDb`emiqO{jt(BXi@bF^9+P zwi)Yc0qkxDQIod(eY84w!m}qY{A6+*YKIQ&IQr<$iM+ zl1T!?25L7Lg#^jcD1Q4eq@xf4qD~9f6t3&VX6k+IN|b}tYv`$O;d6h7e;zFD4_Qc& z8Mju};rw6UUU&mwVdeL)T-x~JV_OdI|J);o5ANIc#Frlb%+ZG@MkX7LxBz4;vxU+o z6ta0-AK&Cm6S~Iv_{^O}DblHwQ zJCXy34(xp5n_v0-cOE~m{m4TT&8^K^f*oy*YE08}{9Rnj52Ts9&1(^@{x*8@}b>dee&?0ufO`YiuCH_sLS7=&BufrBc&JFl>2<3*E|B6pE*7K_ZLo2|MZjo&mPnud>^@c9INo+ z^xX0so;!CB#(y&Z*`ptJWAmS1n_Ye5#L2g*kGb^!_}?o35nup()z8fa6AB^#0000< KMNUMnLSTY4+1_jb literal 0 HcmV?d00001 diff --git a/BeWo/Styles/OrangeBlack.xaml b/BeWo/Styles/OrangeBlack.xaml index eac7b76d1..31543827e 100644 --- a/BeWo/Styles/OrangeBlack.xaml +++ b/BeWo/Styles/OrangeBlack.xaml @@ -3022,8 +3022,23 @@ - - + + + + + + +