From a254f61f7a5c4dbdbfed43d11daaf286eead2b9b Mon Sep 17 00:00:00 2001 From: Inohara Date: Sun, 23 Apr 2023 18:43:59 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B2=D1=80=D0=BE=D0=B4=D0=B5=20=D1=80=D0=B0?= =?UTF-8?q?=D0=B1=D0=BE=D1=82=D0=B0=D0=B5=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessLogics/BackUpLogic.cs | 2 +- IceCreamShop/IceCreamShop/FormMain.cs | 1 - IceCreamShop/IceCreamShop/Program.cs | 3 ++- .../IceCreamShopDatabaseImplement.csproj | 4 ++++ .../Models/Order.cs | 2 +- .../IceCreamShopFileImplement.csproj | 4 ++++ .../IceCreamShopContracts.dll | Bin 31744 -> 31744 bytes .../IceCreamShopDataModels.dll | Bin 6144 -> 6144 bytes .../IceCreamShopListImplement.dll | Bin 26624 -> 26624 bytes 9 files changed, 12 insertions(+), 4 deletions(-) diff --git a/IceCreamShop/IceCreamBusinessLogic/BusinessLogics/BackUpLogic.cs b/IceCreamShop/IceCreamBusinessLogic/BusinessLogics/BackUpLogic.cs index 7ad268c..bcc5c53 100644 --- a/IceCreamShop/IceCreamBusinessLogic/BusinessLogics/BackUpLogic.cs +++ b/IceCreamShop/IceCreamBusinessLogic/BusinessLogics/BackUpLogic.cs @@ -7,7 +7,7 @@ using System.IO.Compression; using System.Reflection; using System.Runtime.Serialization.Json; -namespace ConfectioneryBusinessLogic +namespace IceCreamBusinessLogic.BusinessLogics { public class BackUpLogic : IBackUpLogic { diff --git a/IceCreamShop/IceCreamShop/FormMain.cs b/IceCreamShop/IceCreamShop/FormMain.cs index 15afee0..b325011 100644 --- a/IceCreamShop/IceCreamShop/FormMain.cs +++ b/IceCreamShop/IceCreamShop/FormMain.cs @@ -1,5 +1,4 @@ using AbstractIceCreamShopDataModels.Enums; -using ConfectioneryBusinessLogic; using IceCreamBusinessLogic.BusinessLogics; using IceCreamShop; using IceCreamShopContracts.BindingModels; diff --git a/IceCreamShop/IceCreamShop/Program.cs b/IceCreamShop/IceCreamShop/Program.cs index 0dbbe76..498bc74 100644 --- a/IceCreamShop/IceCreamShop/Program.cs +++ b/IceCreamShop/IceCreamShop/Program.cs @@ -68,8 +68,9 @@ namespace IceCreamShop DependencyManager.Instance.RegisterType(); DependencyManager.Instance.RegisterType(); DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); - DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); DependencyManager.Instance.RegisterType(); DependencyManager.Instance.RegisterType(); diff --git a/IceCreamShop/IceCreamShopDatabaseImplement/IceCreamShopDatabaseImplement.csproj b/IceCreamShop/IceCreamShopDatabaseImplement/IceCreamShopDatabaseImplement.csproj index 616d02d..ac5c1ab 100644 --- a/IceCreamShop/IceCreamShopDatabaseImplement/IceCreamShopDatabaseImplement.csproj +++ b/IceCreamShop/IceCreamShopDatabaseImplement/IceCreamShopDatabaseImplement.csproj @@ -20,4 +20,8 @@ + + + + diff --git a/IceCreamShop/IceCreamShopDatabaseImplement/Models/Order.cs b/IceCreamShop/IceCreamShopDatabaseImplement/Models/Order.cs index 95fb1d6..aa660a9 100644 --- a/IceCreamShop/IceCreamShopDatabaseImplement/Models/Order.cs +++ b/IceCreamShop/IceCreamShopDatabaseImplement/Models/Order.cs @@ -93,7 +93,7 @@ namespace IceCreamShopDatabaseImplement.Models DateCreate = DateCreate, DateImplement = DateImplement, Id = Id, - IceCreamName = IceCream?.IceCreamName ?? string.Empty, + IceCreamName = context.IceCreams.FirstOrDefault(x => x.Id == IceCreamId)?.IceCreamName ?? string.Empty, ImplementerFIO = Implementer?.ImplementerFIO ?? string.Empty, ClientFIO = Client?.ClientFIO ?? string.Empty, }; diff --git a/IceCreamShop/IceCreamShopFileImplement/IceCreamShopFileImplement.csproj b/IceCreamShop/IceCreamShopFileImplement/IceCreamShopFileImplement.csproj index 0689277..c5f50ed 100644 --- a/IceCreamShop/IceCreamShopFileImplement/IceCreamShopFileImplement.csproj +++ b/IceCreamShop/IceCreamShopFileImplement/IceCreamShopFileImplement.csproj @@ -11,4 +11,8 @@ + + + + diff --git a/IceCreamShop/ImplementationExtensions/IceCreamShopContracts.dll b/IceCreamShop/ImplementationExtensions/IceCreamShopContracts.dll index 5e2b943aecb6e9bc35f3a7bbc9ae1a07de193735..cd54247fe1eee6db399dce565d106f08c9421eb2 100644 GIT binary patch delta 3444 zcmXw+U5H%e8OPr^8 zrFwDZFdK0}(DelLa*mUf?oC4(=tb?t9AT(dl3zO`(c?=634 zq<_M)X-=DZu4$^4C(XPW=T^*(>c9=?1M`B}=eEghoVIBj-#vr5X3fvth-rk`C3i8q z);t@!7f?5>S}gS#Cra76Z+>QGEak?R;g&V~?!e}JYra%EW^>tXVERh& zn;{FDs3+lyY+Y(01xiudm~EU@=b$;{o*}Q1*EmoIKT^u7E~~nj>zEhF8~BM6%0>wb z5=R#FS#TL?%Ss=W1~%JQjguO{|C|x@)yIr=p05`02y4=G_l(JDDvyXEbZdtQa9^#}*F-MpqoU3r#njePc z2~wsMb&5Jgx(2UXweOldFHI?CJ}(E&=lQ~fmHdtBzsfZnPbp>{vyQW59sA~(hCUzs zyhu$e%~;BID^~if++rFi#cAWLu|EB!VYh`dZQ%q;G22Yr zOgr?EQl?#|U8X(yL@Cog(>~Kn#e?PpcgQqVTIc8P2x){gwk*37#+gz!nu-(Ob>hH7 z_K{q9q`WJ~t-123o>I(3+uNU~G`>>$rmTvi6Y{`qc4)Ih+y0Jv$6aMr2R~BEs)U@l zlKbRKm?=4>pO7=9m^(P8#HT?ieNA$h^QgR%R1LDPlxDdk5743sl+t&|ky4s<%pOgm zlzvD~mC}qcCp2Nkhm6~svYfF{mRr`y9=Sno!GLBJc4&I=63vjDD&=Mqa;B7K2h&t| zAK|SJ6&cjXo>H2{3ZFh2UnzZy94MvfkRzou>#W_V$Tv`rK2geaNKPxEoFe7+V-{o# zG8$9mj7nKnsPb-TysB*NX_je&>?@^N#&6LCO6fb~sLJoPs47*DDp5*viNz^RiZdZ+ zN^y2@%q|Y9l)gsxl+rZFzEYayUH12y{o0fcIU_rJxY-`r(<6IipX`$Z zau{$CaS@RdazakYDLEr&WM_sO%y0v;NA}4+IUon*h#ZjbR*XXR(&`mDU_ z;jG+X0?nM{8eE(cr$KJP)j9Dy4`J4ZjW4kYY9UM73IQ#s?qH|yT{maLT=AdKt$A3S!fAGXB z+xh+J!;gMxoKuhGj4|i!-&Om+n$`H8a|eoF*z`qw>RkP{=awG+bo|F(|MtU?|H`la z^v~BF>n%SJzklx8dw(4LTSv0p;3lCfnp+smy!QWm?#W|=x!1pOHjkEm0K&b6>i_@% delta 3479 zcmXY!U5H#~8OPrlzL$(T6~{hp1}U* zKmX_VzUMt>zp|Z2PUn&HiyMX4zng8}{P|Jmt()7gI#0)rbFBE(FO7L6_Hti}UvrK* zSK`PCoinkMTPQBJjd9}O>WhQ3xx$mq-NCo#>UHN%eC>tLg?}j?Hz&+LEKiz8mQ7Q1 zkDJp*`fph_%{f!gHBHrW)y$i5Zp}QbzV8O~f%$bA*koVID3HTMGMhBYT{#5BU} zlDn8)YhDW7>!@2+ohkJgCra76Z$57hS;~cP!)ZhI?fVYw&vTV6E@Gf z4NPAtelui26Ll4?$=0P7QlJ#IjoHRocaE4P_X2r?yupDw_>odpby?NL+{C<2-oj6u zP&P_fkT|lS&w|@X+g2Kt1~%JAjguO{|C|x_Ab-QeF9d22tUGCu|O4+E7*~hsJx2<`jJj6+rVvaCJIQQU= zHGdzLCrFu6)G6u|={|g5)jO`q^U#!H=JRsUe4Z~%Sjj)Ej>|P1Pbp>{vyQWD9sA^% zhCVNTUZkd#4q3`}YgYPuxy3Y4iqpo~V2ciYq?GBF?caA3nuI<3_+n2IUz43y&J3v%d6;bC>LQls~jGOaURw$qm@4SHWG(`F%* z#cOu_dZoo6P|CQ?;tf0PRyy>NQl?#|J(@%*eV=|vlPaYj(T@w4&GYWKAm4X8h0AZ+ zH#@wUpk|CSnoJv6JZ147(>4v_l^$W!h!hW!j@plrrrz?K8bqJYst8kZG#4&KKPg(g(DdLfnjtw=%Ecz+OexJC zrm65e!pAQa8Pv$0QkumIpFSF2DSe9^D5dF;Bc(K(tlg@}H&Bm0QOa~kPAj3DBIWX9 z7Gw-E8dK$rN?BH@@@#0ls%-6PmT80RE2UY%Z_xxw={w}8%I~$PDpijvQA%@*#VJjS zGa+Y6arSV`6C6}2eU0oXrD>3Tr8Fx~*xzgRi;F5y%AiAzl+tWkb=K|CBueRr zb5$(k%qjPz`e%{ z7NlQXuxk8=Mt!O0ngbjHE*{_zXI@-#*AMe8_mupXV`zEE9X>6&bwp^M z5%yr?sN{}t@KgWeFU%GeKKSuRzx&GCyMKJ`@@LmheLDEw_kUG%PR0NG(F-%><6mEW zrS|3H&mD2h!T9X?gM-tTcJj~v^*7f(GtQZ_Ib+Pv?8im>*UiN%Ht0XczAo60WA@_{ zJNqPFy;46mH;w;x0Z@#LG~f4};jC9#?>y|Me-KX-TE+r7K{!S0`S-`%|%zjNiy zXVpEqpsu~*I~PAZ_|_X=^Q)EfPQj1uV*Ph6p1Jyr{cCFZ>T>*ztNp?Lw?ED2E}a<6 M{p6p{&F4!02aO+@6aWAK diff --git a/IceCreamShop/ImplementationExtensions/IceCreamShopDataModels.dll b/IceCreamShop/ImplementationExtensions/IceCreamShopDataModels.dll index 749fa9084aaa2d35e8179842440d2be4554e64eb..17d920c58f04e5a40322887181485ea2e65d1f22 100644 GIT binary patch delta 385 zcmZoLXfT-2!J?-ryk}yM4CAGVE5jM#ay zj7-9;KX@4!7$+|jHJ=>7w1n}(=C4funHdjF{>r8-ug|E*V9ekRB&`|3fTS}+GLZCU z0Eq`P=ub9hSN69%fKt*u(f3OfoZq*vep1 zlTnJ{5Ti4Qy?HS^C%eG^nNdB9crslUNVor4GNGe>@*cjQjHZ*f@td$RNHa2sO`gaj zHkntTTlB!9$L$P^z5z@O3=HK!`~c{|2b0$dh_i<4GcbftJ}ICq_V>T@fA4>P{1(n= zlH^%lxQ!90&c$l7uwaT2RLU+9Dg`o5lzqpi?sGGCM=>nYS_U)(1`dGO3KJE@fFX83 iP>Y@6zbb^lsf^ zW@Hj(W#D6AV4S>A)O>OP(-OuTo4+#sXJ$M#`74{Uyg8#DgE2!ekhErq1Cq`R*+9~p z0VE#GU_RNLUD>mYF_l3GDAvpn&7cP)xxi#H!(7Hzu=r9id6+?o;RxenFv-jaVk?75 zO-3n(Q;g0a_U6Uxoa_RuGs^`8^h><@>!!=-IfX5ryoc{6qwVBv{3g5{dVa1U3TAo+ z(u@pZlPB_sO=cD7HY^q~TEM{Q8^FZCz|aB2FMu9>Apm4R0V9wW24Zy}F3<;Q+{bQAyp diff --git a/IceCreamShop/ImplementationExtensions/IceCreamShopListImplement.dll b/IceCreamShop/ImplementationExtensions/IceCreamShopListImplement.dll index 1a911f4db065d379ef26f4e759d4c0718cd6220f..f04f3684ada669ede65ad643cc80d1c445e0d3e7 100644 GIT binary patch delta 1990 zcmXYyUuauZ9LLYO$!%}Cc4$i{n{^~ht42iYzsVewgtWuz#6p!h25YjULUjl-d~)vI zmQK>h=obzOO zT0f>wh7IlO$3yK*xaW^4rNj3tFSeJQD6i}7yE8ve_+NNWspnM3@VL5ZSXRFpzN*A8 z8)i)e5Tu|d`)2$i~yc)iSuPO7LS!LS5H`Kf8AFoMn(rKE`Gnp%NB795edo8M) z>WJF&HW_~jV@e%Mx!sTW1k<$?-(zi$X-{1+2fag9T8^$QrJ2&QOG?XQq_i}Bmy3-4 z&|GAx<}77Fo&|Y2c^1r&3-pULOP10v(=XF0(_bJj(y!30T1vm>v!F()#)7)Z18)_x z#G8TZXC7AP%Js#2;_s!^&jU4?6O8qOj0 zpVy$-pm~MqI)0r_i)o8#Ozv395qD_rnx^0P5(ZsM8TT0vxRFZn^p-Nsq~vL`n4G2f z0=|eTS&Co8S1?se@quLDYoHn_QR`GAOv_UIHok-D(A>pzF0vQNas}2g0Xc#(+`%Vg<;fk=o~+H1>*OsMV-ncMsLUB(&X|#9(;2oTS703z zkR!N-iOC66BWyXsmgITzWf)_2$O&2P<00YnzH#N7r{tmn>qZT{fE>XsOiWIo8fD8- zwj>wfJf=bp;AKoij$s1(cr|AJ5Yt{(zP#x%p5Ej=FBp>zB62KjpDsQ<`M__@+2rAG zkDvJX_t{@g1>xQHr*EG3^b4VT_IXzw*6Lu`SUwo8oZX(h`sm@CO24+`nBPP5JE@io zmcmC?9&&G)bSpfzl0Pun*_!+OgRjchKl`cnL+`I|wCT;i6gF4hdDf0D%-NB--N}Ey zdt&*IOZPASd9U@#)FsokpQDnq8@U7KNA_r?&^}lBT8FdFRD1uqdnxDTx%Pu^@9B-% G;r{`EuQsFr delta 2025 zcmXw)U1(cn9EaaGAMHuk4A<(#<_F2rS^}=y@QZCs60%;zp__EFjg9qWNyX0IDI$nF zCw2o1Dl6wgFHdM4R1k;pO8husb&v}o1HJGnZ(u(A1tT2RbpHe(Q)*I(Wr>zI{3o7W86!d-CqM_qj8zo>pDMW9nzais~DlRN`k1 zE9!!JU^rqpqsG)~x@NfT)bVwEUDefCW}ayi-&Aj?f1D-q5}hT}Ig+_fC&agep3|bb zs`jfLXO;11Frw74l*|2yk1>5q@tdsOWV)%|GzYy$R$7j(Ev1>%vP)9SZ6vicy)<7k z`d#xSM>TIL3kobK&?&HBl3b);qFJ_-euaL8PKEvqxk}%qS+kUW-D5$WQk?}2lee9D z%mT}N7Bnqo*%HkV)3Ox5PCvqQEXChum)l&kODAU9*PcA0zLwG^rA{COTCe0?z>r9vN%XC^yTTCNz$5M{CL9=U`-UBCQ(6^NFfbkX=Qc3RKQl^=t+)WOX zw-jH*moQ~Z@m0KwsacBmC3{X2)l7<7rW#^emg3j(9ZZL27t_b|F@vQ1-)!M^ibJPl zZ6+nh&13SIBBq4#%6ya=xa688XCyZ*IUDE` zY0jILK`Jfxkx9#`b4-imDqMg*{bh1UUN@_DoQNDlH6+)}!4h<#KO{SbaAU~Zr`*h7 zNVZhNEPxZkVoGEeHZVRpgc01p$7JQm6;h6@&5;}AH5g%HIKZgP1y9bHk!2GZwj{f- zf$_;9T*E}<7^)Gr9AQiH3Gy`n<(a$Wiwhe@Z96_Wglm|H978qA zmZNM*F2NHRm+Zr9n2;R77!L3%YyJ=uPEJ0Yi7a<-@{Z$YWrL6$3ESsO2OoJTI6nNt z`$rc~u6959ZE)b&aQo9&7ae^(NMCv;>rB5qb0+uP^r0uT+8Z=y_XcM#tsf44$=+1@ zrPB%XyZEtrpEJLW=jKeXFKs@@&3nqc@0;2E;P6~w>T0#}#YN}O(#pZ=Pip?{-=$SK zda-x&?o#iY-mTtuz3+Qp^=<`M=B^yD-5Yys*X;P@*Rv0+cV4{n*T37p-g(yiO#lBn j6=?TS^IQD5TWnX{FLitO<-e1O#tZE|ul=D{4h{bY&$U1L