From 1cd8aab404aca3193f5ffe890982507a63d0d0a3 Mon Sep 17 00:00:00 2001 From: dimazhelovanov Date: Wed, 17 May 2023 11:49:23 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .../BlacksmithWorkshop/FormClients.cs | 1 + .../BlacksmithWorkshop/FormComponents.cs | 1 + .../BusinessLogics/BackUpLogic.cs | 4 ++++ .../ViewModels/ComponentViewModel.cs | 2 +- .../Models/MessageInfo.cs | 1 + .../Models/Order.cs | 5 +++-- .../Models/Order.cs | 2 +- .../BlacksmithWorkshopContracts.dll | Bin 31744 -> 31744 bytes .../BlacksmithWorkshopDatabaseImplement.dll | Bin 75776 -> 75776 bytes .../BlacksmithWorkshopFileImplement.dll | Bin 39936 -> 39424 bytes .../BlacksmithWorkshopListImplement.dll | Bin 25088 -> 25088 bytes 12 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ca1c7a3..aaf9887 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs +*.dll # Mono auto generated files mono_crash.* diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormClients.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormClients.cs index acde684..d7ac202 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormClients.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormClients.cs @@ -24,6 +24,7 @@ logic) InitializeComponent(); _logger = logger; _logic = logic; + LoadData(); } private void LoadData() diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormComponents.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormComponents.cs index 9fc467c..625df2d 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormComponents.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormComponents.cs @@ -25,6 +25,7 @@ logic) InitializeComponent(); _logger = logger; _logic = logic; + LoadData(); } private void FormComponents_Load(object sender, EventArgs e) diff --git a/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/BackUpLogic.cs b/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/BackUpLogic.cs index e40c07e..da5033e 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/BackUpLogic.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/BackUpLogic.cs @@ -65,6 +65,10 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogics if (type.IsInterface && type.GetInterface(typeIId.Name) != null) { + if(!type.IsInterface) + { + throw new Exception("fgdfd"); + } var modelType = _backUpInfo.GetTypeByModelInterface(type.Name); if (modelType == null) diff --git a/BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/ComponentViewModel.cs b/BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/ComponentViewModel.cs index 554268b..6c3e71c 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/ComponentViewModel.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/ComponentViewModel.cs @@ -15,7 +15,7 @@ namespace BlacksmithWorkshopContracts.ViewModels public int Id { get; set; } [Column(title: "Название компонента", width: 150)] public string ComponentName { get; set; } = string.Empty; - [Column(title: "цена")] + [Column(title: "цена", width: 150)] public double Cost { get; set; } } } diff --git a/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/MessageInfo.cs b/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/MessageInfo.cs index 2e7a0b1..6dafb1d 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/MessageInfo.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/MessageInfo.cs @@ -11,6 +11,7 @@ using System.Threading.Tasks; namespace BlacksmithWorkshopDatabaseImplement.Models { + [DataContract] public class MessageInfo : IMessageInfoModel { [Key] diff --git a/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/Order.cs b/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/Order.cs index 50dd406..7db404d 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/Order.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/Order.cs @@ -13,6 +13,7 @@ using System.Xml.Linq; namespace BlacksmithWorkshopDatabaseImplement.Models { + [DataContract] public class Order : IOrderModel { [DataMember] @@ -23,8 +24,8 @@ namespace BlacksmithWorkshopDatabaseImplement.Models [DataMember] [Required] public int Count { get; private set; } - [Required] [DataMember] + [Required] public double Sum { get; private set; } [DataMember] public string ManufactureName { get; private set; } = string.Empty; @@ -96,7 +97,7 @@ namespace BlacksmithWorkshopDatabaseImplement.Models Status = model.Status; DateImplement = model.DateImplement; - ImplementerId = model.ImplementerId; ; + ImplementerId = model.ImplementerId; diff --git a/BlacksmithWorkshop/BlacksmithWorkshopFileImplement/Models/Order.cs b/BlacksmithWorkshop/BlacksmithWorkshopFileImplement/Models/Order.cs index 4265f25..90afe4a 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopFileImplement/Models/Order.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopFileImplement/Models/Order.cs @@ -72,7 +72,7 @@ namespace BlacksmithWorkshopFileImplement.Models Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value), DateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value), DateImplement = string.IsNullOrEmpty(element.Element("DateImplement")!.Value) ? null : Convert.ToDateTime(element.Element("DateImplement")!.Value), - ClientId = Convert.ToInt32(element.Element("ClientId")!.Value) + //ClientId = Convert.ToInt32(element.Element("ClientId")!.Value) }; } public void Update(OrderBindingModel model) diff --git a/BlacksmithWorkshop/ImplementationExtensions/BlacksmithWorkshopContracts.dll b/BlacksmithWorkshop/ImplementationExtensions/BlacksmithWorkshopContracts.dll index 7427eaa7c93a76e329988eeda71ac57be61ce7e9..d88e3098fc5a0f9e7504b92ccbe9795b69a0af32 100644 GIT binary patch delta 114 zcmZqp!PxMFaY6@+`aHE;8+(3a3aA9H@(+DK(Q(g#xK}ZYD`sw3`z+gX>C{Qx&ZCoaN@gm+1l6E|Ak`C9wzfuo+cP)vt@rfJ Is-?Ht0EQzp+5i9m diff --git a/BlacksmithWorkshop/ImplementationExtensions/BlacksmithWorkshopDatabaseImplement.dll b/BlacksmithWorkshop/ImplementationExtensions/BlacksmithWorkshopDatabaseImplement.dll index bf27cef394add18c4a30b84865dfa57deb152a61..420e8f6e91aeee3b38fb119892a7d376d371e3a6 100644 GIT binary patch delta 3268 zcmY+{4OEm>8VB(Ig&DNu21%!%5xGB(U-FxTdi;x635{1r0It81D9yiqTM#&x*=f`Hasv&)@{ zof8N5W#Kg?-j{_pv}oTWXwag43vkG~dvIemjw$iRY;o9Z{E8R8TcoJc)GO0pzr%}d7Y(Sq99pN)JplUYn z>-Rh)b>?AKjAyRl$I!W~9?t?}6LLwGJU-pEz<3&S=5bgi^$ez@llX`tq$<%7%Zwu2 zIiFYddsa%F$za8JHW~p0vRFNypz$2~wbETdqZp$Xa8@Su0@AWc79X({S&DQowi!|j zd1=3AyRi+$i&#i{-6%!$Vpfl5pH!X_S1H3fot3#-jWSd&;gvC-Lq<7XT6VSOF{1+c zE0iobQ;+d?%u!Emujui#O5G}-So&bnWtmryyNa|K!{hsmo$#(vQoo3=VvJHrTwQ$F zcoh?E*<>Yo+r?#>J*YJy;)+p;4878#Cw&)kbXX{&&0QF?cJPSZ7-!QYB|n~sNHlk2 z-ZfbjvX!`*Dm-q>R_lG4xW%l(&~baqmAnwLGyK7)@qh|18wSI_Tv|+H!=1pUOC+vG;480YlqZZ2yEc&l+y~Dbtu;y z6%{n=u}AAR*-QgIRN|Q$@u?Dj+KuScE2-^96#Ka-wY?XK8(GwL6HaSU+xw8ei8I-@ zWxfsHW+wIh4r-oeQQys&wuMD~w;=8r)+woXk*q~+zlU*J)b{(Bp~P+PM}`u&y&pMx zCADqsN5ZpQl=^N(jTZI&0rHACqrMLS0T$ivHXPBSwm-y#=QyLb|B27FsO^8D@_Ejv z?SrV-qP9P>@PQ`veF$Aj-1lL8uf%;HMp&=R#8&e#T1vR+S@E%X1oDBFFF$Ceqd2HV zBYliHA)6Ii#6B!<20-n&}v7OIbA2=SX>pMKc{oLK%x@ z>cH(j0FtkR49T3^U2-ywCU`u_7{qbzd<@{g2!`Qej&e~(J7 z?NUD=uadJask2D=2kW=8?LO?=#o8ow4l{SN4oLlofRBllDIlmvJ zvYVfW-j1GC7$Ubb|~>o7qLgL`~kyaFQV?6ER1HG+H5*%QwPZc9}&jaw(zV? zVVi!nDXN-g;?}|#u5`6#ye;$EG)75(|AjHm7EZEhn$p#xX|^mwN#4WA8)L&*q&44h zW9-jZe$C1OthC8uS?YUi09$Nfi4q?;fC^i-%ceJN+GpF>X3LH$`Oy*CXAI!D&L+|K z-z9u?&C*Nw&Zd5wez7T{ere668=?*fKbmg}Wi`h|eWTviuWo+FIiyHl{Aft1eqw96 z&$V~f%SqmfbH2di@2&D)S2M5av=EMXGvUG3T8QbX5%NRaD}Q`<3;0TZO%OLZ2jts< z(h(y?lIvu4L&wZ9r+k5P!!LMet}G}`87ZoNr?0jj(N|@yv6ntsZ|!}{(UQ67-SYeO qe=_J7B$M7JmW+xOGn($ZSsWBiHzbPxI3x1!X^Oc;oEIfyhx{L%?@PJ> delta 3299 zcmY+{4^&iD9tZI61x7i^slj=V=%@vQN7&8XjgGBk*kZMcM{PMPnh2(%W+=5}xTyzy z$oQ{?F$j{KHJ8ZL(M2OcVZ{=Q6w?e7NiEYUqd$^ND~tBey1)Co9(G{vf1!!CVL=2GErc6f5V!$b{#f_UX{t@|idwEXD zII+I&jgn%+x-f#4uL(b8wz*~?;g3quHG}$L2GW#T@X#F{GD{vwSqnan?r=ShQmqX0 zoNFew-rrX@3$H72-7M_ZqPp2=)S|j<9Je0mE1ZLml(=vX&T3KNTwKti!g=T&-BmG+*;B|@>J+ZHi>{|ouXR1*yZ%q(F8a*%E_p~u1)bk1e9mrH9*pr6c8W-M zuWJ!TOkf4w*IoGtpTt7k0An%ov;yvK*J8A5Wy)QiL-V7wk{ex$V@jO@ai*~pseie# zXN=UkG|>5U;O~uP@c)&=fP17-fQZSgOy@{r1+HoNqzZ8{oiaY62tg$}BE={|%@nQ+ zx+h3=O=U&8GYk(RGFSn3wy_#{BugHj>C86PB5OK_KB?!Cnn~g#ijl5FM=Ugok(9+N zgYLgebp$`D4oR$xV^@D^k`)|y+$eS$>z)_^&+OtAz6Gx1?DQ!z1Uz#&E=&* zca^aL74uk#+i6t7DSzMSt_9qUQu#`}iw}i5^EnS1KKSSJ%1HNn#zwrnkQH>FG&W($ zA|*@C6fpjcEcMjVrU#{l%O{qO$duc>g1qNQYjE43F5^`sELBp!h?|k9R2IE^P>-=0 zqixw(B@e>IHJLrCl@xN_cn!1lN{gQKt;p43p@=ZIB5_&Y5!*1zriYb0cqSyq+=j<* z%KVtG#Lf8etSu|hbu%%{^dq8xPVnH8C8n9%F;{aFyygx>FX!+V;WhsQzgB&y*Q`OV z{P&Iumxp=Ho%l(sNop5b)x+$;_foH8#7bT{$>B9?(WX@`^#)3dI6LpKyyk9HX~y>R znswNv^&8ntJ&q{xOnY!ji9hWiZySwW#m6kzdRi_5BXQN?3HeThOLOZNH1;^_)@Lhj3bp+CB{b3!G8g zt!U7qwvSjiq)C0hhkz3IeH7m+aoqeJWG)$JcB&Fl%_a?q5tAdX^OL`*P=rR?TA ztkB_T+06goQ{tJfV2cvZbOpQg%5N|r>I(MWl=a|%O|3Sau<0zx0w2+XPFvV*(>0sK zcAA2l>A@{Fxs-0~d6z9quqjbVfB*Ghlr4PNrin^7Hl1e6W-G~i7&&6`1nBv_1a|2-ndGeH*G0i z`)+-8%i*Go<)ig~KxpU3=zUCCY?K(^F!oN-D$4E&Z@4u^{NM=5O>T%BCc5R7{=WiO CB~yw3 diff --git a/BlacksmithWorkshop/ImplementationExtensions/BlacksmithWorkshopFileImplement.dll b/BlacksmithWorkshop/ImplementationExtensions/BlacksmithWorkshopFileImplement.dll index c96669e376b339951b271b07da477fcef930dc2e..5aceeaa0abf65c9720d0544d376512848116f1de 100644 GIT binary patch delta 2458 zcmY+G3s4kw9LK-^Jw)>VM?s0b#F>0G+W8pGQ7 zQdZU~`FXwThh01X`m~^TPtJw_h4LWWI{YhGuxA$At})iHgSQ5lq4iP*YI9h>PHhD; z(NkW9+FCY%6=?@qKekD`#(GCz30lR8@{fWJ_+F1z*2VNpV?bvh8cNIq)+u~o1Y)>5 zQ66Tll=DP{cA-n0el@la3+DsS(FMJy^O*sDj4+zzqJl^ADaf}d;_0Xuo&@Je(?xh< zFCz&lZj+poyM{~hn$*gY)$TIcOmsIwge7D2v+c=gNcs7i@V*K2 zlH!fRR_0QN@#(lo6t9lvGvIvAa&c;3Ni{?jvdt_w6WRyP#t@TQS-hIaXTwY6Qd1?h z5&2^0@;UH6?+-Oi=V^!?C{8Vw)MLEmDrA>;u-YVRLMAp#lJkwG4LlQV6m_Xz z@MW0)VyI~|UyfZwaq2ZmcTKX|co8wdO1AJ@+zT&}FZK>!ffgc{dY}8Scw(q$xX4D0 zL4G+tPQAsmk!ZZm=DoPZ{irc17hzqa#D{QCGF*W(rK?k{!g!Oc@vD$*QUJ5jL%Nwn z`_M5DWhfKGN5~10BUyZm4WXoC zhR8=T(ZaAaQGhK(zOdIsAu5TA!`=`Ys!g)KL=g^~lUSR+FS)H$m!Bm;E5z-QERnI^foDg zM(HXs^O5t1qYAH*ERnJbnI>7!X(#-TqT$$yJW9TgvtlRmiB!i~u?w4sma|J@H_B{v zd$5~aqY@N*aI)R`u@~n_>Qe5-*yQ%T_hGV00hCC$5A$rU8jHzQNmq?*ldQG(V~s7j zABB{3JFbfTC?(2aSB3vG>>zAn*F_EX*b0Nt$yF&gMG#-w+yOL`)1^CrNmJX`*71@_ z#_hf-bS$yCT4a(dk*?N{JQJriBi)?o`p-HzL$4wXbX?6x?FYN96gr>IArt?m#S z$W&R9oF?yqq%KXc|D3(k=2dJT}<~FBR(2HR8!sBWVph zgZ?HN_o-Xt862^>CY;ubr<@xZm9TVpuZS{jVsX*8r>6e#<~MpqU|^TWPqt-T2TM*- zWV8M9I$t9%Em){_SRwzbS)qMh*e9y!-lFWglTMARdF;meJGE+Up|*W6o#{j9%;=Ma wa#zd`m-3#f8#MSUSsnWP9Mmpo-PslGS8crBdE>th<)5K?bm{M`U`WUR0I($?<^TWy delta 2477 zcmY+GeNa?Y7>9r7?(#97g96fCM)-r2#sVs{Nmo({Gb0s&bWBIh%yiTtzZlG9@scZy z8JKWE7gW$(z%LM35JW^&Afs`@QOB$q!b+^snM~2tN$uQw5AJPe?(970`JMND&)MCX z&8nBOnxySphUfkL=mEs57sDec83h#b1z%&)R+oQhHaV>lGSbIY1I$vNmtxepWaOam z0-lKAPocV%M3WurF*1^rs6AwO(7jq?a{_;p;DZOAAnB`+2nPWM13{2No{&MlG5!dl z_T_vrEsOVK{^}1y!aP@OBZyU6`?I88v&nRWHi$oshF?@&=;&xAVvJTf2W}cbr=i9m z|Ca(o=yce}>drsab`jID+OAXR)L>suE}i;FqCAWz`vu+cXVye49Oq3YVcGvEOQ$~4 zOCxC#ZYu&EwrHAy)L3m}ABmD*r!#R|P^=tBXTkoa;lkudPThjsyv%Ia$9o&jL9$ML zBvwwKbKnvbC8ux-pI}sR*cQ;aa7|DKiY}q^FlwSfZn}gnfJ;y>r-kr|^R`%oaGkVM zq|!ym738p`)5Y+A%cv41Z=_3*D=1d}iY~<^L1A(#r_^|8{riZUmsy5O@!G~5{eoBE zmQGrWBDw@-V z7EZjsRA(~%`8R=z~n;hdl_xrbBm6fJ3#S&tWW(gwXj*TW^qVY{t; z*WMkd`H(uWMNq8l%QDfek;2=D$v0>wmTBK@{Vr}$1>HL3z#1ILzQCOKG?yQm9309v z;S-&V_M7mjPEPR8mb-L8M=*kIMy8LxvqIby^re)+iqJnmmJGH7(p2p(oS?{KJMn^`-=#d}LV}=)$Y8}t5%h#t zDZxjA-XJR5g;t$%LKW@Tyc_3)EVh)f-55MgYhhe)DP*0TuvlwZDPnXoPEiKCDOrYi zk&MJKOBq&~l6#S1O76vGk+dt8Mz$BZ0<%dY+lN9yourk0gWaZ$`%x}jh1AaWquJ!# zXcx}Iog3q(dk;~LNjf>v&RsdupE<=B71$_bF_#rkbuvy^iLz%=UsU3NNPdnkR*4!x zvZae1K$D<#fOgV}(0z1hstOi}CjkUNaT!nO<)#4A6 zt3$tV9`5R}e1>;y57z3WUH5h7!B&&2hbmk#cl8Pm=xEH{fO=E30VhS&Zn?=C&><+B z++@daUQj2w%NlXnw66(0!c|BQSrhJ>+;RLXoQJ#PP}U@Q=WfOZowT_hvSt*R+zIRw zu9&+MsL{z7y9F(#WD7b(Qnoy0EjTYoB2U>#Ts9?J(W40Ik^BN$ao;3Q0m<5E+Aw|r zrx34`(Xb7PIvGFFHp~`DyCsmd;X^^$B#@oPQbC<0Am9vEn)aQ=XUQ{-78TOafV0Ro z$#%HJMh|!Gh)eO_QwI`s(ncE^(1D*!t`om`(x-htHZaK9=u>)i=Zxmm`}ZGPhqZZ< zoiRh68&lB!7$h-S;?=78bE}3wYJP$2Q^Nn^l&Dn&BLeSS*ml^}dNHXkDQ#QFg^zk`SzO=0$Dg&>=$&uo}3XC zAYj$}Y^%5LX0Ls1_w~;P>^GczB5I)mRPfY4s31^v_SN4F)7jHI%n;cX*KI|`!{z+m$Lx? DA~-N#