Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
190 changes: 101 additions & 89 deletions src/main/java/org/computate/frFR/java/EcrirePageClasse.java
Original file line number Diff line number Diff line change
Expand Up @@ -1856,6 +1856,12 @@ public void pageCodeClasseJava(String langueNom, JsonObject langueConfig) throws
tl(4, "json.put(\"", langueConfig.getString(I18n.var_pivot), "\", true);");
tl(3, "}");

tl(3, "if(default", langueConfig.getString(I18n.var_Tri), "Vars.contains(String.format(\"%s asc\", var))) {");
tl(4, "json.put(\"", langueConfig.getString(I18n.var_tri), "\", \"asc\");");
tl(3, "} else if(default", langueConfig.getString(I18n.var_Tri), "Vars.contains(String.format(\"%s desc\", var))) {");
tl(4, "json.put(\"", langueConfig.getString(I18n.var_tri), "\", \"desc\");");
tl(3, "}");

tl(3, "vars.put(var, json);");
tl(2, "}");
tl(1, "}");
Expand Down Expand Up @@ -2638,9 +2644,18 @@ public void pageCodeClasseJinja(String langueNom, JsonObject i18nPage) throws Ex

// JS Tri //
auteurPageJsRecherche.l();
auteurPageJsRecherche.tl(1, "document.querySelector('#pageFacet", i18nPage.getString(I18n.var_Tri), classeNomSimple, "_", entiteVar, "')?.addEventListener('", "sl-".equals(composantsWebPrefixe) ? "sl-" : "", "change', (event) => {");
auteurPageJsRecherche.tl(1, "document.querySelector('#pageSelect", i18nPage.getString(I18n.var_Tri), classeNomSimple, "_", entiteVar, "')?.addEventListener('", "sl-".equals(composantsWebPrefixe) ? "sl-" : "", "change', (event) => {");
auteurPageJsRecherche.tl(2, i18nPage.getString(I18n.var_tri), "('", classeNomSimple, "', '", entiteVar, "', event.currentTarget.value);");
auteurPageJsRecherche.tl(1, "});");

// JS Stats //
auteurPageJsRecherche.l();
auteurPageJsRecherche.tl(1, "document.querySelector('#page", i18nPage.getString(I18n.var_Stats), classeNomSimple, "_", entiteVar, "')?.addEventListener('", composantsWebPrefixe, "show', (event) => {");
auteurPageJsRecherche.tl(2, "facet", i18nPage.getString(I18n.var_Stats), "Change('", classeNomSimple, "', '", entiteVar, "', true);");
auteurPageJsRecherche.tl(1, "});");
auteurPageJsRecherche.tl(1, "document.querySelector('#page", i18nPage.getString(I18n.var_Stats), classeNomSimple, "_", entiteVar, "')?.addEventListener('", composantsWebPrefixe, "hide', (event) => {");
auteurPageJsRecherche.tl(2, "facet", i18nPage.getString(I18n.var_Stats), "Change('", classeNomSimple, "', '", entiteVar, "', false);");
auteurPageJsRecherche.tl(1, "});");
}

if(entiteHtml) {
Expand Down Expand Up @@ -4993,31 +5008,34 @@ public void ecrirePageBarreLaterale(String langueNom, JsonObject i18nPage) throw
tl(7, "{% endfor %}");
tl(7, "</div>");

tl(7, "{% for key, value in varsFq.items() %}");
// JS Tri //
tl(7, "<div>");
t(8, "<", composantsWebPrefixe, "radio-group");
s(" orientation=\"horizontal\"");
s(" name=\"pageFacet", i18nPage.getString(I18n.var_Tri), "\"");
s(" class=\"pageFacet", i18nPage.getString(I18n.var_Tri), " \"");
s(" id=\"pageFacet", i18nPage.getString(I18n.var_Tri), classeNomSimple, "_{{ key }}\"");
s(" value=\"{% if (key + ' asc') in default", i18nPage.getString(I18n.var_Tri), "Vars %}asc{% else %}{% if (key + ' desc') in default", i18nPage.getString(I18n.var_Tri), "Vars %}desc{% endif %}{% endif %}\"");
s("{% if ", i18nPage.getString(I18n.var_pivot), " is defined %} checked=\"checked\"{% endif %}");
s(" label={{ value.", i18nPage.getString(I18n.var_nomAffichage), " | tojson }}");
s(" size=\"small\"");
l(">");
t(9, "<", composantsWebPrefixe, "radio-button value=\"\" pill>");
s(i18nPage.getString(I18n.str_aucun));
l("</", composantsWebPrefixe, "radio-button>");
t(9, "<", composantsWebPrefixe, "radio-button value=\"asc\" pill>");
tl(8, "{% for key, value in varsFq.items() %}");
// JS Tri //
tl(8, "<", composantsWebPrefixe, "details");
tl(10, "summary=\"{{ value.", i18nPage.getString(I18n.var_nomAffichage), " | e }}\"");
tl(10, "class=\"pageDetails", i18nPage.getString(I18n.var_Tri), " \"");
tl(10, "id=\"pageDetails", i18nPage.getString(I18n.var_Tri), classeNomSimple, "_{{ key }}\"");
tl(12, "data-value=\"{{ value.var | e }}\"");
tl(12, "{% if value.", i18nPage.getString(I18n.var_tri), " is defined %}open{% endif %}");
tl(10, ">");
tl(9, "<", composantsWebPrefixe, "select with-clear");
tl(11, "orientation=\"horizontal\"");
tl(11, "class=\"pageSelect", i18nPage.getString(I18n.var_Tri), " \"");
tl(11, "id=\"pageSelect", i18nPage.getString(I18n.var_Tri), classeNomSimple, "_{{ key }}\"");
tl(11, "{% if value.", i18nPage.getString(I18n.var_tri), " is defined %}value=\"{{ value.", i18nPage.getString(I18n.var_tri), " | e }}\"{% endif %}");
tl(11, "label={{ value.", i18nPage.getString(I18n.var_nomAffichage), " | tojson }}");
tl(11, "size=\"small\"");
tl(11, ">");
t(10, "<", composantsWebPrefixe, "option value=\"asc\">");
s(i18nPage.getString(I18n.str_croissante));
l("</", composantsWebPrefixe, "radio-button>");
t(9, "<", composantsWebPrefixe, "radio-button value=\"desc\" pill>");
l("</", composantsWebPrefixe, "option>");
t(10, "<", composantsWebPrefixe, "option value=\"desc\">");
s(i18nPage.getString(I18n.str_decroissante));
l("</", composantsWebPrefixe, "radio-button>");
tl(8, "</", composantsWebPrefixe, "radio-group>");
l("</", composantsWebPrefixe, "option>");
tl(9, "</", composantsWebPrefixe, "select>");
tl(8, "</", composantsWebPrefixe, "details>");
tl(8, "{% endfor %}");
tl(7, "</div>");
tl(7, "{% endfor %}");

tl(7, "{%- endblock htmBody", i18nPage.getString(I18n.var_Tri), classePageNomSimple, " %}");
tl(6, "</div>");
Expand Down Expand Up @@ -5310,65 +5328,55 @@ public void ecrirePageBarreLaterale(String langueNom, JsonObject i18nPage) throw
tl(8, "{% endif %}");
tl(7, "</div>");

tl(7, "<table>");
tl(7, "<div>");
tl(8, "{% for key, value in varsFq.items() %}");
tl(9, "{% if value.", i18nPage.getString(I18n.var_activer), i18nPage.getString(I18n.var_Stats), " is defined %}");
tl(10, "<tr class=\"\">");
tl(11, "<td class=\"\">");
t(12, "<span>");
s("<", composantsWebPrefixe, "checkbox");
s(" name=\"page", i18nPage.getString(I18n.var_Stats), "\"");
s(" class=\"page", i18nPage.getString(I18n.var_Stats), " \"");
s(" id=\"page", i18nPage.getString(I18n.var_Stats), classeNomSimple, "_{{ key }}\"");
s(" value=\"{{ value.var }}\"");
s("{% if value.", i18nPage.getString(I18n.var_stats), " is defined %} checked=\"checked\"{% endif %}");
s(" onclick=\"facet", i18nPage.getString(I18n.var_Stats), "Change('", classeNomSimple, "', value); \"");
l(">{{ value.", i18nPage.getString(I18n.var_nomAffichage), " }}</", composantsWebPrefixe, "checkbox></span>");
tl(11, "</td>");
tl(11, "<td>");
tl(12, "<div>");
tl(13, "<label for=\"page", i18nPage.getString(I18n.var_Stats), classeNomSimple, "_{{ key }}\">{{ value.", i18nPage.getString(I18n.var_nomAffichage), " }}</label>");
tl(12, "</div>");

t(12, "<div");
s(" class=\"pageStatsField pageStatsField", classeNomSimple, "_{{ key }} \"");
tl(10, "<", composantsWebPrefixe, "details");
tl(12, "summary=\"{{ value.", i18nPage.getString(I18n.var_nomAffichage), " | e }}\"");
tl(12, "class=\"page", i18nPage.getString(I18n.var_Stats), " \"");
tl(12, "id=\"page", i18nPage.getString(I18n.var_Stats), classeNomSimple, "_{{ key }}\"");
tl(12, "data-value=\"{{ value.var | e }}\"");
tl(12, "{% if value.", i18nPage.getString(I18n.var_stats), " is defined %}open{% endif %}");
tl(12, ">");

t(11, "<div");
s(" class=\"", composantsWebPrefixe, "stack pageStatsField pageStatsField", classeNomSimple, "_{{ key }} \"");
s(" id=\"pageStatsField", classeNomSimple, "_{{ key }}\"");
l(">");
tl(13, "{% if value.stats is defined %}");
tl(14, "{% for item in value.stats %}");
tl(15, "{% if item.key == 'name' %}{% else %}");
t(16, "<div");
s(" data-class=\"", classeNomSimple, "\"");
s(" data-var=\"{{ item.var }}\"");
s(" data-val=\"{{ item.key }}\"");
s(">");
s("{{ item.key }}");
s(": ");
s("{{ item }}");
l("</div>");
tl(15, "{% endif %}");
tl(14, "{% endfor %}");
tl(14, "{% if value.stats.max is defined %}");
tl(15, "<div>");
tl(16, "<span> step </span>");
tl(16, "<", composantsWebPrefixe, "input id=\"animate", i18nPage.getString(I18n.var_Stats), "Step\" placeholder=\"step\" value=\"1\" style=\"width: 4em; \"></", composantsWebPrefixe, "input>");
tl(16, "<span> min </span>");
tl(16, "<", composantsWebPrefixe, "input id=\"animate", i18nPage.getString(I18n.var_Stats), "Min\" placeholder=\"min\" value=\"{{ value.stats.min }}\" style=\"width: 4em; \"></", composantsWebPrefixe, "input>");
tl(16, "<span> max </span>");
tl(16, "<", composantsWebPrefixe, "input id=\"animate", i18nPage.getString(I18n.var_Stats), "Max\" placeholder=\"max\" value=\"{{ value.stats.max }}\" style=\"width: 4em; \"></", composantsWebPrefixe, "input>");
tl(16, "<span> speed in seconds </span>");
tl(16, "<", composantsWebPrefixe, "input id=\"animate", i18nPage.getString(I18n.var_Stats), "Speed\" placeholder=\"speed\" value=\"1\" style=\"width: 4em; \"></", composantsWebPrefixe, "input>");
tl(16, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " onclick=\"animate", i18nPage.getString(I18n.var_Stats), "(); \">animate</", composantsWebPrefixe, "button>");
tl(12, "{% if value.stats is defined %}");
tl(13, "{% for itemKey, itemValue in value.stats.items() %}");
tl(14, "{% if itemKey == 'name' %}{% else %}");
tl(15, "<div");
tl(17, " class=\"", composantsWebPrefixe, "split \"");
tl(17, " data-class=\"", classeNomSimple, "\"");
tl(17, " data-var=\"{{ itemKey }}\"");
tl(17, " data-val=\"{{ itemValue }}\"");
tl(17, ">");
tl(16, "<span>{{ itemKey | e }}</span>");
tl(16, "<span>{{ itemValue | e }}</span>");
tl(15, "</div>");
tl(14, "{% endif %}");
tl(13, "{% endif %}");
tl(12, "</div>");
tl(13, "{% endfor %}");
// tl(13, "{% if value.stats.max is defined %}");
// tl(14, "<div>");
// tl(15, "<span> step </span>");
// tl(15, "<", composantsWebPrefixe, "input id=\"animate", i18nPage.getString(I18n.var_Stats), "Step\" placeholder=\"step\" value=\"1\" style=\"width: 4em; \"></", composantsWebPrefixe, "input>");
// tl(15, "<span> min </span>");
// tl(15, "<", composantsWebPrefixe, "input id=\"animate", i18nPage.getString(I18n.var_Stats), "Min\" placeholder=\"min\" value=\"{{ value.stats.min }}\" style=\"width: 4em; \"></", composantsWebPrefixe, "input>");
// tl(15, "<span> max </span>");
// tl(15, "<", composantsWebPrefixe, "input id=\"animate", i18nPage.getString(I18n.var_Stats), "Max\" placeholder=\"max\" value=\"{{ value.stats.max }}\" style=\"width: 4em; \"></", composantsWebPrefixe, "input>");
// tl(15, "<span> speed in seconds </span>");
// tl(15, "<", composantsWebPrefixe, "input id=\"animate", i18nPage.getString(I18n.var_Stats), "Speed\" placeholder=\"speed\" value=\"1\" style=\"width: 4em; \"></", composantsWebPrefixe, "input>");
// tl(15, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " onclick=\"animate", i18nPage.getString(I18n.var_Stats), "(); \">animate</", composantsWebPrefixe, "button>");
// tl(14, "</div>");
// tl(13, "{% endif %}");
tl(12, "{% endif %}");
tl(11, "</div>");

tl(11, "</td>");
tl(10, "</tr>");
tl(10, "</", composantsWebPrefixe, "details>");
tl(9, "{% endif %}");
tl(8, "{% endfor %}");
tl(7, "</table>");
tl(7, "</div>");
tl(0, "{%- endblock htmBody", i18nPage.getString(I18n.var_Stats), classePageNomSimple, " %}");
tl(6, "</div>");
tl(5, "</", composantsWebPrefixe, "drawer>");
Expand Down Expand Up @@ -5418,12 +5426,12 @@ public void ecrirePageBoutonsRecherche(String langueNom, JsonObject i18nPage) th
//////////////
// bouton q //
//////////////
// tl(5, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", i18nPage.getString(I18n.str_Recherche_avancee_pour_), classeNomAdjectifPluriel, "\">");
tl(7, "<", composantsWebPrefixe, "button class=\"", i18nPage.getString(I18n.var_BoutonsRecherche), "_", i18nPage.getString(I18n.var_Rechercher), " ", i18nPage.getString(I18n.var_BoutonsRecherche), "_", i18nPage.getString(I18n.var_Rechercher), "_", classeNomSimple, " \"", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " onclick=\"document.querySelector('#site", i18nPage.getString(I18n.var_BarreLaterale), "Toggle", i18nPage.getString(I18n.var_Recherche), "').open = true; \">");
tl(8, "<", composantsWebPrefixe, "icon slot=\"start\" class=\"{{ FONTAWESOME_STYLE }} fa-magnifying-glass hover-box-shadow \"></", composantsWebPrefixe, "icon> ");
tl(8, i18nPage.getString(I18n.var_Rechercher));
tl(7, "</", composantsWebPrefixe, "button>");
// tl(5, "</", composantsWebPrefixe, "tooltip>");
// // tl(5, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", i18nPage.getString(I18n.str_Recherche_avancee_pour_), classeNomAdjectifPluriel, "\">");
// tl(7, "<", composantsWebPrefixe, "button class=\"", i18nPage.getString(I18n.var_BoutonsRecherche), "_", i18nPage.getString(I18n.var_Rechercher), " ", i18nPage.getString(I18n.var_BoutonsRecherche), "_", i18nPage.getString(I18n.var_Rechercher), "_", classeNomSimple, " \"", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " onclick=\"document.querySelector('#site", i18nPage.getString(I18n.var_BarreLaterale), "Toggle", i18nPage.getString(I18n.var_Recherche), "').open = true; \">");
// tl(8, "<", composantsWebPrefixe, "icon slot=\"start\" class=\"{{ FONTAWESOME_STYLE }} fa-magnifying-glass hover-box-shadow \"></", composantsWebPrefixe, "icon> ");
// tl(8, i18nPage.getString(I18n.var_Rechercher));
// tl(7, "</", composantsWebPrefixe, "button>");
// // tl(5, "</", composantsWebPrefixe, "tooltip>");

///////////////
// bouton fq //
Expand All @@ -5435,15 +5443,17 @@ public void ecrirePageBoutonsRecherche(String langueNom, JsonObject i18nPage) th
tl(7, "</", composantsWebPrefixe, "button>");
// tl(5, "</", composantsWebPrefixe, "tooltip>");

///////////////
// bouton fq //
///////////////
////////////////
// bouton tri //
////////////////
tl(7, "{% if ", classeVarCleUnique, " is not defined %}");
// tl(5, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", i18nPage.getString(I18n.str_Filtres_et_nombres_de_facettes_pour_), classeNomAdjectifPluriel, "\">");
tl(7, "<", composantsWebPrefixe, "button class=\"", i18nPage.getString(I18n.var_BoutonsRecherche), "_", i18nPage.getString(I18n.var_Tri), " ", i18nPage.getString(I18n.var_BoutonsRecherche), "_", i18nPage.getString(I18n.var_Tri), "_", classeNomSimple, " \"", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " onclick=\"document.querySelector('#site", i18nPage.getString(I18n.var_BarreLaterale), "Toggle", i18nPage.getString(I18n.var_Tri), "').open = true; \">");
tl(8, "<", composantsWebPrefixe, "icon slot=\"start\" class=\"{{ FONTAWESOME_STYLE }} fa-arrow-down-a-z hover-box-shadow \"></", composantsWebPrefixe, "icon> ");
tl(8, i18nPage.getString(I18n.str_Tri));
tl(7, "</", composantsWebPrefixe, "button>");
// tl(5, "</", composantsWebPrefixe, "tooltip>");
tl(7, "{% endif %}");

//////////////////
// bouton gamme //
Expand All @@ -5468,22 +5478,24 @@ public void ecrirePageBoutonsRecherche(String langueNom, JsonObject i18nPage) th
/////////////////////////
// bouton liste champs //
/////////////////////////
// tl(5, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", i18nPage.getString(I18n.str_Recherche_avancee_pour_), classeNomAdjectifPluriel, "\">");
tl(7, "<", composantsWebPrefixe, "button class=\"", i18nPage.getString(I18n.var_BoutonsRecherche), "_", i18nPage.getString(I18n.var_ListeChamps), " ", i18nPage.getString(I18n.var_BoutonsRecherche), "_", i18nPage.getString(I18n.var_ListeChamps), "_", classeNomSimple, " \"", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " onclick=\"document.querySelector('#site", i18nPage.getString(I18n.var_BarreLaterale), "Toggle", i18nPage.getString(I18n.var_ListeChamps), "').open = true; \">");
tl(8, "<", composantsWebPrefixe, "icon slot=\"start\" class=\"{{ FONTAWESOME_STYLE }} fa-list-ul hover-box-shadow \"></", composantsWebPrefixe, "icon> ");
tl(8, i18nPage.getString(I18n.var_ListeChamps));
tl(7, "</", composantsWebPrefixe, "button>");
// tl(5, "</", composantsWebPrefixe, "tooltip>");
// // tl(5, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", i18nPage.getString(I18n.str_Recherche_avancee_pour_), classeNomAdjectifPluriel, "\">");
// tl(7, "<", composantsWebPrefixe, "button class=\"", i18nPage.getString(I18n.var_BoutonsRecherche), "_", i18nPage.getString(I18n.var_ListeChamps), " ", i18nPage.getString(I18n.var_BoutonsRecherche), "_", i18nPage.getString(I18n.var_ListeChamps), "_", classeNomSimple, " \"", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " onclick=\"document.querySelector('#site", i18nPage.getString(I18n.var_BarreLaterale), "Toggle", i18nPage.getString(I18n.var_ListeChamps), "').open = true; \">");
// tl(8, "<", composantsWebPrefixe, "icon slot=\"start\" class=\"{{ FONTAWESOME_STYLE }} fa-list-ul hover-box-shadow \"></", composantsWebPrefixe, "icon> ");
// tl(8, i18nPage.getString(I18n.var_ListeChamps));
// tl(7, "</", composantsWebPrefixe, "button>");
// // tl(5, "</", composantsWebPrefixe, "tooltip>");

//////////////////
// bouton stats //
//////////////////
tl(7, "{% if ", classeVarCleUnique, " is not defined %}");
// tl(5, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", i18nPage.getString(I18n.str_Recherche_avancee_pour_), classeNomAdjectifPluriel, "\">");
tl(7, "<", composantsWebPrefixe, "button class=\"", i18nPage.getString(I18n.var_BoutonsRecherche), "_", i18nPage.getString(I18n.var_Stats), " ", i18nPage.getString(I18n.var_BoutonsRecherche), "_", i18nPage.getString(I18n.var_Stats), "_", classeNomSimple, " \"", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " onclick=\"document.querySelector('#site", i18nPage.getString(I18n.var_BarreLaterale), "Toggle", i18nPage.getString(I18n.var_Stats), "').open = true; \">");
tl(8, "<", composantsWebPrefixe, "icon slot=\"start\" class=\"{{ FONTAWESOME_STYLE }} fa-chart-candlestick hover-box-shadow \"></", composantsWebPrefixe, "icon> ");
tl(8, i18nPage.getString(I18n.var_Stats));
tl(7, "</", composantsWebPrefixe, "button>");
// tl(5, "</", composantsWebPrefixe, "tooltip>");
tl(7, "{% endif %}");

////////////////
// bouton API //
Expand Down Expand Up @@ -5631,7 +5643,7 @@ public void ecrirePageRechercheJinja(String langueNom, JsonObject i18nPage) thro
tl(0, "{%- include ", classePageBarreLateraleTemplate, " %}");
tl(0, "{%- include ", classePageRechercheSuggereTemplate, " %}");

tl(5, "<div>");
tl(5, "<div class=\"pageContent \">");
tl(6, "<form action=\"", classeApiUri, "\" id=\"", classeApiClasseNomSimple, "Form\" class=\"", i18nPage.getString(I18n.var_page), i18nPage.getString(I18n.var_Formulaire), " \" onsubmit=\"event.preventDefault(); return false; \">");
t(7, "<input");
s(" name=\"focusId\"");
Expand Down Expand Up @@ -5789,7 +5801,7 @@ public void ecrirePageEditionJinja(String langueNom, JsonObject i18nPage) throws
tl(0, "{%- block htmBody", i18nPage.getString(I18n.var_Milieu), classePageSuperNomSimple, " %}");
tl(0, "{%- block htmBody", i18nPage.getString(I18n.var_Milieu), classePageNomSimple, " %}");

tl(4, "<div>");
tl(4, "<div class=\"pageContent \">");
// htmBodyCount0 //
tl(0, "{% if ", varResultat, "Count == 0 %}");
ecrirePageRechercheAucun(langueNom, i18nPage);
Expand Down
Loading