diff --git a/_filtres.tpl b/_filtres.tpl index cda31cb..379dd60 100644 --- a/_filtres.tpl +++ b/_filtres.tpl @@ -54,7 +54,7 @@ {{* sélecteurs de catégories et d'appartenances *}} {{:assign var="cat_options." value="" label="Toutes les catégories" href="?cat_key=-1"}} -{{#load module="equipment" type="category" order="$$.name"}} +{{#load module="equipment_resa" type="category" order="$$.name"}} {{:assign var="categories.%s"|args:$key value=$name}} {{:assign var="cat_options." diff --git a/_resa_inventory.html b/_resa_inventory.html index 98f2532..94e5225 100644 --- a/_resa_inventory.html +++ b/_resa_inventory.html @@ -205,7 +205,11 @@ {{if $stock >= 1}} {{:linkbutton label="Réserver" href="index.html?key=%s&fonc=resa"|args:$key shape="table"}} {{else}} - {{:linkbutton label="Contactez nous" href="/contact.html?key=%s&fonc=resa"|args:$key shape="mail" target="_dialog"}} + {{#module name="web"}} + {{:linkbutton label="Contactez nous" href="/contact.html?key=%s&fonc=resa"|args:$key shape="mail" target="_dialog"}} + {{else}} + {{:button disabled=true label="Contactez nous" shape="mail"}} + {{/module}} {{/if}} {{/if}} diff --git a/_web_contract.html b/_web_contract.html index 4283546..cf9144b 100644 --- a/_web_contract.html +++ b/_web_contract.html @@ -137,7 +137,7 @@ {{* Invité Ano *}} {{:assign _module="web"}} {{else}} - {{:assign _module="equipment"}} + {{:assign _module="equipment_resa"}} {{/if}} {{:assign reservation_id=$_GET.rid|trim}} @@ -148,13 +148,13 @@ {{/load}} {{*:debug rsa=$resa*}} {{* récupérer les infos du matériel associé *}} - {{#load module="equipment" key=$resa.equipment assign="equipment"}} + {{#load module="equipment_resa" key=$resa.equipment assign="equipment"}} {{else}} {{:error message="Aucun matériel avec la clé « %s »"|args:$resa.equipment}} {{/load}} - {{#load module="equipment" key=$equipment.category assign="category"}}{{/load}} + {{#load module="equipment_resa" key=$equipment.category assign="category"}}{{/load}} {{*:debug rsa=$equipment*}} - {{#module name="equipment"}} + {{#module name="equipment_resa"}} {{*Sa configuration est : {{:debug config=$config}}*}} {{:assign var="states" value=$config.states|explode:","}} {{:assign var="_equip_config_state" from="states.%d"|args:$equipment.state}} diff --git a/_web_exemple/contact.html b/_web_exemple/contact.html index 7f127fa..0a4d7b9 100644 --- a/_web_exemple/contact.html +++ b/_web_exemple/contact.html @@ -9,7 +9,7 @@ {{if $_GET.fonc|trim === 'resa'}} {{:assign var=sujet value="d"}} {{* Charge le matériel *}} - {{#load module="equipment" key=$_GET.key assign="equipment"}} + {{#load module="equipment_resa" key=$_GET.key assign="equipment"}} {{:assign var=message value="Bonjour, je souhaite me renseigner pour la réservation de %s du __/__/__ au __/__/__ ."|args:$name}} {{/load}} {{elseif $_GET.fonc|trim === 'velo'}} diff --git a/_web_exemple/equipment.html b/_web_exemple/equipment.html index 2ddb3ac..a2bdd79 100644 --- a/_web_exemple/equipment.html +++ b/_web_exemple/equipment.html @@ -31,25 +31,25 @@ Dans le cas de matériel mis à disposition, celui-ci n'appartient pas à l'asso {{/if}} {{if !$_GET.fonc}} - {{:include file="/equipment/_web_inventory.html" parent=$page.path}} + {{:include file="/equipment_resa/_web_inventory.html" parent=$page.path}} {{*elseif $_GET.fonc=="inv2"}} - {{:include file="/equipment/_web_inventory2.html" parent=$page.path*}} + {{:include file="/equipment_resa/_web_inventory2.html" parent=$page.path*}} {{elseif $_GET.fonc=="inv3"}} - {{:include file="/equipment/_web_inventory3.html" parent=$page.path}} + {{:include file="/equipment_resa/_web_inventory3.html" parent=$page.path}} {{elseif $_GET.fonc=="voir"}} - {{:include file="/equipment/_web_view.html" parent=$page.path}} + {{:include file="/equipment_resa/_web_view.html" parent=$page.path}} {{elseif $_GET.fonc=="resa"}} - {{:include file="/equipment/_web_resa.html" parent=$page.path}} + {{:include file="/equipment_resa/_web_resa.html" parent=$page.path}} {{elseif $_GET.fonc=="resadel"}} - {{:include file="/equipment/_web_resadel.html" keep="_GET.keys" parent=$page.path}} + {{:include file="/equipment_resa/_web_resadel.html" keep="_GET.keys" parent=$page.path}} {{elseif $_GET.fonc=="confirm_resa"}} {{if $_GET.ok}} - {{:include file="/equipment/_web_contract.html" parent=$page.path}} + {{:include file="/equipment_resa/_web_contract.html" parent=$page.path}} {{/if}} {{elseif $_GET.fonc=="save_resa"}} - {{:include file="/equipment/_web_saved_resa.html" parent=$page.path}} + {{:include file="/equipment_resa/_web_saved_resa.html" parent=$page.path}} {{else}} - {{:include file="/equipment/_web_inventory.html" parent=$page.path keep="cat_key,prop"}} + {{:include file="/equipment_resa/_web_inventory.html" parent=$page.path keep="cat_key,prop"}} {{/if}} {{:include file="./_foot.html"}} \ No newline at end of file diff --git a/_web_inventory.html b/_web_inventory.html index 6738754..2d8b581 100644 --- a/_web_inventory.html +++ b/_web_inventory.html @@ -50,7 +50,7 @@ {{* sélecteurs de catégories et d'appartenances *}} {{:assign var="cat_options." value="" label="Toutes les catégories" href="?cat_key=-1"}} -{{#load module="equipment" type="category" order="$$.name"}} +{{#load module="equipment_resa" type="category" order="$$.name"}} {{:assign var="categories.%s"|args:$key value=$name}} {{:assign var="cat_options." value=$key label=$name href="?cat_key=%s"|args:$key}} {{/load}} @@ -116,7 +116,7 @@ {{*:debug catcond=$cat_condition*}} {{*:debug propcond=$prop_condition*}} -{{#list module="equipment" +{{#list module="equipment_resa" select=" $$.name AS 'Matériel' ; (SELECT $$.name @@ -166,7 +166,7 @@ Met a jour le status de la réservation dans le module web TODO à supprimer *}} - {{*#load module="equipment" type="reservation" equipement_id=$id assign="reservations"}} + {{*#load module="equipment_resa" type="reservation" equipement_id=$id assign="reservations"}} {{*:debug reservations=$reservations}} {{*:save key="%s"|args:$reservations.key status=$reservations.status|strval}} {{else}} diff --git a/_web_inventory2.html b/_web_inventory2.html index ced09cd..2f979f9 100644 --- a/_web_inventory2.html +++ b/_web_inventory2.html @@ -34,7 +34,7 @@ {{* sélecteurs de catégories *}} {{:assign var="cat_options." value="" label="Toutes les catégories" href="?fonc=inv2&cat_key=-1"}} -{{#load module="equipment" type="category" order="$$.name"}} +{{#load module="equipment_resa" type="category" order="$$.name"}} {{:assign var="categories.%s"|args:$key value=$name}} {{:assign var="cat_options." value=$key label=$name href="?fonc=inv2&cat_key=%s"|args:$key }} {{/load}} @@ -75,7 +75,7 @@ {{* Affichage des équipements en mode vignette *}} -{{#load module="equipment" type="category" where=$cat_condition}} +{{#load module="equipment_resa" type="category" where=$cat_condition}} {{:assign lignes=null}} {{#select td_equ.key AS wequ_key, diff --git a/_web_inventory3.html b/_web_inventory3.html index d53f168..9f340cb 100644 --- a/_web_inventory3.html +++ b/_web_inventory3.html @@ -21,12 +21,12 @@ {{* lister les états matériels possibles *}} -{{#module name="equipment"}} +{{#module name="equipment_resa"}} {{:assign var="states" value=$config.states|explode:","}} {{/module}} {{* Affichage des équipements en mode vignette *}} -{{#load module="equipment" type="category" where=$cat_condition}} +{{#load module="equipment_resa" type="category" where=$cat_condition}} {{:assign lignes=null}} {{#select td_equ.id AS wequ_id, @@ -80,7 +80,7 @@ {{$stock}}