diff --git a/_nav.html b/_nav.html index 84b5a0f..a1dba90 100644 --- a/_nav.html +++ b/_nav.html @@ -7,6 +7,7 @@ {{:linkbutton label="Ajouter une catégorie" shape="plus" href="categories/add_category.html" target="_dialog"}} {{else}} {{:linkbutton label="Ajouter un nouveau matériel" shape="plus" href="movements/add_new_equipment.html" target="_dialog"}} + {{:exportmenu right=true}} {{/if}} {{/if}} diff --git a/config/add_movement_type.html b/config/add_movement_type.html index c5e827f..ecf6866 100644 --- a/config/add_movement_type.html +++ b/config/add_movement_type.html @@ -146,6 +146,13 @@
  • retour : le matériel non propriété de l'asso est rendu à son propriétaire (ex : retour de location ou d'emprunt)
    • +
    +

    Tarification

    + +

    {{:button type="submit" name="save" label="Enregistrer" shape="right" class="main"}} @@ -160,8 +167,10 @@ function toggleTarif(event) { const value = output_fieldstype.value; if (value == 'temporaire') { g.toggle('#tarif', true); + g.toggle('div.tarif', true); } else { g.toggle('#tarif', false); + g.toggle('div.tarif', false); } } toggleTarif(); diff --git a/config/modify_movement_type.html b/config/modify_movement_type.html index c5f7915..0f7a9f7 100644 --- a/config/modify_movement_type.html +++ b/config/modify_movement_type.html @@ -101,10 +101,21 @@ {{:input type="text" name="name" label="Libellé" default=$default_label required=true maxlength="100"}} {{/if}} {{if $sortie_temp}} - {{:input type="radio-btn" name="tarif" value="gratuit" label="Gratuit" required=true default=$fee prefix_title=Tarif}} - {{:input type="radio-btn" name="tarif" value="payant" label="Payant" required=true default=$fee}} +

    + {{:input type="radio-btn" name="tarif" value="gratuit" label="Gratuit" required=true default=$fee prefix_title=Tarif}} + {{:input type="radio-btn" name="tarif" value="payant" label="Payant" required=true default=$fee}} +
    {{/if}} + {{if $sortie_temp}} +
    +

    Tarification

    + +
    + {{/if}}

    {{:button type="submit" name="save" label="Enregistrer" shape="right" class="main"}}

    diff --git a/equipment_history.html b/equipment_history.html index 6cc3bf7..83c0860 100644 --- a/equipment_history.html +++ b/equipment_history.html @@ -318,8 +318,8 @@ {{:link href="/admin/users/details.php?id=%s"|args:$user label="%s"|args:$user_details}} {{/if}} {{$storage}} - {{if $nb_files > 0}}{{:icon shape="attach"}}{{/if}} - {{if $transactions|count > 0}}{{:icon shape="money"}}{{/if}} + {{if $nb_files > 0}}{{$nb_files}}{{/if}} + {{if $transactions|count > 0}}{{"Oui"}}{{/if}} {{if $current != "archives"}} {{if $direction == "output" && $type_mvt == "temporaire"}} diff --git a/loan_movements.html b/loan_movements.html index 4b56e9e..4a3f859 100644 --- a/loan_movements.html +++ b/loan_movements.html @@ -205,8 +205,8 @@ {{$amount}} {{:link href="/admin/users/details.php?id=%s"|args:$user_id label="%s"|args:$user}} {{$stockage}} - {{if $nb_files > 0}}{{:icon shape="attach"}}{{/if}} - {{if $transactions != null}}{{:icon shape="money"}}{{/if}} + {{if $nb_files > 0}}{{$nb_files}}{{/if}} + {{if $transactions != null}}{{"Oui"}}{{/if}} {{$comment}} {{if $_GET.output_type == "loan"}} diff --git a/member_loan.html b/member_loan.html index 63e71a8..9f40061 100644 --- a/member_loan.html +++ b/member_loan.html @@ -48,7 +48,7 @@ {{:assign premier=true}} {{#select - nom, user, GROUP_CONCAT(mat_name) AS materiel, SUM(remain) AS quantite + nom, user, GROUP_CONCAT(mat_name, ", ") AS materiel, SUM(remain) AS quantite FROM (SELECT users.nom AS nom, users.id AS user, diff --git a/movements/output_equipment.html b/movements/output_equipment.html index e5f0a8a..7043184 100644 --- a/movements/output_equipment.html +++ b/movements/output_equipment.html @@ -204,43 +204,26 @@
    Informations obligatoires
    + {{:input type="date" name="date" label="Date de sortie" required=true default=$now|date_short}} + {{:input type="number" name="amount" label="Quantité" required=true default=1 min=1 max=$dispo}} {{if $output_labels|count == 1}} {{:input type="select" name="operation" label="Type de sortie" required=true options=$output_labels}} {{else}} {{:input type="select" name="operation" label="Type de sortie" required=true default_empty="— Aucun —" options=$output_labels|sort}} {{/if}} - {{:input type="date" name="date" label="Date de sortie" required=true default=$now|date_short}} - {{:input type="number" name="amount" label="Quantité" required=true default=1 min=1 max=$dispo}} -
    - {{if $_GET.output_type == null || $_GET.output_type == "rent"}} - {{:input - type="list" - name="user" - label="Membre destinataire" - target="!users/selector.php" - multiple=true - max=1 - required=true - }} - {{/if}} -
    - Informations facultatives + Autres informations
    -
    - {{if $_GET.output_type != "rent"}} - {{:input - type="list" - name="user" - label="Membre destinataire" - target="!users/selector.php" - multiple=true - max=1 - }} - {{/if}} -
    + {{:input + type="list" + name="user" + label="Membre destinataire" + target="!users/selector.php" + multiple=true + max=1 + }} {{:input type="list" name="transactions" label="Écritures liées" target="!acc/transactions/selector.php" multiple=true help="par exemple écriture avec facture"}} {{:input type="textarea" name="remarques" label="Remarques" cols="40" rows="3" required=false}} {{:input id="set_return_date" type="checkbox" value=1 name="set_return_date" label="Fixer une date de retour" help="Cocher pour fixer une date de retour"}} @@ -275,23 +258,9 @@ function changeReturnDate(evt, id_date = 'f_date', id_return_date = 'f_return_da setReturnDate(id_date, id_return_date, id_loan_duration); } -function toggleUserDiv(event) { - const operation = document.getElementById('f_operation').value; - console.log('paid_keys=' + paid_keys + ', operation=' + operation); - if (paid_keys.includes(operation)) { - g.toggle('#rent_user', true); - g.toggle('#loan_user', false); - } else { - g.toggle('#rent_user', false); - g.toggle('#loan_user', true); - } -} -toggleUserDiv(); - (function () { document.getElementById('f_set_return_date_1').checked = false; document.getElementById('f_set_return_date_1').onclick = changeVisibility; document.getElementById('f_date').onchange = changeReturnDate; - document.getElementById('f_operation').onchange = toggleUserDiv; })();