Внесены изменения в модель. Добавлено расписание. Реализован вывод информации о заказах н/з от посещаемости. Реализовано отображение всех дней месяца

templates/asuzr/attend_order.html

@@ -4,9 +4,9 @@
 {% block page %}
 <table WIDTH="100%">
   <TR VALIGN=top>
-    <TD WIDTH="40%">{% include 'asuzr/attendance.html' %}</TD>
+    <TD WIDTH="50%">{% include 'asuzr/attendance.html' %}</TD>
     <TD WIDTH="5%"></TD>
-    <TD WIDTH="55%">{% include 'asuzr/orders_detail.html' %}</TD>
+    <TD WIDTH="45%">{% include 'asuzr/orders_detail.html' %}</TD>
   </TR>
 </table>
 {% include 'asuzr/plan_balance.html' %}

templates/asuzr/attendance.html

@@ -8,15 +8,17 @@
       <TH>Посещения</TH>
       <TH>Заказы</TH>
       <TH>Стоимость</TH>
+      <TH>Дизайнеры</TH>
     </TR>
     {% 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><a href="{% url 'asuzr-main' attend.date.day attend.date.month attend.date.year %}">{{ attend.order_count}}</a></TD>
+        <TR bgcolor={{attend.date.weekday_color}}>
+	  <TD>{{ attend.date.date_dd_mm_yy}}</TD>
+	  <TD>{{ attend.date.weekday_name}}</TD>
+	  <TD>{{ attend.attend.calls }}</TD>
+	  <TD>{{ attend.attend.visits }}</TD>
+	  <TD><a href="{% url 'asuzr-main' attend.date.day attend.date.month attend.date.year %}">{{ attend.orders_count}}</a></TD>
 	  <TD>{{ attend.orders_price}}</TD>
+	  <TD>{{ attend.designers}}</TD>
         </TR>
     {% endfor %}
     <TR>
@@ -25,9 +27,10 @@
       <TD>{{sum_visits}}</TD>
       <TD>{{sum_orders}}</TD>
       <TD>{{sum_price}}</TD>
+      <TD></TD>
      </TR>
     </ul>
   {% else %}
-    <p>Список изделий пуст</p>
+    <p>Список пуст</p>
   {% endif %}
   </TABLE>

templates/asuzr/desreport.html

@@ -13,7 +13,7 @@
     </TR>
   {% for des in des_list %}
      <TR> 
-	<TD>{{des.designer__first_name}}</TD> 
+	<TD>{{des.designer__first_name}} {{des.designer__last_name}}</TD> 
 	<TD>{{des.designer__count}}</TD>
 	<TD>{{des.price__sum}}</TD>
      </TR>

templates/asuzr/orders.html

@@ -36,7 +36,7 @@
 	<TD>{{ order.ostatok }}</TD>
 	<TD>{%if order.approved%} {{ order.approved_date }} {%else%} Нет {% endif %}</TD>
 	<TD>{{order.sketch.sketch_file}}</TD>
-	<TD>{{ order.executor.first_name }}</TD>
+	<TD>{{ order.executor.first_name }} {{ order.executor.last_name }}</TD>
 	<TD>{%if order.is_done%} Да {%else%} Нет {% endif %}</TD>
 	{% if archive %} <TD {% if order.calls_color%} bgcolor='FFFACD' {% endif %}>{{ order.calls}}</TD> {% endif %}
       </TR>

templates/asuzr/orders_detail.html

@@ -14,7 +14,7 @@
 	  <TD>{{ order.product.name }}</TD>
 	  <TD>{{ order.price }}</TD>
 	  <TD>{{ order.address }}</TD>
-	  <TD>{{ order.designer.first_name }}</TD>
+	  <TD>{{ order.designer.first_name}} {{order.designer.last_name}}</TD>
 	  <TD>{{ order.deadline_dmy }}</TD>
         </TR>
     {% endfor %}

templates/asuzr/plan_balance.html

@@ -3,7 +3,7 @@
   <ul>
       <TR>
 	<TD>ПЛАН</TD>
-	<TD>{{ plan.plan }}</TD>
+	<TD>{{ plan }}</TD>
       </TR>
       <TR>
 	<TD>Осталось до выполнения</TD>