From 2eb7bdacbeff29b92ab9e87ce9032ae794e8dd69 Mon Sep 17 00:00:00 2001
From: Yourdax <tikhonenkov2015@gmail.com>
Date: Mon, 13 Jan 2025 19:06:42 +0400
Subject: [PATCH] 4

---
 KopLab1/Lab3Form/PluginsConvention.cs         |  12 +++++------
 .../InternetShopOrdersBusinessLogic.dll       | Bin 7168 -> 7168 bytes
 .../Plugins/InternetShopOrdersContracts.dll   | Bin 9216 -> 9216 bytes
 .../Plugins/InternetShopOrdersDataModels.dll  | Bin 5120 -> 5120 bytes
 .../InternetShopOrdersDatabaseImplement.dll   | Bin 26112 -> 26112 bytes
 KopLab1/Plugins/Lab3Form.dll                  | Bin 39424 -> 39424 bytes
 KopLab1/Plugins/PluginsConventionLibrary.dll  | Bin 6656 -> 6656 bytes
 .../MainPluginConventionElement.cs            |  20 ------------------
 .../Plugins/PluginsConventionSaveDocument.cs  |   2 +-
 9 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 KopLab1/PluginsConventionLibrary/MainPluginConventionElement.cs

diff --git a/KopLab1/Lab3Form/PluginsConvention.cs b/KopLab1/Lab3Form/PluginsConvention.cs
index 8969af5..b179979 100644
--- a/KopLab1/Lab3Form/PluginsConvention.cs
+++ b/KopLab1/Lab3Form/PluginsConvention.cs
@@ -22,10 +22,9 @@ namespace Lab3Form
     public class PluginsConvention : IPluginsConvention
     {
         private readonly IOrderLogic _orderLogic;
-    private readonly ICityLogic _selecteditemLogic;
+    private readonly ICityLogic _cityLogic;
     private readonly ControlDataTableTable _controlDataTableTable;
     private readonly ExcelTableComponent _excelComponent;
-    private readonly ComponentHistogramToPdf _componentHistogramToPdf;
 
     public string PluginName { get; set; } = "Plugin";
 
@@ -37,10 +36,9 @@ namespace Lab3Form
     public PluginsConvention()
     {
         _orderLogic = new OrderLogic(new OrderStorage());
-        _selecteditemLogic = new CityLogic(new CityStorage());
+        _cityLogic = new CityLogic(new CityStorage());
         _controlDataTableTable = new();
         _excelComponent = new();
-        _componentHistogramToPdf = new();
     }
 
     public PluginsConventionElement GetElement
@@ -59,11 +57,11 @@ namespace Lab3Form
     {
         if (element == null)
         {
-            return new FormOrder(_orderLogic, _selecteditemLogic);
+            return new FormOrder(_orderLogic, _cityLogic);
         }
         else
         {
-            FormOrder form = new FormOrder(_orderLogic, _selecteditemLogic);
+            FormOrder form = new FormOrder(_orderLogic, _cityLogic);
             form.Id = element.Id.GetHashCode();
             return form;
         }
@@ -71,7 +69,7 @@ namespace Lab3Form
 
     public Form GetThesaurus()
     {
-        return new FormCities(_selecteditemLogic);
+        return new FormCities(_cityLogic);
     }
 
     public bool DeleteElement(PluginsConventionElement element)
diff --git a/KopLab1/Plugins/InternetShopOrdersBusinessLogic.dll b/KopLab1/Plugins/InternetShopOrdersBusinessLogic.dll
index 6dd832edfe0f7c992d4075e86e4b2b1378a9045c..72644896323c50ada7332345c4afe64c9f5723e1 100644
GIT binary patch
delta 240
zcmZp$Xt0>j!4j|UcV%PG89sp-OA3@d532g@t+*50`r%8+<_!L&j2f1PX(owDX{kvD
zX(lG7W~ruzmdPne2BwCFiRQ@$Mn+~SrfG&osm7B{1=U$fd!Ox?oFEt=`qo`Qb;Xs>
zZqrjt_bz{4>%+*vz~DOhs9=c#R3;531JYvd_HdGvk{sia75ffujuc8}^|xd&WJqH$
zVMt_10@A5K(g4giVK8Md1M*FQ@|FzA3@Kn45YG^()*L8ez+eP~W<VKJpbkSIJC(tB
JGq=Q7W&p98N}vD$

delta 240
zcmZp$Xt0>j!E$xg+V+h-XZQq)p4V9MFMa5@O0~A%@~ijs%^Cbl88u8(5-ki2lT(dN
z%#6&<Ez-;_%`KDC5)Bhgj4X_d(+n)kQcM$*EmJ0&3aYd4yxIJJa)Mxh==`{V&A~lN
zE_;@_{Yw%n*}=%bz~Dals9=c#RHo$*R0gDF)rM$xwyc#eK6L9CZH^R5X7x8^NMT51
zuwXD?Fl0z(NM$f)FkvubFk&zVLJNj8AZZE4NkDcYP)#CG-UujT1XP&@)MWuwox)%W
P6i)`KOxesW@s$|>Q`t$q

diff --git a/KopLab1/Plugins/InternetShopOrdersContracts.dll b/KopLab1/Plugins/InternetShopOrdersContracts.dll
index ff93921f4bec3b1a7f8a0e9c94232753133861a3..bc0cb529f5351b526571eaae5758216aa0f319c2 100644
GIT binary patch
delta 240
zcmZqhXz-ZO!D9D4;_${E8*zbN3Cqi0<c|37JlE{T-p-!1`G)ugMh#2DG?T=nwA3Vn
zG!qk3vs6<<%jA?K15-o8MDt_=BO|jE(=<b)RO87TBp<K@u@zpPJVh!%G$vy6)Qt=6
zotpEUk8}$v%wc3;U~rxMQz}ORDszY#Dg)9ICz{8aG1K^Kz%T2T&8^b>EdG`Zh74&8
zCJc!TNkBRkNE(3oCJd$wW<b6vP~MUunIQ!%1L7G1)tUoE3>b`n&<rSJ3e;f;WT!G1
KZ+<K<%K`w|G)Bw-

delta 240
zcmZqhXz-ZO!P2I!yK`fYjkv(>Q?~CNW&e9^dfqm@f9<>@n{SA3VAL>8NwhF9Oind6
zF*7nZw@5R$G`CDjOEgS0F|sf+PBXADOEFDMwoIA4LGl4hl7HaU$y1~PL>KwSF=a?@
z@oY{wzl}-6Ifs#ffx&(9PpKRQs7&Qys0>g`=%fGNuD*D`{K|pYiD{c#rTJO>O&L-c
z5*aKQ3>XX<k{MDNj2TQA%ovOq%z@B?Aq_}cf^ia%od{Hu2$VMh$`}DvrU7+X09B_j
Rm;%L<fhtorKbDte0RWo2N<IJp

diff --git a/KopLab1/Plugins/InternetShopOrdersDataModels.dll b/KopLab1/Plugins/InternetShopOrdersDataModels.dll
index 1366b3b299f1169c9c9e6d77e69db98100b53103..1efa2bbfeab1ba3458dec5012c718cf9b0a322d7 100644
GIT binary patch
delta 240
zcmZqBXwaC@!D1uPe|uxk5q5#cM*{X1AMf?q{BxsfR5{y{%?TWAj2f1PX(owDX{kvD
zX(lG7W~ruzmdPne2BwCFiRQ@$Mn+~SrfG&osm7E0IK@~tixwQ8yn-`8ROH?ExYV~D
zZhI@&s$AW6Y9k{91B2^iUak}cs7xD72Bam?mN$#<%aN#GdsKFBp2#K6>Tk(l$dJZh
z!jQ<21f)}eqyd<3!eGi^2IQLp<t-VK8B)M9Af6#mtvOJ{fWZg|&44ndKploab}EDM
J=I{KREC97(O5p$i

delta 240
zcmZqBXwaC@!6KYzFlS@W5q5!Ti{F^<mz?R)^)X(*;R}nw<^&ElMh(-HL<<AM<Wyr5
zGb3|zi!^gfbIYW(M8iZABMT$rGy@B>6w}0H%aqA|oMJ4e-{zm5yn-`8bpHLC)t=YB
zIy9UT_xJpNw2zU2fx&$;FIS2JROZ0}s0>hxccF3htcFaXui5hq6gE%f5@+={Wk_L2
zWUyc`U@&AzW=Lf)W-wteV=!Vc2SN*mG$3gS#z{bSB2Y~tP~HeAV+2&02GnH%RGq?L
Q3KUNUs!ZAZou88h0PK-UE&u=k

diff --git a/KopLab1/Plugins/InternetShopOrdersDatabaseImplement.dll b/KopLab1/Plugins/InternetShopOrdersDatabaseImplement.dll
index f36f733844be5292b837f806e630a6e470a5c002..a617b9f9377bff69c6717543d63edf56764cbbf9 100644
GIT binary patch
delta 243
zcmZoT!`N_!aY6@+p|@Y##-1a-0-ZBi6?M0}I&J*xA>p;HBzkj#pE9?GrD2*$Vp3Xa
zl0lk@iK$ttsi9?ZN|J%8p<$wVvVoD2S&C_zp;4;w=GBoa8CkT}`Td?85gj1PUU!=H
zXw4GGt;aiBEVnGNWMp7qaGkt2x<&ye^A#!s)Kb0w`}cbHw4E2#XGyedj*RJM^|xd&
zWJqH$VMt_10@A5K(g4giVK8Md1M*FQ@|FzA3@Kn45YG^()*L8ez+eP~W<VKJpbkSI
NJC(tBvvJZ{W&o#dOC$gQ

delta 243
zcmZoT!`N_!aY6@+2G^g@8+(rU3anC@{OsI66_5Qb%$y+`0w--w@Kfg2FilCcFfdF`
zH8wFbGB>wKGq*IiOiD{MOf)gFFfvXvurNz8O-!~-*}OV(B_qqibsbM8M??pRnp%aP
zxD#;2b3XU#``b?X7cw$1Ft|_N8(pISlerI-0cknmvri}X&#n)T_NO{;j*RJM^*3cm
zVMt`KU@%}XWJqR6WiVziVK8GbVlW3n3x+fxX$i(jKz1TfO(Ia<2q<F&RG9|UWdT&3
S!e9y%PX?+?*=(G2mKgwoz)#cw

diff --git a/KopLab1/Plugins/Lab3Form.dll b/KopLab1/Plugins/Lab3Form.dll
index b91e0f2d321f0635ea59de62debc1d863ebf311e..9f94f92da31d2bbb827a957efe3a8744bfe6902e 100644
GIT binary patch
delta 447
zcmXX?UnoOi6hGfLBQiGsm9VDfVGsAa_kPn#VqMvkKZTZ}?9aWP#Ea)`<w2<Jx+zkt
zl}NGFCwY+aBIQM%lqt_%C{G^5+1mL!zjMy_`<>J2q%LXdl4dun3dNIObEk`Ro2L=-
zXc6MIf1Lr$S|eGXHBY>x&q|Y|`|lje7DA+82W<vmBLYCM_5)Nu2sgcAL=i8_1?e1Y
z1n|twz*88&i3-oyTv)^SF7kXKOdOUo+0q2i_ISS*S|1OJqOS4ZNLr}LV10jp8EQ0U
z=rPGqRqoe03&ayKi8B@*h)c5UPjG|Dx*~GhhK+p)^AO0yG{x~t=o&7nWiY8&X~AZ6
zFZvO3M;6a`S~sp6oRPa+=%6QWD!$vDl4{gi$xO->rlYgMl;$6Ay)E9fuNHq^UC-Z@
zLtq0q3JATXyN&*x3wySfTEoOC8g}b!QvqOLfC^EFVbl?&a;*Z#d+CS_0uYBpnJHBa
hwFCGgfsD_O495<Jxekh0-pf<kJ0x8DpTv}E{sG5-b@c!M

delta 474
zcmZqJ!ql*ZX+j4J-^0ECCiciM>P=i3&Ukw=BcnPi!&(N0kjaJ<bS6hKsxz8QZe*-i
z<X^`C1|C3?iGh{DC76L>N;m@pBam;#z`%B6vm(<rLq^xlH;gwhO8W3KFerxxGd%EQ
zU=RSRP<9XXbOF*IHZL@d@idqBWvFEEVMt_1Vkl?GXDDLGW(Z)&VJKxtXUJs8V_;y_
zVNd|7){;E;a{IbFt{Z$rbT2Gl9<^De-ib%UG$ql(z%V)0*u>1p+}t9~+|t}KDJ{`3
z(ZtBY$T-cw!Ysu!G1)R@b6<BFv*ClhPn`^mz5z@?^AdnK1mw4VAOi|O?iU7Pbs*jX
zl-n{{wO?8EM^msFZ$gj9?6%`m8W!89fmFFqj_vm|g33tThRT4<-@W@t_YE_im2pZl
z4>Ci;38;ZV7Q|MVs3^w7zi#u_eom&%e3Q7C{Y@ECfL^y?FkmobNM=Z7FlI0T2B8sy
zIS^Vfqyb4wFirxp6M<?Hf$~N`86%*|G@vdEpz0I`Q=oV<P-V*I^r;J(m<;ST3(k1Y
IIMIL|05~^z@Bjb+

diff --git a/KopLab1/Plugins/PluginsConventionLibrary.dll b/KopLab1/Plugins/PluginsConventionLibrary.dll
index 73e99974053c8f88d3cbb03daa343d48c174ab13..7b2e0a2e958bd177ba0110607a3a4cc93c74b90a 100644
GIT binary patch
delta 240
zcmZoLX)u}4!J?unKWAf)1+M^OWafnL``)-L?NeR1Tdg^G^A%nlMh#2DG?T=nwA3Vn
zG!qk3vs6<<%jA?K15-o8MDt_=BO|jE(=<b)RO87S{5C9)+<&c{oWUO;YHn;k-{Mrh
z@1DQ*VpcCrJ~J{fFt|=W%U`Gfm9d4%fV2eKI7eA5og88z6~AV4oPZLmza@hqLmGn#
zLn1>GkWK}X24KDkgDHa<kZ%f<w`53WNCC@$c!of==0Fhx1|uLe1Im~Jbr=HKsSL)O
J&x;ze006mOMY;e0

delta 240
zcmZoLX)u}4!SY*bM(4&J3toZhtzTqTA4~U~*~TZ#>-NBZ^A%nlMh(-HL<<AM<Wyr5
zGb3|zi!^gfbIYW(M8iZABMT$rGy@B>6w}0H%aq9){5C8r`B$EuoWUO;%H)3hQqns)
z=Vnjk=H!<TxEL827~ChH<u6o#$~41dfLeUL=J#EBc~n2J+x2nq<~RW*R)1556oy0w
z3kCxQLxyCAR0d-P69zK|BL;IIv|vaBl9phc1Y{=y)g%Jtjes&nK$U4gT^2yqDGa7S
O@noRNl+EWw4Osx=e?~F@

diff --git a/KopLab1/PluginsConventionLibrary/MainPluginConventionElement.cs b/KopLab1/PluginsConventionLibrary/MainPluginConventionElement.cs
deleted file mode 100644
index ac57cb5..0000000
--- a/KopLab1/PluginsConventionLibrary/MainPluginConventionElement.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using PluginsConventionLibrary.Plugins;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PluginsConventionLibrary
-{
-    public class MainPluginConventionElement : PluginsConventionElement
-    {
-        public string ProductCategoryName { get; set; }
-
-        public string PhotoFilePath { get; set; }
-
-        public string FIO { get; set; }
-
-        public string Email { get; set; }
-    }
-}
diff --git a/KopLab1/PluginsConventionLibrary/Plugins/PluginsConventionSaveDocument.cs b/KopLab1/PluginsConventionLibrary/Plugins/PluginsConventionSaveDocument.cs
index a0a7ce1..cd3fdd9 100644
--- a/KopLab1/PluginsConventionLibrary/Plugins/PluginsConventionSaveDocument.cs
+++ b/KopLab1/PluginsConventionLibrary/Plugins/PluginsConventionSaveDocument.cs
@@ -2,6 +2,6 @@
 {
     public class PluginsConventionSaveDocument
     {
-        public string FileName { get; set; }
+        public required string FileName { get; set; }
     }
 }