From ab890dbf98af99eba9c6c9cda8b47141f4045ee4 Mon Sep 17 00:00:00 2001 From: fede Date: Sun, 11 Aug 2024 18:25:05 -0300 Subject: [PATCH] feat: terminados 4 de 7 forms --- Controladora/ControladoraFacturas.cs | 8 + Controladora/ControladoraLotes.cs | 27 +- .../bin/Debug/net6.0/Controladora.dll | Bin 19968 -> 18432 bytes .../bin/Debug/net6.0/Controladora.pdb | Bin 15912 -> 14640 bytes .../obj/Controladora.csproj.nuget.dgspec.json | 42 ++- ....GeneratedMSBuildEditorConfig.editorconfig | 4 + ...ontroladora.csproj.CoreCompileInputs.cache | 4 + .../Controladora.csproj.FileListAbsolute.txt | 17 + .../obj/Debug/net6.0/Controladora.dll | Bin 19968 -> 18432 bytes .../obj/Debug/net6.0/Controladora.pdb | Bin 15912 -> 14640 bytes .../obj/Debug/net6.0/ref/Controladora.dll | Bin 7680 -> 7680 bytes .../obj/Debug/net6.0/refint/Controladora.dll | Bin 7680 -> 7680 bytes Controladora/obj/project.assets.json | 16 +- Controladora/obj/project.nuget.cache | 6 +- Entidades/DetalleFactura.cs | 1 - Entidades/Lote.cs | 12 - ....GeneratedMSBuildEditorConfig.editorconfig | 4 + .../obj/Entidades.csproj.nuget.dgspec.json | 14 +- Entidades/obj/project.assets.json | 8 +- Entidades/obj/project.nuget.cache | 6 +- Informes/bin/Debug/net6.0/Entidades.dll | Bin 16384 -> 14336 bytes Informes/bin/Debug/net6.0/Entidades.pdb | Bin 16568 -> 14888 bytes Informes/bin/Debug/net6.0/Informes.dll | Bin 9216 -> 9216 bytes Informes/bin/Debug/net6.0/Informes.pdb | Bin 11400 -> 11404 bytes ....GeneratedMSBuildEditorConfig.editorconfig | 2 +- .../obj/Debug/net6.0/Informes.assets.cache | Bin 152 -> 152 bytes .../Informes.csproj.AssemblyReference.cache | Bin 92311 -> 93013 bytes .../Informes.csproj.CoreCompileInputs.cache | 2 +- .../Informes.csproj.FileListAbsolute.txt | 15 + Informes/obj/Debug/net6.0/Informes.dll | Bin 9216 -> 9216 bytes Informes/obj/Debug/net6.0/Informes.pdb | Bin 11400 -> 11404 bytes Informes/obj/Debug/net6.0/ref/Informes.dll | Bin 5632 -> 5632 bytes Informes/obj/Debug/net6.0/refint/Informes.dll | Bin 5632 -> 5632 bytes .../obj/Informes.csproj.nuget.dgspec.json | 22 +- Informes/obj/project.assets.json | 10 +- Informes/obj/project.nuget.cache | 4 +- ....GeneratedMSBuildEditorConfig.editorconfig | 4 + Modelo/obj/Modelo.csproj.nuget.dgspec.json | 31 +- Modelo/obj/project.assets.json | 13 +- Modelo/obj/project.nuget.cache | 6 +- Vista/FrmFactura.Designer.cs | 208 ++++++----- Vista/FrmFactura.cs | 322 +++++++----------- Vista/FrmFactura.resx | 2 +- Vista/FrmFacturas.Designer.cs | 94 +++-- Vista/FrmFacturas.cs | 69 ++-- Vista/FrmFacturas.resx | 2 +- Vista/FrmProducto.Designer.cs | 105 +++--- Vista/FrmProducto.cs | 125 +++---- Vista/FrmProductoMod.Designer.cs | 45 --- Vista/FrmProductoMod.cs | 20 -- Vista/FrmProductoMod.resx | 120 ------- Vista/FrmProductos.Designer.cs | 22 +- Vista/FrmProductos.cs | 47 ++- Vista/FrmProductos.resx | 2 +- Vista/FrmProveedor.cs | 1 + Vista/Vista.csproj.user | 3 - ....GeneratedMSBuildEditorConfig.editorconfig | 4 + Vista/obj/Vista.csproj.nuget.dgspec.json | 81 +++-- Vista/obj/project.assets.json | 22 +- Vista/obj/project.nuget.cache | 6 +- 60 files changed, 753 insertions(+), 825 deletions(-) delete mode 100644 Vista/FrmProductoMod.Designer.cs delete mode 100644 Vista/FrmProductoMod.cs delete mode 100644 Vista/FrmProductoMod.resx diff --git a/Controladora/ControladoraFacturas.cs b/Controladora/ControladoraFacturas.cs index ce68e52..201339a 100644 --- a/Controladora/ControladoraFacturas.cs +++ b/Controladora/ControladoraFacturas.cs @@ -57,6 +57,14 @@ namespace Controladora { return RepositorioFactura.Instance.Listar(); } + + public ReadOnlyCollection ListarDetallesFactura(Factura factura) + { + Factura facturaalistar = ControladoraFacturas.Instance.Listar().First(x => x.Id == factura.Id); + if (facturaalistar == null) return new ReadOnlyCollection(new List()); + return facturaalistar.MostrarDetalles(); + + } } } \ No newline at end of file diff --git a/Controladora/ControladoraLotes.cs b/Controladora/ControladoraLotes.cs index 54a1021..0b2c555 100644 --- a/Controladora/ControladoraLotes.cs +++ b/Controladora/ControladoraLotes.cs @@ -65,30 +65,7 @@ namespace Controladora } } - public string EliminarPorFacturaId(int facturaId) - { - try - { - var lotes = RepositorioLote.Instance.Listar(); - var lotesAEliminar = lotes.Where(lote => lote.Id == facturaId).ToList(); - - foreach (var lote in lotesAEliminar) - { - RepositorioLote.Instance.Del(lote); - } - - return lotesAEliminar.Any() ? - $"Los Lotes asociados a la Factura con el ID {facturaId} se eliminaron correctamente" : - $"No se encontraron Lotes asociados a la Factura con el ID {facturaId}"; - } - catch (Exception ex) - { - // Captura cualquier excepción no prevista - return $"Ocurrió un error inesperado: {ex.Message}"; - } - } - - public ReadOnlyCollection ListarPorFacturaId(int facturaId) + /*public ReadOnlyCollection ListarPorFacturaId(int facturaId) { try { @@ -101,7 +78,7 @@ namespace Controladora // Captura cualquier excepción no prevista throw new InvalidOperationException($"Ocurrió un error inesperado: {ex.Message}"); } - } + }*/ public ReadOnlyCollection Listar() { diff --git a/Controladora/bin/Debug/net6.0/Controladora.dll b/Controladora/bin/Debug/net6.0/Controladora.dll index 4f73da0d73b47bafad90b03575e6ec14002c0937..391c6d40ed41a53ad782e3119da8426a791618ab 100644 GIT binary patch literal 18432 zcmeHPdvIIjl|T1hJ#0B~VmU9!ONm2br+iiz#q3r_g&@Gfq2c~7W?9kl~EEE>DTe>iP(dn>LV1MU) z_a#}fw(puuJ~3unBX)8$kxJ%rRv|HDChTG^k;x^x`UVoCR@!WvIWxAxQN5>| zs8=)SNxA-suZ%UD--GlA`w*L{GX^UI(^x3Vbz z^*d8)CBSa8^L7fD*mej5c62-5f!8+7ZnMp-1wpoz#_?udJMa#?woRBxw3*|I7u%*& zm`-jWy0e)`6YBKAa=m#bQH;(Vat8YRyAn`$&OGDP%}^RTcZ1l(E*g0+av^wmBsbO!(bgHQRC6xR{W#`ARRbAw-qT`{ z)ipNQV|A_9>xLC)=`iNas9D`kabxN7`OS@>#SMEWgqr7I46-8#Ev>+s=Yd++dcG`g zSo49ciQAuqykRW>(tH*`>sY%FdQ)6m@*M40fT!CfMcbU8wXf)+W)L0kd51 zT~++OA?WYC_cYh#Ri4ZDvbHmEd66>ht;tNgNG~-FdDLX>{oN#8h8jX^)+}8$KhL!=6SLk8%u*}63PnfjrloDZ@Fc5C9XN)m)nA_9 z7$$p{L1PVJYdKrW)l>JflnH6ltFEORUZ?qUu?4uExiO**HsmjI_5uQhy}&`SngFm9 zHuFwc!O9Tq*19MPA3>_I@4zxMTL(loYORF8nzndo=^7_+A^RH;Z~_;K+{lU@KSRpT zx%R9OjYX|hm}+~)H?x&$&y{`3do3EsTa8Lv>-A2~&`Nko9pO^@Ot)7-p|d0kG>|J@ zEqMW?*Ll)`*p^A#QgAA^YHD4pv)5GJ)kxiWVRGxP1txiQ$DN}#V1J!`E6l6g6bHQ- z#fh?O1+-QJxMjE0E4v@~uApVGV6)RQDwW+oAy$U922!gV)Tekq@7njYR&74l;A)ip z?`3_bM3n_?n9>+-2$z=VNZ5;G+2U@AuJ%iG5=$$VXv8VeNLh)h`n-p3n5B93Ik5&L zhNuB${#uwXHQ<(=Za?bVj;sa(7pMWhVgkmONvo2qSOe-hP+FU%cHtURUYm^(FQ#QH z`L(&$tIbL5nyNNqQkxtfYaM{pChzsjP$PBVStdJy_mjSjZI_)NmQSl4gb^0Ro;~v55vvu}ixLmjCZqQNjxZ0xP zaa~2RquQ4H1@y2V8B`lOkyq+&wYB)dzppB+E{x?3G2~QRsI1!10Hq(!rK5MLepuOu z#nA~qpd%_D0%lzYG5;!2$%nv>nZ$=ca-DkvH1$8#hwo1G0X3j}X!b)}S2L9lt-kOi zK1eVB)AE2uN;A2ZRNYu8%vkK@1$8Q!Q9qaYt>D}cLA5*i)Tn+IE#T`Ls&gBd(vRJH zx6(a(6&%LBTXP4*3~M`}^b+^luiIbsBZ58K2?3`G2YN}fw`YG{Rob3g>xH)LdQz#E zl-kwh+U4F{>2`NOT{XMTJrld`2`G}y=3VEewyWE<%a6b_0d>{vYCRLX7RIW@OI?3) zvyS^d&YQIZz`g!ng7GBz?uS;+H%=tTcMqWC+r8-O_Pv2+4GRskLcUje_P<-63bUe_)^0zGwpnySUC#q(kkyQa!F&Sl6q=gry$ zP;yN}8*kt?AZIyja9qlWleo*PX zeloq1ixRzR&!HJ32kf_X1wcs-;+z9)N67(hj*$aT5II0=jpPS0sTuhR@*e__ z92}5=%E46_%YB7Gu$dZpZSTzeU6^0jioV!o4z_|!lu!cN(zW9V2dHBT3SxEr+gykdoAzlprdOp?I2eBrf zi&!?w&rP_=gqAir+aP3r0RsNHh!vNgi`eX_I8y0c#P@NfHTf3gxh7RK(!6Bc?yR3A z8s!IS_dJd3CUWe#>Go984!_awM$x)wQ*{-^PIf$&VKfj)d4h;BJ# zMWC%2wc9$*3_b}c;uiIIOTRIMx_(b9Veolemj?ks#$I(u({Dt34#|0~jLVl{{YGx= zaz!rV=7h^F$Kqj-3tKGV@*V>NzHA@3Y`f+>ft&&S$cDD|w)O4n*Wq-+Pl@0J-3><5 zhl&1x&oM09G*GZJxsg0eWYH8B;bPRZe}HapQqOyvF4^CMW0phvm;0;>|XDp7l$gmv05jOe6k&K_!$e8Cr zONjYQ?KOTHj?kk5PwGF!E~$lRgr3uXYDDO>#$YHyYXts6=W$fVS%KdcN>XPHKQOj~ zyCBN&CY|Bq6c5E{j`lvd?O~Q_2RBBmbf(-G;&B1o7{ac9PFGO-M%;SeaiBK-Q9ho6|j{zcxxS{R$>0gO#^sv821Q_F-&8Axs z%Z(U^KmitB0y_*;2xG~}5-kR-POwM8s|Pk)u#bZm2R2WzQ{c@5wotJ5!8;pRLa^t7 zEdjPtu=9Z}2ew+U&xV$0D}k*O>^WMZ?E-cl8L*6Vz6*9;AQ%b?SePyntW~fGT^zuo zv^9X$P)A^1Ep=l3Q<0zRE9nK}O}&BM(0-&x==<6)0e44#19+46JHWR>?*QHtdKYjQ z^gRhIMIT#m6gkvr(8DxCBiq9wz&`3>%sVOAaoVaUHI06xc+?-BVd!+tGQ#U)lmKSX z6Al&z7NP^o6|W^6H^OvOVX}IdZgF`1;f3JchkdBDEJN*YUZJoscu{)Z!CJyAjT-uu z!bD3A{lVe&hu4C)ZKbPatx-!qaj-CWxEEigcrD?LMjhShV8hxLVE?Hw(K&uaGx=Y#uX-7X3?DvuRnYRcq=%`5~VAQ+4Q)B zg~4l}eXCt9R~vB}QQWeL;xoqC^q7Ms!pn?>w2vDnd=G=Sh#qvXmT+EQOiwFJv@E9QJ>LDsV)~VX^@qO# z>~=i!Qd+)ZETP1Dg(bjSN{=W^v?S;W!9G>`$iL88Q`s; zl*9WJ{m@uJM+3Zb=(xkP>0b@L&S==(42PqY;qEGQC4bYTbF1l8^tVElSG=bReWEse zs|3rh5eqB9S~?omaJ#}?=`6q)wE)gWA7yxfzz%^u0{aCH3QPh<=osK!%E)*hJ*yqY zce5?wBgo{@@a?oryEgg>x`X~s`x<=`ly3l1Xg1&@+P45_g-=8N>)O+h=?R^tby`dG zp9MY-dVT0=z-PdnA^Ovz|9(0@`aWHtZHpROTIPP4exseHw5*$T)*Xl@z-0~h(*m8j ztY?nsDTtnj#i|bNi&|29n40uqtsvS8GOHl+1<|<(@*mZ1ax@P?^DUz1PQV8+cR}Q9 z+9IKx6wN0^&y%A6r06**I!}tWUqf;>q3RI5QzCy#aQ(eS*; z|A%OJmHHxieX~$r7Y(nAhBrjR>oV(2nf1D8dtJ13iTv9l|F+1yEwkPc%X@|U2f22B zTE=&1FKEx}uL}1K$!{C(7G5&iaFYEQ;6e(A+NcRDwBf77UcmKqHQ+^*0qmqBfIEdg z0Jxsw^gp3a`Vid)7z0enIOU8}bZ6*69lr;~nqrGM_-IvQA>$I?Rs*tgAAP(SEmNg49?qS`a?I`9_ zhdu!LF)N=bz#waTGH-&id6$(gX3Z^VzyYRbHg#ILf^B7!Fd-R~=(E#iuFLGSM#sQ# zoOgT=%DJRcA6@FO3Kk6EFA1flZxLS%f`4PjrZ7?nM?1m z?9pVQV5TXPCU~NxbI3<7Wm2bYBK$ornsEoLa+jIUCr3>3!|58ax0owrMom$*+Zr9R z)vz<0F>?ho=v%J^+zXYmkh({Q%yimJcNB0u9xAc~VwB06ws-`C0xVBxKO5s=i04po zWQ3FK({>lL*-}bJK5vc=WsmL46oP{Lk~TctfggmK*IV{=z6Mu*2duf=wDTyJiOind zumly%WVWgl%3?S(f;#7#^OY!9g}B$uCXdP}@AF*?P}b>Us^BwR=eXSPGcBLt&S1^S z+%ccwq)F(7%uptqDFnFNk0J0ovdNLMthPBGVT+J@e&JM7Z>E4@|m-y-7W}Bgt$g-8Y7%IB?xZQ|1^CxOVYt zGIHW#5q{Cf0kTRK+iQ+u?*=Q-p*Y)b54uEgtZ3#-g@WX@jo(6ttRgX)>2anN!D84=2+ZJ7}lZ#;5~b z>PQkDh}z&DL-`2C)Z0<{67NeoPAO}LY9o0!giNY+Qm)oo@tnQDtHUYbMK3l_9^BQc0jXx$v1<*$^%8B*b&WX0L ztr^H<#IF=Se=9yrY1evp?VyG!*6-UbkybXdRVrcySj#h~9ot-l~SP7^TDm?nvAl+}x$g>NE*H_Z+rN?fE472zL+efjp0UrRtQv zFK1F|?#%KiRI*>2W(`bB_q208E$v%Xh4rGYIgXR!ZlU#0w6C({8C%zU1rvbpPR7HQ9R9G__4M;XZ-a;|i&KpWyFq-!5LI zv?Hr~9gYL{#z}4T?iGSsrm(@wo^Qi0SX_Q>pN19Q^}STj6m~cjxd*Z0-BLuRi!v&} zn)2N~MZUdzLEooJd%fCPv{dD~D&M=m^YsTKuC8gN5v!`pySMUnmBwva+MK&2UX62D zlu3wB+dw6GES*<+Evd8TDqdPzq+MU zTQgdroA8=i&&1eOll6OaMf*CGeS48bK4JY49b=X8{eeG=ctbb>SK}mNT`n$>Z4hG ztX3cG>SIG))QE4M8}HEK-Fj?peEe2D-W?ym15eu{(THf!oMqw#iHT(ws^l@-_YaO)vwQiMPf_2N&S(i zA(GAl{dLi(TEJgnFg|`iYp)3@D*j?9j{LaM3|Iwvo*p^G<88vUz zaXTYsWE?X_l^LV%+M|x1!}0NNxq1$>p5FLjrKjlVIV^e(J9>&rPtny=lnBO;IqHh> z@$Ya3_QZ>U3=~C0(Ot(I-0aM{IX?bmD2m8P)ish4K^4r_XbGWi5U+=}9{fndk7E}a zk;P#>g1kvegThI= zoTQ+pi<*LFTr}g(8;xg#bJ*n^b~(lPVc~eux>?Yh4Sc1A5w?s#Hb|Gnby20uG(BDn z)o@j5&c9d2H)a~`)8~EAPLAykJQdz|jcr|@*B}?w_`%u58ZBts-Mz09UkBm)kJZkz z?2C__*M@)hxvzeX_srk>@eh=+#yb4w4}TP0 z5d8E{7M9=Bt<>li{HRffr87ISS?l^;cnX{u%bFn6_T;X?w>A7l48(fpOf3e*Pz?*@ zJ2(tMkRdxt-}~L!uaUNE4^u|*F5q|11^kxXeX&)Ic(20yRq$R7@K|OxgTQO=K-a*d z*_XBt-}bTIFTMEg)-_8O?_?dF7arK3$2TDdhRyVtb)d_-K9{wUY2f&JE}P)T%E|13 zVAKv+L)RXVpdHAW1%$PP+cuUSqJc|0KCtmTa@Korm9rlE^og7Ll8+3Wb?4Lf9iHEg zpA);U%Xpk{vC>cX--|2iK_tH`o86VnT`yJk7wrF81k~@w z@lV>vOAV9lfp6s}(pm0OystP!^mBj9V7vj;%klmFLBMX>i%}0weY=780Pax#>jHfz z^h^BQldGTK{8FFp7Qz)TuoFc9r)ZYC9CwB`^ki@+XhLTWXJ<1ao%);xPJhYlNBeE-%_8|-x7 z{GUEFK%OJSPn>Lg@-qhC;%aNP!E$~U!LMdy0lgIS`8glHc7$(Z@S80kp=+R-D1rB7 zvKF82na+`AY1d!I`1^(GF$%7!;#_(<^R2F~1M1;F|KhcDZh55qI1z1%b9`%2Q9N6+_;LBfJn05sI51CDohX4Qo literal 19968 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 Pu+p703s!2w!jb<0A!Ifn diff --git a/Controladora/obj/Controladora.csproj.nuget.dgspec.json b/Controladora/obj/Controladora.csproj.nuget.dgspec.json index 73e01d9..39672d5 100644 --- a/Controladora/obj/Controladora.csproj.nuget.dgspec.json +++ b/Controladora/obj/Controladora.csproj.nuget.dgspec.json @@ -6,6 +6,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": {} }, @@ -35,16 +36,20 @@ ======= "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj": {} >>>>>>> 3925b59 (cambios nacho) +======= + "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj": {} +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) }, "projects": { - "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj": { + "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj", "projectName": "Controladora", <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Controladora\\Controladora.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", @@ -68,8 +73,11 @@ ======= "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj", >>>>>>> 3925b59 (cambios nacho) +======= + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj", +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -96,6 +104,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj" @@ -144,6 +153,13 @@ "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj": { "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj" >>>>>>> 3925b59 (cambios nacho) +======= + "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj" + }, + "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj" +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) } } } @@ -323,14 +339,14 @@ } } }, - "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { + "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj", "projectName": "Entidades", - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -379,14 +395,14 @@ } } }, - "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj": { + "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj", "projectName": "Modelo", - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -404,8 +420,8 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj" + "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj" } } } diff --git a/Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig b/Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig index 0622c7b..5b92c88 100644 --- a/Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig +++ b/Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig @@ -15,6 +15,7 @@ build_property.RootNamespace = Controladora <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Controladora/ ======= build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Controladora\ @@ -39,3 +40,6 @@ build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\final actual\C ======= build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actual(2)\Final actual\Controladora\ >>>>>>> 3925b59 (cambios nacho) +======= +build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\Controladora\ +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) diff --git a/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache b/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache index 0dc0cd5..ca4ae83 100644 --- a/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache +++ b/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache @@ -1,5 +1,9 @@ <<<<<<< HEAD +<<<<<<< HEAD 07cbdde4e47ec2d3a6db548797ff84a15aa08946633217fe5ed64773b3cc8491 ======= 39c8634b9e930bb7c3ea67187f4543b71aaf8be2 >>>>>>> 82ef086 (a) +======= +dba3ec7c7a0b4bd2c09ad0be4ae57d8a36772676 +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) diff --git a/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt b/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt index 239e0ea..c65b434 100644 --- a/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt +++ b/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt @@ -32,3 +32,20 @@ C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controladora.d C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\refint\Controladora.dll C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\Controladora.pdb C:\Users\Nacho\Desktop\Final actual\Controladora\obj\Debug\net6.0\ref\Controladora.dll +C:\Users\fedpo\Downloads\final actual\Controladora\bin\Debug\net6.0\Controladora.deps.json +C:\Users\fedpo\Downloads\final actual\Controladora\bin\Debug\net6.0\Controladora.dll +C:\Users\fedpo\Downloads\final actual\Controladora\bin\Debug\net6.0\Controladora.pdb +C:\Users\fedpo\Downloads\final actual\Controladora\bin\Debug\net6.0\Entidades.dll +C:\Users\fedpo\Downloads\final actual\Controladora\bin\Debug\net6.0\Modelo.dll +C:\Users\fedpo\Downloads\final actual\Controladora\bin\Debug\net6.0\Modelo.pdb +C:\Users\fedpo\Downloads\final actual\Controladora\bin\Debug\net6.0\Entidades.pdb +C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora.csproj.AssemblyReference.cache +C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora.GeneratedMSBuildEditorConfig.editorconfig +C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfoInputs.cache +C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfo.cs +C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora.csproj.CoreCompileInputs.cache +C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora.csproj.CopyComplete +C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora.dll +C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\refint\Controladora.dll +C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\Controladora.pdb +C:\Users\fedpo\Downloads\final actual\Controladora\obj\Debug\net6.0\ref\Controladora.dll diff --git a/Controladora/obj/Debug/net6.0/Controladora.dll b/Controladora/obj/Debug/net6.0/Controladora.dll index 4f73da0d73b47bafad90b03575e6ec14002c0937..391c6d40ed41a53ad782e3119da8426a791618ab 100644 GIT binary patch literal 18432 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 literal 19968 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 Pu+p703s!2w!jb<0A!Ifn diff --git a/Controladora/obj/Debug/net6.0/ref/Controladora.dll b/Controladora/obj/Debug/net6.0/ref/Controladora.dll index 3bfc6be0258cfad377c809de3361e53c8bdde5fd..f46256e8893f09ca7db7c163a219bdc03c930f79 100644 GIT binary patch literal 7680 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 CuNHp* literal 7680 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 L6unb!yA1pjEf7zc diff --git a/Controladora/obj/Debug/net6.0/refint/Controladora.dll b/Controladora/obj/Debug/net6.0/refint/Controladora.dll index 3bfc6be0258cfad377c809de3361e53c8bdde5fd..f46256e8893f09ca7db7c163a219bdc03c930f79 100644 GIT binary patch literal 7680 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 CuNHp* literal 7680 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 L6unb!yA1pjEf7zc diff --git a/Controladora/obj/project.assets.json b/Controladora/obj/project.assets.json index 95f5340..4c5fe0f 100644 --- a/Controladora/obj/project.assets.json +++ b/Controladora/obj/project.assets.json @@ -60,6 +60,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectUniqueName": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj", "projectName": "Controladora", @@ -94,10 +95,13 @@ ======= "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj", >>>>>>> 3925b59 (cambios nacho) +======= + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj", +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) "projectName": "Controladora", - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -124,6 +128,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj" @@ -172,6 +177,13 @@ "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj": { "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj" >>>>>>> 3925b59 (cambios nacho) +======= + "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj" + }, + "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj" +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) } } } diff --git a/Controladora/obj/project.nuget.cache b/Controladora/obj/project.nuget.cache index 61f2591..f07ba6e 100644 --- a/Controladora/obj/project.nuget.cache +++ b/Controladora/obj/project.nuget.cache @@ -5,6 +5,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "dgSpecHash": "Vs+HTdq8Gqw56GHRk+ivU0JJ/5n6ghHJP2CKgIV+gDHL9rO3WgHHPoz0OWJjyozNRvnYskqZVibjHcSALkg9JQ==", "success": true, @@ -619,8 +620,11 @@ ======= "dgSpecHash": "r6yZkn7vz8/vk90IKpsbux5MO0+aB5kxgPItYHl5ZJHIUAUs/bsNzJEgYyHcVZOte6JF54JInW9sHlpZnQcQMQ==", >>>>>>> 3925b59 (cambios nacho) +======= + "dgSpecHash": "IpwbiXL3dRwH5wx4tbGN8sdWb7j6j3mIXiyS0Hjs/qZK1voDpRMu2YLROEx5AIgE25tapPlkUXWChBlhRVT26A==", +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) "success": true, - "projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj", + "projectFilePath": "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj", "expectedPackageFiles": [], >>>>>>> c493033 (cosas que faltaban) "logs": [] diff --git a/Entidades/DetalleFactura.cs b/Entidades/DetalleFactura.cs index 5f68ebb..d0092bc 100644 --- a/Entidades/DetalleFactura.cs +++ b/Entidades/DetalleFactura.cs @@ -4,7 +4,6 @@ namespace Entidades public class DetalleFactura: Detalle { public int IdFactura { get; set; } - public double PrecioUnitario { get; set; } public double Subtotal { get; set; } } } diff --git a/Entidades/Lote.cs b/Entidades/Lote.cs index 6735959..7e24699 100644 --- a/Entidades/Lote.cs +++ b/Entidades/Lote.cs @@ -8,18 +8,6 @@ namespace Entidades public Producto Producto { get; set; } public long CantidadDeProductos { get; set; } public bool Habilitado { get; set; } - public string NombreProducto - { - get { return Producto?.Nombre ?? string.Empty; } - } - public double PrecioUnitario - { - get { return Producto?.Precio ?? 0; } - } - public double Subtotal - { - get { return PrecioUnitario * CantidadDeProductos; } - } } } diff --git a/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig b/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig index b28f406..87239f0 100644 --- a/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig +++ b/Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig @@ -14,6 +14,7 @@ build_property.RootNamespace = Entidades <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Entidades/ ======= build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Entidades\ @@ -35,3 +36,6 @@ build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\final actual\E ======= build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actual(2)\Final actual\Entidades\ >>>>>>> 3925b59 (cambios nacho) +======= +build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\Entidades\ +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) diff --git a/Entidades/obj/Entidades.csproj.nuget.dgspec.json b/Entidades/obj/Entidades.csproj.nuget.dgspec.json index e2c43a0..0847617 100644 --- a/Entidades/obj/Entidades.csproj.nuget.dgspec.json +++ b/Entidades/obj/Entidades.csproj.nuget.dgspec.json @@ -6,6 +6,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {} }, @@ -35,16 +36,20 @@ ======= "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {} >>>>>>> 3925b59 (cambios nacho) +======= + "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": {} +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) }, "projects": { - "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { + "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj", "projectName": "Entidades", <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", @@ -68,8 +73,11 @@ ======= "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj", >>>>>>> 3925b59 (cambios nacho) +======= + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj", +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", diff --git a/Entidades/obj/project.assets.json b/Entidades/obj/project.assets.json index b8bb4a1..e22939f 100644 --- a/Entidades/obj/project.assets.json +++ b/Entidades/obj/project.assets.json @@ -22,6 +22,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectUniqueName": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj", "projectName": "Entidades", @@ -56,10 +57,13 @@ ======= "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj", >>>>>>> 3925b59 (cambios nacho) +======= + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj", +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) "projectName": "Entidades", - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", diff --git a/Entidades/obj/project.nuget.cache b/Entidades/obj/project.nuget.cache index 071cc5f..0107426 100644 --- a/Entidades/obj/project.nuget.cache +++ b/Entidades/obj/project.nuget.cache @@ -5,6 +5,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "dgSpecHash": "LSnXGupX+sIU3VjCECy137T1ThKtECGacQq+4Cfd3SDyYEpIcp26yf15qIysqN2+1Fwti7c13f3fBKmUt8i0Og==", "success": true, @@ -30,8 +31,11 @@ ======= "dgSpecHash": "vCw9TkU23iJeVGdgwKLwcggjjvRCnx4IVmqtdUC1cx6S4CwC+/lso1ry576JGcrpGs6Tvfs4jnEYWVDgrNS9aA==", >>>>>>> 3925b59 (cambios nacho) +======= + "dgSpecHash": "JjmZ/x9rvI6DKcp6sqA/2XwtSHr6XeI0O0c8c5GAHxMcNMVKoIzQeSSZe+awvwhJFTb+hDsL4RbtngW8O8CFow==", +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) "success": true, - "projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj", + "projectFilePath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj", "expectedPackageFiles": [], >>>>>>> 8ad9dc6 (faltan controladoras) "logs": [] diff --git a/Informes/bin/Debug/net6.0/Entidades.dll b/Informes/bin/Debug/net6.0/Entidades.dll index 30c6233e860e10f258fce8abfa21de527d5801b4..50ca90c6ee0b5c09cabb017a5ea82609aee3b9b8 100644 GIT binary patch literal 14336 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 diff --git a/Informes/bin/Debug/net6.0/Entidades.pdb b/Informes/bin/Debug/net6.0/Entidades.pdb index b09e376c1798ccefd1d9c54aeef4fb1567880fe2..cc3ebbab420064cadcbcc49040818511624ea565 100644 GIT binary patch literal 14888 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 literal 16568 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 rQDf diff --git a/Informes/bin/Debug/net6.0/Informes.dll b/Informes/bin/Debug/net6.0/Informes.dll index 8e706b3d2a635a9478ad871a40e6d33f121987d0..4031947ea89e99719c8500af22823c076321e7e3 100644 GIT binary patch delta 518 zcmZqhXz-ZO!J?X(v}IzC3?tXXmEn9ltQZ*l8GyinfkB3OqM|TQ0s{jNkblFHfgxnF zB9qSKNJe!=fys?PQfBf>#&F3uKrJBP0mMuUtPFEh7#M6s85kHRJIb1G4q#ft!q~I< zFIzcFy$X{v0~dn|QzAn&n9OF-WJ(6JlfmN249N^eOpRcXMh1{R~Mjj>w5XIyGA~*l%w&fMbdc4Y_ zRx!nWSC6mgge@DhHv33QGI4S-GO!xz8R!{Io-Umy8gG4LF$1G-029!EsX(j)^smlj zSs8KGi9puG$(Az8dMvy4?Nt$Y=FxwzD(l^yd1o1c>YS}&LW@(2ieu7JQws89T=L8F za`F>Xfc(iFGFC7xKlq_qK-So9zpU-Rr*LzI;hA3#puq|>iQ$*kx_Jb^v_ygxdfB delta 648 zcmXX^O=uHA6n-;F{HbY3wMIkZy6F!U65=MCcJouE5|t=MgSE735N9_V3V}8>MUN)U zr3b;T<1vWRQ=lTU7onFz!K>oIgCIy11TP|jKL@REr+LHs=9}+(Z-?2LM!u0>U2*5~ zR>ZHzo7 z1rM}`0p<<^5Z-r8vx{`yOyLR>+Mkkl zE?9Q^%)ij)d;3x_NE0f7SUjf0ln7IG%}nbRBgx8YG7*m(nr`Z5DqUerWn(zBl+Khg zpC6b%iswJ~;MY2kLXjdjFlX_v&GPR9M?4$IHh6DnDB7t!`trIudhx}N-#@1pJyQhh za+%U}-CV4fE;D0pp>)=)SCs)D}L#bB(P8tOW71^a-1kl*ZA Qb{|wKYxfO)BbKuFKXs;@@c;k- diff --git a/Informes/bin/Debug/net6.0/Informes.pdb b/Informes/bin/Debug/net6.0/Informes.pdb index 8ba9ac3c071d190811341decf891bcf0173bfa0b..beeb1a0dea08abaaa651de4c24c0def74ca8242b 100644 GIT binary patch delta 6177 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 delta 5954 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 D@`)+R diff --git a/Informes/obj/Debug/net6.0/Informes.GeneratedMSBuildEditorConfig.editorconfig b/Informes/obj/Debug/net6.0/Informes.GeneratedMSBuildEditorConfig.editorconfig index e8f15c7..55f0a0b 100644 --- a/Informes/obj/Debug/net6.0/Informes.GeneratedMSBuildEditorConfig.editorconfig +++ b/Informes/obj/Debug/net6.0/Informes.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = Informes -build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actual(2)\Final actual\Informes\ +build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\Informes\ diff --git a/Informes/obj/Debug/net6.0/Informes.assets.cache b/Informes/obj/Debug/net6.0/Informes.assets.cache index 0a5a102ff0607422eda07729eaabb5dba18d1b5c..6fc1d9dbf10bf34afba7d07cb7868876906095c3 100644 GIT binary patch delta 55 zcmV-70LcHC0hj?PP)kQa3;+NCpt*k`XXGW99&20e3!!-&_CcT>KFgAs$NTjm=A1+? Nl#wwbkw6HMR75u777YLZ delta 55 zcmV-70LcHC0hj?PP)kQa3;+NC7MDdCBY7BW`t;*l2h3+0@o8iQQE{0`dGKLR@tcj; Nl#wwbkw6HMR74JM6(9fr diff --git a/Informes/obj/Debug/net6.0/Informes.csproj.AssemblyReference.cache b/Informes/obj/Debug/net6.0/Informes.csproj.AssemblyReference.cache index 1e9a4f7d705e666845383b0035a3fcd3f4575008..2e16751142ddfc71674866c6a337912ead9c2317 100644 GIT binary patch delta 99 zcmbP!k@e~|R%SNFMUBi`nHi^K$T0djTg8MHrxq2*q@|`5#&F3uKrJBP0mMuUtPFEh7#M6s85kHRJIb1G4q#ft!q~I< zFIzcFy$X{v0~dn|QzAn&n9OF-WJ(6JlfmN249N^eOpRcXMh1{R~Mjj>w5XIyGA~*l%w&fMbdc4Y_ zRx!nWSC6mgge@DhHv33QGI4S-GO!xz8R!{Io-Umy8gG4LF$1G-029!EsX(j)^smlj zSs8KGi9puG$(Az8dMvy4?Nt$Y=FxwzD(l^yd1o1c>YS}&LW@(2ieu7JQws89T=L8F za`F>Xfc(iFGFC7xKlq_qK-So9zpU-Rr*LzI;hA3#puq|>iQ$*kx_Jb^v_ygxdfB delta 648 zcmXX^O=uHA6n-;F{HbY3wMIkZy6F!U65=MCcJouE5|t=MgSE735N9_V3V}8>MUN)U zr3b;T<1vWRQ=lTU7onFz!K>oIgCIy11TP|jKL@REr+LHs=9}+(Z-?2LM!u0>U2*5~ zR>ZHzo7 z1rM}`0p<<^5Z-r8vx{`yOyLR>+Mkkl zE?9Q^%)ij)d;3x_NE0f7SUjf0ln7IG%}nbRBgx8YG7*m(nr`Z5DqUerWn(zBl+Khg zpC6b%iswJ~;MY2kLXjdjFlX_v&GPR9M?4$IHh6DnDB7t!`trIudhx}N-#@1pJyQhh za+%U}-CV4fE;D0pp>)=)SCs)D}L#bB(P8tOW71^a-1kl*ZA Qb{|wKYxfO)BbKuFKXs;@@c;k- diff --git a/Informes/obj/Debug/net6.0/Informes.pdb b/Informes/obj/Debug/net6.0/Informes.pdb index 8ba9ac3c071d190811341decf891bcf0173bfa0b..beeb1a0dea08abaaa651de4c24c0def74ca8242b 100644 GIT binary patch delta 6177 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 delta 5954 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 D@`)+R diff --git a/Informes/obj/Debug/net6.0/ref/Informes.dll b/Informes/obj/Debug/net6.0/ref/Informes.dll index 3cd584e27489c65724e8faa34bd7a60e79b8f55f..c627a331df4bbfde98f2c5113f7c05f8abda23ca 100644 GIT binary patch delta 326 zcmZqBY0#O_!Lm?~`R~LY8OBQ!SBCR7crq~fGXOyX1A`3nL`7kq1_lNmAU_2tAv0N# zNoR5-qd(IP&dIA7)figS^vb<+xV%Rd7kxiIY zfRllN5vb98asXQjW6tKSYzLXl1sR(ek{RYQG&694$!rD-#sy%J#SBUe@r;WZgcwp8 z4}e7ugGCO5L^iMGv}VDy?guX$BPSOl1FNB)fu6x+1OAN3)A`@&Et; delta 439 zcmZXQyGsK>5XQf`#K?(B&S<9y8nH=8?sAb!6ve{E#spG`R_^72V3R_ugEkhv;)-D5 z11vOx)nO?pX)Uy{i~oR4urp%epN( zWWcckls(mv{@x1E%ljP`hUAD6l}nUS&?9eXoXXA%#T700`f;*vs0-(F8)IShxastH zo1~y2$=BbNQUPM4C9}Q)9XWTtN5z_?E#z^EE%dnK8U$Uq&-}MeyvyC-AT?wyI4uL(Oklv%QGfxDT-MHLUADBal2x4HzC-eCA}*a!Bo~2z z2^$uQNb_9c$0wN;m?n{c!I@{(X1!f0K2>79?Gl*yD~q|!Yn^?NZ=q*(_P77vX}7CY Gz554sxonI8 diff --git a/Informes/obj/Debug/net6.0/refint/Informes.dll b/Informes/obj/Debug/net6.0/refint/Informes.dll index 3cd584e27489c65724e8faa34bd7a60e79b8f55f..c627a331df4bbfde98f2c5113f7c05f8abda23ca 100644 GIT binary patch delta 326 zcmZqBY0#O_!Lm?~`R~LY8OBQ!SBCR7crq~fGXOyX1A`3nL`7kq1_lNmAU_2tAv0N# zNoR5-qd(IP&dIA7)figS^vb<+xV%Rd7kxiIY zfRllN5vb98asXQjW6tKSYzLXl1sR(ek{RYQG&694$!rD-#sy%J#SBUe@r;WZgcwp8 z4}e7ugGCO5L^iMGv}VDy?guX$BPSOl1FNB)fu6x+1OAN3)A`@&Et; delta 439 zcmZXQyGsK>5XQf`#K?(B&S<9y8nH=8?sAb!6ve{E#spG`R_^72V3R_ugEkhv;)-D5 z11vOx)nO?pX)Uy{i~oR4urp%epN( zWWcckls(mv{@x1E%ljP`hUAD6l}nUS&?9eXoXXA%#T700`f;*vs0-(F8)IShxastH zo1~y2$=BbNQUPM4C9}Q)9XWTtN5z_?E#z^EE%dnK8U$Uq&-}MeyvyC-AT?wyI4uL(Oklv%QGfxDT-MHLUADBal2x4HzC-eCA}*a!Bo~2z z2^$uQNb_9c$0wN;m?n{c!I@{(X1!f0K2>79?Gl*yD~q|!Yn^?NZ=q*(_P77vX}7CY Gz554sxonI8 diff --git a/Informes/obj/Informes.csproj.nuget.dgspec.json b/Informes/obj/Informes.csproj.nuget.dgspec.json index 9d73e69..88a5477 100644 --- a/Informes/obj/Informes.csproj.nuget.dgspec.json +++ b/Informes/obj/Informes.csproj.nuget.dgspec.json @@ -1,17 +1,17 @@ { "format": 1, "restore": { - "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj": {} + "C:\\Users\\fedpo\\Downloads\\final actual\\Informes\\Informes.csproj": {} }, "projects": { - "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { + "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj", "projectName": "Entidades", - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -60,14 +60,14 @@ } } }, - "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj": { + "C:\\Users\\fedpo\\Downloads\\final actual\\Informes\\Informes.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Informes\\Informes.csproj", "projectName": "Informes", - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Informes\\Informes.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Informes\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -85,8 +85,8 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj" + "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj" } } } diff --git a/Informes/obj/project.assets.json b/Informes/obj/project.assets.json index 6045869..53552aa 100644 --- a/Informes/obj/project.assets.json +++ b/Informes/obj/project.assets.json @@ -32,11 +32,11 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Informes\\Informes.csproj", "projectName": "Informes", - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Informes\\Informes.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Informes\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -54,8 +54,8 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj" + "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj" } } } diff --git a/Informes/obj/project.nuget.cache b/Informes/obj/project.nuget.cache index 376e547..6632485 100644 --- a/Informes/obj/project.nuget.cache +++ b/Informes/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "wSRUDPAOADbuzfBaccmKkWkxTPKcGjNIB8Bpaz2yc1b+hR10rBbeJ6qupMQnFD6UaiKUQHlyxseEoFUSlbM17A==", + "dgSpecHash": "iKJAdqV1q/kMNu72oEWf+wTcoFyU56YA7P8rCel2LyJMylEEsdJ3zg2KDcBSbSFYhociP4Acc3XZ4KiTT60MbQ==", "success": true, - "projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj", + "projectFilePath": "C:\\Users\\fedpo\\Downloads\\final actual\\Informes\\Informes.csproj", "expectedPackageFiles": [], "logs": [] } \ No newline at end of file diff --git a/Modelo/obj/Debug/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig b/Modelo/obj/Debug/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig index 6170f0c..9b26878 100644 --- a/Modelo/obj/Debug/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig +++ b/Modelo/obj/Debug/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig @@ -14,6 +14,7 @@ build_property.RootNamespace = Modelo <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Modelo/ ======= build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Modelo\ @@ -35,3 +36,6 @@ build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\final actual\M ======= build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actual(2)\Final actual\Modelo\ >>>>>>> 3925b59 (cambios nacho) +======= +build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\Modelo\ +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) diff --git a/Modelo/obj/Modelo.csproj.nuget.dgspec.json b/Modelo/obj/Modelo.csproj.nuget.dgspec.json index 12b3c4e..ed4cabf 100644 --- a/Modelo/obj/Modelo.csproj.nuget.dgspec.json +++ b/Modelo/obj/Modelo.csproj.nuget.dgspec.json @@ -6,6 +6,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj": {} }, @@ -35,16 +36,20 @@ ======= "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj": {} >>>>>>> 3925b59 (cambios nacho) +======= + "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj": {} +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) }, "projects": { - "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { + "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj", "projectName": "Entidades", <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", @@ -68,8 +73,11 @@ ======= "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj", >>>>>>> 3925b59 (cambios nacho) +======= + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj", +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -155,6 +163,7 @@ }, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj": { >>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc)) @@ -167,13 +176,17 @@ ======= "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj": { >>>>>>> 3925b59 (cambios nacho) +======= + "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj": { +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj", "projectName": "Modelo", <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\", @@ -197,8 +210,11 @@ ======= "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj", >>>>>>> 3925b59 (cambios nacho) +======= + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj", +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -225,6 +241,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj" @@ -252,6 +269,10 @@ "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj" >>>>>>> 3925b59 (cambios nacho) +======= + "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj" +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) } } } diff --git a/Modelo/obj/project.assets.json b/Modelo/obj/project.assets.json index ed84c96..c481ed7 100644 --- a/Modelo/obj/project.assets.json +++ b/Modelo/obj/project.assets.json @@ -41,6 +41,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectUniqueName": "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj", "projectName": "Modelo", @@ -75,10 +76,13 @@ ======= "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj", >>>>>>> 3925b59 (cambios nacho) +======= + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj", +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) "projectName": "Modelo", - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -105,6 +109,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj" @@ -132,6 +137,10 @@ "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj" >>>>>>> 3925b59 (cambios nacho) +======= + "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj" +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) } } } diff --git a/Modelo/obj/project.nuget.cache b/Modelo/obj/project.nuget.cache index 1d9b6bf..c9d58ec 100644 --- a/Modelo/obj/project.nuget.cache +++ b/Modelo/obj/project.nuget.cache @@ -5,6 +5,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "dgSpecHash": "druJUlWKmOp0ZDp0BX75o9Fs1GyoqoIkTLLMStpqDmZBEy8hoSreNrR/4qjyFeX2PbXxwtpQp0hY2GY2ewsTOQ==", "success": true, @@ -30,8 +31,11 @@ ======= "dgSpecHash": "gEY07P7prGCYVR0m9ujCWDU4VIm7roMDseNKc2YK6GTpNG+hy+RKyuu6ewyYVPxE4rRuW4p/7q2JBw4Oa4TZHw==", >>>>>>> 3925b59 (cambios nacho) +======= + "dgSpecHash": "+dSzN8HQCE/7+A8WiGWZUevsFyBg+RjmhJtwnva8KQTR/8cIYqrYcGitnOradj5OOEtIzia0uezPEUiSGR+5rw==", +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) "success": true, - "projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj", + "projectFilePath": "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj", "expectedPackageFiles": [], >>>>>>> 8ad9dc6 (faltan controladoras) "logs": [] diff --git a/Vista/FrmFactura.Designer.cs b/Vista/FrmFactura.Designer.cs index 539d852..ef58e64 100644 --- a/Vista/FrmFactura.Designer.cs +++ b/Vista/FrmFactura.Designer.cs @@ -28,8 +28,8 @@ /// private void InitializeComponent() { - button1 = new Button(); - button2 = new Button(); + btnAceptar = new Button(); + btnCancelar = new Button(); numid = new NumericUpDown(); label1 = new Label(); numtotal = new NumericUpDown(); @@ -38,41 +38,44 @@ label3 = new Label(); label4 = new Label(); cmbCliente = new ComboBox(); - dataGridView1 = new DataGridView(); - dataGridView2 = new DataGridView(); - numericUpDown1 = new NumericUpDown(); + dgvProductos = new DataGridView(); + dgvDetalles = new DataGridView(); + numCantidad = new NumericUpDown(); Unidades = new Label(); - button3 = new Button(); + btnAddDetalle = new Button(); + label5 = new Label(); + label6 = new Label(); + btnEliminar = new Button(); ((System.ComponentModel.ISupportInitialize)numid).BeginInit(); ((System.ComponentModel.ISupportInitialize)numtotal).BeginInit(); - ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit(); - ((System.ComponentModel.ISupportInitialize)dataGridView2).BeginInit(); - ((System.ComponentModel.ISupportInitialize)numericUpDown1).BeginInit(); + ((System.ComponentModel.ISupportInitialize)dgvProductos).BeginInit(); + ((System.ComponentModel.ISupportInitialize)dgvDetalles).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numCantidad).BeginInit(); SuspendLayout(); // - // button1 + // btnAceptar // - button1.Location = new Point(12, 367); - button1.Name = "button1"; - button1.Size = new Size(113, 46); - button1.TabIndex = 0; - button1.Text = "Aceptar"; - button1.UseVisualStyleBackColor = true; - button1.Click += button1_Click; + btnAceptar.Location = new Point(12, 395); + btnAceptar.Name = "btnAceptar"; + btnAceptar.Size = new Size(82, 26); + btnAceptar.TabIndex = 0; + btnAceptar.Text = "Aceptar"; + btnAceptar.UseVisualStyleBackColor = true; + btnAceptar.Click += btnAceptar_Click; // - // button2 + // btnCancelar // - button2.Location = new Point(172, 367); - button2.Name = "button2"; - button2.Size = new Size(115, 46); - button2.TabIndex = 1; - button2.Text = "Cancelar"; - button2.UseVisualStyleBackColor = true; - button2.Click += button2_Click; + btnCancelar.Location = new Point(873, 395); + btnCancelar.Name = "btnCancelar"; + btnCancelar.Size = new Size(80, 26); + btnCancelar.TabIndex = 1; + btnCancelar.Text = "Cancelar"; + btnCancelar.UseVisualStyleBackColor = true; + btnCancelar.Click += btnCerrar_Click; // // numid // - numid.Location = new Point(97, 26); + numid.Location = new Point(60, 14); numid.Maximum = new decimal(new int[] { 1215752191, 23, 0, 0 }); numid.Name = "numid"; numid.Size = new Size(120, 23); @@ -81,7 +84,7 @@ // label1 // label1.AutoSize = true; - label1.Location = new Point(69, 34); + label1.Location = new Point(32, 22); label1.Name = "label1"; label1.Size = new Size(18, 15); label1.TabIndex = 3; @@ -90,7 +93,7 @@ // numtotal // numtotal.Enabled = false; - numtotal.Location = new Point(97, 57); + numtotal.Location = new Point(60, 45); numtotal.Maximum = new decimal(new int[] { 1215752191, 23, 0, 0 }); numtotal.Name = "numtotal"; numtotal.ReadOnly = true; @@ -100,7 +103,7 @@ // label2 // label2.AutoSize = true; - label2.Location = new Point(59, 65); + label2.Location = new Point(22, 53); label2.Name = "label2"; label2.Size = new Size(32, 15); label2.TabIndex = 5; @@ -108,16 +111,15 @@ // // datepick // - datepick.Location = new Point(97, 88); + datepick.Location = new Point(60, 76); datepick.Name = "datepick"; datepick.Size = new Size(120, 23); datepick.TabIndex = 6; - datepick.ValueChanged += datepick_ValueChanged; // // label3 // label3.AutoSize = true; - label3.Location = new Point(49, 94); + label3.Location = new Point(12, 82); label3.Name = "label3"; label3.Size = new Size(38, 15); label3.TabIndex = 7; @@ -126,7 +128,7 @@ // label4 // label4.AutoSize = true; - label4.Location = new Point(49, 124); + label4.Location = new Point(12, 112); label4.Name = "label4"; label4.Size = new Size(44, 15); label4.TabIndex = 8; @@ -136,69 +138,106 @@ // cmbCliente.DropDownStyle = ComboBoxStyle.DropDownList; cmbCliente.FormattingEnabled = true; - cmbCliente.Location = new Point(99, 121); + cmbCliente.Location = new Point(62, 109); cmbCliente.Name = "cmbCliente"; cmbCliente.Size = new Size(121, 23); cmbCliente.TabIndex = 10; // - // dataGridView1 + // dgvProductos // - dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; - dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView1.Location = new Point(290, 12); - dataGridView1.Name = "dataGridView1"; - dataGridView1.RowTemplate.Height = 25; - dataGridView1.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridView1.Size = new Size(324, 318); - dataGridView1.TabIndex = 11; + dgvProductos.AllowUserToAddRows = false; + dgvProductos.AllowUserToDeleteRows = false; + dgvProductos.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + dgvProductos.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dgvProductos.EditMode = DataGridViewEditMode.EditProgrammatically; + dgvProductos.Location = new Point(237, 30); + dgvProductos.Name = "dgvProductos"; + dgvProductos.RowTemplate.Height = 25; + dgvProductos.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dgvProductos.Size = new Size(350, 318); + dgvProductos.TabIndex = 11; // - // dataGridView2 + // dgvDetalles // - dataGridView2.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; - dataGridView2.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView2.Location = new Point(674, 12); - dataGridView2.Name = "dataGridView2"; - dataGridView2.RowTemplate.Height = 25; - dataGridView2.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridView2.Size = new Size(290, 336); - dataGridView2.TabIndex = 12; + dgvDetalles.AllowUserToAddRows = false; + dgvDetalles.AllowUserToDeleteRows = false; + dgvDetalles.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + dgvDetalles.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dgvDetalles.EditMode = DataGridViewEditMode.EditProgrammatically; + dgvDetalles.Location = new Point(593, 30); + dgvDetalles.Name = "dgvDetalles"; + dgvDetalles.RowTemplate.Height = 25; + dgvDetalles.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dgvDetalles.Size = new Size(360, 318); + dgvDetalles.TabIndex = 12; // - // numericUpDown1 + // numCantidad // - numericUpDown1.Location = new Point(494, 359); - numericUpDown1.Name = "numericUpDown1"; - numericUpDown1.Size = new Size(120, 23); - numericUpDown1.TabIndex = 13; + numCantidad.Location = new Point(309, 354); + numCantidad.Name = "numCantidad"; + numCantidad.Size = new Size(120, 23); + numCantidad.TabIndex = 13; // // Unidades // Unidades.AutoSize = true; - Unidades.Location = new Point(420, 367); + Unidades.Location = new Point(235, 362); Unidades.Name = "Unidades"; Unidades.Size = new Size(56, 15); Unidades.TabIndex = 14; Unidades.Text = "Unidades"; // - // button3 + // btnAddDetalle // - button3.Location = new Point(420, 390); - button3.Name = "button3"; - button3.Size = new Size(194, 36); - button3.TabIndex = 15; - button3.Text = "Añadir"; - button3.UseVisualStyleBackColor = true; - button3.Click += button3_Click; + btnAddDetalle.Location = new Point(235, 385); + btnAddDetalle.Name = "btnAddDetalle"; + btnAddDetalle.Size = new Size(80, 31); + btnAddDetalle.TabIndex = 15; + btnAddDetalle.Text = "Añadir"; + btnAddDetalle.UseVisualStyleBackColor = true; + btnAddDetalle.Click += btnAddDetalle_Click; + // + // label5 + // + label5.AutoSize = true; + label5.Location = new Point(593, 9); + label5.Name = "label5"; + label5.Size = new Size(48, 15); + label5.TabIndex = 16; + label5.Text = "Detalles"; + // + // label6 + // + label6.AutoSize = true; + label6.Location = new Point(237, 5); + label6.Name = "label6"; + label6.Size = new Size(61, 15); + label6.TabIndex = 17; + label6.Text = "Productos"; + // + // btnEliminar + // + btnEliminar.Location = new Point(321, 385); + btnEliminar.Name = "btnEliminar"; + btnEliminar.Size = new Size(80, 31); + btnEliminar.TabIndex = 18; + btnEliminar.Text = "Eliminar"; + btnEliminar.UseVisualStyleBackColor = true; + btnEliminar.Click += btnEliminar_Click; // // FrmFactura // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(976, 450); - Controls.Add(button3); + ClientSize = new Size(965, 428); + Controls.Add(btnEliminar); + Controls.Add(label6); + Controls.Add(label5); + Controls.Add(btnAddDetalle); Controls.Add(Unidades); - Controls.Add(numericUpDown1); - Controls.Add(dataGridView2); - Controls.Add(dataGridView1); + Controls.Add(numCantidad); + Controls.Add(dgvDetalles); + Controls.Add(dgvProductos); Controls.Add(cmbCliente); Controls.Add(label4); Controls.Add(label3); @@ -207,23 +246,23 @@ Controls.Add(numtotal); Controls.Add(label1); Controls.Add(numid); - Controls.Add(button2); - Controls.Add(button1); + Controls.Add(btnCancelar); + Controls.Add(btnAceptar); Name = "FrmFactura"; - Text = "Form1"; + Text = "Agregar Factura"; ((System.ComponentModel.ISupportInitialize)numid).EndInit(); ((System.ComponentModel.ISupportInitialize)numtotal).EndInit(); - ((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit(); - ((System.ComponentModel.ISupportInitialize)dataGridView2).EndInit(); - ((System.ComponentModel.ISupportInitialize)numericUpDown1).EndInit(); + ((System.ComponentModel.ISupportInitialize)dgvProductos).EndInit(); + ((System.ComponentModel.ISupportInitialize)dgvDetalles).EndInit(); + ((System.ComponentModel.ISupportInitialize)numCantidad).EndInit(); ResumeLayout(false); PerformLayout(); } #endregion - private Button button1; - private Button button2; + private Button btnAceptar; + private Button btnCancelar; private NumericUpDown numid; private Label label1; private NumericUpDown numtotal; @@ -232,10 +271,13 @@ private Label label3; private Label label4; private ComboBox cmbCliente; - private DataGridView dataGridView1; - private DataGridView dataGridView2; - private NumericUpDown numericUpDown1; + private DataGridView dgvProductos; + private DataGridView dgvDetalles; + private NumericUpDown numCantidad; private Label Unidades; - private Button button3; + private Button btnAddDetalle; + private Label label5; + private Label label6; + private Button btnEliminar; } } \ No newline at end of file diff --git a/Vista/FrmFactura.cs b/Vista/FrmFactura.cs index a7e74ce..c85710d 100644 --- a/Vista/FrmFactura.cs +++ b/Vista/FrmFactura.cs @@ -1,6 +1,5 @@ using Controladora; using Entidades; -using Modelo; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -16,134 +15,76 @@ namespace Vista { public partial class FrmFactura : Form { - private Factura factura; - private Cliente clienteSeleccionado; - private List carrito; // Lista para almacenar los lotes en el carrito - - public FrmFactura(Factura? factura = null) + private Factura factura = new Factura(); + private int detalleid; + public FrmFactura() { InitializeComponent(); - ConfigurarDataGridView(); - ConfigurarDataGridViewCarrito(); // Nueva configuración del DataGridView para el carrito ActualizarGrilla(); - CargarClientes(); - carrito = new List(); // Inicializar la lista del carrito - - cmbCliente.SelectedIndexChanged += comboBox1_SelectedIndexChanged; - - // Para el primer control NumericUpDown - numid.Maximum = int.MaxValue; // Esto permitirá IDs muy grandes - - // Para el segundo control NumericUpDown - numtotal.Maximum = decimal.MaxValue; // Esto permitirá totales muy grandes - numtotal.Enabled = false; // Deshabilitar el control para que no se pueda modificar - - // Configurar NumericUpDown para unidades - numericUpDown1.Maximum = int.MaxValue; // Configurar el máximo valor permitido + CargarDatos(); cmbCliente.DisplayMember = "Cliente"; cmbCliente.SelectedIndex = -1; - - if (factura != null) - { - this.factura = factura; - this.Text = "Modificar Factura"; - CargarDatos(); - } - else - { - this.Text = "Agregar Factura"; - } } - private void ConfigurarDataGridView() + private void ActualizarGrilla() { - dataGridView1.AutoGenerateColumns = false; + dgvProductos.DataSource = null; + dgvProductos.DataSource = ControladoraProductos.Instance.Listar(); + + dgvDetalles.AutoGenerateColumns = false; // Definir las columnas manualmente - dataGridView1.Columns.Add(new DataGridViewTextBoxColumn + dgvDetalles.Columns.Add(new DataGridViewTextBoxColumn { - DataPropertyName = "Id", - HeaderText = "ID", + DataPropertyName = "Id", // Usa la propiedad NombreProducto + HeaderText = "Id", Name = "Id" }); - dataGridView1.Columns.Add(new DataGridViewTextBoxColumn + dgvDetalles.Columns.Add(new DataGridViewTextBoxColumn { - DataPropertyName = "Nombre", - HeaderText = "Nombre", - Name = "Nombre" - }); - dataGridView1.Columns.Add(new DataGridViewTextBoxColumn - { - DataPropertyName = "Precio", - HeaderText = "Precio", - Name = "Precio" - }); - } - - private void ConfigurarDataGridViewCarrito() - { - dataGridView2.AutoGenerateColumns = false; - - // Definir las columnas manualmente - dataGridView2.Columns.Add(new DataGridViewTextBoxColumn - { - DataPropertyName = "NombreProducto", // Usa la propiedad NombreProducto + DataPropertyName = "Producto", // Usa la propiedad NombreProducto HeaderText = "Producto", Name = "Producto" }); - dataGridView2.Columns.Add(new DataGridViewTextBoxColumn + dgvDetalles.Columns.Add(new DataGridViewTextBoxColumn { DataPropertyName = "CantidadDeProductos", HeaderText = "Cantidad", Name = "CantidadDeProductos" }); + dgvDetalles.Columns.Add(new DataGridViewTextBoxColumn + { + DataPropertyName = "PrecioUnitario", + HeaderText = "PrecioUnitario" + }); + dgvDetalles.Columns.Add(new DataGridViewTextBoxColumn + { + DataPropertyName = "Subtotal", + HeaderText = "Subtotal" + }); - // Asignar la lista de lotes al DataGridView - dataGridView2.DataSource = carrito; - } - - - private void ActualizarGrilla() - { - dataGridView1.DataSource = null; - dataGridView1.DataSource = ControladoraProductos.Instance.Listar(); - } - - private void CargarClientes() - { - // Obtener la lista de clientes desde el repositorio - ReadOnlyCollection clientes = RepositorioClientes.Instance.Listar(); - - // Asignar la lista de clientes como origen de datos para el ComboBox - cmbCliente.DataSource = clientes; - - // Establecer la propiedad para mostrar el nombre del cliente en el ComboBox - cmbCliente.DisplayMember = "NombreCompleto"; - } - - private void comboBox1_SelectedIndexChanged(object sender, EventArgs e) - { - clienteSeleccionado = (Cliente)cmbCliente.SelectedItem; } private void CargarDatos() { - numid.Value = factura.Id; - numtotal.Value = (decimal)factura.Total; - datepick.Value = factura.Fecha; + // Asignar la lista de clientes como origen de datos para el ComboBox + cmbCliente.DataSource = ControladoraClientes.Instance.Listar(); - // Asignar el cliente seleccionado en el ComboBox - if (factura.Cliente != null) - { - cmbCliente.SelectedItem = factura.Cliente; - } + // Establecer la propiedad para mostrar el nombre del cliente en el ComboBox + cmbCliente.DisplayMember = "NombreCompleto"; + + var listdetalle = ControladoraFacturas.Instance.Listar(); + numid.Value = (listdetalle.Count > 0) ? + listdetalle.Max(x => x.Id + 1) : + 0; + + numid.Enabled = false; // Deshabilitar el control para que no se pueda modificar + + numtotal.Enabled = false; // Deshabilitar el control para que no se pueda modificar // Recuperar los lotes asociados a la factura y actualizar el DataGridView - carrito = ControladoraLotes.Instance.ListarPorFacturaId(factura.Id).ToList() ?? new List(); - - dataGridView2.DataSource = null; - dataGridView2.DataSource = carrito; + // var listaDetalles = ControladoraFacturas.Instance.ListarDetallesFactura(factura); // Actualizar el total ActualizarTotal(); @@ -153,9 +94,9 @@ namespace Vista { // Recalcular el total de la factura decimal total = 0; - foreach (var lote in carrito) + foreach (var detalle in factura.MostrarDetalles()) { - total += (decimal)(lote.Producto.Precio * lote.CantidadDeProductos); + total += (decimal)(detalle.Producto.Precio * detalle.Cantidad); } numtotal.Value = total; } @@ -165,7 +106,7 @@ namespace Vista string devolucion = ""; if (string.IsNullOrEmpty(numid.Text)) devolucion += "El ID no puede ser nulo o vacío\n"; - if (clienteSeleccionado == null) devolucion += "Debe seleccionar un cliente\n"; + if (cmbCliente.SelectedIndex == -1) devolucion += "Debe seleccionar un cliente\n"; if (devolucion == "") { @@ -178,153 +119,120 @@ namespace Vista } } - private void button1_Click(object sender, EventArgs e) + private void btnAceptar_Click(object sender, EventArgs e) { // Validar los datos antes de continuar if (ValidarDatos()) { - try + factura.Total = Convert.ToDouble(numtotal.Value); + factura.Fecha = datepick.Value; + factura.Id = Convert.ToInt32(numid.Value); + factura.Cliente = ControladoraClientes.Instance.Listar().First(x => x.NombreCompleto == cmbCliente.SelectedValue.ToString()); + + string mensaje = ControladoraFacturas.Instance.Añadir(factura); + MessageBox.Show(mensaje, "Información", MessageBoxButtons.OK, MessageBoxIcon.Information); + Close(); + } + } + + private void btnAddDetalle_Click(object sender, EventArgs e) + { + // Validar los datos antes de crear el detalle + if (ValidarDatosdetalle()) return; + if (dgvProductos.SelectedRows.Count > 0) + { + foreach (DataGridViewRow selectedRow in dgvProductos.SelectedRows) { - // Verificar si la ID de la factura ya está en uso - if (RepositorioFactura.Instance.ExistePorId((int)numid.Value) && factura == null) + Producto producto = (Producto)selectedRow.DataBoundItem; + var checkcolicion = factura.MostrarDetalles().Count(x => x.Producto.Id == producto.Id); + if (checkcolicion != 0) { - MessageBox.Show("La ID de la factura ya está en uso. Por favor, elija una ID diferente.", "ID en Uso", MessageBoxButtons.OK, MessageBoxIcon.Warning); + MessageBox.Show("El Producto ya fue cargado"); return; } - if (factura == null) + factura.AñadirDetalle(new DetalleFactura { - // Crear una nueva factura con los datos proporcionados - factura = new Factura - { - Id = (int)numid.Value, - Total = (double)numtotal.Value, - Fecha = datepick.Value, - Cliente = (Cliente)cmbCliente.SelectedItem - }; - // Agregar la factura a la colección - ControladoraFacturas.Instance.Añadir(factura); - - // Guardar los lotes asociados a la factura - foreach (var lote in carrito) - { - lote.Id = factura.Id; // Usar la ID de la factura - lote.Fecha = factura.Fecha; // Usar la fecha de la factura - ControladoraLotes.Instance.Añadir(lote); - } - } - else - { - // Actualizar los datos de la factura existente - factura.Id = (int)numid.Value; - factura.Total = (double)numtotal.Value; - factura.Fecha = datepick.Value; - factura.Cliente = (Cliente)cmbCliente.SelectedItem; - // Modificar la factura en la colección - ControladoraFacturas.Instance.Modificar(factura); - - // Actualizar los lotes asociados a la factura - ControladoraLotes.Instance.EliminarPorFacturaId(factura.Id); // Eliminar lotes antiguos - foreach (var lote in carrito) - { - lote.Id = factura.Id; // Usar la ID de la factura - lote.Fecha = factura.Fecha; // Usar la fecha de la factura - ControladoraLotes.Instance.Añadir(lote); - } - } - MessageBox.Show("Operación realizada con éxito", "Información", MessageBoxButtons.OK, MessageBoxIcon.Information); - Close(); - } - catch (InvalidOperationException ex) - { - MessageBox.Show(ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - catch (Exception ex) - { - // Captura cualquier otra excepción que pueda ocurrir - MessageBox.Show("Ocurrió un error inesperado: " + ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + Id = int.Parse(detalleid++.ToString()), + Cantidad = (int)numCantidad.Value, + IdFactura = factura.Id, + Producto = ControladoraProductos.Instance.Listar().First(x => x.Id == producto.Id), + Subtotal = producto.Precio * Convert.ToInt32(numCantidad.Value), + }); + ActualizarGrillaDetalles(); } } } - - - private void button2_Click(object sender, EventArgs e) + private void ActualizarGrillaDetalles() { - this.Close(); - } - - - - private void button3_Click(object sender, EventArgs e) - { - // Validar los datos antes de crear el lote - if (ValidarDatos() && ValidarDatosLote()) + var detalles = factura.MostrarDetalles(); + dgvDetalles.DataSource = null; + if (detalles.Any()) { - // Verifica si hay una fila seleccionada en el DataGridView - if (dataGridView1.CurrentRow != null) + var loteDatos = detalles.Select(detalle => new { - // Deshabilitar los controles para ID, fecha, y cliente - numid.Enabled = false; - datepick.Enabled = false; - cmbCliente.Enabled = false; + Id = detalle.Id, + Producto = detalle.Producto.Nombre, + CantidadDeProductos = detalle.Cantidad, + Subtotal = detalle.Subtotal, + PrecioUnitario = detalle.Producto.Precio, + }).ToList(); - // Crear un nuevo lote con los datos proporcionados - var lote = new Lote - { - Id = (int)numid.Value, // Usar la misma ID que la de la factura - Fecha = datepick.Value, // Usar la misma fecha que la de la factura - Producto = (Producto)dataGridView1.CurrentRow.DataBoundItem, - CantidadDeProductos = (long)numericUpDown1.Value, // Usar el valor de unidades del NumericUpDown - Habilitado = true // Asignar un valor por defecto o según tus necesidades - }; - - // Añadir el lote al carrito - carrito.Add(lote); - - // Actualizar el total de la factura - ActualizarTotal(); - - // Actualizar el DataGridView para reflejar los cambios - dataGridView2.DataSource = null; - dataGridView2.DataSource = carrito; - } - else - { - // Mostrar un mensaje si no se ha seleccionado ninguna fila - MessageBox.Show("Por favor, seleccione un producto en el carrito antes de añadir.", "Selección Requerida", MessageBoxButtons.OK, MessageBoxIcon.Warning); - } + dgvDetalles.DataSource = loteDatos; + numtotal.Value = (Decimal)loteDatos.Sum(x => x.Subtotal); } } - - // Función actualizada para validar los datos del lote - private bool ValidarDatosLote() + // metodo para validar los datos del detalle + private bool ValidarDatosdetalle() { string devolucion = ""; // Validar la selección del producto - if (dataGridView1.CurrentRow == null) + if (dgvProductos.CurrentRow == null) devolucion += "Debe seleccionar un producto para añadir al lote\n"; // Validar la cantidad de productos - if (numericUpDown1.Value <= 0) + if (numCantidad.Value <= 0) devolucion += "La cantidad de productos debe ser mayor que cero\n"; if (devolucion == "") { - return true; + return false; } else { MessageBox.Show(devolucion, "Errores de Validación", MessageBoxButtons.OK, MessageBoxIcon.Warning); - return false; + return true; } } - private void datepick_ValueChanged(object sender, EventArgs e) + private void btnCerrar_Click(object sender, EventArgs e) { + this.Close(); + } + private void btnEliminar_Click(object sender, EventArgs e) + { + if (dgvDetalles.SelectedRows.Count > 0) + { + foreach (DataGridViewRow selectedRow in dgvDetalles.SelectedRows) + { + DetalleFactura det = new DetalleFactura + { + Id = Convert.ToInt32(selectedRow.Cells["Id"].Value), + }; + var detalleAborrar = factura.MostrarDetalles().First(x => x.Id == det.Id); + factura.EliminarDetalle(detalleAborrar); + ActualizarGrillaDetalles(); + detalleid--; + } + } + else + { + MessageBox.Show("Por favor, selecciona una fila para eliminar Proveedor del producto."); + } } } } \ No newline at end of file diff --git a/Vista/FrmFactura.resx b/Vista/FrmFactura.resx index af32865..a395bff 100644 --- a/Vista/FrmFactura.resx +++ b/Vista/FrmFactura.resx @@ -18,7 +18,7 @@ System.Resources.ResXResourceReader, System.Windows.Forms, ... System.Resources.ResXResourceWriter, System.Windows.Forms, ... this is my long stringthis is a comment - Blue + Blue [base64 mime encoded serialized .NET Framework object] diff --git a/Vista/FrmFacturas.Designer.cs b/Vista/FrmFacturas.Designer.cs index 21766e3..f58664a 100644 --- a/Vista/FrmFacturas.Designer.cs +++ b/Vista/FrmFacturas.Designer.cs @@ -29,18 +29,22 @@ private void InitializeComponent() { groupBox1 = new GroupBox(); - dataGridView2 = new DataGridView(); - dataGridView1 = new DataGridView(); + label2 = new Label(); + label1 = new Label(); + dgvDetalles = new DataGridView(); + dgvFacturas = new DataGridView(); BtnAdd = new Button(); groupBox1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)dataGridView2).BeginInit(); - ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit(); + ((System.ComponentModel.ISupportInitialize)dgvDetalles).BeginInit(); + ((System.ComponentModel.ISupportInitialize)dgvFacturas).BeginInit(); SuspendLayout(); // // groupBox1 // - groupBox1.Controls.Add(dataGridView2); - groupBox1.Controls.Add(dataGridView1); + groupBox1.Controls.Add(label2); + groupBox1.Controls.Add(label1); + groupBox1.Controls.Add(dgvDetalles); + groupBox1.Controls.Add(dgvFacturas); groupBox1.Controls.Add(BtnAdd); groupBox1.Location = new Point(12, 12); groupBox1.Name = "groupBox1"; @@ -48,34 +52,57 @@ groupBox1.TabIndex = 5; groupBox1.TabStop = false; // - // dataGridView2 + // label2 // - dataGridView2.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; - dataGridView2.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView2.Location = new Point(623, 0); - dataGridView2.Name = "dataGridView2"; - dataGridView2.RowTemplate.Height = 25; - dataGridView2.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridView2.Size = new Size(384, 426); - dataGridView2.TabIndex = 4; + label2.AutoSize = true; + label2.Location = new Point(6, 19); + label2.Name = "label2"; + label2.Size = new Size(46, 15); + label2.TabIndex = 6; + label2.Text = "Factura"; // - // dataGridView1 + // label1 // - dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; - dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView1.Location = new Point(6, 16); - dataGridView1.Name = "dataGridView1"; - dataGridView1.RowTemplate.Height = 25; - dataGridView1.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridView1.Size = new Size(508, 241); - dataGridView1.TabIndex = 3; - dataGridView1.CellBorderStyleChanged += dataGridView1_CellBorderStyleChanged; - dataGridView1.CellClick += dataGridView1_CellClick; - dataGridView1.CellContentClick += dataGridView1_CellContentClick; + label1.AutoSize = true; + label1.Location = new Point(520, 19); + label1.Name = "label1"; + label1.Size = new Size(48, 15); + label1.TabIndex = 5; + label1.Text = "Detalles"; + // + // dgvDetalles + // + dgvDetalles.AllowUserToAddRows = false; + dgvDetalles.AllowUserToDeleteRows = false; + dgvDetalles.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + dgvDetalles.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dgvDetalles.EditMode = DataGridViewEditMode.EditProgrammatically; + dgvDetalles.ImeMode = ImeMode.On; + dgvDetalles.Location = new Point(520, 40); + dgvDetalles.Name = "dgvDetalles"; + dgvDetalles.RowTemplate.Height = 25; + dgvDetalles.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dgvDetalles.Size = new Size(384, 241); + dgvDetalles.TabIndex = 4; + // + // dgvFacturas + // + dgvFacturas.AllowUserToAddRows = false; + dgvFacturas.AllowUserToDeleteRows = false; + dgvFacturas.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + dgvFacturas.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dgvFacturas.EditMode = DataGridViewEditMode.EditProgrammatically; + dgvFacturas.Location = new Point(6, 40); + dgvFacturas.Name = "dgvFacturas"; + dgvFacturas.RowTemplate.Height = 25; + dgvFacturas.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dgvFacturas.Size = new Size(508, 241); + dgvFacturas.TabIndex = 3; + dgvFacturas.CellClick += dgvFacturas_CellClick; // // BtnAdd // - BtnAdd.Location = new Point(6, 299); + BtnAdd.Location = new Point(6, 287); BtnAdd.Name = "BtnAdd"; BtnAdd.Size = new Size(75, 23); BtnAdd.TabIndex = 0; @@ -93,16 +120,19 @@ Text = "Ventas"; WindowState = FormWindowState.Maximized; groupBox1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)dataGridView2).EndInit(); - ((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit(); + groupBox1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)dgvDetalles).EndInit(); + ((System.ComponentModel.ISupportInitialize)dgvFacturas).EndInit(); ResumeLayout(false); } #endregion private GroupBox groupBox1; - private DataGridView dataGridView1; + private DataGridView dgvFacturas; private Button BtnAdd; - private DataGridView dataGridView2; + private DataGridView dgvDetalles; + private Label label2; + private Label label1; } } \ No newline at end of file diff --git a/Vista/FrmFacturas.cs b/Vista/FrmFacturas.cs index a4661d2..b38a55a 100644 --- a/Vista/FrmFacturas.cs +++ b/Vista/FrmFacturas.cs @@ -10,14 +10,13 @@ namespace Vista public FrmFacturas() { InitializeComponent(); + ConfigurarDataGridViewDetalle(); ActualizarGrilla(); - dataGridView1.CellClick += dataGridView1_CellClick; - ConfigurarDataGridView2(); } private void ActualizarGrilla() { - dataGridView1.DataSource = null; - dataGridView1.DataSource = ControladoraFacturas.Instance.Listar(); + dgvFacturas.DataSource = null; + dgvFacturas.DataSource = ControladoraFacturas.Instance.Listar(); } private void BtnAdd_Click(object sender, EventArgs e) { @@ -26,64 +25,60 @@ namespace Vista ActualizarGrilla(); } - private void dataGridView1_CellBorderStyleChanged(object sender, EventArgs e) + private void ConfigurarDataGridViewDetalle() { - - } - - private void dataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e) - { - - } - private void ConfigurarDataGridView2() - { - dataGridView2.AutoGenerateColumns = false; - dataGridView2.Columns.Add(new DataGridViewTextBoxColumn + dgvDetalles.AutoGenerateColumns = false; + dgvDetalles.Columns.Add(new DataGridViewTextBoxColumn { DataPropertyName = "Producto", - HeaderText = "Producto" + HeaderText = "Producto", + Name = "Producto" }); - dataGridView2.Columns.Add(new DataGridViewTextBoxColumn + dgvDetalles.Columns.Add(new DataGridViewTextBoxColumn { DataPropertyName = "Cantidad", - HeaderText = "Cantidad" + HeaderText = "Cantidad", + Name = "Cantidad" + }); - - dataGridView2.Columns.Add(new DataGridViewTextBoxColumn + dgvDetalles.Columns.Add(new DataGridViewTextBoxColumn { DataPropertyName = "PrecioUnitario", - HeaderText = "PrecioUnitariod" + HeaderText = "PrecioUnitario", + Name = "PrecioUnitario" }); - dataGridView2.Columns.Add(new DataGridViewTextBoxColumn + dgvDetalles.Columns.Add(new DataGridViewTextBoxColumn { DataPropertyName = "Subtotal", - HeaderText = "Subtotal" + HeaderText = "Subtotal", + Name = "Subtotal" }); } - private void ActualizarGrillaLotes(ReadOnlyCollection lotes) + private void ActualizarGrillaDetalles(ReadOnlyCollection detalles) { - dataGridView2.DataSource = null; - if (lotes.Any()) + dgvDetalles.DataSource = null; + if (detalles.Any()) { - var loteDatos = lotes.Select(lote => new + var loteDatos = detalles.Select(detalle => new { - Producto = lote.NombreProducto, - Cantidad = lote.CantidadDeProductos, - Subtotal = lote.Subtotal, - PrecioUnitario = lote.PrecioUnitario, + Producto = detalle.Producto.Nombre, + Cantidad = detalle.Cantidad, + Subtotal = detalle.Subtotal, + PrecioUnitario = detalle.Producto.Precio, }).ToList(); - dataGridView2.DataSource = loteDatos; + dgvDetalles.DataSource = loteDatos; } } - private void dataGridView1_CellClick(object sender, DataGridViewCellEventArgs e) + private void dgvFacturas_CellClick(object sender, DataGridViewCellEventArgs e) { if (e.RowIndex >= 0) { - var selectedFactura = (Factura)dataGridView1.Rows[e.RowIndex].DataBoundItem; - var lotes = ControladoraLotes.Instance.ListarPorFacturaId(selectedFactura.Id); - ActualizarGrillaLotes(lotes); + var selectedFactura = (Factura)dgvFacturas.Rows[e.RowIndex].DataBoundItem; + var detalles = ControladoraFacturas.Instance.ListarDetallesFactura(selectedFactura); + ActualizarGrillaDetalles(detalles); } } + } } diff --git a/Vista/FrmFacturas.resx b/Vista/FrmFacturas.resx index af32865..a395bff 100644 --- a/Vista/FrmFacturas.resx +++ b/Vista/FrmFacturas.resx @@ -18,7 +18,7 @@ System.Resources.ResXResourceReader, System.Windows.Forms, ... System.Resources.ResXResourceWriter, System.Windows.Forms, ... this is my long stringthis is a comment - Blue + Blue [base64 mime encoded serialized .NET Framework object] diff --git a/Vista/FrmProducto.Designer.cs b/Vista/FrmProducto.Designer.cs index f53fcf0..ac2a130 100644 --- a/Vista/FrmProducto.Designer.cs +++ b/Vista/FrmProducto.Designer.cs @@ -33,11 +33,11 @@ label3 = new Label(); label4 = new Label(); label5 = new Label(); - numericUpDown1 = new NumericUpDown(); - textBox1 = new TextBox(); - numericUpDown2 = new NumericUpDown(); - checkBox1 = new CheckBox(); - comboBox1 = new ComboBox(); + numId = new NumericUpDown(); + txtNombre = new TextBox(); + numPrecio = new NumericUpDown(); + checkHabilitado = new CheckBox(); + cmbCategoria = new ComboBox(); btnacept = new Button(); btncancel = new Button(); label6 = new Label(); @@ -46,8 +46,8 @@ dgvProveedor = new DataGridView(); btnaddProveedor = new Button(); btnrmProveedor = new Button(); - ((System.ComponentModel.ISupportInitialize)numericUpDown1).BeginInit(); - ((System.ComponentModel.ISupportInitialize)numericUpDown2).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numId).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numPrecio).BeginInit(); ((System.ComponentModel.ISupportInitialize)dgvProveedorAñadido).BeginInit(); ((System.ComponentModel.ISupportInitialize)dgvProveedor).BeginInit(); SuspendLayout(); @@ -97,47 +97,46 @@ label5.TabIndex = 4; label5.Text = "Categoria"; // - // numericUpDown1 + // numId // - numericUpDown1.Location = new Point(70, 12); - numericUpDown1.Maximum = new decimal(new int[] { 1215752191, 23, 0, 0 }); - numericUpDown1.Name = "numericUpDown1"; - numericUpDown1.Size = new Size(120, 23); - numericUpDown1.TabIndex = 5; + numId.Location = new Point(70, 12); + numId.Maximum = new decimal(new int[] { 1215752191, 23, 0, 0 }); + numId.Name = "numId"; + numId.Size = new Size(120, 23); + numId.TabIndex = 5; // - // textBox1 + // txtNombre // - textBox1.Location = new Point(71, 40); - textBox1.Name = "textBox1"; - textBox1.Size = new Size(120, 23); - textBox1.TabIndex = 6; + txtNombre.Location = new Point(71, 40); + txtNombre.Name = "txtNombre"; + txtNombre.Size = new Size(120, 23); + txtNombre.TabIndex = 6; // - // numericUpDown2 + // numPrecio // - numericUpDown2.Location = new Point(71, 72); - numericUpDown2.Maximum = new decimal(new int[] { 100000000, 0, 0, 0 }); - numericUpDown2.Name = "numericUpDown2"; - numericUpDown2.Size = new Size(120, 23); - numericUpDown2.TabIndex = 7; + numPrecio.Location = new Point(71, 72); + numPrecio.Maximum = new decimal(new int[] { 100000000, 0, 0, 0 }); + numPrecio.Name = "numPrecio"; + numPrecio.Size = new Size(120, 23); + numPrecio.TabIndex = 7; // - // checkBox1 + // checkHabilitado // - checkBox1.AutoSize = true; - checkBox1.Location = new Point(71, 112); - checkBox1.Name = "checkBox1"; - checkBox1.Size = new Size(15, 14); - checkBox1.TabIndex = 8; - checkBox1.UseVisualStyleBackColor = true; + checkHabilitado.AutoSize = true; + checkHabilitado.Location = new Point(71, 112); + checkHabilitado.Name = "checkHabilitado"; + checkHabilitado.Size = new Size(15, 14); + checkHabilitado.TabIndex = 8; + checkHabilitado.UseVisualStyleBackColor = true; // - // comboBox1 + // cmbCategoria // - comboBox1.DropDownStyle = ComboBoxStyle.DropDownList; - comboBox1.FormattingEnabled = true; - comboBox1.Location = new Point(70, 134); - comboBox1.Name = "comboBox1"; - comboBox1.Size = new Size(121, 23); - comboBox1.TabIndex = 9; - comboBox1.SelectedIndexChanged += comboBox1_SelectedIndexChanged; + cmbCategoria.DropDownStyle = ComboBoxStyle.DropDownList; + cmbCategoria.FormattingEnabled = true; + cmbCategoria.Location = new Point(70, 134); + cmbCategoria.Name = "cmbCategoria"; + cmbCategoria.Size = new Size(121, 23); + cmbCategoria.TabIndex = 9; // // btnacept // @@ -147,7 +146,7 @@ btnacept.TabIndex = 10; btnacept.Text = "Aceptar"; btnacept.UseVisualStyleBackColor = true; - btnacept.Click += button1_Click; + btnacept.Click += btnacept_Click; // // btncancel // @@ -157,7 +156,7 @@ btncancel.TabIndex = 11; btncancel.Text = "Cancelar"; btncancel.UseVisualStyleBackColor = true; - btncancel.Click += button2_Click; + btncancel.Click += btnCerrar; // // label6 // @@ -235,11 +234,11 @@ Controls.Add(label6); Controls.Add(btncancel); Controls.Add(btnacept); - Controls.Add(comboBox1); - Controls.Add(checkBox1); - Controls.Add(numericUpDown2); - Controls.Add(textBox1); - Controls.Add(numericUpDown1); + Controls.Add(cmbCategoria); + Controls.Add(checkHabilitado); + Controls.Add(numPrecio); + Controls.Add(txtNombre); + Controls.Add(numId); Controls.Add(label5); Controls.Add(label4); Controls.Add(label3); @@ -247,8 +246,8 @@ Controls.Add(label1); Name = "FrmProducto"; Text = "Producto"; - ((System.ComponentModel.ISupportInitialize)numericUpDown1).EndInit(); - ((System.ComponentModel.ISupportInitialize)numericUpDown2).EndInit(); + ((System.ComponentModel.ISupportInitialize)numId).EndInit(); + ((System.ComponentModel.ISupportInitialize)numPrecio).EndInit(); ((System.ComponentModel.ISupportInitialize)dgvProveedorAñadido).EndInit(); ((System.ComponentModel.ISupportInitialize)dgvProveedor).EndInit(); ResumeLayout(false); @@ -262,11 +261,11 @@ private Label label3; private Label label4; private Label label5; - private NumericUpDown numericUpDown1; - private TextBox textBox1; - private NumericUpDown numericUpDown2; - private CheckBox checkBox1; - private ComboBox comboBox1; + private NumericUpDown numId; + private TextBox txtNombre; + private NumericUpDown numPrecio; + private CheckBox checkHabilitado; + private ComboBox cmbCategoria; private Button btnacept; private Button btncancel; private Label label6; diff --git a/Vista/FrmProducto.cs b/Vista/FrmProducto.cs index 4565a97..a96c514 100644 --- a/Vista/FrmProducto.cs +++ b/Vista/FrmProducto.cs @@ -16,43 +16,44 @@ namespace Vista public partial class FrmProducto : Form { private Producto nuevoproducto = new Producto(); - private Producto _producto; - private bool _esModificacion; - - public FrmProducto() + private bool mod = false; + public FrmProducto(Producto? producto = null) { InitializeComponent(); CargarCategorias(); CargarTabla(); + if (producto != null) + { + nuevoproducto = producto; + mod = true; + InicializarFormulario(); + } } - public FrmProducto(Producto producto = null, bool esModificacion = false) - { - InitializeComponent(); - _producto = producto ?? new Producto(); - _esModificacion = esModificacion; - CargarCategorias(); - CargarTabla(); - InicializarFormulario(); - } + private void InicializarFormulario() { - if (_esModificacion && _producto != null) - { - numericUpDown1.Value = _producto.Id; - numericUpDown1.Enabled = false; - textBox1.Text = _producto.Nombre; - numericUpDown2.Value = (decimal)_producto.Precio; - checkBox1.Checked = _producto.Habilitado; - comboBox1.SelectedValue = _producto.Categoria.Id; - dgvProveedorAñadido.DataSource = _producto.ListarProveedores(); - } + numId.Value = nuevoproducto.Id; + numId.Enabled = false; + txtNombre.Text = nuevoproducto.Nombre; + numPrecio.Value = (decimal)nuevoproducto.Precio; + checkHabilitado.Checked = nuevoproducto.Habilitado; + cmbCategoria.SelectedValue = nuevoproducto.Categoria.Id; + dgvProveedorAñadido.DataSource = nuevoproducto.ListarProveedores(); + } private void CargarTabla() { dgvProveedor.DataSource = null; dgvProveedor.DataSource = ControladoraProveedores.Instance.Listar(); + if (mod) + { + foreach (Proveedor prov in ControladoraProductos.Instance.ListarProveedores(nuevoproducto)) + { + nuevoproducto.AñadirProveedor(prov); + } + } } private void CargarCategorias() @@ -61,58 +62,37 @@ namespace Vista var categorias = ControladoraCategorias.Instance.Listar(); // Configurar el ComboBox para categorías - comboBox1.DisplayMember = "Descripcion"; // Mostrar la propiedad Descripcion - comboBox1.ValueMember = "Id"; // Usar la propiedad Id como valor + cmbCategoria.DisplayMember = "Descripcion"; // Mostrar la propiedad Descripcion + cmbCategoria.ValueMember = "Id"; // Usar la propiedad Id como valor // Asignar la lista de categorías al ComboBox - comboBox1.DataSource = categorias; + cmbCategoria.DataSource = categorias; } - private void CargarDatosProducto() - { - if (_producto != null) - { - numericUpDown1.Value = _producto.Id; - textBox1.Text = _producto.Nombre; - numericUpDown2.Value = Convert.ToDecimal(_producto.Precio); - checkBox1.Checked = _producto.Habilitado; - comboBox1.SelectedItem = _producto.Categoria; - - if (_esModificacion) - { - numericUpDown1.Enabled = false; // Bloquear el ID - } - } - } private bool ValidarDatos() { string devolucion = ""; // Validar Nombre - if (string.IsNullOrEmpty(textBox1.Text)) - { - devolucion += "El nombre del producto no puede estar vacío.\n"; - } - else if (textBox1.Text.Length > 100) // Limite de caracteres - { - devolucion += "El nombre del producto no puede superar los 100 caracteres.\n"; - } + if (string.IsNullOrEmpty(txtNombre.Text)) { devolucion += "El nombre del producto no puede estar vacío.\n"; } + if (txtNombre.Text.Length > 100) { devolucion += "El nombre del producto no puede superar los 100 caracteres.\n"; } + if (numId.Value <= 0) { devolucion += "NO es un cuit válido"; }; // Validar Precio - if (numericUpDown2.Value <= 0) + if (numPrecio.Value <= 0) { devolucion += "El precio debe ser mayor a cero.\n"; } // Validar ID (Si es necesario) - if (!_esModificacion && ControladoraProductos.Instance.Listar().Any(p => p.Id == (int)numericUpDown1.Value)) + if (!mod && ControladoraProductos.Instance.Listar().Any(p => p.Id == (int)numId.Value)) { devolucion += "Ya existe un producto con el mismo ID.\n"; } // Validar Categoría Seleccionada - if (comboBox1.SelectedItem == null) + if (cmbCategoria.SelectedItem == null) { devolucion += "Debe seleccionar una categoría.\n"; } @@ -128,24 +108,24 @@ namespace Vista } } - private void button1_Click(object sender, EventArgs e) + private void btnacept_Click(object sender, EventArgs e) { if (ValidarDatos()) { - _producto.Nombre = textBox1.Text; - _producto.Precio = (double)numericUpDown2.Value; - _producto.Habilitado = checkBox1.Checked; - _producto.Categoria = (Categoria)comboBox1.SelectedItem; + nuevoproducto.Nombre = txtNombre.Text; + nuevoproducto.Precio = (double)numPrecio.Value; + nuevoproducto.Habilitado = checkHabilitado.Checked; + nuevoproducto.Categoria = (Categoria)cmbCategoria.SelectedItem; string mensaje; - if (_esModificacion) + if (mod) { - mensaje = ControladoraProductos.Instance.Modificar(_producto); + mensaje = ControladoraProductos.Instance.Modificar(nuevoproducto); } else { - _producto.Id = (int)numericUpDown1.Value; - mensaje = ControladoraProductos.Instance.Añadir(_producto); + nuevoproducto.Id = (int)numId.Value; + mensaje = ControladoraProductos.Instance.Añadir(nuevoproducto); } MessageBox.Show(mensaje, "Información", MessageBoxButtons.OK, MessageBoxIcon.Information); @@ -153,7 +133,7 @@ namespace Vista } } - private void button2_Click(object sender, EventArgs e) + private void btnCerrar(object sender, EventArgs e) { this.Close(); } @@ -172,9 +152,15 @@ namespace Vista foreach (DataGridViewRow selectedRow in dgvProveedor.SelectedRows) { Proveedor proveedor = (Proveedor)selectedRow.DataBoundItem; - _producto.AñadirProveedor(proveedor); + var checkcolicion = nuevoproducto.ListarProveedores().Contains(proveedor); + if (checkcolicion) + { + MessageBox.Show("El proveedor ya fue cargado"); + return; + } + nuevoproducto.AñadirProveedor(proveedor); dgvProveedorAñadido.DataSource = null; - dgvProveedorAñadido.DataSource = _producto.ListarProveedores(); + dgvProveedorAñadido.DataSource = nuevoproducto.ListarProveedores(); } } else @@ -197,9 +183,9 @@ namespace Vista foreach (DataGridViewRow selectedRow in dgvProveedorAñadido.SelectedRows) { Proveedor proveedor = (Proveedor)selectedRow.DataBoundItem; - dgvProveedorAñadido.Rows.Remove(selectedRow); - Proveedor proveedoreliminar = _producto.ListarProveedores().FirstOrDefault(x => x.Cuit == proveedor.Cuit); - _producto.EliminarProveedor(proveedoreliminar); + nuevoproducto.EliminarProveedor(proveedor); + dgvProveedorAñadido.DataSource = null; + dgvProveedorAñadido.DataSource = nuevoproducto.ListarProveedores(); } } else @@ -212,5 +198,6 @@ namespace Vista MessageBox.Show($"Error al eliminar proveedor: {ex.Message}", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - } + +} } diff --git a/Vista/FrmProductoMod.Designer.cs b/Vista/FrmProductoMod.Designer.cs deleted file mode 100644 index 43b7527..0000000 --- a/Vista/FrmProductoMod.Designer.cs +++ /dev/null @@ -1,45 +0,0 @@ -namespace Vista -{ - partial class FrmProductoMod - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - SuspendLayout(); - // - // FrmProductoMod - // - AutoScaleDimensions = new SizeF(7F, 15F); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(654, 299); - Name = "FrmProductoMod"; - Text = "Form1"; - ResumeLayout(false); - } - - #endregion - } -} \ No newline at end of file diff --git a/Vista/FrmProductoMod.cs b/Vista/FrmProductoMod.cs deleted file mode 100644 index 2a1aebb..0000000 --- a/Vista/FrmProductoMod.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace Vista -{ - public partial class FrmProductoMod : Form - { - public FrmProductoMod() - { - InitializeComponent(); - } - } -} diff --git a/Vista/FrmProductoMod.resx b/Vista/FrmProductoMod.resx deleted file mode 100644 index af32865..0000000 --- a/Vista/FrmProductoMod.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/Vista/FrmProductos.Designer.cs b/Vista/FrmProductos.Designer.cs index af2f4f9..201e21f 100644 --- a/Vista/FrmProductos.Designer.cs +++ b/Vista/FrmProductos.Designer.cs @@ -29,7 +29,7 @@ private void InitializeComponent() { groupBox1 = new GroupBox(); - button2 = new Button(); + btnModificar = new Button(); label3 = new Label(); dgvProveedores = new DataGridView(); label2 = new Label(); @@ -47,7 +47,7 @@ // // groupBox1 // - groupBox1.Controls.Add(button2); + groupBox1.Controls.Add(btnModificar); groupBox1.Controls.Add(label3); groupBox1.Controls.Add(dgvProveedores); groupBox1.Controls.Add(label2); @@ -60,15 +60,15 @@ groupBox1.TabIndex = 5; groupBox1.TabStop = false; // - // button2 + // btnModificar // - button2.Location = new Point(87, 263); - button2.Name = "button2"; - button2.Size = new Size(75, 23); - button2.TabIndex = 11; - button2.Text = "Modificar"; - button2.UseVisualStyleBackColor = true; - button2.Click += button2_Click; + btnModificar.Location = new Point(87, 263); + btnModificar.Name = "btnModificar"; + btnModificar.Size = new Size(75, 23); + btnModificar.TabIndex = 11; + btnModificar.Text = "Modificar"; + btnModificar.UseVisualStyleBackColor = true; + btnModificar.Click += btnModificar_Click; // // label3 // @@ -195,6 +195,6 @@ private Label label1; private DataGridView dgvProveedores; private Label label3; - private Button button2; + private Button btnModificar; } } \ No newline at end of file diff --git a/Vista/FrmProductos.cs b/Vista/FrmProductos.cs index 88f8891..b96419e 100644 --- a/Vista/FrmProductos.cs +++ b/Vista/FrmProductos.cs @@ -34,7 +34,7 @@ namespace Vista var colId = new DataGridViewTextBoxColumn { DataPropertyName = "Id", - HeaderText = "ID", + HeaderText = "Id", Name = "Id" }; @@ -82,15 +82,6 @@ namespace Vista var categorias = ControladoraCategorias.Instance.Listar(); dgvCategorias.DataSource = categorias; - if (dgvProductos.SelectedRows.Count > 0) - { - Producto producto = new Producto - { - Id = int.Parse(dgvProductos.SelectedRows[0].Cells["Id"].Value.ToString()), - }; - dgvProveedores.DataSource = ControladoraProductos.Instance.ListarProveedores(producto); - } - // Obtener la lista de productos y proyectar los datos var productos = ControladoraProductos.Instance.Listar() .Select(p => new @@ -166,18 +157,10 @@ namespace Vista private void dgvProductos_CellClick(object sender, DataGridViewCellEventArgs e) { if (dgvProductos.SelectedRows.Count == 0) return; - - if (dgvProductos.SelectedRows.Count > 0) - { - Producto producto = new Producto - { - Id = Convert.ToInt32(dgvProductos.SelectedRows[0].Cells["Id"].Value.ToString()), - }; - dgvProveedores.DataSource = ControladoraProductos.Instance.ListarProveedores(producto); - } + ActualizarGrillaProveedores(); } - private void button2_Click(object sender, EventArgs e) + private void btnModificar_Click(object sender, EventArgs e) { if (dgvProductos.SelectedRows.Count < 1) { @@ -185,18 +168,34 @@ namespace Vista return; } - Producto producto = new Producto() + Producto producto = new Producto { Id = Convert.ToInt32(dgvProductos.SelectedRows[0].Cells["Id"].Value), - Nombre = dgvProductos.SelectedRows[0].Cells["Nombre"].Value.ToString(), - Precio = Convert.ToInt32(dgvProductos.SelectedRows[0].Cells["Precio"].Value), + Nombre = dgvProductos.SelectedRows[0].Cells["Nombre"].Value as String, + Precio = Convert.ToDouble(dgvProductos.SelectedRows[0].Cells["Precio"].Value), Habilitado = Convert.ToBoolean(dgvProductos.SelectedRows[0].Cells["Habilitado"].Value), Categoria = ControladoraCategorias.Instance.Listar().FirstOrDefault(c => c.Descripcion == dgvProductos.SelectedRows[0].Cells["Categoria"].Value.ToString()) }; + foreach (Proveedor prov in ControladoraProductos.Instance.ListarProveedores(producto)) + { + producto.AñadirProveedor(prov); + } - var formModificar = new FrmProducto(producto, true); + var formModificar = new FrmProducto(producto); formModificar.ShowDialog(); ActualizarGrilla(); + ActualizarGrillaProveedores(); + } + private void ActualizarGrillaProveedores() + { + if (dgvProductos.SelectedRows.Count > 0) + { + Producto producto = new Producto + { + Id = Convert.ToInt32(dgvProductos.SelectedRows[0].Cells["Id"].Value), + }; + dgvProveedores.DataSource = ControladoraProductos.Instance.ListarProveedores(producto); + } } } } diff --git a/Vista/FrmProductos.resx b/Vista/FrmProductos.resx index af32865..a395bff 100644 --- a/Vista/FrmProductos.resx +++ b/Vista/FrmProductos.resx @@ -18,7 +18,7 @@ System.Resources.ResXResourceReader, System.Windows.Forms, ... System.Resources.ResXResourceWriter, System.Windows.Forms, ... this is my long stringthis is a comment - Blue + Blue [base64 mime encoded serialized .NET Framework object] diff --git a/Vista/FrmProveedor.cs b/Vista/FrmProveedor.cs index 7d5f231..d8e33ae 100644 --- a/Vista/FrmProveedor.cs +++ b/Vista/FrmProveedor.cs @@ -48,6 +48,7 @@ namespace Vista if (string.IsNullOrEmpty(txtSocial.Text)) devolucion += "La razon social no puede ser nulo o vacio\n"; if (txtSocial.Text.Length > 50) devolucion += "La razon social no puede superar los 50 chars\n"; if (string.IsNullOrEmpty(txtNombre.Text)) devolucion += "El Nombre no puede ser nulo o vacio\n"; + if (numCuit.Value <= 0) { devolucion += "NO es un cuit válido"; }; if (devolucion == "") { diff --git a/Vista/Vista.csproj.user b/Vista/Vista.csproj.user index 3260701..23c81a0 100644 --- a/Vista/Vista.csproj.user +++ b/Vista/Vista.csproj.user @@ -8,9 +8,6 @@ Form - - Form - Form diff --git a/Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig b/Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig index 49b6fcb..b2150f3 100644 --- a/Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig +++ b/Vista/obj/Debug/net6.0-windows/Vista.GeneratedMSBuildEditorConfig.editorconfig @@ -15,6 +15,7 @@ build_property.RootNamespace = Vista <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Vista/ ======= build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Vista\ @@ -39,3 +40,6 @@ build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\final actual\V ======= build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actual(2)\Final actual\Vista\ >>>>>>> 3925b59 (cambios nacho) +======= +build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\Vista\ +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) diff --git a/Vista/obj/Vista.csproj.nuget.dgspec.json b/Vista/obj/Vista.csproj.nuget.dgspec.json index e5b46ee..81940b6 100644 --- a/Vista/obj/Vista.csproj.nuget.dgspec.json +++ b/Vista/obj/Vista.csproj.nuget.dgspec.json @@ -6,6 +6,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj": {} }, @@ -35,16 +36,19 @@ ======= "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj": {} >>>>>>> 3925b59 (cambios nacho) +======= + "C:\\Users\\fedpo\\Downloads\\final actual\\Vista\\Vista.csproj": {} +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) }, "projects": { - "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj": { + "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj", "projectName": "Controladora", - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -62,11 +66,11 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj" + "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj" }, - "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj": { - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj" + "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj" } } } @@ -100,14 +104,14 @@ } } }, - "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { + "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj", "projectName": "Entidades", - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -156,14 +160,14 @@ } } }, - "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj": { + "C:\\Users\\fedpo\\Downloads\\final actual\\Informes\\Informes.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Informes\\Informes.csproj", "projectName": "Informes", - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Informes\\Informes.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Informes\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -181,8 +185,8 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj" + "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj" } } } @@ -216,12 +220,13 @@ } } }, - "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj": { + "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj": { "version": "1.0.0", "restore": { <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectUniqueName": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj", "projectName": "Vista", @@ -247,10 +252,13 @@ ======= "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj", >>>>>>> 3925b59 (cambios nacho) +======= + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj", +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) "projectName": "Modelo", - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\Modelo.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Modelo\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -474,6 +482,7 @@ "projectReferences": { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj" @@ -489,6 +498,10 @@ "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj" >>>>>>> 3925b59 (cambios nacho) +======= + "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj" +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) } } } @@ -534,6 +547,7 @@ }, <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj": { "version": "1.0.0", @@ -551,13 +565,17 @@ ======= "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj": { >>>>>>> 3925b59 (cambios nacho) +======= + "C:\\Users\\fedpo\\Downloads\\final actual\\Vista\\Vista.csproj": { +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) "version": "1.0.0", "restore": { - "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj", + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Vista\\Vista.csproj", "projectName": "Vista", - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Vista\\Vista.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "outputPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Vista\\obj\\", >>>>>>> c493033 (cosas que faltaban) @@ -567,6 +585,9 @@ ======= "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\obj\\", >>>>>>> 3925b59 (cambios nacho) +======= + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Vista\\obj\\", +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) "projectStyle": "PackageReference", "configFilePaths": [ "/home/fede/.nuget/NuGet/NuGet.Config" @@ -584,6 +605,7 @@ "projectReferences": { <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj" @@ -623,13 +645,22 @@ ======= "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj": { "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj" +======= + "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj" +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) }, - "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj" + "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj" }, +<<<<<<< HEAD "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj": { "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj" >>>>>>> 3925b59 (cambios nacho) +======= + "C:\\Users\\fedpo\\Downloads\\final actual\\Informes\\Informes.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Informes\\Informes.csproj" +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) } } } diff --git a/Vista/obj/project.assets.json b/Vista/obj/project.assets.json index afe58b9..e9fe4b0 100644 --- a/Vista/obj/project.assets.json +++ b/Vista/obj/project.assets.json @@ -13573,6 +13573,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "projectUniqueName": "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj", "projectName": "Vista", @@ -13607,10 +13608,13 @@ ======= "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj", >>>>>>> 3925b59 (cambios nacho) +======= + "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Vista\\Vista.csproj", +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) "projectName": "Vista", - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj", + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Vista\\Vista.csproj", "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\", - "outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\obj\\", + "outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Vista\\obj\\", "projectStyle": "PackageReference", "configFilePaths": [ "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config", @@ -13637,6 +13641,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": { "projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj" @@ -13681,13 +13686,22 @@ ======= "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj": { "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj" +======= + "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj" +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) }, - "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": { - "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj" + "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj" }, +<<<<<<< HEAD "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj": { "projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj" >>>>>>> 3925b59 (cambios nacho) +======= + "C:\\Users\\fedpo\\Downloads\\final actual\\Informes\\Informes.csproj": { + "projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Informes\\Informes.csproj" +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) } } } diff --git a/Vista/obj/project.nuget.cache b/Vista/obj/project.nuget.cache index b9c2f81..94f53c5 100644 --- a/Vista/obj/project.nuget.cache +++ b/Vista/obj/project.nuget.cache @@ -6,6 +6,7 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "dgSpecHash": "NrgVcMaE+xOpA8UnmFhQwGflGRDAICnz8EffGQ+5vJrqniVecS26UDqJMYcJ2SmlijA3PT49NDmcrKADdBbkcQ==", "success": true, @@ -625,8 +626,11 @@ ======= "dgSpecHash": "9xoX6uTcIEHTfvrkxbiNwJryG4RwhPq70t4kNMVhRSGHltn2QOmFl8cQl5qjiBimTD2Zuo2MWeKOifxctKIbdg==", >>>>>>> 3925b59 (cambios nacho) +======= + "dgSpecHash": "u13WwQGaPCePxL1JyQkpyhXuHxLQ97k9ktwi/o+F5Yk11GsR1/fPqs1rMKxJn/R3EX1AhoyxsvvOwv1MhGTPhQ==", +>>>>>>> 51cffaf (feat: terminados 4 de 7 forms) "success": true, - "projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj", + "projectFilePath": "C:\\Users\\fedpo\\Downloads\\final actual\\Vista\\Vista.csproj", "expectedPackageFiles": [], >>>>>>> c493033 (cosas que faltaban) "logs": []