From 4324af05d5aac6500065f7658950a944d2a8e0b0 Mon Sep 17 00:00:00 2001 From: Bachurin Sergey Date: Thu, 7 Aug 2014 18:05:26 +0300 Subject: [PATCH] clients and akt --- project/customer/views/clients_ajax.py | 6 +++--- project/static/css/style.css | 1 + project/static/js/dialogs.js | 2 +- project/templates/customer/clients/list.html | 20 +----------------- .../templates/customer/clients/list_item.html | 19 +++++++++++++++++ project/templates/docs/aktrabot/as_pdf.html | 3 ++- project/xls_templates/aktrabot.xls | Bin 20480 -> 14336 bytes 7 files changed, 27 insertions(+), 24 deletions(-) create mode 100644 project/templates/customer/clients/list_item.html diff --git a/project/customer/views/clients_ajax.py b/project/customer/views/clients_ajax.py index eae393f..7fbcf73 100644 --- a/project/customer/views/clients_ajax.py +++ b/project/customer/views/clients_ajax.py @@ -59,7 +59,7 @@ def clients_add_ajax(request): 'field_errors': form.errors, # ошибки полей 'form_errors': non_field_errors, # ошибки формы #'reload': form.is_valid() and 'reload_on_success' in request.GET - 'reload': False, + 'reload': True, 'id': new_client_id, 'name': new_client_str, } @@ -90,7 +90,7 @@ def clients_edit_ajax(request, id): 'success': form.is_valid(), 'field_errors': form.errors, # ошибки полей 'form_errors': non_field_errors, # ошибки формы - 'reload': False + 'reload': True, } return HttpResponse(json.dumps(data), mimetype='application/json') @@ -110,6 +110,6 @@ def clients_delete_ajax(request, id): data = { 'success': True, 'message': {'title': 'Инфо', 'msg': 'Контрагент удалён.',}, - 'reload': False + 'reload': True, } return HttpResponse(json.dumps(data), mimetype='application/json') diff --git a/project/static/css/style.css b/project/static/css/style.css index 23a9457..731489a 100644 --- a/project/static/css/style.css +++ b/project/static/css/style.css @@ -221,3 +221,4 @@ div.blockMsg { width: 100%; height: 100%; top: 0; left: 0; text-align: center; } .doc_status2 {color:blue;} tr.doc-row:hover {cursor:pointer;} +#clients tr:nth-child(odd) {background: #f5f5f5;} diff --git a/project/static/js/dialogs.js b/project/static/js/dialogs.js index a95e389..33cdd7b 100644 --- a/project/static/js/dialogs.js +++ b/project/static/js/dialogs.js @@ -106,7 +106,7 @@ function update_form_fields(form, obj_values) { for (var key in obj_values) if (obj_values.hasOwnProperty(key)) { var value = obj_values[key]; - var input = $('input[name="' + key + '"]', form); + var input = $(':input[name="' + key + '"]', form); if (input) { var input_type = input.attr('type'); if (input_type == 'checkbox' || input_type == 'radio') diff --git a/project/templates/customer/clients/list.html b/project/templates/customer/clients/list.html index df2efbc..fed1e1b 100644 --- a/project/templates/customer/clients/list.html +++ b/project/templates/customer/clients/list.html @@ -24,25 +24,7 @@ {% for obj in page.object_list %} - - - - {{ obj.name }} - - - {{ obj.contact_name }} - {{ obj.contact_phone }} - - - Редактировать - - - - - [X] - - - + {% include "customer/clients/list_item.html" %} {% endfor %} diff --git a/project/templates/customer/clients/list_item.html b/project/templates/customer/clients/list_item.html new file mode 100644 index 0000000..85564a0 --- /dev/null +++ b/project/templates/customer/clients/list_item.html @@ -0,0 +1,19 @@ + + + + {{ obj.name }} + + + {{ obj.contact_name }} + {{ obj.contact_phone }} + + + Редактировать + + + + + [X] + + + diff --git a/project/templates/docs/aktrabot/as_pdf.html b/project/templates/docs/aktrabot/as_pdf.html index c421070..da28691 100644 --- a/project/templates/docs/aktrabot/as_pdf.html +++ b/project/templates/docs/aktrabot/as_pdf.html @@ -113,7 +113,8 @@ на сумму {{ obj.sum_full_total_price|floatformat:2 }} руб.

- + Вышеперечисленные услуги выполнены полностью и в срок. Заказчик претензий по объему, качеству и срокам оказания услуг не имеет. +

{{ obj.doc_text|safe }} diff --git a/project/xls_templates/aktrabot.xls b/project/xls_templates/aktrabot.xls index abec8735e5aaa11803f1ca143465f990bc69309c..d6f90642f70316b9070cd9a44779030296bfe145 100644 GIT binary patch literal 14336 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 literal 20480 zcmeHPYiwM_6+U-;ZLgigYdeYK#E!GJ<3}Fe_>~8CVy~UpNz{am%vJd zW7RI3@C;D?`Y*CTi5CM|R49MmaJBfC7x7pi@{V}qC+6$8i@b|`mrRQ(G8!L0?Y~*q zpweN~pbi(|czX;}4EW^JfS1WyrCX)CuT=LRE6mr_eUDVib$L^2xBa4d7w83)M?FD> z_kDG5Q1>$24f(mE`JIAvNP}Dg{@l0E)7j-pYl$%+GZK?gnH0b5mD8yGyRbYr)GHt_ zrL;G$wEB!Nbf1!_%tHHHQQnVoL=u3FN*p~2r1y7`6wfSKMzvu;_t!X>ir2wA&fF%2vRaHr*(!}l?HKx?8Nj_44&Mfd8(wGLg5_{sc9J_`)u@ciH*ym9O0m?W z69*tOw^V0qojD|43|*SKPJ~{`rGXQ#&b&`HOP3fC^l>vdX7-aU+6D`?+w={}v8CZa zXgllvX2NsvFU4NRz_KX2D=LEi;5?r+d(Nf2`{gZH2pO``DDXa{GpVa58-Y;&t;vLQxQeUTXJ%s#W%Y?Dru81-gz zySc|~Hw(q6H}{&mk=jk5RYOpp*@fJL00{43KPU!(?3W$@`^=!(4Sh&DXnqaQK9mFI ze!y7o1pHP730ZA^*#rK)X2?`Kf)u+TP=5+o1DkFok0rXHddJSPV-zxgJP4W&C1}5* zxdpKOfYHu}(1R5Yk>SvCT^|hXyCX6Zx_w@Lzc~zL`;1q$Ab7!Q;7|SjzkU*jO;&nD;5C-84QKPp~Dssi>xhK0WP!-~miC z3lNBpPDRhoj!r}Y4hDx09<_`f3@+z{88G`{*j{C>K^T;N(1X2+u?7y+gS=Bsj~)Qm zim@I5?cVfN&KH`Q^NY^TAsSS}uorxL;k#XCff%bX=>oDWmo#stEQqJ~_o@Nxv;4YP z4651SR@%emCQb{ zSQcx6?w1X?Pl@5wXAJtrATJKd0o+Gb+<6xIj6$2JC6SY<+FXz1wvdzlI4F|nO$?mk zC>gDeqr4B+nNH)ikPfuwIBdb_cNX?>YJzvB49h_|3a$ra2v7S_h5-#q-MmHOF z>Qd7&g}OO~Iz1B`i#m`gBAsu03R&xPW0EdK;_S(dscIc4c5E(`PfMre3AE6!G<$ zT6+ABiAWda^qW#HHi@UW90%k?nv-&4z*nr^QtZue{aLjrL@-TGViHZlA(L1Pl5l!H zPs4>{SUfnzCjj9xk;GF1a313%F~vJAXjYSFt%+jR+Ouv9 z&?yM!tUC=A7C)PFaa`Oyc2j@x89WE0c;z41gkzT?m$5N;2jyQ-@pwf3fUUttC||)F z?pFmOCSJzt3Po1nP2Gr%_?UM!G6<|oZ94Jn;ig_6nU*__OqY3dpiTU>$d9iPd8i%? zg-49baUU0-dal4-ux0hir$7AQ&BMoz^hXqAv$}6l_wV3tU_YGFpa~mg1BaRqq2+ax zvZ&H`72d;&rWx3;-W7Q2@_X<0x1>F{raf;;dp<02L*%gXEIPrgas<9=LU0JW1U=3# z`v4zP{;8LCKNd=Q-EqjrM%onf_i|newsBKkqG02AGH|SD-$f3AQxYi(ce{Dl{ju>W zMuO<({PlTS{n9-2<~%%$*KP^?fOcVEdr2L=I%OO3b+mZ#vZvdM@v^Z7b$E;io{EdU zCDM)T^{{Vzeol2TX!!hu(Yv}u{VoG~pTdKO19pn&0z3u7fqn)aL%41^Ve?aX3`@JE z%mJfcy74&nZWw2a8-|$(m{S+_)vYsTC}7udPw7k>xbd*Z&487|zFjUGR4SO0A9i}c zbHaEq=7!;zID=nR7QAW&>(veiJAWp$0Dm-V!TkajS$bphO-Wr!I=!Jq)+_1!xx_#% zm5MB!Vri8f3g>R%cv1UmlGcfy*TO9pEK;cs2T~ff;Dnu4WBA^R17G6YjoMeO6Ft8P z8RO$Af({01)T0RYXp#+pUw}SEQh?fx(n^bR6)@=v7jW2Gg!S4@HdiF(mgE( zAHr;`wloaFbx*zM&pP;ysQ!6D(||Z$(|BSKsT;Vpt)2QVne&{q%yBVnq^5WQ`2t4EFByDf5 z)N7?4a_NKRki8aT!rt$|+Q4J#rKM_6?gHgHsahf>&f1g?d?)btK0D|TNo~vMR2Ja7s1B?5QW7n&12eK_NmP_TnRS@GxvjojS!gxnQyv!Gt1bMTr^_aZ{br^VVG3t<3t$I&Nje5K~ zx%7466;uSXZBZrbJRc`6OAj2KCEbQ4-IXQrS=#i(Cm-UoBtA>x>#GZGd{Gr);pNgx zTn{*OsXEINB=RdoV!0B@zyPqU!626*3E)*o44qi6Ks(DCY@JxP0B~Z!pZ-y&_$pAFD8iN3$hu0Q;HG$GJ`mLTaqP+6VXB3mmidQ@S$|Nl) zyVkF%uJyZuGCA1fQ@+F?tpI6biFH0;1!?phoGBpNL7M3bMhw-S8Kk-K$ioez7rS8$ z$lNdnWNsLPFE@-^5jTu8&g1h1|EJ&$bfNGa`U6j+_0)FFr1`h;4ut#)2?&D zxS`;+8sGWoMVD4ztwxS*+$j67GKoBhV;%gSpte8NLETmWOj?ySj)G6kBVzI(h8rb~ zX@W9^$+7V%xx{1`LCjjklfgp@le~Q@oTmh@YUAjz#*y=33uD(vXScERslx$Ez>gnF zf?r8k=8(W~^0yUsV>5}_#6;3RbZRU*sjPnP-m4#Nthr(YiFkGH(caH4>*q&beEN+GR}Bni z{>ob*Z-Kl8@)pQjAa8-Z1@aciTOemY>mJaxPLrw=~tP@36)10c(-W*#xvDF0N4$<9LR{jJX+q^II7P%ls~ezsob$=XW%W z>lw2%e%IfN=op{hd+;}Z#`*k`gZ~SRu|CfO_*DhJw%|7w{3ePYm$RJ#IX|iQBiAE0 zAU7g!L}vSE$Sm{MS8oCSFDU-0p&x$%%fH;6!QcBW<*LHhBes_GBfnQ4u3XeihSPbS zU;FA$e}nHbIJP$Yc1WMWU-ceSdfaD&7hU3yTIS_bkHr!uHfhX4xlR3X8~>z@eLn~* wr2lDU40^>EVA=}#oI{*Hi