From e62be89b3ddb615bbf336b336e8b34a2f69886e4 Mon Sep 17 00:00:00 2001
From: Anastasia <anastasia.v.sokolova@gmail.com>
Date: Thu, 7 May 2015 16:42:03 +0500
Subject: [PATCH] =?UTF-8?q?=D0=A2=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D0=B0=20?=
 =?UTF-8?q?=D0=B4=D0=B5=D1=82=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0=D1=86=D0=B8?=
 =?UTF-8?q?=D0=B8=20=D0=B7=D0=B0=D0=BA=D0=B0=D0=B7=D0=BE=D0=B2.=20=D0=A0?=
 =?UTF-8?q?=D0=B0=D1=81=D1=87=D0=B5=D1=82=20=D0=B2=D1=8B=D0=BF=D0=BE=D0=BB?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF=D0=BB=D0=B0=D0=BD=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 asuzr/models.py                   |  15 ++++++----
 asuzr/models.pyc                  | Bin 5441 -> 5649 bytes
 asuzr/views.py                    |  45 ++++++++++++++++++++++++++++--
 asuzr/views.pyc                   | Bin 5416 -> 7365 bytes
 db.sqlite3                        | Bin 60416 -> 56320 bytes
 record/urls.py                    |   1 +
 record/urls.pyc                   | Bin 840 -> 959 bytes
 templates/asuzr/attend_order.html |  10 +++++--
 templates/asuzr/attendance.html   |   4 +--
 templates/asuzr/orders.html       |   2 +-
 templates/asuzr/plan_balance.html |  21 ++++++++++++++
 11 files changed, 84 insertions(+), 14 deletions(-)
 create mode 100644 templates/asuzr/plan_balance.html

diff --git a/asuzr/models.py b/asuzr/models.py
index 3f55a72..30bead2 100644
--- a/asuzr/models.py
+++ b/asuzr/models.py
@@ -23,7 +23,11 @@ class Attendance(models.Model):
   
   @property
   def date_dd_mm_yy(self):
-    return self.date.strftime("%d/%m/%y")
+    return self.date.strftime("%d/%m/%Y")
+  
+  @property
+  def date_as_tuple(self):
+    return tuple(self.date_dd_mm_yy().split("/"))
   
   @property
   def week_day(self):
@@ -69,13 +73,12 @@ class Order(models.Model):
   
   @property
   def deadline_dmy(self):
-    return self.deadline.strftime("%d/%m/%y")
+    return self.deadline.strftime("%d/%m/%Y")
   
 #Эскизы
 class Sketch(models.Model):
-  file_name = models.CharField(max_length=150)	#имя файла
-  file_path = models.CharField(max_length=150)	#путь к файу
-  order = models.ForeignKey(Order)		#id заказа
+  sketch_file = models.FileField(upload_to = 'sketches')	#путь к файу
+  order = models.ForeignKey(Order)	#id заказа
 
 #Действия
 class Action(models.Model):
@@ -97,5 +100,5 @@ class AccessProtocol(models.Model):
   
 #План заказов
 class OrderPlan(models.Model):
-  month = models.DateField()
+  date = models.DateField()
   plan = models.IntegerField()
\ No newline at end of file
diff --git a/asuzr/models.pyc b/asuzr/models.pyc
index 5da9309a204e32ba26ff7a7b0b2668bbe5231a95..9685f459b529d829f4b0c7760c04e5439bbb41f7 100644
GIT binary patch
delta 677
zcmX|8OKTHR6ux(6?mQAF)9I+mgv2C*by_1<tRh;lAXJUe>P>}2C`mC>8avX!+~USv
zMQ~R={Q<gnVJYZZ#J%9&?sem1uRUjcaOZw}=brC8=A3s^&zhG0)6Ml|Yu9>hXipe4
z@@4pBEC;d827*0iY>TtI1t!~(2{Ym{@4`rIw>e`>$9olT8X_ph9x-;Gvn@o84UlAC
zJJQg*peW!>L?KELY>tvxj{h^$Q8I*@eH-?L<E*5;%w2)+;xn(qNApg(h)PMBq=k^>
zkv^FvxMKDB1iY~Jc@qNy0Q*Pf9J*4Hn=GPovPy7_paw6Ur~Wk3)I?xfi67;W2jBD}
z$lP2|CQ*f;K@cIpS^Xw_%{e9N*W`!jXr6(`#AC?nUM^qPa5AUdhi(fsS!t$4b=dU-
zJ_+yLOZ+(ea!>LZm?&)XDR^6GI!(%d{%?Lk9bSZ4?;7e~>5bE|nN8lJ$<v=G2LY$H
zu`=kX4P~R1uE*-$TAW5Ubzh$!Ch`0*P6jIf-`QKmM|lBlSp|2jQ@DY2k=zD?37cbY
z1er@P?eAda4}QJ;M~#nifq*tAY0q*Ie*0Z<3uy<I$9KFrWQy{r;R7u4JXjY?X!T(f
yB+eu<=^?<Epes5^R^j^LwQ9Br>OxXoN!cVtNs{2CTTnbw%by5~p$Lu84$T7?@quUn

delta 628
zcmYL`&ubGw6vyZ7?#$+golQ2W$=0^1(jSWiYNH2#fr7N!6oifzX`zJBtR$K=lCG3q
z?4c(QV)Ydd9z1#Sq!c`O^A8X&_0W?i@hbQa^u0YO!+iM8ydU%4n^)DZ=Uw~nQ0BwS
zi=W(&4s7GBAK;5(3Xh!!uDKUVAq0LKx(qwGEBEn8eTPwe@2<=g$Y3mnO9*XNc}9^C
zbJ#||+aKVvyP(r_YBhHn$;~;8Q$Ha*yq}gZI!l%<&Z0!}lnF?i5ylyOnt7hDvV$TB
zs|=?h)cD6P;dJ(<F0<1ZW0HV#_EJTY;JUVQ1O=yfS)Su5T8;@0e`O~uYDDR6Sionx
z0#o=-Uxjfz)-!Mc!P|#veC<`!A;p_H0;iQ+(<LnBZo@Tf<SM(iXi+~P_5`d+5n1Aq
z5|JzRK&+(%%`BM;_uP3y2w542!Ba7`g~<?NHazTfqsC^l7yUmyX~u0+V=sO<8D)Ra
ziUwSiAmA1IR&Jj3676I*3Vf{RKg&hBSVrj|P-AcXiIIOv%pI~AVBBCV;*q~9>m*mO
zRygpklZv^-xYLVF4Sy6K%e!=3$N6GcPqBe(@AWt1Hhw9tO73C<%fs!l<iofc!>=38
ZX*krd3yrUizlST?vq33PffJ+xbprnHaGn4F

diff --git a/asuzr/views.py b/asuzr/views.py
index d28a50b..2bb9b65 100644
--- a/asuzr/views.py
+++ b/asuzr/views.py
@@ -4,6 +4,7 @@ from django.template import Context, loader
 from asuzr.models import Product
 from asuzr.models import Attendance
 from asuzr.models import Order
+from asuzr.models import OrderPlan
 from datetime import datetime, date, time
 # Create your views here.
 
@@ -56,7 +57,7 @@ def get_filtered_list(p_list, year, month):
   filtered_list=[]
   for a in p_list:
     a_date = a.date
-    if a_date.strftime('%m/%Y') == month+'/'+year:
+    if a_date.strftime('%m/%Y').lstrip('0') == '/'.join((month,year)).lstrip('0'):
       filtered_list.append(a)
       
   return filtered_list
@@ -72,13 +73,16 @@ def attend_order_table(request, year, month):
   order_list = Order.objects.all().order_by('id')
   filtered_order_list  = get_filtered_list(order_list, year, month)
   
+  plan = OrderPlan.objects.all()
+  filtered_plan = get_filtered_list(plan, year, month)
+  
   sum_calls = sum(l.calls for l in filtered_attend_list)
   sum_visits = sum(l.visits for l in filtered_attend_list)
   sum_orders = sum(l.order_count for l in filtered_attend_list)
   sum_price = sum(l.orders_price for l in filtered_attend_list)
   
   sum_order_price = sum(l.price for l in filtered_order_list)
-    
+   
   t = loader.get_template('asuzr/attend_order.html')
   c = Context({
     'attend_list': filtered_attend_list,
@@ -88,9 +92,44 @@ def attend_order_table(request, year, month):
     'sum_orders': sum_orders,
     'sum_price': sum_price,
     'sum_order_price': sum_order_price,
+    'plan': filtered_plan[0],  
+    })
+  return HttpResponse(t.render(c))
+
+def main(request, day, month, year):
+  attend_list = Attendance.objects.all().order_by('date')
+  filtered_attend_list=get_filtered_list(attend_list, year, month)
+  
+  p_date = datetime.strptime(day+'/'+month+'/'+year, '%d/%m/%Y')
+  order_list = Order.objects.filter(date=p_date).order_by('id')
+  
+  plan = OrderPlan.objects.all()
+  filtered_plan = get_filtered_list(plan, year, month)
+  
+  sum_calls = sum(l.calls for l in filtered_attend_list)
+  sum_visits = sum(l.visits for l in filtered_attend_list)
+  sum_orders = sum(l.order_count for l in filtered_attend_list)
+  sum_price = sum(l.orders_price for l in filtered_attend_list)
+  
+  sum_order_price = sum(l.price for l in order_list)
+  plan_balance = filtered_plan[0].plan-sum_price
+  
+  d_date = p_date.strftime("%d/%m/%Y")
+    
+  t = loader.get_template('asuzr/attend_order.html')
+  c = Context({
+    'attend_list': filtered_attend_list,
+    'order_list': order_list,
+    'sum_calls': sum_calls,
+    'sum_visits': sum_visits,
+    'sum_orders': sum_orders,
+    'sum_price': sum_price,
+    'sum_order_price': sum_order_price,
+    'plan': filtered_plan[0],
+    'balance': plan_balance,
+    'd_date': d_date,
     })
   return HttpResponse(t.render(c))
   
-  
 
 
diff --git a/asuzr/views.pyc b/asuzr/views.pyc
index 254769efa5cfa33547c3007bfc8c9a7dedf2578a..edad42ccf9ad7ac24012ec198edc85c2ba8a2f04 100644
GIT binary patch
literal 7365
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

delta 1432
zcmZux&u<$=6n?X7dw+Qy=a+5b{G<)pwowzP5)`OVphi7FO*>Tt7@^2y+%|696z?Ko
zX`>*)A3!p<iW3qN7o<uR7sR!vUbu6ukbomX;#BdzF>-?y@6I<f-`klt@0<7hc;ox?
zRr{~d|M}ZXTRZgM&*FZQTm1N_dVe;cPCyODJT>yv38@j1P%eE%)F{x=!wvgpR6Kfi
z_~>h43E^vPH5vc5J`x3e!`=~NkAAe*gmCqrnV-b0zF5AZf6tEQO6)+Ek8@l4yX@Qg
zL2h!uJkaksrNL}V`%a*rIQx|VEAkA9%dp>7t?u?GJ?U!co)e)?-O39ESThX0R<oOA
zdC=Lvm)wz6{e!zSHO+H51DFNO0Y(7D<J?uf=8cMyzUuutGr?R8AB$>bv9q%Hp~NJC
zEW1iS%)X|3{>bwKiWU9TUk$KbgyTs^&jqD6j+^8dZtd<Rt*)Gh=?uUIgaB+Q1%Mkx
z9!7{ko&_v2B=}f0duFHm+p3wg<T8vyr~fS&70ddcVBrwqU*Q(tV7N_mVAJO{N{MP8
zU#5c$r5S27o24{MZ9z)Vmx5A@lttxKQ2DM!-H=k7+7`ZLqxdu=e&1*AW`y(9V@TVV
z24We~h$I(akuU0B@)MJTAmmFRmjDr@-V94)uktL0TqJTL6rPyTcfz+;p|m{D5Fri;
z{iM10ix|x_L=eqfhDzizwp%Ea=Qo**v4q5|*uf#8<3NiA{XwB|sBB~{2UX*!_&soN
zLn<@Gx`xdTv7TXbL#%ID$FRA<z5yi;wO!&eftx%f9_=~}xK<vmr|i_{&LI_W$KU0-
z^GJo<`J@Wm1*Ar39jil1d`k1g8I^|Ek6$i14zJ$VoaNHZ;_Jmpri?mrP+a02F1T8;
za*E|$w$x8#@ily@rz`#mu5MOeIA!(q<ME}bDjWLQI9yu#&GGVKzZy(J3~IMu2A8nV
z-0c~Ra9yVsgsFx97lee<1X<UwtCresCQ0j_+TPoZIU!&jH&*?}_}JX=!Pp|#0nZD+
zH&K42##D?fB~cM$7FtP|$0}JPoT1K%C$#F(r2eM*#o1Bp1aI;j;AMb`Z4ILhhKM*r
nSIs}x<<7qPY_IhO>OG!fD2gKc02alx?YUmYD|vzEd6|C!Uo_q1

diff --git a/db.sqlite3 b/db.sqlite3
index 780e608f4ee59c1fa115267f6fb9bf53a0295521..879ba87ef776fe34c277a2357def2320f1b61d40 100644
GIT binary patch
delta 4050
zcmai0X>e256~4<8T5QR?<Xw_2W6MIap5A-f2qng0alm1*3uJ2$lECsJ8Oh+<lU6)8
zw82b=n46h)GD!#8$t1ze;wS`?X_kg*i(%TDAEgXK+etGdX*-!rn<+mEUG7_C%XTug
zJZJ7Z?|kQc_uhAwqu24#3;3xz4G#baOxxC%@xc8t($FUzzD_0JXGaF{)-?{gbXciq
zsG*{^iVAZD6=fzWbOtK4jFHL`a1r1+d<s8`+t3&2B07b7kRD!xKY@dg19!m1Y4N#l
z_)GMlQx8iz^hTeT72IC>&)QgD*y{@m0gs>Ky}^)<?;IVCCu5OhG;T}nABaas{id(R
z@w|s;c{Ui-k=a`nr2bZ^xxg#u^>9MS7YgcpWW%kds)AQ6>j?<Kkk6|l_Kz#FMM{X4
z71X?8p7VHF&M)wK-}ZDYo>p10hA)M%VId?zctP+70(!O(vO%vvtdJ`_017DzhJ8Md
zKgjw+Ecx(n)@+wfF}1HS4Tim5kB?I40}PkhpGs$<{fR*qb@fM*2jel@fkZkp`dBhD
z9QSl+RVPb#MdJm+-k^u``$Iyo(1~Z2N^si>gkK69^7;8-fbqrRnZ&_lJk4?%1>js^
z&xZxh!?GbR6eKO5*ejKzr=j^U7xV;$keBz7hd!}q3tssA9zV-*yid#SNT*_lqoe9s
z3rGp$ULJ-IgneF*m*?nNo0RL>F%(JWVeqSA(*8NY$Js+B<&Fw)QX)Wnhf2_d@8rr#
zKgSr@t4|ek&JCy?l_LZ{hd1FBc%FXXr{K5Y0NevRp$nFS+u#QHC3qG5a9X@)i<yCL
zXo|&$;-m4$Qqs3GLdmr&>Zp8Qi)v>D16!df5{oVB+Ugh>fJU-ovP#>kt~-rY+11qy
zWT8>AjYOmIOlBmV8cju0LoHPdrBSSgq}rGi(V=M7h<R;uIRjf@vE(GLYLYn=sqjd2
zG?7Z$6`cx}b=jn?l!10wq!5s-tg@9sMP>%$qtX6GMW-SaU4slXNI*qVFSF1W9#Wm6
zQgQOR)s`^O3iT3<K5vevYb*@xfVw=>g_2RN=<{qB^p;8nI-yP`yr9hOHof9BV3+}T
z3(TOhSuqZa#5!aIVk@V!vgGH%n(XHO1Q+Za=5~x7@H$-4y`3)q#tptB@vVKM$z*II
zHPA7z%{y_p$A5qSMBvDl!M%ydI6v6kvu;_6O9`})H}g-=Uzk5X|JwXp^Y6@`yLyyX
z!GelNvqZ8MYq1fmlBn3-GL?bY#DPuR_}JK?Ufz*Tru#dhsh((J3%he{c;n9DT^&1x
zbnm8)?R~wzp<R8k%vd@z-t|y#_i`#y_AgeB`7`sg^Y30gdi6Nv^!5rSk}*w$X8<5?
zgfH|4df9_f|L$#(o`JoN(60FI-GdW7sgVb_?-|;EU(bDmoA&RG-oMei@jiZhPo}T$
zK<DAXLu2FjKe&to?+<e!kH85*fhF&)bvN;DpJ4OyVVco=z!UNYLM$sa7>ut0`~|*+
zujR^^OW0__cDTSj_tAQuG1g%X`V9RJT|g(%$gH>x*&9q6V7FN1Psb)@KqPZ`BE67-
ztwu7tsSOsB8=LBDiZr0cQlot9vYE0p8%W7!i=fv4i^U=%7kxD9B=`2n!iS{b79Ppk
z&GRLzun)&@ANmKj;&I%StKD)PWh)qq6)rlGsF|u6i&N1p&1GXbV`)%c<nyz*l(E$0
zZKbp;T2v_MWGG=QmVyZSO2%SW5u>A8wXu?KZhf*?YTOW;0XE}Rv*N!I|1YXo_!AEz
zP0!?`o&0bj;R}Z1heo+bG#H5me9^R!NFF#ekW8hA(`4O8ui6ARE7({ztX!(!PaCda
zz&EM)^8la6H|fpIV5bB3!2jcIKcev+)1vLvrB#LwKr{RZT8AcbrI)JV^bT$Azh8$4
zi#-*DyRrsWlYLiCzrOdU7@Ek-54S@Dx&Cl#nY=9qp9A<ad;|XqpQFK_$9qZ{dSy_*
zm}RI8OB$$Xc(*rDY$&56P@&3i(3ZiaD#56c&JE#X0DpjwQRm}0yB3vG9CAXtUXK9O
z8I4BWf?q#6?45tT@Q3p6*w6zud=Kp!c0F=aux<rdc))h`iKV{+bZaRs5OfejU=n~y
z?3@;l;A4(TvTt7#tRY8JHMwW^C6K<aN^5Cpfs=#86m1}>p(=83)L*20FOMBa48_Tr
zu150x;c)IhQJv1v4L~=zj<)08X)%PwVl&w~<bd^LWGDeG<i=1NY^3YToMku!=_Tw;
z^3X~ZX7X(EyuQ6gYjL^YWD$8J)eLQvL=So8N^S1bRJ~4z@D2G|=&Ah%yUP#*>^OfG
zUKU*3Q3e-P(p&()ds^CHHRvYV$JbOp55_39<$r6ciA${QU)c-RSTrC2JG$sRp!5UV
zV#exLbcoev4Pc>DvZh_4&~#bT`1Ruf+*S@-0sb?77e9k1a3A(y6Z#Z=fSyBXv>BP<
zpWus7gnh7eTD*f??c`OlwqnH~;Bu0iVr|$|*yyB+(9$L`Y0WcPtYS-t1EH08C#~{y
zV1}#7L3vH51Juz%el%HM^(Eth(?NbaS(9BpA2^#eK!C1-gOUo4TsVtWa`_6>+@t{=
zuqDrJ(M~#~yph8$8Oa+^8njKRsp?>%r$dWWyc{+%@*Q)wD1Q~QveBvmG?DTFRG@qX
z3aD|pZ?*6(89f{g3s#DEn`))TQl1*?X{_vGFx5s1rYxK4G{CLwR^5nv8B3;>rrHG?
zHI!nbMv@=uYc!x0TJxJy45To0rH`kjK39U@B-$seG&P>W<jwCrP`V1t05AhR@GW#N
zx{1FvE&c$Dpq8{hDZpm3@5ybjj=W6QEp%-q=(s>rG<cjlHC0Kn$JfIK^4{@I^6b=V
zvU-ZA8T;^5Ct*)ilGmoT(saE$C6G5x*vQTkuGLEP7XbbP{yn~mui($|U+_oxEu6zI
z;}`HR@O$_U{wF0S;tmalP*);LlPrz0ES99cNR|dkGJ08(YbTqvCd6Q<H@*H8Q*F{f
z7SPG{9NLG=@X1-x3b9D5MD~OL+X<YiAeT-AvDjuOkr%t6OV+&mVh?O0#V>V3xB6@*
z*_ZC2XYjL^Sm>d<uOj%YA38|*tczSbTStzbbwWc9mSRQ+@rM9^h%Zw1Z)3P_y0g~R
zh&$Dy|7C3pNvDDEZGi9M+Z6RztdVwta(B+_OUt$33_u=q8kgf^@HNPTGt=S;ES9>+
z>C5Y2fc)|DF8xHi*0R<K#RkI8Rg$k=HbXyoWUhg(bY$Xkv;J|X^4>1Le}B$Q`Ytz;
z_vduv?pzD0o2exi&sLBvGj-(eXI(U}8)jUPCEYU{VJkT~<Ay%+&P*2?ZzJt<Eaa%`
J%|Cv+_<yOuVdek;

delta 5653
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
bZPR^)d_JYMcNmFOE0>!bt0IS8MRorVYE1tZ

diff --git a/record/urls.py b/record/urls.py
index 82c2dc6..ec4e03e 100644
--- a/record/urls.py
+++ b/record/urls.py
@@ -10,6 +10,7 @@ urlpatterns = patterns('',
     url(r'^product/$', 'asuzr.views.prod_list'),
     url(r'^product/(?P<prod_id>\d+)/$', 'asuzr.views.prod_detail'),
     url(r'^attendance/(?P<year>\d+)/(?P<month>\d+)/$', 'asuzr.views.attend_table'),
+    url(r'^main/(?P<day>\d+)/(?P<month>\d+)/(?P<year>\d+)/$', 'asuzr.views.main', name='asuzr-main'),
     url(r'^orders/(?P<year>\d+)/(?P<month>\d+)/(?P<day>\d+)/$', 'asuzr.views.orders_table'),
     url(r'^attend_order/(?P<year>\d+)/(?P<month>\d+)/$', 'asuzr.views.attend_order_table'),
     url(r'^admin/', include(admin.site.urls)),
diff --git a/record/urls.pyc b/record/urls.pyc
index 747de66c0854e7387fcdf0f212ab87de61ebf2b3..4566253043f73f17c54a0ec2c0d53d72b03dc220 100644
GIT binary patch
delta 237
zcmX@Xwx3;^`7<w<Z=hFbG6NLw0BHvxE?zTHI>$AIharWRp_z#>m6;)hk0FI0$Yubs
z1sGBUVQe9WRG=U$Ll!$j76(H!BS^fNgCUBOAw`%WSVLsut}jW3KqKRF6EpMlHS7ay
zQW7ieVp6m<!JORuypjwAw=y-c2*Oh-769r>EH14o(kshMEicvs8BoFk6wFJ^O)chv
g$?Af{H?L)EWt0#BipekuFmf@mvG6d0pb(e@0A+_Wi~s-t

delta 118
zcmdnbeu7P!`7<xq&V|OI$qZ1y4Wu1_xOmn?=^W!`CWcgIh7=x#6kY}>n~xzCD9Fl?
y#m<n$!O+YI5^rW_h~i{O;b#ce5SV!8%VuS!7Dh24peZs;0*qWtY%DyCFbDuhs1w!z

diff --git a/templates/asuzr/attend_order.html b/templates/asuzr/attend_order.html
index f02c5bd..30014c2 100644
--- a/templates/asuzr/attend_order.html
+++ b/templates/asuzr/attend_order.html
@@ -1,2 +1,8 @@
-{% include 'asuzr/attendance.html' %}
-{% include 'asuzr/orders.html' %}
\ No newline at end of file
+<table WIDTH="100%">
+  <TR VALIGN=top>
+    <TD WIDTH="40%">{% include 'asuzr/attendance.html' %}</TD>
+    <TD WIDTH="5%"></TD>
+    <TD WIDTH="55%">{% include 'asuzr/orders.html' %}</TD>
+  </TR>
+</table>
+{% include 'asuzr/plan_balance.html' %}
\ No newline at end of file
diff --git a/templates/asuzr/attendance.html b/templates/asuzr/attendance.html
index 43f1c60..0f318aa 100644
--- a/templates/asuzr/attendance.html
+++ b/templates/asuzr/attendance.html
@@ -17,13 +17,13 @@
       <TH>Заказы</TH>
       <TH>Стоимость</TH>
     </TR>
-    {% for attend in attend_list %}
+    {% for attend in attend_list %}	
         <TR bgcolor={{attend.day_color}}>
 	  <TD>{{ attend.date_dd_mm_yy}}</TD>
 	  <TD>{{ attend.week_day}}</TD>
 	  <TD>{{ attend.calls }}</TD>
 	  <TD>{{ attend.visits }}</TD>
-	  <TD>{{ attend.order_count}}</TD>
+	  <TD><a href="{% url 'asuzr-main' attend.date.day attend.date.month attend.date.year %}">{{ attend.order_count}}</a></TD>
 	  <TD>{{ attend.orders_price}}</TD>
         </TR>
     {% endfor %}
diff --git a/templates/asuzr/orders.html b/templates/asuzr/orders.html
index 18f8baa..8ebb8bf 100644
--- a/templates/asuzr/orders.html
+++ b/templates/asuzr/orders.html
@@ -5,7 +5,7 @@
     <style></style>
   </head>
   <body>
-  <H1>Заказы</H1>
+  <H1>Заказы на {{ d_date }} </H1>
   <TABLE BORDER WIDTH="100%">
   {% if order_list %}
     <ul>
diff --git a/templates/asuzr/plan_balance.html b/templates/asuzr/plan_balance.html
new file mode 100644
index 0000000..a5154eb
--- /dev/null
+++ b/templates/asuzr/plan_balance.html
@@ -0,0 +1,21 @@
+<html>
+  <head>
+    <title></title>
+    <meta content="">
+    <style></style>
+  </head>
+  <body>
+  <H4>Справочно:</H4>
+  <TABLE BORDER WIDTH="20%">
+  <ul>
+      <TR>
+	<TD>ПЛАН</TD>
+	<TD>{{ plan.plan }}</TD>
+      </TR>
+      <TR>
+	<TD>Осталось до выполнения</TD>
+	<TD>{{ balance }}</TD>
+      </TR>
+  </ul>
+  </body>
+</html>
\ No newline at end of file