From 27bf1c95757112df66c44dfa4d628db44f8919e6 Mon Sep 17 00:00:00 2001 From: Juliana Date: Wed, 23 Oct 2019 16:04:05 +0200 Subject: [PATCH] Bug sur les dates local --- .../__pycache__/__init__.cpython-35.pyc | Bin 0 -> 197 bytes controllers/__pycache__/main.cpython-35.pyc | Bin 0 -> 3091 bytes models/__pycache__/__init__.cpython-35.pyc | Bin 0 -> 376 bytes models/__pycache__/delivery.cpython-35.pyc | Bin 0 -> 510 bytes models/__pycache__/sale_order.cpython-35.pyc | Bin 0 -> 1588 bytes .../vracoop_point_retrait.cpython-35.pyc | Bin 0 -> 5788 bytes .../vracoop_retrait_suivi.cpython-35.pyc | Bin 0 -> 1168 bytes .../vracoop_retrait_time.cpython-35.pyc | Bin 0 -> 2326 bytes models/vracoop_point_retrait.py | 24 ++++++------ models/vracoop_retrait_time.py | 37 +++++++++++------- static/src/scss/style.css | 4 +- views/vracoop_templates.xml | 8 ++++ 12 files changed, 45 insertions(+), 28 deletions(-) create mode 100644 controllers/__pycache__/__init__.cpython-35.pyc create mode 100644 controllers/__pycache__/main.cpython-35.pyc create mode 100644 models/__pycache__/__init__.cpython-35.pyc create mode 100644 models/__pycache__/delivery.cpython-35.pyc create mode 100644 models/__pycache__/sale_order.cpython-35.pyc create mode 100644 models/__pycache__/vracoop_point_retrait.cpython-35.pyc create mode 100644 models/__pycache__/vracoop_retrait_suivi.cpython-35.pyc create mode 100644 models/__pycache__/vracoop_retrait_time.cpython-35.pyc diff --git a/controllers/__pycache__/__init__.cpython-35.pyc b/controllers/__pycache__/__init__.cpython-35.pyc new file mode 100644 index 0000000000000000000000000000000000000000..7c169b8aaddba8b2b4442754d10c52909a77be7e GIT binary patch literal 197 zcmX|)K?(vf3`Ns%79z|}yu%<^bS>fu1aT)wDeZv8wi()v;3d3drQs{!1j_2Rm9b8~^|S literal 0 HcmV?d00001 diff --git a/controllers/__pycache__/main.cpython-35.pyc b/controllers/__pycache__/main.cpython-35.pyc new file mode 100644 index 0000000000000000000000000000000000000000..4ff2daf5133a1b74b665ff21ae3876838ba652ff GIT binary patch literal 3091 zcmb_eTW=dh6h3>k<2b3Cq-j!$iYON?7n>FVFQo;k;vz&qas?T7A zcKHN*R}KfeQthR@LG@{t9sLJ7l2~Ub3!SA$J3ilK8zU|Wj|5n&7WCl3Itl31ATdt| zP9T~j7Fgp0Ts)|jFaGQ07f7_KPGA4$~P)WvuyH=yU$iSx}Qxt(}_rO87rBqWRM#_-2A+ZLCm5z~TYW+kfd9F-Y$f*|2!MLyGaLf3U zOy}$hdOFPYZ=_Z+`{c_`KO4zTCbGMZXI4rLC0nsljeSVhLC6iA3(l%L>pUNU_Oo`Ftrf7OeF-HP zj5tk{8c6lO8hAM_4k-7w2SuK`2+h?JlXVabEOUQ_$t5Oi$bwu(&n%tQl4Va@;O%oP zaCUv_VgvpJXg=CJn*Iy~4wPGufddsz18+HW=#fWx6`|`p0Uf}nLe3V5Ohn)#pZ4)X z&<1o1f8D6IF}qY^-JWEFao(<+|6=8C*5!3yiYLy8n`Y5U=?dh?o1GO@SE1r&R5O8| zPNY&bux2gZmU(O)WRmQS=p+J*;sYbv#F}MsBZC5i@35`w5f-2EHLrlFlMm~pUQFOt9*q$O|xQnPjkKED&IPp%J{^o z8b{%YK)a4p)$2?mCT}n~9d|a{y^L|a20}9iO|ZEe5%a?qB2wQNNSyI z%g9x4;YOw<%D2GLM6JNW!eBGsP00NNAn!or2AX~age)A(r~pl8!P15^hkyRgS=w-C zxBnwJrN^9#QBEcnqwmmpDn_4pMJ#<6L{@hB5hJT_v)ar|JK42v1Xb;$%Oo90q+ z*r_W_IP2PQRO|w_Y91>aIqEeYMR3Y!<2Yj$QMY8aoNCiWb~ zS=Y=l-{!ZiwPY`{eDPRmpUfuh6YrBYzfTkw&)&`F$;Xw?pIyi)-zs!`i=t=ief?Hp QoZIYiw$QBFwA1qb2EiHeivR!s literal 0 HcmV?d00001 diff --git a/models/__pycache__/__init__.cpython-35.pyc b/models/__pycache__/__init__.cpython-35.pyc new file mode 100644 index 0000000000000000000000000000000000000000..d2d86b04b81ce7a25336b5cc45748d6f5a404672 GIT binary patch literal 376 zcmYk1O-jTt6vtosWf>T7;dqB`47yds1Be@46(octU@+|~Nm`gA%~d=?x30W`D_>d* zlaC+yy+`;b*ZckM{_FI9U;y86HZnRt(GG6}O^bm8=oqvNSn_P~4BBke-v_#YMe}6cxN^5d;ql5<(JfYIakTZK1u^NAM;3D853j zo_qyQPIl{0$P6Fzk#D}44AZp#_P%-84*)*k--!{AFzg8?jyC`WPzF#0P=-*15M1#P zcm%IVMj%3%MzD^ch=Ip&mvuhzA!MOT9;Hy+x}?-xD9e2L=R^ob81?{@056WcP#oJ8 zC>q1G18ti%1VyrycEfu^nbxyQq2xlCxany#+*s(N^Q-2dzAKYy!2qQB|j7eN0CPyGdi z#9vTJv=lTGwDf4^kzlV!rB6@3mp;jWUcnKN60`{D#-~|GGNg+ndW|h8@ocozQkAuh z=7lO{od_#F&UtPB!y($F8z_o67m^?svd?@{0WGj6OqULu-;g(poWDadq8o&Do!KMV zab}-nmn6(Sy~65|Ga+MV#?Cw@dE!hcT^x8|dly-$el}8>ZNG*()~wq&*RF)L%9d(- z_QGVj)~oSK7gaMhsxev7*r;wyQ9aup|HAGEJNI_*qh6Z_a((MK{XwmbI`B+$ZwEwx zw~yx=JoQfyS40a!wIo;rDuPDW9$g9230--#a5~Dr_FXLSfyZYe3c)ytCS)7hMdDBY z@95{dic(imx;uJW$Rx6TRn<6esw-uERlTs$Q=?zj%7!mZ(J1Q`(gshpE|b6pwJPVc z)44XeI@o0vJ4k+Qftq!8`~N}a6g9q?PA>IQO|;b7iBBI*@^#(lCJ8SA6_OpLfBFazG`jK%x> zp^spPc`NR*?LAs*V~>QfOQvpiJFN~ zL1WH&DV&!&+hO3h7~E%nz@PlP{&-(MFMfoueXn=}abKYP;eX5L(B#B+Q+FYxsqLpJ zT5*joOl_Q|zpt~BuL@Y*w5To>CdDvLw);4%Hjgk%rt41hEs%Ev+3-7eXg;WUhs6gh zK4ifid?1)M!-#kA)Epa&$m@wn^g!9b8}tT8ZheaJ4S1{!Uoh?fW(duOkNHA&F$ep) UG_EJQpSRU~$rn=1Vu*(L2k4b@OaK4? literal 0 HcmV?d00001 diff --git a/models/__pycache__/vracoop_point_retrait.cpython-35.pyc b/models/__pycache__/vracoop_point_retrait.cpython-35.pyc new file mode 100644 index 0000000000000000000000000000000000000000..b5d9600f0cb55030e343858a1a3a2f866157a17d GIT binary patch literal 5788 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 Y@%_~NAF@4TCOelak literal 0 HcmV?d00001 diff --git a/models/__pycache__/vracoop_retrait_suivi.cpython-35.pyc b/models/__pycache__/vracoop_retrait_suivi.cpython-35.pyc new file mode 100644 index 0000000000000000000000000000000000000000..8c8ed7eaa85b933b1930be2b6f2aedbb8c1b35de GIT binary patch literal 1168 zcmYjQ&2H2%5S}EPG`rmeR7CkNOUq?1yP{kXsssX5(F(Cr1uLN_WK1_Du@@())NouL zftTowci=62;lPPk;KbO8x6Q8Y@#oJopU30P!Jzm1{m+lzJb*uN>FbcaN3D259n#-{ z3?O%4=0NVk%mwEax_};hr$rB#11BCVJ(zU>J1`yje`zC(TovR3SyrgvbILL-5)Iq0 zOU53x;s!z%xEF2(SZ;IwJA zr(Tz=7%yU3awb*qJWClbRi9kyR7O0`*@c3INO@^>sGuli%8%>8TMgU5%Fil}sq)`6 zLmo>#J1|3-Gnq(6KzLv+|AbYVv2TX(lyPhrN7f1oQbCkp+KeHlblzmnRQRH`>Z|*r zl0&SljQZMZR!MdVIUKolqpfbV>A6u?H|l7<(pRtaX_iq~Hwrb&YOF)6kaiWU?AXsux9+aglF@$Mw4ic;j07*X(IVnZfbntX|<5~D<9I@Y9lk1K*zV=8#OIFtJ6uTd+u zsp~s|6Sy1BhSMcWH}BG~ONikgj(pY8Vx+4jnymN-x?0Whh499DL?jhHZ4&)V2Q2iy GP47QE3R=Mc literal 0 HcmV?d00001 diff --git a/models/__pycache__/vracoop_retrait_time.cpython-35.pyc b/models/__pycache__/vracoop_retrait_time.cpython-35.pyc new file mode 100644 index 0000000000000000000000000000000000000000..bba385045c638fa73cf2be9ece5632636c32c39d GIT binary patch literal 2326 zcmds(OK;mo5XYC2NIfh?w)}{lI1ZgO4*{*!=({IzaE0t-jvFZN;hZD>SML<@lW7;H;8S-$Kyz($P z-E*r)_pbGpZ`ke!=Ld9W;uYq>=c@Dm7wvKti%$A2s?~uk2r_6DkFGNg} z@RVyW&6G$^iqXEzmCv{zQ9tD|6$vl4zv8*#KFj?lyeiaxjJJ`D3%}ZBTqWXqM1BwQ zRzYtaLFektujvP|U}Bs#fjr2tDHQJjF`kjMvaX)6{&sz7va-`)_{nnMmg{ z71;Hu`)QboneK?8PX^gGtaw_o+F zzl46@`UCWDSbvEAvh}h1Y6bl@-3d$)L7;m<07c~y2frT#Kjk#S@?hnf5D*zpLnY>T zD{ArNX>$HlCR`5}Hxc0L5(uWdhdknNw=&T!JV(1cE9x!^YH_LKO z&x6JL4|TsL>JhdF&EMZmPG!s|l1XXIlc$p~Pcs=$C}S{0lk$`>65)>lO;`}h2yc60 zVO0f`39vhR^K*rRf{!r$5KQ0k9Ir6~+pPU`oo;XBfOSeca)z+-9CP)%`S&{<_aFSb zg=kseWCtk%{6pFSaz=)B6&FESHB7Sn15$zlLVH4>^C2vv=Ps)oUU$c%y-LFfMW z04ga`Sd=d~Qn&`@u)?+#70yAx?iCj3u)+=&of7FFU?YnK)M1HWDJrawhiVN3g}hW7 zXl|m}M1%BDx6vRo)g3fDXzrr%(d?o@daL_rs;RWzW7NiA-iL3B^tMxUZHB7pv6E!3 pc`^2M3#VG)-!h9b_W=LBFr#H+-jz^yKC+1X80R-dv(emo@DExFOpO2l literal 0 HcmV?d00001 diff --git a/models/vracoop_point_retrait.py b/models/vracoop_point_retrait.py index 678d848..cc3c802 100644 --- a/models/vracoop_point_retrait.py +++ b/models/vracoop_point_retrait.py @@ -69,13 +69,13 @@ class VracoopPointRetrait(models.Model): def slot_calculate(self): self.ensure_one() LIST_WEEK_DAY = [ - ('lundi', 0), - ('mardi', 1), - ('mercredi', 2), - ('jeudi', 3), - ('vendredi', 4), - ('samedi', 5), - ('dimanche', 6), + ('lundi', 0, 1, 'lun.'), + ('mardi', 1, 2, 'mar.'), + ('mercredi', 2, 3, 'mer.'), + ('jeudi', 3, 4, 'jeu.'), + ('vendredi', 4, 5, 'ven.'), + ('samedi', 5, 6, 'sam.'), + ('dimanche', 6, 0, 'dim.'), ] for rec in self: my_datetime = datetime.today() @@ -95,17 +95,17 @@ class VracoopPointRetrait(models.Model): exclure_the_day = rec.vracoop_retrait_time_ids.search([ ('vracoop_point_retrait_id', '=', rec.id), ('active_day', '=', False), - ('name', '=', week.strftime("%A"))]) + ('name', '=', week.strftime("%w"))]) if exclure_the_day: pass else: - print("----- week.strftime -----", str(week.strftime("%A"))) corresponding_line = rec.vracoop_retrait_time_ids.search([ ('vracoop_point_retrait_id', '=', rec.id), - ('name', '=', week.strftime("%A"))]) + ('name', '=', week.strftime("%w"))]) for week_day in LIST_WEEK_DAY: - if week_day[0] == week.strftime("%A"): + if week_day[2] == int(week.strftime("%w")): byweekday = week_day[1] + day_short_name = week_day[3] time_available_week = datetime( week.year, week.month, week.day) + timedelta( hours=corresponding_line.availability_time) @@ -219,7 +219,7 @@ class VracoopPointRetrait(models.Model): return_slot_list = slots if return_slot_list: vals.append( - (week.strftime("%a"), + (day_short_name, week, week.strftime("%b"), return_slot_list)) diff --git a/models/vracoop_retrait_time.py b/models/vracoop_retrait_time.py index d8e2a2f..60ed373 100644 --- a/models/vracoop_retrait_time.py +++ b/models/vracoop_retrait_time.py @@ -10,14 +10,23 @@ class VracoopRetraitTime(models.Model): vracoop_time_id = fields.Many2one('vracoop.time', 'Conf time') name = fields.Selection([ - ('lundi', 'Lundi'), - ('mardi', 'Mardi'), - ('mercredi', 'Mercredi'), - ('jeudi', 'Jeudi'), - ('vendredi', 'Vendredi'), - ('samedi', 'Samedi'), - ('dimanche', 'Dimanche')], + (1, 'Lundi'), + (2, 'Mardi'), + (3, 'Mercredi'), + (4, 'Jeudi'), + (5, 'Vendredi'), + (6, 'Samedi'), + (0, 'Dimanche')], string='Jour de la semaine') + # name = fields.Selection([ + # ('lundi', 'Lundi'), + # ('mardi', 'Mardi'), + # ('mercredi', 'Mercredi'), + # ('jeudi', 'Jeudi'), + # ('vendredi', 'Vendredi'), + # ('samedi', 'Samedi'), + # ('dimanche', 'Dimanche')], + # string='Jour de la semaine') first_morning_heure = fields.Float(string='Heure du 1er retrait (matin)') last_morning_heure = fields.Float( string='Heure du dernier retrait (matin)') @@ -37,13 +46,13 @@ class VracoopTime(models.Model): _description = "Configuration horaires de base" name = fields.Selection([ - ('lundi', 'Lundi'), - ('mardi', 'Mardi'), - ('mercredi', 'Mercredi'), - ('jeudi', 'Jeudi'), - ('vendredi', 'Vendredi'), - ('samedi', 'Samedi'), - ('dimanche', 'Dimanche')], + (1, 'Lundi'), + (2, 'Mardi'), + (3, 'Mercredi'), + (4, 'Jeudi'), + (5, 'Vendredi'), + (6, 'Samedi'), + (0, 'Dimanche')], string='Jour de la semaine') first_morning_heure = fields.Float(string='Heure du 1er retrait (matin)') last_morning_heure = fields.Float( diff --git a/static/src/scss/style.css b/static/src/scss/style.css index 5409d6f..9b29d02 100644 --- a/static/src/scss/style.css +++ b/static/src/scss/style.css @@ -183,9 +183,9 @@ border-bottom: 0px solid #dee2e6; } -#retrait_method h5, #retrait_method span{ +/*#retrait_method h5, #retrait_method span{ margin: 0.5rem; -} +}*/ .btn-primary:not(:disabled):not(.disabled):active:focus, .btn-primary:not(:disabled):not(.disabled).active:focus, .show > .btn-primary.dropdown-toggle:focus { box-shadow: 0 0 0 0.2rem rgba(0, 160, 157, 0); diff --git a/views/vracoop_templates.xml b/views/vracoop_templates.xml index fa1f6bb..a3be104 100644 --- a/views/vracoop_templates.xml +++ b/views/vracoop_templates.xml @@ -7,6 +7,14 @@