[WIP][REF][FIX]GOLEM Member card : only default season and refactoring

This commit is contained in:
Fabien BOURGEOIS 2018-03-08 14:52:03 +01:00
parent e7c8a4d5e4
commit 8ee4aca5f4

View File

@ -31,23 +31,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<t t-call="report.html_container"> <t t-call="report.html_container">
<t t-call="report.external_layout"> <t t-call="report.external_layout">
<div id='page_report_member' class="page"> <div id='page_report_member' class="page">
<t t-foreach="docs" t-as="o"> <t t-set="season" t-value="docs._default_season()" />
<div class="row" style="margin: 3% 0 3% 0;"> <t t-foreach="docs" t-as="member">
<div class="col-xs-8"> <div class="row">
<h2><span t-field="o.name" /> - <span t-field="o.number" /></h2> <h2>Member <span t-field="member.name" /> - <span t-field="member.number" /></h2>
</div> <p>
<div class="col-xs-4">
<strong>Season :</strong> <strong>Season :</strong>
<span t-field="o.season_ids[0].name" /> <span t-field="season.name" />
<br /> <t t-if="season.date_start">
<strong>Date :</strong> (<em>from :
<span t-field="o.season_ids[0].date_start" /> <span t-field="season.date_start" /> to
- <span t-field="season.date_end" /></em>)
<span t-field="o.season_ids[0].date_end" />
</div>
</div>
</t> </t>
<p><strong>Activities</strong> for this season</p> </p>
</div>
<h3>Activities for this season</h3>
<table id="table_activity_ref" class="table table-striped"> <table id="table_activity_ref" class="table table-striped">
<thead> <thead>
<tr> <tr>
@ -62,39 +60,39 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<t t-foreach="docs" t-as="o"> <tr id="activity_inherit_price_sum"
<tr id="activity_inherit_price_sum" t-foreach="o.activity_registration_ids" t-as="t"> t-foreach="member.activity_registration_ids" t-as="reg">
<td class="col-xs-2"> <td class="col-xs-2">
<span t-esc="t.activity_id.name" /> <span t-esc="reg.activity_id.name" />
</td> </td>
<td class="col-xs-2"> <td class="col-xs-2">
<span t-esc="t.activity_id.type_id.name" /> <span t-esc="reg.activity_id.type_id.name" />
</td> </td>
<td class="col-xs-2"> <td class="col-xs-2">
<span t-field="t.activity_id.animator_id" /> <span t-field="reg.activity_id.animator_id" />
</td> </td>
<td class="col-xs-2"> <td class="col-xs-2">
<span t-field="t.activity_id.weekday" /> <span t-field="reg.activity_id.weekday" />
</td> </td>
<td class="col-xs-1"> <td class="col-xs-1">
<t t-esc="'%02d:%02d' % (int(t.activity_id.hour_start), round(t.activity_id.hour_start % 1 * 60))" /> <t t-esc="'%02d:%02d' % (int(reg.activity_id.hour_start), round(reg.activity_id.hour_start % 1 * 60))" />
</td> </td>
<td class="col-xs-1"> <td class="col-xs-1">
<t t-esc="'%02d:%02d' % (int(t.activity_id.hour_stop), round(t.activity_id.hour_stop % 1 * 60))" /> <t t-esc="'%02d:%02d' % (int(reg.activity_id.hour_stop), round(reg.activity_id.hour_stop % 1 * 60))" />
</td> </td>
<td class="col-xs-2"> <td class="col-xs-2">
<span t-if="t.activity_id.is_fullseason" t-field="o.season_ids[0].date_start" /> <span t-if="reg.activity_id.is_fullseason" t-field="season.date_start" />
<span t-else="" t-field="t.activity_id.date_start" /> <span t-else="" t-field="reg.activity_id.date_start" />
</td> </td>
<td id="activity_inherit_td"> <td id="activity_inherit_td">
<span t-if="t.activity_id.is_fullseason" t-field="o.season_ids[0].date_end" /> <span t-if="reg.activity_id.is_fullseason" t-field="season.date_end" />
<span t-else="" t-field="t.activity_id.date_stop" /> <span t-else="" t-field="reg.activity_id.date_stop" />
</td> </td>
</tr> </tr>
<tr id="activity_inherit_total"></tr> <tr id="activity_inherit_total"></tr>
</t>
</tbody> </tbody>
</table> </table>
</t>
</div> </div>
</t> </t>
</t> </t>