From f0a0f53765d77ab6703a11f61728e65fd2139175 Mon Sep 17 00:00:00 2001 From: fedpo Date: Sun, 4 Aug 2024 21:38:55 +0100 Subject: [PATCH] cambios nachito a form factura --- .../bin/Debug/net6.0/Controladora.dll | Bin 19456 -> 19456 bytes .../bin/Debug/net6.0/Controladora.pdb | Bin 15024 -> 15768 bytes ...ontroladora.csproj.CoreCompileInputs.cache | 4 ++ .../Controladora.csproj.FileListAbsolute.txt | 3 + .../obj/Debug/net6.0/Controladora.dll | Bin 19456 -> 19456 bytes .../obj/Debug/net6.0/Controladora.pdb | Bin 15024 -> 15768 bytes .../obj/Debug/net6.0/ref/Controladora.dll | Bin 7680 -> 7680 bytes .../obj/Debug/net6.0/refint/Controladora.dll | Bin 7680 -> 7680 bytes Entidades/Lote.cs | 12 ++++ Vista/FrmFacturas.Designer.cs | 26 ++++++-- Vista/FrmFacturas.cs | 59 ++++++++++++++++++ Vista/Vista - Backup.csproj.user | 56 +++++++++++++++++ Vista/Vista.csproj.user | 35 ++++++----- 13 files changed, 174 insertions(+), 21 deletions(-) create mode 100644 Vista/Vista - Backup.csproj.user diff --git a/Controladora/bin/Debug/net6.0/Controladora.dll b/Controladora/bin/Debug/net6.0/Controladora.dll index 13030f54091d098873258562c922496e06f8ebc0..750cce1777516b2b974faa60e8e2d62a600d9606 100644 GIT binary patch delta 735 zcmXw%PiPZC6vp3VcWEpoSc3+O#ilDLM&c%$KV2y*ZW5~y4YX2f0yaBY5URA89(oWP zyHJZ%Fb+r#MGEPm>A}l_mqH1qm!8y1Em%AlR1hJ#iFnZ2XF9|C=J($Fc6Q-ysX|H> z@_b3$dpPu~ynKS}mTTjl1qyHz_$mQZgtFh;vkK6|^A!VNjQL&X*aSIE_Ss{u6;>nT zA5rXy<4?Nh&qz9CVO!Lpn=3`89j34&T3E5LVgZG=ScO6G zNmb~BeyM@nKyD&8kp<#-1mbvPWEojU){&{h^Ag3x!iI%hMXn+@kQ>NNYaAR!r$IqF}m8F5jT|bTq%0p@memsSS-JW({n7n0y}G=)yKyr5jc}iSA$O~2J}BmH zxU-)|D}7X-Fv-7%1YNiFN(Vq delta 648 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 Tr&U^E15XaI{||+v8f*R!IKW{A delta 6965 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 diff --git a/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache b/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache index 7658e09..d0af5da 100644 --- a/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache +++ b/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache @@ -1 +1,5 @@ +<<<<<<< HEAD +07cbdde4e47ec2d3a6db548797ff84a15aa08946633217fe5ed64773b3cc8491 +======= a7a9c23e29aac78d8fc99e5e2578c73ffe3d4cba +>>>>>>> 5b78d74e54350285696596720e82f5fbd99b4d02 diff --git a/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt b/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt index 98c01d0..e362374 100644 --- a/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt +++ b/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt @@ -115,6 +115,8 @@ 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 +<<<<<<< HEAD +======= C:\Users\fedpo\Downloads\final actual\final actual\Controladora\bin\Debug\net6.0\Controladora.deps.json C:\Users\fedpo\Downloads\final actual\final actual\Controladora\bin\Debug\net6.0\Controladora.dll C:\Users\fedpo\Downloads\final actual\final actual\Controladora\bin\Debug\net6.0\Controladora.pdb @@ -132,3 +134,4 @@ C:\Users\fedpo\Downloads\final actual\final actual\Controladora\obj\Debug\net6.0 C:\Users\fedpo\Downloads\final actual\final actual\Controladora\obj\Debug\net6.0\refint\Controladora.dll C:\Users\fedpo\Downloads\final actual\final actual\Controladora\obj\Debug\net6.0\Controladora.pdb C:\Users\fedpo\Downloads\final actual\final actual\Controladora\obj\Debug\net6.0\ref\Controladora.dll +>>>>>>> 5b78d74e54350285696596720e82f5fbd99b4d02 diff --git a/Controladora/obj/Debug/net6.0/Controladora.dll b/Controladora/obj/Debug/net6.0/Controladora.dll index 13030f54091d098873258562c922496e06f8ebc0..750cce1777516b2b974faa60e8e2d62a600d9606 100644 GIT binary patch delta 735 zcmXw%PiPZC6vp3VcWEpoSc3+O#ilDLM&c%$KV2y*ZW5~y4YX2f0yaBY5URA89(oWP zyHJZ%Fb+r#MGEPm>A}l_mqH1qm!8y1Em%AlR1hJ#iFnZ2XF9|C=J($Fc6Q-ysX|H> z@_b3$dpPu~ynKS}mTTjl1qyHz_$mQZgtFh;vkK6|^A!VNjQL&X*aSIE_Ss{u6;>nT zA5rXy<4?Nh&qz9CVO!Lpn=3`89j34&T3E5LVgZG=ScO6G zNmb~BeyM@nKyD&8kp<#-1mbvPWEojU){&{h^Ag3x!iI%hMXn+@kQ>NNYaAR!r$IqF}m8F5jT|bTq%0p@memsSS-JW({n7n0y}G=)yKyr5jc}iSA$O~2J}BmH zxU-)|D}7X-Fv-7%1YNiFN(Vq delta 648 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 Tr&U^E15XaI{||+v8f*R!IKW{A delta 6965 zcmZu$2|SeD_kTu=t%YJd_Ob6XmPsm=v2R0#>MfPQD2y4+jHJ>iAtB4PlqFQENg||# zC@tDkT2w@f7KL_ic>6#1dB^+uy#Jri=bm%#J>PTgx#!+{?tRAoZ8b4jw7}=m2%@(G zLE2;xWFvyr{RF&l&IUeKMT}(;L=yG|_#x(4JqXs_0z8~Co{qKkt+2Kun;VR^1u>gL zlxWlF$Bh$h*rXpf5;w|MW@jY`Z7`V+LO@m_5=b`2i!k1W@fR3ZCJ+!ZK>`WFcqGQF zFn$i>-!YCzNFWO&2#5>DcVavpfLNeOJk zfBuAcjesbd5Rfsf*q9QK6#iB%rS?3 zl8C;!B(fhXy;#w=kVJ~G(r*D}Qpj|Q6k>`MAFQw`u#bquQ;0|rR)mchd5m{TBkw5E z2$3p{=wro^3V||+A5{j~gq2*Z)Z%@zNIMk^uB9w84=Vwd5GRL(S;`@?Sjodm9o{F8 zbc*>X&I!nGoJ$}?Y+az!GpvwVctr{CkVVw3>WU?vNDA+mz#tKj2y8ZxzqBM`+z6Zd z0!brGaUrn`o7X3kGHfQ_Oxm!znQ0$Jmzg32SSMq&z%&S>gQf`>C7UG>h=`e48CG9r z)`m+F2`S{N85yI?%p7nUgwX=iG6^Xml5XCHHSU}DVHCAMrb!_Q7$qXWf{fK~W0Z(= zTR32KA|(N%%go9!>P~6H>wOq4FeOXkrZMVH3Bv0M7%ebu!|Q!`KOzM&WQ=0&!n$b! zM!hqsWq6|v7a&9_WRyzAsG%j9NJK0x9kBW`(;$pu{^GO^_L%kI6p@B?2aFbAy9nHo z*$3FNUbDhjq0wAfXKpNq&1Hu2!DU&RoNORLQcgil&4>mFa`XRf#sMd}`SNm;(u8J^ zENA;~dnW>}$~jDF(}9A#0nT*F zl=d({w$CoV_8P8gRG!vC+aL9$YMUeNR#lH->>uN`?>_25Bz!s9vzf`f4wNBO+G)YwIENVy)>iXaG)o)1xmHXomL1c^($dbB z38pC~Nzkn7_A1UJxUEz(C_~z?6vg(6IG>{HeE4WYV8_f18Y4V}$K`Xw1QaK~jZ9uN zC6vv^cE8)z;U`D}f^2nqR!y=k zcPY4c;6;SOO&JWJf&O|QFbK6x}BJTDw<9@k6*gc6hKDCcW=aCv?&En(B|8doH9SOUI) z$q8lhLd8hq!o2rL8v$_?zV|0V;koSPsT2Y@s2TJVJseB49-_R{0M?ApIu4*HT#zP0c95x+H<~- z80^Glvsod6a4v^W0XLNtJuFZ7mBHzeu945&AQ^b)*;$V6$txK6ANao)OZB(89Vr2vLoAkmgD6}E_znFLKCL?V;esngeZUe|Bk-)I> zY;+FSZUpYB;GEs1ySi_Bl$`kyRR2m5+ozt+aJdb_B@AU=VY3V$L7kQ21!=?v&Npk={vniJXh} zpZ>rH7$hm8b%A%kLKjC3^3D;zGBT%&(*-@-v1e~<6ozSfVvvtr=rwR(2^zbbq#nx;=UrivDe=|8e*J#koCBYZrTL; zR8&zTyTl440lW1N@^`KG4RAT|P#XlQ^FIPbRNt}f?BY)7(YtX*-n$*=-OIu{%NsIS zw&FpYnF6NRogCeDHP9Va_Vz|!BG>UasqdkQSP?8 zrENaA{>QQqX9&=DW(CJ=5L+?;?=HYGnTuyUT$KCByRcM2wkfINs@I;E6mlH-Mgb;N5n@k0aTKm;JlzFht4&@7WW`$g93q`; z(Msyk7DxW?EnNDOng@>`?^1>N_n0pEH^Q1~heLwEPq0Gz`wLs3o_ij^I_5zUgK2(&PrfRM+%e*YUd^8dr-nYgpl)kpY;sf{ z=ukKCvM(0pKywqUgKC+IvTmZ=&!uzRHMfe*xnYl4COdrV)I-wLWIh5_q^vL0s#_2p zj*qB5n^yfR2H0sBqVH^5hM;h5y-ao6az)>iU8}dTwc_Do-G5O3~TS+3WJ*J_ERxNbF^Xc?L z_1_1j&N=QKL%$y0YrYEyEYO_k@YI$)0nMvwq+X~VmT+iVk~~MGp;9NFkB6@~C;^6t z`yuYuBGEmsLqjeN!a~Nwo1KK=juNSA z%}_I~{jV>Ax)aW=xpzFvqxiqUxTXPmvv?P7*2<%*Vc_*+*Tl~?&W7WN516lIh(@&R z#q*tXEb+)A`vpFyi>{VjJbQlwh}F_tdaOv)3&%X{ms3;o=QYp7%Mbi$PZcK@0(0C0 z%RNj1E7VVby)HIPrj|>_nb)D-p`6uEG)Tu?s#aLm|4G}g2tH`(qGccav!JgJ1_sYY z=7qRbB(ruWMSoWV`r7*Fv<(VRp>SMP?nVaV3M029EQHw9b^-)xlhA8xx8fm?PjV!S zo{jjH5$$KIt>i8N`?L)m&l(-?fSOyrY|^JHXEn=Tp1j zR$hAlp7YPw{*3g&QX9pAJQnz&t%aVdq;bWV@M+3b~t?q4-oU_Dtw*c$3r4~3+BQ~57%Gu=+K7+OERuD}#Kz+gpj zd2wPFEYgy1B7Io0dX1!q7gc&4vn_l0;|-W5#`>@(FLv1kP8polA%k|$fSZRrt1d21 z$#5}godR?h2;eKp7e15j>zw@#pBQ8D3%l|MTN!0vsS{{$$FcvyJ^BA!FShef131D` z`mH_BBgg2u3^~V{S5^f94;?KuDn8~TT*y_ooO`l(Tbz%8teG!0=TU)BhlDB}8XAQY zZak^9!|$q%8vw(H42mL(L6r^}ooQA64w_Z*@4J8aoE1GOG4*M=;%iUvMn@mrouKdx zYD#=8dSmoG%eS~}cTQ9BJtEN2C80}2!>6F;*sOykIom&ZUJz_NeR@_C5BTb82zA#l zDu$YMUuOr}eLw1aDAcK^wsB?3lnE|pZHi&>v2^oyHatD>=p_vGY}5E}x5AR0>UI<_ z@|0b(af*f?D#qnosHm_McF&ZDl7Zl{ZGE>?@Y+j$t%03USK(H?^%z0ko= zytVujCF`8dyZ`>nd3JR_(9}~!y&jY|L1nYgcDroGLVZfPKfAY77*K(ao;unvG5sJ6 zr|XLY*Ke$pb*?rl2^%e1Bn5Wr8K4nr{dkr*wC#uIxc*AUIZ^&17m}b4T+mZP3%?uZ z!!c*+XV%z0>T(bzUSDVO;m%)RL{AS@s4N_YLeA0qQC9DVoNG26d2RM0bpa-veAYu!Z3zwxVCZ@kRdCvE>V(x;UQ46t6Ggla9|;D@g8WW?%%ozGk|D1zN)afVVLLto3| zN}R9{M%-QJ4^6f#(;+iD5cTLVEEUJkH#h=&EaJ~$aln6_n4bj|$&&63{Ys*<-;fYHdNcfeD(Cj$VWVZf#xc5$GC8-={S@Whl>d9#AvXL$|rc z?SaCYq6_62srs&ENE}%%{~-$m80w(eN#CC%WC^;n@ZmYjEAr2)&(>f?r;N?k=d>ogv1~-gt%f6RFREjFFZK zYeMEA9J8N`IP-d+xs~W$kgPbW0TvkC#oGJ$v9z{*%yEz6rBk3ObU@dH~CWjOIv9dxf+~AY;|L)xBftyv{yqwLj2qUkpl2 zG|)A=$@rzNamZEiSCG6@O|Ja0e-U=|(RR{k#)tc@ZHQqrqUN znWp$VVxo!q0*?IZY`MR@ce=-Ed!gEx=W;s;0qac_QJ12s6VS$4|2^n<*f)oyS<4BR zk|t6hKyONZ4yDpW(2)Gx4}GYhi(dJvJ+>*^pbaY1M|}(!X8P#WB>yUSPNKSB4@a>+F^=a| zv7W3zWI(E!Ci+l)aRJmEP`vSQyYR4Q4S`M3Yzig-Ukgp}%uErr*E%=>GhI99t6z|g z4n2o^sq@9h+wKsc>-5i)wXZy|0@``L=#VxmY1|8}C_LT2gph{Y2{M;M{Sxe(U?3g^ zY%v~JnD5d&E_H&cf(W1qiHpGmh5s1G8goqtn_+cLCJMBReh@TkAJd}=S#G|e-+;aPD<-y$*w zpt-Ia>^uSE@zd5ct|iyWxuJ7}7yMS^vUr33=b8v;AHm--r-wHV-jWcyw$$nQMlIEl z1O$qjcoWope1qSu#v?`>?vVUk4|uKRInI5s9fKI7rsnzhyYlMYl%ba;7u{NW_wAXm z_*Mbv6g@O5dJzAbXbfBH8nNMua;%n+<2FwZ?7wEmY5|Hg5j) z!+e#JfBfWa4i8~1<#9t;{K<1vw!St#bhKj#6`Y?r|WON_KnF-dhiaI!^aQxfcdplbziYMjGb% zPaSN^{=YP1r~^J}I&y52Zq;1%YSw;Fy!+Pz3K*jrpmX%CO6VA#>s@(geVx`Ziz#FbThN1xwZK;A5JYnsEnsZh1g86I4T&s)Q z&C9%Q9|5J7x~TowL;O4cFk;xnNpAKm7_2YdI*+dcx-AV+RilGvpk|?`#muLfGw27l zy*OcdkruGo43E*vIj1K*A4`0-6a~8Tby()GG zGETR{R0c*tx|JdNe*cRCs2LJX4U9~aqUXjb5h7%o7v)&1Xp49Ed-lR?7&+5`+Q2yV z-;7dj{Ee6m8Z9~2x~Sm?g%eQy?gve4*^Re7n)}1L*0s;x0~T0oqG4N}jYFYdozQ(_ z?+=G_wy4jNgmMW`ZmlHVs-YGau0e>dmt>#!i*@v)nGF4-!ME;X5VG(b-FFBM%n{wm zxTfk%uhUGiikLXc6))KeCOd}Z9~1r0uMmfosR_^+<4eajr`y{YHE)Gvua0aPF@7a$ z@+YydhKFHa{Pn$!yCgmPmiH~#m94#(jT$M;_|C+)L$*qKU--1$oHh#0&oYBG03xwk!l zlYB&z`ou9wa6TSVa#yEHQ0o_Gj{oQekyE}R=2iBlLc5=9M?!UjO4iBDR)W})-(#sMrQ*ZnzmQ1_Z9pe99X$ObFr-&W0#b=QF246 z*%XgfIdel|qF9{C7mZiN#A~?cM5MVEiw*>PSJas=t$UwF2Wd1-G$S{u5_*#2U(s*{ z_|j8EPg*V;-ZlblG;KHL**kSGOYgjYDR9lW$oJSlnC#mmy6V)ymNEq!#ary!1K(HB zmU&O-v#&c0z0=|yC4#SsFHt<;~sd9*Iuum{_2to%FRj!gdK zJ3vmOH5nplr$ipM=BpVycbE~9S_C&h>f9zx5rrU{OAsw3h*lFsVFb};f+&R`I!F+; h5JcDNn6^R*^8bcFIRu_uS37@|q|*Na0rn#E{{w9q^X~uv diff --git a/Controladora/obj/Debug/net6.0/ref/Controladora.dll b/Controladora/obj/Debug/net6.0/ref/Controladora.dll index 344a73d01e2eebede495aeb2284662d38336deb6..8a0bf5bc34bb04d8765f7b3af695b6effd64b21c 100644 GIT binary patch delta 566 zcmZXR!Al!K6vn?dYhqh$h_wxA)PoIpFeTY!Zy4_%L=3B2TjvK^ph$o`+Di$PIqBu zaqrb;jA*qGjSgLs!nvXJSn638AU@bIE9nlsjgHfk!yn$L7Bse~g?k*eu)g7K+)<%a zLaBtj(C-Wza4)9guHZFDdTn>pZB6GxR#Ib3&cRG8HG;a$F4 N^8J5p`P800d=2`&ea8R* delta 453 zcmZY6KTE?v6aet|E^SInDQPPq)>f$%5!4zHbg4y12M3`Y1hJElf9P@w@ll9o##sWR)(?LYGfY-#O3XyYsM< zuxbER5Ni*hB02eV+yaP;eM1zoJkJ*RE>_ux!XI%KD{c>$n9@EvXua}5r8RYP^=)>a z-DKzs8FV9C>zpg6e3YjOj(+!r|)Ij%4ROxQ;QVj`Mk^UqEAM4K`;Wo&4I%-S#w ziy~%Vg?VI;?2~=6gh7vlK~I5PARAth*(dv$g0g#>I0^rM ztv1%jXbd5|T-1v?pHvU|wVF)bi;0a^H}Hm&SFz*v)OF-Ko8t+soEWlE3&4=^x^|13 l{6{O`jGG&OLrDjj4>I$-K5-|`Y)8dC!Ef|+nz5rtegUd3XXyX{ diff --git a/Controladora/obj/Debug/net6.0/refint/Controladora.dll b/Controladora/obj/Debug/net6.0/refint/Controladora.dll index 344a73d01e2eebede495aeb2284662d38336deb6..8a0bf5bc34bb04d8765f7b3af695b6effd64b21c 100644 GIT binary patch delta 566 zcmZXR!Al!K6vn?dYhqh$h_wxA)PoIpFeTY!Zy4_%L=3B2TjvK^ph$o`+Di$PIqBu zaqrb;jA*qGjSgLs!nvXJSn638AU@bIE9nlsjgHfk!yn$L7Bse~g?k*eu)g7K+)<%a zLaBtj(C-Wza4)9guHZFDdTn>pZB6GxR#Ib3&cRG8HG;a$F4 N^8J5p`P800d=2`&ea8R* delta 453 zcmZY6KTE?v6aet|E^SInDQPPq)>f$%5!4zHbg4y12M3`Y1hJElf9P@w@ll9o##sWR)(?LYGfY-#O3XyYsM< zuxbER5Ni*hB02eV+yaP;eM1zoJkJ*RE>_ux!XI%KD{c>$n9@EvXua}5r8RYP^=)>a z-DKzs8FV9C>zpg6e3YjOj(+!r|)Ij%4ROxQ;QVj`Mk^UqEAM4K`;Wo&4I%-S#w ziy~%Vg?VI;?2~=6gh7vlK~I5PARAth*(dv$g0g#>I0^rM ztv1%jXbd5|T-1v?pHvU|wVF)bi;0a^H}Hm&SFz*v)OF-Ko8t+soEWlE3&4=^x^|13 l{6{O`jGG&OLrDjj4>I$-K5-|`Y)8dC!Ef|+nz5rtegUd3XXyX{ diff --git a/Entidades/Lote.cs b/Entidades/Lote.cs index e6781ec..c555008 100644 --- a/Entidades/Lote.cs +++ b/Entidades/Lote.cs @@ -12,5 +12,17 @@ namespace Entidades { get { return Producto?.Nombre ?? string.Empty; } } +<<<<<<< HEAD + public double PrecioUnitario + { + get { return Producto?.Precio ?? 0; } + } + public double Subtotal + { + get { return PrecioUnitario * CantidadDeProductos; } + } +======= +>>>>>>> 5b78d74e54350285696596720e82f5fbd99b4d02 } + } diff --git a/Vista/FrmFacturas.Designer.cs b/Vista/FrmFacturas.Designer.cs index 030b4c1..21766e3 100644 --- a/Vista/FrmFacturas.Designer.cs +++ b/Vista/FrmFacturas.Designer.cs @@ -29,33 +29,49 @@ private void InitializeComponent() { groupBox1 = new GroupBox(); + dataGridView2 = new DataGridView(); dataGridView1 = new DataGridView(); BtnAdd = new Button(); groupBox1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)dataGridView2).BeginInit(); ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit(); SuspendLayout(); // // groupBox1 // + groupBox1.Controls.Add(dataGridView2); groupBox1.Controls.Add(dataGridView1); groupBox1.Controls.Add(BtnAdd); groupBox1.Location = new Point(12, 12); groupBox1.Name = "groupBox1"; - groupBox1.Size = new Size(776, 351); + groupBox1.Size = new Size(1041, 426); groupBox1.TabIndex = 5; groupBox1.TabStop = false; // + // dataGridView2 + // + 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; + // // dataGridView1 // dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView1.Location = new Point(6, 22); + dataGridView1.Location = new Point(6, 16); dataGridView1.Name = "dataGridView1"; dataGridView1.RowTemplate.Height = 25; dataGridView1.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridView1.Size = new Size(594, 235); + dataGridView1.Size = new Size(508, 241); dataGridView1.TabIndex = 3; dataGridView1.CellBorderStyleChanged += dataGridView1_CellBorderStyleChanged; + dataGridView1.CellClick += dataGridView1_CellClick; + dataGridView1.CellContentClick += dataGridView1_CellContentClick; // // BtnAdd // @@ -71,12 +87,13 @@ // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(800, 450); + ClientSize = new Size(1068, 450); Controls.Add(groupBox1); Name = "FrmFacturas"; Text = "Ventas"; WindowState = FormWindowState.Maximized; groupBox1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)dataGridView2).EndInit(); ((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit(); ResumeLayout(false); } @@ -86,5 +103,6 @@ private GroupBox groupBox1; private DataGridView dataGridView1; private Button BtnAdd; + private DataGridView dataGridView2; } } \ No newline at end of file diff --git a/Vista/FrmFacturas.cs b/Vista/FrmFacturas.cs index 027eaa5..a4661d2 100644 --- a/Vista/FrmFacturas.cs +++ b/Vista/FrmFacturas.cs @@ -1,4 +1,6 @@ using Controladora; +using Entidades; +using System.Collections.ObjectModel; namespace Vista { @@ -9,6 +11,8 @@ namespace Vista { InitializeComponent(); ActualizarGrilla(); + dataGridView1.CellClick += dataGridView1_CellClick; + ConfigurarDataGridView2(); } private void ActualizarGrilla() { @@ -26,5 +30,60 @@ namespace Vista { } + + private void dataGridView1_CellContentClick(object sender, DataGridViewCellEventArgs e) + { + + } + private void ConfigurarDataGridView2() + { + dataGridView2.AutoGenerateColumns = false; + dataGridView2.Columns.Add(new DataGridViewTextBoxColumn + { + DataPropertyName = "Producto", + HeaderText = "Producto" + }); + dataGridView2.Columns.Add(new DataGridViewTextBoxColumn + { + DataPropertyName = "Cantidad", + HeaderText = "Cantidad" + }); + + dataGridView2.Columns.Add(new DataGridViewTextBoxColumn + { + DataPropertyName = "PrecioUnitario", + HeaderText = "PrecioUnitariod" + }); + dataGridView2.Columns.Add(new DataGridViewTextBoxColumn + { + DataPropertyName = "Subtotal", + HeaderText = "Subtotal" + }); + } + private void ActualizarGrillaLotes(ReadOnlyCollection lotes) + { + dataGridView2.DataSource = null; + if (lotes.Any()) + { + var loteDatos = lotes.Select(lote => new + { + Producto = lote.NombreProducto, + Cantidad = lote.CantidadDeProductos, + Subtotal = lote.Subtotal, + PrecioUnitario = lote.PrecioUnitario, + }).ToList(); + + dataGridView2.DataSource = loteDatos; + } + } + private void dataGridView1_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); + } + } } } diff --git a/Vista/Vista - Backup.csproj.user b/Vista/Vista - Backup.csproj.user new file mode 100644 index 0000000..fb55c6b --- /dev/null +++ b/Vista/Vista - Backup.csproj.user @@ -0,0 +1,56 @@ + + + + + Form + + + Form + +<<<<<<< HEAD + + Form + +======= +>>>>>>> 5b78d74e54350285696596720e82f5fbd99b4d02 + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + Form + + + \ No newline at end of file diff --git a/Vista/Vista.csproj.user b/Vista/Vista.csproj.user index b55bb35..19b2365 100644 --- a/Vista/Vista.csproj.user +++ b/Vista/Vista.csproj.user @@ -1,5 +1,6 @@  + Form @@ -7,43 +8,43 @@ Form - - Form - - - Form - Form + + Form + Form - + + Form + + Form Form + + Form + + + Form + Form - - Form - - - Form - Form + + Form + Form - - Form - - + Form