Skip to content

Commit 681522c

Browse files
computatecomputate
committed
Adding sort functionalilty
1 parent 17e5bd5 commit 681522c

File tree

1 file changed

+57
-31
lines changed

1 file changed

+57
-31
lines changed

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

Lines changed: 57 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2293,14 +2293,14 @@ public void pageCodeClasseJinja(String langueNom, JsonObject i18nPage) throws Ex
22932293
if(entiteLien) {
22942294
wTh.tl(7, "<div></div>");
22952295
} else {
2296-
wTh.tl(7, "<", composantsWebPrefixe, "dropdown id=\"htm", i18nGlobale.getString(I18n.var_ListeDeroulante), "_", entiteVar, "\">");
2296+
wTh.tl(7, "<", composantsWebPrefixe, "dropdown id=\"htm", i18nGlobale.getString(I18n.var_ListeDeroulante), "-", entiteVar, "\">");
22972297
wTh.tl(8, "<", composantsWebPrefixe, "button slot=\"trigger\" caret>", entiteNomAffichage, "</", composantsWebPrefixe, "button>");
22982298
wTh.tl(8, "<", composantsWebPrefixe, "menu>");
2299-
wTh.tl(9, "<", composantsWebPrefixe, "menu-item type=\"checkbox\" data-action=\"", i18nPage.getString(I18n.var_tri), "\">");
2299+
wTh.tl(9, "<", composantsWebPrefixe, "menu-item data-action=\"", i18nPage.getString(I18n.var_tri), "\" data-order=\"asc\" id=\"htm", i18nGlobale.getString(I18n.var_ListeDeroulante), "-", entiteVar, "-asc\">");
23002300
wTh.tl(10, "<i class=\"fa-solid fa-arrow-down-a-z\"></i>");
23012301
wTh.t(10).sx(String.format(i18nPage.getString(I18n.str_trier_par___croissante), entiteNomAffichage)).l();
23022302
wTh.tl(9, "</", composantsWebPrefixe, "menu-item>");
2303-
wTh.tl(9, "<", composantsWebPrefixe, "menu-item type=\"checkbox\" data-action=\"", i18nPage.getString(I18n.var_tri), "\">");
2303+
wTh.tl(9, "<", composantsWebPrefixe, "menu-item data-action=\"", i18nPage.getString(I18n.var_tri), "\" data-order=\"desc\" id=\"htm", i18nGlobale.getString(I18n.var_ListeDeroulante), "-", entiteVar, "-desc\">");
23042304
wTh.tl(10, "<i class=\"fa-solid fa-arrow-down-z-a\"></i>");
23052305
wTh.t(10).sx(String.format(i18nPage.getString(I18n.str_trier_par___decroissante), entiteNomAffichage)).l();
23062306
wTh.tl(9, "</", composantsWebPrefixe, "menu-item>");
@@ -2385,14 +2385,22 @@ public void pageCodeClasseJinja(String langueNom, JsonObject i18nPage) throws Ex
23852385
wFoot.tl(7, "{% endif %}");
23862386

23872387
//STUFF3
2388+
// js tri
23882389
auteurPageJsRecherche.l();
2389-
auteurPageJsRecherche.tl(1, "document.querySelector('#htm", i18nGlobale.getString(I18n.var_ListeDeroulante), "_", entiteVar, "')?.addEventListener('sl-select', (event) => {");
2390+
auteurPageJsRecherche.tl(1, "document.querySelector('#htm", i18nGlobale.getString(I18n.var_ListeDeroulante), "-", entiteVar, "')?.addEventListener('sl-select', (event) => {");
23902391
auteurPageJsRecherche.tl(2, "const item = event.detail.item;");
23912392
auteurPageJsRecherche.tl(2, "const action = item.getAttribute('data-action');");
2393+
auteurPageJsRecherche.tl(2, "const order = item.getAttribute('data-order');");
2394+
auteurPageJsRecherche.tl(2, "const checked = !(document.querySelector('#pageSearchVal-page", i18nPage.getString(I18n.var_Tri), "-", classeNomSimple, "-", entiteVar, "').innerText == undefined);");
23922395
auteurPageJsRecherche.tl(2, "if (action === '", i18nPage.getString(I18n.var_tri), "') {");
2393-
auteurPageJsRecherche.tl(3, i18nPage.getString(I18n.var_tri), "('", classeNomSimple, "', item.value, item.checked);");
2396+
auteurPageJsRecherche.tl(3, i18nPage.getString(I18n.var_tri), "('", classeNomSimple, "', '", entiteVar, "', checked ? order : '');");
2397+
auteurPageJsRecherche.tl(3, "document.querySelector('#pageFacet", i18nPage.getString(I18n.var_Tri), classeNomSimple, "_", entiteVar, "').value = checked ? order : '';");
23942398
auteurPageJsRecherche.tl(2, "}");
23952399
auteurPageJsRecherche.tl(1, "});");
2400+
auteurPageJsRecherche.l();
2401+
auteurPageJsRecherche.tl(1, "document.querySelector('#pageFacet", i18nPage.getString(I18n.var_Tri), classeNomSimple, "_", entiteVar, "')?.addEventListener('sl-change', (event) => {");
2402+
auteurPageJsRecherche.tl(2, i18nPage.getString(I18n.var_tri), "('", classeNomSimple, "', '", entiteVar, "', event.currentTarget.value);");
2403+
auteurPageJsRecherche.tl(1, "});");
23962404
}
23972405
rechercheSolr.setStart(i.intValue() + rechercheLignes);
23982406
rechercheReponse = clientSolrComputate.query(rechercheSolr);
@@ -4557,42 +4565,60 @@ public void ecrirePageBarreLaterale(String langueNom, JsonObject i18nPage) throw
45574565

45584566
tl(7, "{%- block htmBody", i18nPage.getString(I18n.var_Tri), classePageNomSimple, " %}");
45594567

4560-
t(7, "<div");
4561-
s(" style=\"display: none; \"");
4562-
s(" id=\"pageSearchVal-", i18nPage.getString(I18n.var_Tri), classeNomSimple, "Hidden\"");
4563-
l(">");
4564-
tl(8, "{% for item in default", i18nPage.getString(I18n.var_Tri), "Vars %}");
4565-
t(9, "<div");
4566-
s(" class=\"pageSearchVal-", i18nPage.getString(I18n.var_Tri), classeNomSimple, "Hidden \"");
4567-
s(" id=\"pageSearchVal-", i18nPage.getString(I18n.var_Tri), classeNomSimple, "Hidden_{{ item }}\"");
4568-
l(">{{ item }}</div>");
4569-
tl(8, "{% endfor %}");
4570-
tl(7, "</div>");
4568+
// t(7, "<div");
4569+
// s(" style=\"display: none; \"");
4570+
// s(" id=\"pageSearchVal-page", i18nPage.getString(I18n.var_Tri), "-", classeNomSimple, "Hidden\"");
4571+
// l(">");
4572+
// tl(7, "{% for key, value in varsFq.items() %}");
4573+
// // tl(8, "{% for item in default", i18nPage.getString(I18n.var_Tri), "Vars %}");
4574+
// t(9, "<div");
4575+
// s(" class=\"pageSearchVal-page", i18nPage.getString(I18n.var_Tri), "-", classeNomSimple, "Hidden \"");
4576+
// s(" id=\"pageSearchVal-page", i18nPage.getString(I18n.var_Tri), "-", classeNomSimple, "Hidden_{{ key }}\"");
4577+
// l(">{{ value }}</div>");
4578+
// tl(8, "{% endfor %}");
4579+
// tl(7, "</div>");
45714580

45724581
t(7, "<div");
4573-
s(" id=\"pageSearchVal-", i18nPage.getString(I18n.var_Tri), classeNomSimple, "\"");
4582+
s(" id=\"pageSearchVal-page", i18nPage.getString(I18n.var_Tri), "-", classeNomSimple, "\"");
45744583
l(">");
4575-
tl(8, "{% if default", i18nPage.getString(I18n.var_Tri), "Vars is defined and default", i18nPage.getString(I18n.var_Tri), "Vars.length > 0 %}");
4584+
tl(7, "{% for key, value in varsFq.items() %}");
45764585
t(9, "<div");
4577-
s(" class=\"pageSearchVal pageSearchVal-", i18nPage.getString(I18n.var_Tri), classeNomSimple, " \"");
4578-
s(" id=\"pageSearchVal-", i18nPage.getString(I18n.var_Tri), classeNomSimple, "_1\"");
4579-
s(">facet.pivot={!range=r1}");
4580-
s("{% for item in default", i18nPage.getString(I18n.var_Tri), "Vars %}");
4581-
s("{% if loop.index > 0 %},{% endif %}{{ item }}");
4582-
s("{% endfor %}");
4586+
s(" class=\"pageSearchVal pageSearchVal-page", i18nPage.getString(I18n.var_Tri), "-", classeNomSimple, "-{{ key }} \"");
4587+
s(" id=\"pageSearchVal-page", i18nPage.getString(I18n.var_Tri), "-", classeNomSimple, "-{{ key }}\"");
4588+
s(">");
4589+
// s("{% for item in default", i18nPage.getString(I18n.var_Tri), "Vars %}");
4590+
s("{% if default", i18nPage.getString(I18n.var_Tri), "Vars is defined and (key + ' asc') in default", i18nPage.getString(I18n.var_Tri), "Vars %}");
4591+
s("sort={{ key }} asc");
4592+
s("{% else %}");
4593+
s("{% if default", i18nPage.getString(I18n.var_Tri), "Vars is defined and (key + ' desc') in default", i18nPage.getString(I18n.var_Tri), "Vars %}");
4594+
s("sort={{ key }} desc");
4595+
s("{% endif %}");
4596+
s("{% endif %}");
45834597
l("</div>");
4584-
tl(8, "{% endif %}");
4598+
tl(7, "{% endfor %}");
45854599
tl(7, "</div>");
45864600

45874601
tl(7, "{% for key, value in varsFq.items() %}");
45884602
tl(7, "<div>");
4589-
t(8, "<", composantsWebPrefixe, "checkbox");
4590-
s(" name=\"pageFacetTri\"");
4591-
s(" class=\"pageFacetTri \"");
4592-
s(" id=\"pageFacetTri", classeNomSimple, "_{{ key }}\"");
4593-
s(" value=\"{{ value.var }}\"");
4603+
t(8, "<", composantsWebPrefixe, "radio-group");
4604+
s(" name=\"pageFacet", i18nPage.getString(I18n.var_Tri), "\"");
4605+
s(" class=\"pageFacet", i18nPage.getString(I18n.var_Tri), " \"");
4606+
s(" id=\"pageFacet", i18nPage.getString(I18n.var_Tri), classeNomSimple, "_{{ key }}\"");
4607+
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 %}\"");
45944608
s("{% if ", i18nPage.getString(I18n.var_pivot), " is defined %} checked=\"checked\"{% endif %}");
4595-
l(">{{ value.", i18nPage.getString(I18n.var_nomAffichage), " }}</", composantsWebPrefixe, "checkbox>");
4609+
s(" label={{ value.", i18nPage.getString(I18n.var_nomAffichage), " | tojson }}");
4610+
l(" size=\"small\"");
4611+
l(">");
4612+
t(9, "<", composantsWebPrefixe, "radio-button value=\"\" pill>");
4613+
s(i18nPage.getString(I18n.str_aucun));
4614+
l("</", composantsWebPrefixe, "radio-button>");
4615+
t(9, "<", composantsWebPrefixe, "radio-button value=\"asc\" pill>");
4616+
s(i18nPage.getString(I18n.str_croissante));
4617+
l("</", composantsWebPrefixe, "radio-button>");
4618+
t(9, "<", composantsWebPrefixe, "radio-button value=\"desc\" pill>");
4619+
s(i18nPage.getString(I18n.str_decroissante));
4620+
l("</", composantsWebPrefixe, "radio-button>");
4621+
l("</", composantsWebPrefixe, "radio-group>");
45964622
tl(7, "</div>");
45974623
tl(7, "{% endfor %}");
45984624

0 commit comments

Comments
 (0)