Overview
Comment: | Don't use links but buttons to switch between old services and current ones |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk | stable |
Files: | files | file ages | folders |
SHA3-256: |
38a877f869d91d74e9357ccd48bffab3 |
User & Date: | bohwaz on 2022-01-06 00:42:07 |
Other Links: | manifest | tags |
Context
2022-01-06
| ||
00:52 | Fix "mark as paid" checkbox default state, add some help text for transactions check-in: 1ad8dbcb4d user: bohwaz tags: trunk, stable | |
00:42 | Don't use links but buttons to switch between old services and current ones check-in: 38a877f869 user: bohwaz tags: trunk, stable | |
2022-01-05
| ||
23:02 | Change label check-in: 46ef3b798d user: bohwaz tags: trunk, stable | |
Changes
Modified src/templates/services/user/_service_user_form.tpl from [3ef36d4e1c] to [c9218447e4].
1 2 3 4 5 6 7 8 9 10 11 12 | <?php assert(isset($create) && is_bool($create)); assert(isset($has_past_services) && is_bool($has_past_services)); assert(isset($current_only) && is_bool($current_only)); assert(isset($form_url) && is_string($form_url)); assert(isset($today) && $today instanceof \DateTimeInterface); assert($create === false || isset($account_targets)); assert(isset($grouped_services) && is_array($grouped_services)); ?> <form method="post" action="{$self_url}" data-focus="1" data-create="{$create|escape:json}"> | < < < < < < < < < | | | > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 | <?php assert(isset($create) && is_bool($create)); assert(isset($has_past_services) && is_bool($has_past_services)); assert(isset($current_only) && is_bool($current_only)); assert(isset($form_url) && is_string($form_url)); assert(isset($today) && $today instanceof \DateTimeInterface); assert($create === false || isset($account_targets)); assert(isset($grouped_services) && is_array($grouped_services)); ?> <form method="post" action="{$self_url}" data-focus="1" data-create="{$create|escape:json}"> <fieldset> <legend>Inscrire à une activité</legend> <dl> {if $create && $users} <dt>Membres à inscrire</dt> {if count($users) <= 10} {foreach from=$users key="id" item="name"} <dd><h3>{$name}</h3><input type="hidden" name="users[{$id}]" value="{$name}" /></dd> {/foreach} {else} <dd>{$users|count} membres sélectionnés</dd> {/if} {elseif $create && $copy_service} <dt>Recopier depuis l'activité</dt> <dd><strong>{$copy_service.label}</strong><input type="hidden" name="copy_service" value="{$copy_service.id}" /></dd> <dd><em>{if $copy_service_only_paid}(seulement les inscriptions marquées comme payées){else}(toutes les inscriptions){/if}</em><input type="hidden" name="copy_service_only_paid" value="{$copy_service_only_paid}" /></dd> {/if} <dt><label for="f_service_ID">Activité</label> <b>(obligatoire)</b></dt> {if $has_past_services} <dd> {if $current_only} Seules les activités courantes sont affichées. {button name="past_services" value="1" shape="reset" type="submit" label="Inscrire à une activité passée"} {else} Seules les activités passées sont affichées. {button name="past_services" value="0" shape="left" type="submit" label="Inscrire à une activité courante"} {/if} </dd> {/if} {foreach from=$grouped_services item="service"} <dd class="radio-btn"> {input type="radio" name="id_service" value=$service.id data-duration=$service.duration data-expiry=$service.expiry_date|date_short label=null source=$service_user} <label for="f_id_service_{$service.id}"> <div> <h3>{$service.label}</h3> |
︙ | ︙ |
Modified src/www/admin/services/user/_form.php from [f5cd3da56d] to [ff70cded0e].
1 2 3 4 5 6 7 8 9 10 11 12 13 | <?php namespace Garradin; use Garradin\Services\Services; if (!defined('\Garradin\ROOT')) { die(); } assert(isset($tpl, $form_url, $create)); | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | <?php namespace Garradin; use Garradin\Services\Services; if (!defined('\Garradin\ROOT')) { die(); } assert(isset($tpl, $form_url, $create)); $current_only = !f('past_services'); // If there is only one user selected we can calculate the amount $single_user_id = isset($users) && count($users) == 1 ? key($users) : null; $copy_service ??= null; $copy_service_only_paid ??= null; $users ??= null; |
︙ | ︙ |