Overview
Comment: | Change page title |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk | stable |
Files: | files | file ages | folders |
SHA3-256: |
f364b467c16e78edcfe626e1f38a881d |
User & Date: | bohwaz on 2022-06-29 00:29:16 |
Other Links: | manifest | tags |
Context
2022-06-30
| ||
18:59 | Assisted reconciliation: If date is invalid, show it and allow to cancel check-in: c045ebd5f9 user: bohwaz tags: trunk, stable | |
2022-06-29
| ||
00:29 | Change page title check-in: f364b467c1 user: bohwaz tags: trunk, stable | |
2022-06-27
| ||
22:50 | Add missing mandatory mention in service form check-in: b82a63e4c3 user: bohwaz tags: trunk, stable | |
Changes
Modified src/include/lib/Garradin/Entities/Services/Service.php from [cc2d41494e] to [b496e0d5d1].
︙ | ︙ | |||
136 137 138 139 140 141 142 | public function getUsers(bool $paid_only = false) { $where = $paid_only ? 'AND paid = 1' : ''; $id_field = Config::getInstance()->champ_identite; $sql = sprintf('SELECT su.id_user, u.%s FROM services_users su INNER JOIN membres u ON u.id = su.id_user WHERE su.id_service = ? %s;', $id_field, $where); return DB::getInstance()->getAssoc($sql, $this->id()); } | | > > > > > > > > > > > > > > | 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 | public function getUsers(bool $paid_only = false) { $where = $paid_only ? 'AND paid = 1' : ''; $id_field = Config::getInstance()->champ_identite; $sql = sprintf('SELECT su.id_user, u.%s FROM services_users su INNER JOIN membres u ON u.id = su.id_user WHERE su.id_service = ? %s;', $id_field, $where); return DB::getInstance()->getAssoc($sql, $this->id()); } public function long_label(): string { if ($this->duration) { $duration = sprintf('%d jours', $this->duration); } elseif ($this->start_date) $duration = sprintf('du %s au %s', $this->start_date->format('d/m/Y'), $this->end_date->format('d/m/Y')); else { $duration = 'ponctuelle'; } return sprintf('%s — %s', $this->label, $duration); } } |
Modified src/templates/services/_nav.tpl from [c0864e45b5] to [883c7c58b1].
︙ | ︙ | |||
18 19 20 21 22 23 24 | <li{if $show_old_services} class="current"{/if}>{link href="!services/?old=1" label="Activités passées"}</li> </ul> {/if} {if isset($current_service)} <ul class="sub"> <li class="title"> | | < < < < < < < | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | <li{if $show_old_services} class="current"{/if}>{link href="!services/?old=1" label="Activités passées"}</li> </ul> {/if} {if isset($current_service)} <ul class="sub"> <li class="title"> {$current_service->long_label()} </li> <li{if $service_page == 'index'} class="current"{/if}><a href="{$admin_url}services/fees/?id={$current_service.id}"><strong>Tarifs</strong></a></li> <li{if $service_page == 'active'} class="current"{/if}><a href="{$admin_url}services/details.php?id={$current_service.id}">À jour</a></li> <li{if $service_page == 'expired'} class="current"{/if}><a href="{$admin_url}services/details.php?id={$current_service.id}&type=expired">Inscription expirée</a></li> <li{if $service_page == 'unpaid'} class="current"{/if}><a href="{$admin_url}services/details.php?id={$current_service.id}&type=unpaid">En attente de règlement</a></li> </ul> {/if} |
︙ | ︙ |
Modified src/templates/services/fees/_fee_form.tpl from [eac2bbbf9c] to [cbf57c15a9].
︙ | ︙ | |||
67 68 69 70 71 72 73 | </p> </form> <script type="text/javascript"> {literal} (function () { | < | 67 68 69 70 71 72 73 74 75 76 77 78 79 80 | </p> </form> <script type="text/javascript"> {literal} (function () { var hide = []; if (!$('#f_amount_type_1').checked) hide.push('.amount_type_1'); if (!$('#f_amount_type_2').checked) hide.push('.amount_type_2'); |
︙ | ︙ |
Modified src/templates/services/fees/edit.tpl from [5f56ed8c69] to [6cdf0d7768].
|
| | | 1 2 3 4 5 6 7 | {include file="admin/_head.tpl" title="%s — Modifier le tarif"|args:$fee.label current="membres/services"} {include file="services/_nav.tpl" current="index" current_service=$service service_page="index"} {include file="services/fees/_fee_form.tpl" legend="Modifier un tarif" submit_label="Enregistrer"} {include file="admin/_foot.tpl"} |