From c978429032fe14c987b154375a7698d92018d30e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vanessa=20Ca=C3=B1ete?= Date: Fri, 1 Mar 2019 18:02:56 -0300 Subject: [PATCH] Cambios visuales --- .../__pycache__/settings.cpython-37.pyc | Bin 0 -> 2397 bytes .../__pycache__/urls.cpython-37.pyc | Bin 0 -> 1341 bytes .../__pycache__/wsgi.cpython-37.pyc | Bin 0 -> 611 bytes bodegaTerrazaDelChupi/urls.py | 2 +- catalogo/__pycache__/admin.cpython-37.pyc | Bin 0 -> 640 bytes catalogo/__pycache__/apps.cpython-37.pyc | Bin 0 -> 387 bytes catalogo/__pycache__/models.cpython-37.pyc | Bin 0 -> 2783 bytes catalogo/__pycache__/urls.cpython-37.pyc | Bin 0 -> 296 bytes catalogo/__pycache__/views.cpython-37.pyc | Bin 0 -> 870 bytes catalogo/models.py | 122 +++++++++--------- catalogo/templates/base_generic.html | 25 ++-- catalogo/templates/index.html | 20 ++- catalogo/views.py | 13 +- db.sqlite3 | Bin 176128 -> 176128 bytes 14 files changed, 102 insertions(+), 80 deletions(-) create mode 100644 bodegaTerrazaDelChupi/__pycache__/settings.cpython-37.pyc create mode 100644 bodegaTerrazaDelChupi/__pycache__/urls.cpython-37.pyc create mode 100644 bodegaTerrazaDelChupi/__pycache__/wsgi.cpython-37.pyc create mode 100644 catalogo/__pycache__/admin.cpython-37.pyc create mode 100644 catalogo/__pycache__/apps.cpython-37.pyc create mode 100644 catalogo/__pycache__/models.cpython-37.pyc create mode 100644 catalogo/__pycache__/urls.cpython-37.pyc create mode 100644 catalogo/__pycache__/views.cpython-37.pyc diff --git a/bodegaTerrazaDelChupi/__pycache__/settings.cpython-37.pyc b/bodegaTerrazaDelChupi/__pycache__/settings.cpython-37.pyc new file mode 100644 index 0000000000000000000000000000000000000000..e117b2dfc8aa89416e99f095420b3e22230d66f0 GIT binary patch literal 2397 zcmb7FTXWM!6t)$`b{rA{giC?8qD_F%Mj|0l%5*4-ErJK%CQ?YNX-BixuH{X1akMLf z_1eF|LwW2!>gcsk{R@5Sk!&X(Co@g8)_Qd=-?{8LyW0y3<;v9qVq*4aT@p% z{CJOodFqmH!5dQUao%Sy6a@!1lZQ6O9@v4W5MKd6g$I3VGiB_)GKA+nB6TCzm0ZfW z6m(C+Lp}yWgoe_4*_%+D4q}|fN#({cwG&#;&I!V$_Td4t51}9ApI(Q^BdvaF zj7{j>KDY1WD0Eq@j4(Oz`YyDd+yOA+<8f=q)vODR5t}7*V@YOS&1&WYx1fJ)@HPlp z{BRoYtc;9FCvxIP7my6e5%dy|zZuDcLS&>HQ!YG``0w6E{fQmuNeqNatE%vDuGO^xfx zEp^X$W3^RX-*4?!t#@j@2Fw=J-$Gq&?(C^MnpJ64H2|zNG|Oy3jg*-Xovb$X6W76_2KQ8{K^hoVYA#4|p%| zt69r8QugNKjqjCn%l_oXlKX?C^n(}R$R#i5!6GwY5{1&t-J&=n3SvRXpN@ifx)$<< d8Br93MFF0X%wj<-rt9T$VJ02r5+Dpm;a}_xE|mZP literal 0 HcmV?d00001 diff --git a/bodegaTerrazaDelChupi/__pycache__/urls.cpython-37.pyc b/bodegaTerrazaDelChupi/__pycache__/urls.cpython-37.pyc new file mode 100644 index 0000000000000000000000000000000000000000..f84442ff88441724ce8fa6a116a39420451443d9 GIT binary patch literal 1341 zcma)6PmkL~6t}%jvT-)M+X_UFbIV#&HSaT4JA>9@Nd|LzCDpYCP1 z1_(aK$NY{P5AuMAJgPzw~pG`)dC{2XYKuWn#T6hzru7DXJ24I>HTq|p9Go_TP!eo5S zk|tLbGv>ov zB*yow{$CWzu0Xp$GM}hjIA5VHAN@N<;mAUoZ2pOklw_O?<>iV56#nmB>CJ4w^zFC3L1 z4ci{$qLc_?mvQ_bbovO7Zh)5>yW)Ffi|>a9tVMbTaotiEdxKM{&I6?}Gr-pm8s;_&G0FFuW< K@IF2d;(q{V$en)x literal 0 HcmV?d00001 diff --git a/bodegaTerrazaDelChupi/__pycache__/wsgi.cpython-37.pyc b/bodegaTerrazaDelChupi/__pycache__/wsgi.cpython-37.pyc new file mode 100644 index 0000000000000000000000000000000000000000..3e50a41e75ca2035f3ec1e5e464d9d096eb2cf33 GIT binary patch literal 611 zcmZuuO>Yx15cN7~6KyHtfH)#wBf+}u4TKOMDNztjk&+4#A#L3CWaG%|S=mlXa_t|1 zBWM22UJ(cW0w=s1D)rEjJob1r^WMC9b9fk&U#OFAaK{q67g(|9ms8JfAu*&HpqLz~R;6O4#U*4uiQ}PX@U=t-j`;DhVz;=}3o@ts;E4!l<;cfC&4Nz*_mO)HA7da$FFWMP`52C+22Rvj>FWzke| zD3mZ4EA6X;TlhbStry(5zn}Sq1MB!&7|4X-x$?YFUS<6MxI9}~haWe7fu`T+a8{>J gj*g%4JNY&mB;}^+zSwQ%WjCO?+O=ty-lO;FKOcC**Z=?k literal 0 HcmV?d00001 diff --git a/bodegaTerrazaDelChupi/urls.py b/bodegaTerrazaDelChupi/urls.py index a93c515..6d951ab 100644 --- a/bodegaTerrazaDelChupi/urls.py +++ b/bodegaTerrazaDelChupi/urls.py @@ -32,7 +32,7 @@ #2 Add URL maps to redirect the base URL to our application from django.views.generic import RedirectView urlpatterns += [ - path('', RedirectView.as_view(url='/catalogo/', permanent=True)), + path('/', RedirectView.as_view(url='/catalogo/', permanent=True)), ] #3 Use static() to add url mapping to serve static files during development (only) diff --git a/catalogo/__pycache__/admin.cpython-37.pyc b/catalogo/__pycache__/admin.cpython-37.pyc new file mode 100644 index 0000000000000000000000000000000000000000..1f0c7ac544adee0b54fb5e5206f775cccd1fc540 GIT binary patch literal 640 zcmYLHO^ehp7*5)x?aXuqW&I7(%T~P!BI_!6nq@(}l!cIKVkcvo)FdO!Sr7gU_vl~B z)zkh3Pv-5+;tP3rzw*2v$<^7}5+xaa9&Vpy2>k)$K}b?A)A6?n1QJ-I5qB6Pk%?Sq zW8UQ>>BvYsijl;-;#VojU5cM{3i<~mh@d}^pvhZ(&%4Dbn#;vqmbi+Ks44GL1=Qe3 zxfqqX$6)2LxRM(scr0$DP{PLYomSEW*+ce&K<;Ha{yc$19Tup|1nzQ?bwuQeoy66V z=q->pWh{&xH%`Vf@R6IXjnwmvb&&)$+4#7(sfI}f8P~ntS{;kY$zDNTu>F^YxJ9bv zU~_H-P$#%S+4`(>knT5fFvARg z*X<`Soo~N!BYSSzL4|fyLG|tA>`wNf?f1^xn?u-I^M1$8VAl|S`TWJJw&#IsJJ@z! z=f!kzWg>=FJv?fK37$RI&9ZwW=F1l_wNo3HegTR_YF=vZAlp%Z0^G!_AYKo`(pr!BrZ{fGmOzKl942zND_s2B#UJH zh|+@}=t3#(CRf(3jeae15ne{akgUM{5r9G&mI#zMBQgRt=?>St=B3Hapv@AouQzGj zC5&laDaN`fW0jFj8S*(}?+q{aOdR4DatX}u;rEU{dF4F);93c;X&#Y( znu^AG^U&6BM&E3?&dq(G&rVLy>G(b6*7~Jw9f7&wBt8O2a9?j=@tN$E%h2Zn*E9cX T4A}&TF1Z+XzYNFd=gi3;0?1uL literal 0 HcmV?d00001 diff --git a/catalogo/__pycache__/models.cpython-37.pyc b/catalogo/__pycache__/models.cpython-37.pyc new file mode 100644 index 0000000000000000000000000000000000000000..393f8221c218df4f1125e4527e9e9e30695dccbf GIT binary patch literal 2783 zcmb7G&2!sC6t^r{lI5?&`D!}Acz^?DAO=oA8K#cyrlylP)0h-?7&MA@Z7Y$r?n(|# zh8Yg@z@>M%!Hr({1Gx6W-=Hg}{0p4;tzTy&49QZ3s7yP~$xS>_ zhz{M5%R@I4yPnwd3qBS#NP(K9Nb{sbEmCF$S{P(mkrp9Kv;Ch;m3r zZ={&pnw-UkZHJMt?OSsDS%{2zUQV~OHT$$zUyDuK4xBNw?bxzyjGp>ZFWUCQspHSS zU@FR8+ZJ+~INusM;*Q6BDhje+>;@4VveZP3$Qe7qh?89C9C1PN*!?ME6sjRp*E?t; zN621>G?61D@ZOimQLlZkNecb$e$U?SYlVz7<_Q0duc6^tQxKDHd&h_L1 z5qD2S1$#&$xFE{Xra~BK;hPYquBk<}m_<{yZ1QS)R=!qlX=YDGTwkttF~z)GnR={I z1;r}MRVBHkpO&k>pc@OinQ{loQxgEn$41NdP%`X70rs=B-Pl{TDK4Teutm{L6ger-+}c(Uf8Cq0OOGnT@~1k|mbpxMeA-Qb@Fj zRS05v)OOP&Cugzu8?)MMpxmtPS+B@jhWvD?9%TBU8ftM*G+l@c-V~feMSNC^LNs0 zyog?Flf-Stu3`g6or6c*Ku2ssfLDsnG~#x^zp))kC5Q6B24S;^#d=E6aVcG~&A=PJ zP1}0&J4dIFSj5QMYPVHPK#*$ z=Karz*%^Smyi-n$z9T@2&P(9{xLZ(han ziagtMK#Ll>ajES@tnZCkLWaZ~%odHUJ6tet7~DhsN~EIRn+L6CyF-jw6~vWYCphbK zDbvwLnwU_mVE`$N5o~Tp9O*&ik%eZv2L*}f_Io6s5aoVzr$@>lNa}$P1AF2OIl_(5 z_q&Jimf`R8o5b41sGgm;TVp^7(ShrWtL`SY@HJZaI)s_iR9SaRN*Pj9H1MVc3$(1R zK+6j0e|g$usq5>lYlKs;CQ1BsYFJO(hVVVl^8V z1@jSln%rFC6|AvWFJ8@9k}P?EWP9QbXt+9(0!oNpyb4Raxz9t~qNnU&j6(RwO=jX2 zj_{|4E>NMosYPEOj;kv0~ X^ON)*{#5?^2xWy8_3CzYt@`%gCXt0^ literal 0 HcmV?d00001 diff --git a/catalogo/__pycache__/urls.cpython-37.pyc b/catalogo/__pycache__/urls.cpython-37.pyc new file mode 100644 index 0000000000000000000000000000000000000000..82d95245bf8c42b8b522822d38deb8d9a71e3723 GIT binary patch literal 296 zcmXv|K~BRk5VYest!Vp@Tw=-%2_b|y0zyJuA}*HKN*y_NWIKiY0iM7E_y@1>l~cdK z3A>1qc6L{@yR+Au%?V2Q`k0^JQvS}(KWHkhQurnjAix?8xWyPj0Yn!AX$eLWLn%pL z0)^_GbhxFkctrK`kakdwV>$A$JK(>D?v;G;5k;yD$k!|zKFIsJiYw^3>1;DO?Ol<^ zUAA{+rYccfB_-Vo(i#7WTz>mVKez13OXu018!5P9oeFGFK?ycG+e;Ccn4Gr{bJ$sP mb9A}O^4aP3oCzMdww-0!w;AWSycjG@T3+UteYRiYHTeYtPE9!g literal 0 HcmV?d00001 diff --git a/catalogo/__pycache__/views.cpython-37.pyc b/catalogo/__pycache__/views.cpython-37.pyc new file mode 100644 index 0000000000000000000000000000000000000000..6074d7652275fa7d76225972363023c33dacb08b GIT binary patch literal 870 zcmYjP&2H2%5Vqs|b-P$YlfEkPt%cURzcaE)miy8(V3XINpw(rA6CQx$*`* zbdNjML+!ob6V1z6+UeOi3WSiKfZ=xmATGFMrWJ{m3YoGf+8A1+@ZJ>=RzJBjj z2>E6&^Ed|jx?e|A-!{x#NZ=t8>#6` z6h>QyJZ(^@wlU!7*{!@RL6o@>;HZLYN)p%z#91q}0oOj*cBb#l0L?D~d${~NN zI$h+ADDoyPE0fB~R7E-m<$jkIEoe2qFsG^+&GM#HM=t&P<*PSok)!0QROzA;-}G>P zVS|o;gg5J5G=%NY9dD2Im`B|QPce4i8V3{K)4DbLxLJ}JxuM+2P7Mlu<=zoNfxTlJ zHcC!GB+UBb4=0~2D}}Ma9ID179z4eCtk1=wD#T=w*RAO2t<4imIyL1Sa(Ir8c6t)p zr|<&T<77MA0f*62<{8%o7RtvmfYsUgGyaQy71ginWer#kH&!|vJ#0G!g$ Yp@`q&*|rw%-1F3~pilQ{-;W>t2Ol%qM*si- literal 0 HcmV?d00001 diff --git a/catalogo/models.py b/catalogo/models.py index f0351e4..84d00a8 100644 --- a/catalogo/models.py +++ b/catalogo/models.py @@ -1,73 +1,73 @@ -from django.db import models +from django.db import models -#Create your models here +#Create your models here - -class Bebida(models.Model): + +class Bebida(models.Model): """ - + Modelo que representa una bebida. - - """ - + + """ + nombre = models.CharField(max_length=200) - - + + tamanho = models.IntegerField(help_text="Ingresar solo números en mililitros (ml)") - - sabor = models.CharField(max_length=30) - + + sabor = models.CharField(max_length=30) + proveedor = models.CharField (max_length=200) - - + + GASEOSA = 'GASE' - + CERVEZA = 'CERV' - + WHISKY = 'WHIS' - + VODKA = 'VOD' - + TIPO_BEBIDA = ( - - (GASEOSA, 'Gaseosa'), + + (GASEOSA, 'Gaseosa'), (CERVEZA, 'Cerveza'), - + (WHISKY, 'Whisky'), - - (VODKA, 'Vodka'), - ) - + (VODKA, 'Vodka'), + + ) + tipo = models.CharField (max_length = 4, choices = TIPO_BEBIDA, default = GASEOSA) - - + + contenido_alcohol = models.IntegerField(default=0) - + precio = models.IntegerField(default=0) - - + + stock = models.IntegerField(default=0) - - - def __str__(self): + + + def __str__(self): """ - + String que representa al objeto Bebida - - """ - return self.nombre - - - + """ + + return self.nombre + + + class Cliente (models.Model): @@ -76,28 +76,28 @@ class Cliente (models.Model): ruc = models.CharField(max_length=200) telefono = models.CharField(max_length=200) - def __str__(self): + def __str__(self): """ - + String que representa al objeto Cliente - - """ - return self.nombre - - - + """ + + return self.nombre + + + class Pedido(models.Model): """ - + Modelo que representa un pedido. - - """ - + + """ + no_pedido = models.CharField(max_length=10, unique=True, primary_key=True) f_pedido = models.DateTimeField(auto_now_add=True) @@ -106,12 +106,12 @@ class Pedido(models.Model): monto_total = models.IntegerField (default=0) CONTADO = 'CONT' CREDITO = 'CRED' - + TIPO_PAGO = ( - - (CONTADO, 'Contado'), - (CREDITO, 'Crédito'), + (CONTADO, 'Contado'), + + (CREDITO, 'Crédito'), ) condicion_pago = models.CharField (max_length = 4, choices = TIPO_PAGO, default = CONTADO) @@ -121,15 +121,15 @@ class Pedido(models.Model): (EFECTIVO, 'Efectivo'), (TARJETA, 'Tarjeta'), ) - + medio_pago = models.CharField (max_length = 4, choices = MEDIO_PAGO, default = EFECTIVO) def __str__(self): """ - + String que representa al objeto Pedido - - """ + + """ return self.no_pedido diff --git a/catalogo/templates/base_generic.html b/catalogo/templates/base_generic.html index d551da7..6c3042a 100644 --- a/catalogo/templates/base_generic.html +++ b/catalogo/templates/base_generic.html @@ -7,7 +7,7 @@ - + {% load static %} @@ -15,19 +15,22 @@ +
-
-
- {% block sidebar %} - - {% endblock %} -
{% block content %}{% endblock %}
diff --git a/catalogo/templates/index.html b/catalogo/templates/index.html index 98b3376..20b8573 100644 --- a/catalogo/templates/index.html +++ b/catalogo/templates/index.html @@ -1,9 +1,9 @@ {% extends "base_generic.html" %} {% block content %} -

Inicio Bodega Terraza Del Chupi

+

Bodega Terraza

-

Bienvenido a Terraza Del Chupi, un sitio web básico de Django desarrollado como tutorial de ejemplo para MITIC.

+

Bienvenido a Terraza, un sitio web básico de Django desarrollado como tutorial de ejemplo para MITIC.

Contenido Dinámico

@@ -13,5 +13,19 @@

Contenido Dinámico

  • Pedidos: {{ num_pedidos }}
  • Bebidas Disponibles: {{ num_bebidas_disponibles }}
    • - + + + + {% for bebida in bebidas %} + + + + + {% endfor %} +
    NombreCantidad
    + {{ bebida.nombre }} + + {{ bebida.stock }} +
    + {% endblock %} \ No newline at end of file diff --git a/catalogo/views.py b/catalogo/views.py index fd0aab0..ec87dff 100644 --- a/catalogo/views.py +++ b/catalogo/views.py @@ -5,7 +5,7 @@ #Create your views here. def index(request): - + # Genera contadores de algunos de los objetos principales num_bebidas = Bebida.objects.all().count() num_pedidos = Pedido.objects.all().count() @@ -13,10 +13,15 @@ def index(request): num_bebidas_disponibles = Bebida.objects.all().aggregate(Sum('stock')) #num_bebidas_disponibles = Bebida.objects.filter(stock__gt=0).count() - + bebidas = Bebida.objects.all() + # Renderiza la plantilla HTML index.html con los datos en la variable contexto return render( request, 'index.html', - context={'num_bebidas':num_bebidas, 'num_pedidos':num_pedidos, 'num_bebidas_disponibles':num_bebidas_disponibles}, - ) \ No newline at end of file + context={'num_bebidas':num_bebidas, 'num_pedidos':num_pedidos, 'num_bebidas_disponibles':num_bebidas_disponibles, 'bebidas': bebidas}, + ) + +def comprar(request): + device_value = request.POST.get('nombre') + print (device_value) diff --git a/db.sqlite3 b/db.sqlite3 index e27fab778602080a97eef9f67fea8cc626a1aac2..29dc653a7cb5b168e08b52828b1268abea616b13 100644 GIT binary patch delta 634 zcmZp8z}4`8Yl1YR_e2?IR&NG9nGG9L=E)1SGO+Q7vGTv<5980_U&=p?|H@{;1SkH< zVfy+C{JR(gITK4uGU7{%Q;UE+ULIz7Mz{de=B4`a2^>s(%Nh7X`Ic{1RG7`j)u_$H z%h0Il$SFNJe!g^lURI%bL|$>Cr&Cdtih;SOOQ@NFS8BR*v2Sj9R7OsrQC5~|VPZ(B zS9+vHR7AFKadw$wK}K@At&xGDrLKXou7RO~p{13PnU#@&o{6D_g{fg#VqR);Vjh&r zNG(ZqNY72o%+X8E&qde8Wo2NbXJT$@YGFA!bpCn{CjK`J{6F~L0R8xYUzD3!nh|OY z6FajgXKrdvChum(g8%ZHF0cr2F!8o9@Ezi90eY;0H?GN=iPg7-)iEtEsl+6=q9V(r z$T-)y$}%UzIN8w9Bqt}W)X22lpeQOND910$v&t{rvobQvu`((v)X=ZWvC=Oqu-wlj zyTUgl)F8^;wLB`swcO7=EH^UCE!Q_|vch{w#>&Zm-WErj__+rf`{lYC`-g`b_*VI4 z`Gxys`vOgf%Jnq#b8*Uu3URFPGjhv`$_>i$4-d-qGm5P8%rk%onV~6CkQo_TT9`Fi zGlJbd{lR-ih0U+tNqq!{#C8V$?fiFuA+efYMTOayk&wrx-+s@i3DkF(f&UTzVW7V4 V{Bm;4j*PG{$Fz3)!~cx(8vw_f#cTio delta 349 zcmZp8z}4`8Yl1YR`$QRMR(A$Hi4z-B=E)09W?2j)Na`cd{yPl(clhrB?O(^Qs7lD>>9^lA lY63MqV&H$oe;BA~7r(T;k%6J5u7R;GriI%d{%4fm007>nZK41G