First implementation of orders using Doctrine

This commit is contained in:
Andrey
2013-07-02 14:21:46 +02:00
parent 03fe7a6610
commit 07ff0c4d7a
9 changed files with 335 additions and 633 deletions

View File

@@ -40,10 +40,10 @@
</thead>
<tbody>
{% for order in orders %}
{% set deadline = app['date-formatter'].getPrettyString(order.get_deadline()) %}
<tr id="order_{{ order.get_order_id() }}" class="order_row" {{ current_date > order.get_deadline() ? "style=color:#777": "" }}>
<td>{{ order.get_user().get_display_name() }}</td>
<td>{{ app['date-formatter'].getPrettyString(order.get_created_on()) }}</td>
{% set deadline = app['date-formatter'].getPrettyString(order.getDeadline()) %}
<tr id="order_{{ order.getId() }}" class="order_row" {{ current_date > order.getDeadline() ? "style=color:#777": "" }}>
<td>{{ order.getUser(app).get_display_name() }}</td>
<td>{{ app['date-formatter'].getPrettyString(order.getCreatedOn()) }}</td>
<td>
{% if deadline != '' %}
{{deadline}}
@@ -51,8 +51,8 @@
{% trans 'Aucune' %}
{% endif %}
</td>
<td>{{ order.get_usage() | nl2br }}</td>
<td>{% if order.get_todo() == 0 %}<img src="/skins/icons/ok.png" />{% endif %}</td>
<td>{{ order.getOrderUsage() | nl2br }}</td>
<td>{% if order.getTodo() == 0 %}<img src="/skins/icons/ok.png" />{% endif %}</td>
</tr>
{% endfor %}
</tbody>

View File

@@ -1,5 +1,5 @@
{% import 'common/thumbnail.html.twig' as thumbnail %}
{% set displayName = order.get_user().get_display_name() %}
{% set displayName = order.getUser(app).get_display_name() %}
<div class="page-header">
<h1>{% trans %} {{ displayName }} wants to place an order {% endtrans %}</h1>
@@ -29,23 +29,23 @@
<table class="table" style="color:#333;">
<tr>
<td>{% trans 'Destinataire' %}</td>
<td>{{ displayName }}({{ order.get_user().get_email() }})</td>
<td>{{ displayName }}({{ order.getUser(app).get_email() }})</td>
</tr>
<tr>
<td>{% trans 'Date de commande' %}</td>
<td>{{ app['date-formatter'].getPrettyString(order.get_created_on()) }}</td>
<td>{{ app['date-formatter'].getPrettyString(order.getCreatedOn()) }}</td>
</tr>
<tr>
<td>{% trans 'Deadline' %}</td>
<td>{{ app['date-formatter'].getPrettyString(order.get_deadline()) }}</td>
<td>{{ app['date-formatter'].getPrettyString(order.getDeadline()) }}</td>
</tr>
<tr>
<td>{% trans 'Utilisation prevue' %}</td>
<td>{{ order.get_usage() | nl2br }}</td>
<td>{{ order.getOrderUsage() | nl2br }}</td>
</tr>
<tr>
<td>{% trans 'Nombre total d\'element commandes' %}</td>
<td>{{ order.get_total() }}</td>
<td>{{ order.getTotal() }}</td>
</tr>
</table>
</div>
@@ -55,13 +55,13 @@
<div class="order_list well-small">
<ul>
{% for order_element_id,element in order %}
{% for element in order.getElements() %}
<li>
<div id="order_wrapper_{{order.get_order_id()}}_{{element.get_base_id()}}_{{element.get_record_id()}}" class="order_wrapper {% if element.get_order_master_id() == false %}selectable{% endif %}">
{{ thumbnail.format(element.get_thumbnail() ,80, 80, '', true, false) }}
{% if element.get_order_master_id() %}
{% set name = element.get_order_master_name() %}
{% if element.get_deny() == 1 %}
<div id="order_wrapper_{{order.getId()}}_{{element.getBaseId()}}_{{element.getRecordId()}}" class="order_wrapper {% if element.getOrderMasterId() == false %}selectable{% endif %}">
{{ thumbnail.format(element.getRecord(app).get_thumbnail() ,80, 80, '', true, false) }}
{% if element.getOrderMasterId() %}
{% set name = element.getOrderMasterName(app) %}
{% if element.getDeny() == true %}
{% set title %}
{% trans %}Document refuse par {{name}} {% endtrans %}
{% endset %}
@@ -78,11 +78,11 @@
{% endif %}
{% endif %}
<div style="position:absolute;bottom:4px;right:4px;">
<img class="infoTips" tooltipsrc="{{ path('prod_tooltip_technical_data', { 'sbas_id' : element.get_sbas_id(), 'record_id' : element.get_record_id() }) }}" src="/skins/icons/info.gif"/>
<div tooltipsrc="{{ path('prod_tooltip_preview', { 'sbas_id' : element.get_sbas_id(), 'record_id' : element.get_record_id() }) }}" class="previewTips"></div>
<div tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : element.get_sbas_id(), 'record_id' : element.get_record_id(), 'context' : 'preview' }) }}" class="captionRolloverTips"></div>
<img class="infoTips" tooltipsrc="{{ path('prod_tooltip_technical_data', { 'sbas_id' : element.getSbasId(app), 'record_id' : element.getRecordId() }) }}" src="/skins/icons/info.gif"/>
<div tooltipsrc="{{ path('prod_tooltip_preview', { 'sbas_id' : element.getSbasId(app), 'record_id' : element.getRecordId() }) }}" class="previewTips"></div>
<div tooltipsrc="{{ path('prod_tooltip_caption', { 'sbas_id' : element.getSbasId(app), 'record_id' : element.getRecordId(), 'context' : 'preview' }) }}" class="captionRolloverTips"></div>
</div>
<input type="hidden" name="order_element_id" value="{{order_element_id}}"/>
<input type="hidden" name="order_element_id" value="{{element.getId()}}"/>
</div>
</li>
{% endfor %}
@@ -95,7 +95,7 @@
<button class="btn deny">Refuser</button>
<button class="order_launcher btn">{% trans 'Retour aux commandes' %}</button>
<img src="/skins/icons/loader000000.gif" class="activity_indicator" style="display:none;"/>
<input name="order_id" type="hidden" value="{{ order.get_order_id() }}" />
<input name="order_id" type="hidden" value="{{ order.getId() }}" />
</div>
</div>
<script type="text/javascript">