Skip to content

Commit 8f9c2b2

Browse files
computatecomputate
committed
Fix bugs with stats
1 parent efb0562 commit 8f9c2b2

File tree

1 file changed

+53
-52
lines changed

1 file changed

+53
-52
lines changed

‎src/main/java/org/computate/frFR/java/EcrirePageClasse.java‎

Lines changed: 53 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -2641,6 +2641,15 @@ public void pageCodeClasseJinja(String langueNom, JsonObject i18nPage) throws Ex
26412641
auteurPageJsRecherche.tl(1, "document.querySelector('#pageFacet", i18nPage.getString(I18n.var_Tri), classeNomSimple, "_", entiteVar, "')?.addEventListener('", "sl-".equals(composantsWebPrefixe) ? "sl-" : "", "change', (event) => {");
26422642
auteurPageJsRecherche.tl(2, i18nPage.getString(I18n.var_tri), "('", classeNomSimple, "', '", entiteVar, "', event.currentTarget.value);");
26432643
auteurPageJsRecherche.tl(1, "});");
2644+
2645+
// JS Stats //
2646+
auteurPageJsRecherche.l();
2647+
auteurPageJsRecherche.tl(1, "document.querySelector('#page", i18nPage.getString(I18n.var_Stats), classeNomSimple, "_", entiteVar, "')?.addEventListener('", composantsWebPrefixe, "show', (event) => {");
2648+
auteurPageJsRecherche.tl(2, "facet", i18nPage.getString(I18n.var_Stats), "Change('", classeNomSimple, "', '", entiteVar, "', true);");
2649+
auteurPageJsRecherche.tl(1, "});");
2650+
auteurPageJsRecherche.tl(1, "document.querySelector('#page", i18nPage.getString(I18n.var_Stats), classeNomSimple, "_", entiteVar, "')?.addEventListener('", composantsWebPrefixe, "hide', (event) => {");
2651+
auteurPageJsRecherche.tl(2, "facet", i18nPage.getString(I18n.var_Stats), "Change('", classeNomSimple, "', '", entiteVar, "', false);");
2652+
auteurPageJsRecherche.tl(1, "});");
26442653
}
26452654

26462655
if(entiteHtml) {
@@ -5310,65 +5319,55 @@ public void ecrirePageBarreLaterale(String langueNom, JsonObject i18nPage) throw
53105319
tl(8, "{% endif %}");
53115320
tl(7, "</div>");
53125321

5313-
tl(7, "<table>");
5322+
tl(7, "<div>");
53145323
tl(8, "{% for key, value in varsFq.items() %}");
53155324
tl(9, "{% if value.", i18nPage.getString(I18n.var_activer), i18nPage.getString(I18n.var_Stats), " is defined %}");
5316-
tl(10, "<tr class=\"\">");
5317-
tl(11, "<td class=\"\">");
5318-
t(12, "<span>");
5319-
s("<", composantsWebPrefixe, "checkbox");
5320-
s(" name=\"page", i18nPage.getString(I18n.var_Stats), "\"");
5321-
s(" class=\"page", i18nPage.getString(I18n.var_Stats), " \"");
5322-
s(" id=\"page", i18nPage.getString(I18n.var_Stats), classeNomSimple, "_{{ key }}\"");
5323-
s(" value=\"{{ value.var }}\"");
5324-
s("{% if value.", i18nPage.getString(I18n.var_stats), " is defined %} checked=\"checked\"{% endif %}");
5325-
s(" onclick=\"facet", i18nPage.getString(I18n.var_Stats), "Change('", classeNomSimple, "', value); \"");
5326-
l(">{{ value.", i18nPage.getString(I18n.var_nomAffichage), " }}</", composantsWebPrefixe, "checkbox></span>");
5327-
tl(11, "</td>");
5328-
tl(11, "<td>");
5329-
tl(12, "<div>");
5330-
tl(13, "<label for=\"page", i18nPage.getString(I18n.var_Stats), classeNomSimple, "_{{ key }}\">{{ value.", i18nPage.getString(I18n.var_nomAffichage), " }}</label>");
5331-
tl(12, "</div>");
5332-
5333-
t(12, "<div");
5334-
s(" class=\"pageStatsField pageStatsField", classeNomSimple, "_{{ key }} \"");
5325+
tl(10, "<", composantsWebPrefixe, "details");
5326+
tl(12, "summary=\"{{ value.", i18nPage.getString(I18n.var_nomAffichage), " | e }}\"");
5327+
tl(12, "class=\"page", i18nPage.getString(I18n.var_Stats), " \"");
5328+
tl(12, "id=\"page", i18nPage.getString(I18n.var_Stats), classeNomSimple, "_{{ key }}\"");
5329+
tl(12, "data-value=\"{{ value.var | e }}\"");
5330+
tl(12, "{% if value.", i18nPage.getString(I18n.var_stats), " is defined %}open{% endif %}");
5331+
tl(12, ">");
5332+
5333+
t(11, "<div");
5334+
s(" class=\"", composantsWebPrefixe, "stack pageStatsField pageStatsField", classeNomSimple, "_{{ key }} \"");
53355335
s(" id=\"pageStatsField", classeNomSimple, "_{{ key }}\"");
53365336
l(">");
5337-
tl(13, "{% if value.stats is defined %}");
5338-
tl(14, "{% for item in value.stats %}");
5339-
tl(15, "{% if item.key == 'name' %}{% else %}");
5340-
t(16, "<div");
5341-
s(" data-class=\"", classeNomSimple, "\"");
5342-
s(" data-var=\"{{ item.var }}\"");
5343-
s(" data-val=\"{{ item.key }}\"");
5344-
s(">");
5345-
s("{{ item.key }}");
5346-
s(": ");
5347-
s("{{ item }}");
5348-
l("</div>");
5349-
tl(15, "{% endif %}");
5350-
tl(14, "{% endfor %}");
5351-
tl(14, "{% if value.stats.max is defined %}");
5352-
tl(15, "<div>");
5353-
tl(16, "<span> step </span>");
5354-
tl(16, "<", composantsWebPrefixe, "input id=\"animate", i18nPage.getString(I18n.var_Stats), "Step\" placeholder=\"step\" value=\"1\" style=\"width: 4em; \"></", composantsWebPrefixe, "input>");
5355-
tl(16, "<span> min </span>");
5356-
tl(16, "<", composantsWebPrefixe, "input id=\"animate", i18nPage.getString(I18n.var_Stats), "Min\" placeholder=\"min\" value=\"{{ value.stats.min }}\" style=\"width: 4em; \"></", composantsWebPrefixe, "input>");
5357-
tl(16, "<span> max </span>");
5358-
tl(16, "<", composantsWebPrefixe, "input id=\"animate", i18nPage.getString(I18n.var_Stats), "Max\" placeholder=\"max\" value=\"{{ value.stats.max }}\" style=\"width: 4em; \"></", composantsWebPrefixe, "input>");
5359-
tl(16, "<span> speed in seconds </span>");
5360-
tl(16, "<", composantsWebPrefixe, "input id=\"animate", i18nPage.getString(I18n.var_Stats), "Speed\" placeholder=\"speed\" value=\"1\" style=\"width: 4em; \"></", composantsWebPrefixe, "input>");
5361-
tl(16, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " onclick=\"animate", i18nPage.getString(I18n.var_Stats), "(); \">animate</", composantsWebPrefixe, "button>");
5337+
tl(12, "{% if value.stats is defined %}");
5338+
tl(13, "{% for itemKey, itemValue in value.stats.items() %}");
5339+
tl(14, "{% if itemKey == 'name' %}{% else %}");
5340+
tl(15, "<div");
5341+
tl(17, " class=\"", composantsWebPrefixe, "split \"");
5342+
tl(17, " data-class=\"", classeNomSimple, "\"");
5343+
tl(17, " data-var=\"{{ itemKey }}\"");
5344+
tl(17, " data-val=\"{{ itemValue }}\"");
5345+
tl(17, ">");
5346+
tl(16, "<span>{{ itemKey | e }}</span>");
5347+
tl(16, "<span>{{ itemValue | e }}</span>");
53625348
tl(15, "</div>");
53635349
tl(14, "{% endif %}");
5364-
tl(13, "{% endif %}");
5365-
tl(12, "</div>");
5350+
tl(13, "{% endfor %}");
5351+
// tl(13, "{% if value.stats.max is defined %}");
5352+
// tl(14, "<div>");
5353+
// tl(15, "<span> step </span>");
5354+
// tl(15, "<", composantsWebPrefixe, "input id=\"animate", i18nPage.getString(I18n.var_Stats), "Step\" placeholder=\"step\" value=\"1\" style=\"width: 4em; \"></", composantsWebPrefixe, "input>");
5355+
// tl(15, "<span> min </span>");
5356+
// tl(15, "<", composantsWebPrefixe, "input id=\"animate", i18nPage.getString(I18n.var_Stats), "Min\" placeholder=\"min\" value=\"{{ value.stats.min }}\" style=\"width: 4em; \"></", composantsWebPrefixe, "input>");
5357+
// tl(15, "<span> max </span>");
5358+
// tl(15, "<", composantsWebPrefixe, "input id=\"animate", i18nPage.getString(I18n.var_Stats), "Max\" placeholder=\"max\" value=\"{{ value.stats.max }}\" style=\"width: 4em; \"></", composantsWebPrefixe, "input>");
5359+
// tl(15, "<span> speed in seconds </span>");
5360+
// tl(15, "<", composantsWebPrefixe, "input id=\"animate", i18nPage.getString(I18n.var_Stats), "Speed\" placeholder=\"speed\" value=\"1\" style=\"width: 4em; \"></", composantsWebPrefixe, "input>");
5361+
// tl(15, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " onclick=\"animate", i18nPage.getString(I18n.var_Stats), "(); \">animate</", composantsWebPrefixe, "button>");
5362+
// tl(14, "</div>");
5363+
// tl(13, "{% endif %}");
5364+
tl(12, "{% endif %}");
5365+
tl(11, "</div>");
53665366

5367-
tl(11, "</td>");
5368-
tl(10, "</tr>");
5367+
tl(10, "</", composantsWebPrefixe, "details>");
53695368
tl(9, "{% endif %}");
53705369
tl(8, "{% endfor %}");
5371-
tl(7, "</table>");
5370+
tl(7, "</div>");
53725371
tl(0, "{%- endblock htmBody", i18nPage.getString(I18n.var_Stats), classePageNomSimple, " %}");
53735372
tl(6, "</div>");
53745373
tl(5, "</", composantsWebPrefixe, "drawer>");
@@ -5478,12 +5477,14 @@ public void ecrirePageBoutonsRecherche(String langueNom, JsonObject i18nPage) th
54785477
//////////////////
54795478
// bouton stats //
54805479
//////////////////
5480+
tl(7, "{% if ", classeVarCleUnique, " is not defined %}");
54815481
// tl(5, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", i18nPage.getString(I18n.str_Recherche_avancee_pour_), classeNomAdjectifPluriel, "\">");
54825482
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; \">");
54835483
tl(8, "<", composantsWebPrefixe, "icon slot=\"start\" class=\"{{ FONTAWESOME_STYLE }} fa-chart-candlestick hover-box-shadow \"></", composantsWebPrefixe, "icon> ");
54845484
tl(8, i18nPage.getString(I18n.var_Stats));
54855485
tl(7, "</", composantsWebPrefixe, "button>");
54865486
// tl(5, "</", composantsWebPrefixe, "tooltip>");
5487+
tl(7, "{% endif %}");
54875488

54885489
////////////////
54895490
// bouton API //
@@ -5631,7 +5632,7 @@ public void ecrirePageRechercheJinja(String langueNom, JsonObject i18nPage) thro
56315632
tl(0, "{%- include ", classePageBarreLateraleTemplate, " %}");
56325633
tl(0, "{%- include ", classePageRechercheSuggereTemplate, " %}");
56335634

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

5792-
tl(4, "<div>");
5793+
tl(4, "<div class=\"pageContent \">");
57935794
// htmBodyCount0 //
57945795
tl(0, "{% if ", varResultat, "Count == 0 %}");
57955796
ecrirePageRechercheAucun(langueNom, i18nPage);

0 commit comments

Comments
 (0)