Skip to content

Commit 16feb20

Browse files
computatecomputate
committed
Fixed sort buttons
1 parent 68896ed commit 16feb20

File tree

1 file changed

+16
-22
lines changed

1 file changed

+16
-22
lines changed

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

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2338,18 +2338,18 @@ public void pageCodeClasseJinja(String langueNom, JsonObject i18nPage) throws Ex
23382338
if("Boolean".equals(entiteNomSimple)) {
23392339
jsVal = ".checked";
23402340
}
2341-
//STUFF3
23422341
if(entiteLien) {
23432342
wTh.tl(7, "<div></div>");
23442343
} else {
2344+
// JS Tri //
23452345
wTh.tl(7, "<", composantsWebPrefixe, "dropdown id=\"htm", i18nGlobale.getString(I18n.var_ListeDeroulante), "-", entiteVar, "\">");
23462346
wTh.tl(8, "<", composantsWebPrefixe, "button", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " slot=\"trigger\" caret>", entiteNomAffichage, "</", composantsWebPrefixe, "button>");
23472347
wTh.tl(8, "<", composantsWebPrefixe, "menu>");
2348-
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\">");
2348+
wTh.tl(9, "<", composantsWebPrefixe, "menu-item onclick=\"var e = document.querySelector('#pageFacet", i18nPage.getString(I18n.var_Tri), classeNomSimple, "_", entiteVar, "'); e.value = this.getAttribute('data-order'); document.querySelectorAll('.pageSearchVal-page", i18nPage.getString(I18n.var_Tri), "-", classeNomSimple, "').forEach(e => e.remove()); e.dispatchEvent(new Event('change', {})); \" data-action=\"", i18nPage.getString(I18n.var_tri), "\" data-order=\"asc\" id=\"htm", i18nGlobale.getString(I18n.var_ListeDeroulante), "-", entiteVar, "-asc\">");
23492349
wTh.tl(10, "<i class=\"{{ FONTAWESOME_STYLE }} fa-arrow-down-a-z\"></i>");
23502350
wTh.t(10).sx(String.format(i18nPage.getString(I18n.str_trier_par___croissante), entiteNomAffichage)).l();
23512351
wTh.tl(9, "</", composantsWebPrefixe, "menu-item>");
2352-
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\">");
2352+
wTh.tl(9, "<", composantsWebPrefixe, "menu-item onclick=\"var e = document.querySelector('#pageFacet", i18nPage.getString(I18n.var_Tri), classeNomSimple, "_", entiteVar, "'); e.value = this.getAttribute('data-order'); document.querySelectorAll('.pageSearchVal-page", i18nPage.getString(I18n.var_Tri), "-", classeNomSimple, "').forEach(e => e.remove()); e.dispatchEvent(new Event('change', {})); \" data-action=\"", i18nPage.getString(I18n.var_tri), "\" data-order=\"desc\" id=\"htm", i18nGlobale.getString(I18n.var_ListeDeroulante), "-", entiteVar, "-desc\">");
23532353
wTh.tl(10, "<i class=\"{{ FONTAWESOME_STYLE }} fa-arrow-down-z-a\"></i>");
23542354
wTh.t(10).sx(String.format(i18nPage.getString(I18n.str_trier_par___decroissante), entiteNomAffichage)).l();
23552355
wTh.tl(9, "</", composantsWebPrefixe, "menu-item>");
@@ -2432,24 +2432,6 @@ public void pageCodeClasseJinja(String langueNom, JsonObject i18nPage) throws Ex
24322432
}
24332433
wFoot.tl(8, "</div>");
24342434
wFoot.tl(7, "{% endif %}");
2435-
2436-
//STUFF3
2437-
// js tri
2438-
auteurPageJsRecherche.l();
2439-
auteurPageJsRecherche.tl(1, "document.querySelector('#htm", i18nGlobale.getString(I18n.var_ListeDeroulante), "-", entiteVar, "')?.addEventListener('select', (event) => {");
2440-
auteurPageJsRecherche.tl(2, "const item = event.detail.item;");
2441-
auteurPageJsRecherche.tl(2, "const action = item.getAttribute('data-action');");
2442-
auteurPageJsRecherche.tl(2, "const order = item.getAttribute('data-order');");
2443-
auteurPageJsRecherche.tl(2, "const checked = !(document.querySelector('#pageSearchVal-page", i18nPage.getString(I18n.var_Tri), "-", classeNomSimple, "-", entiteVar, "').innerText == undefined);");
2444-
auteurPageJsRecherche.tl(2, "if (action === '", i18nPage.getString(I18n.var_tri), "') {");
2445-
auteurPageJsRecherche.tl(3, i18nPage.getString(I18n.var_tri), "('", classeNomSimple, "', '", entiteVar, "', checked ? order : '');");
2446-
auteurPageJsRecherche.tl(3, "document.querySelector('#pageFacet", i18nPage.getString(I18n.var_Tri), classeNomSimple, "_", entiteVar, "').value = checked ? order : '';");
2447-
auteurPageJsRecherche.tl(2, "}");
2448-
auteurPageJsRecherche.tl(1, "});");
2449-
auteurPageJsRecherche.l();
2450-
auteurPageJsRecherche.tl(1, "document.querySelector('#pageFacet", i18nPage.getString(I18n.var_Tri), classeNomSimple, "_", entiteVar, "')?.addEventListener('", "sl-".equals(composantsWebPrefixe) ? "sl-" : "", "change', (event) => {");
2451-
auteurPageJsRecherche.tl(2, i18nPage.getString(I18n.var_tri), "('", classeNomSimple, "', '", entiteVar, "', event.currentTarget.value);");
2452-
auteurPageJsRecherche.tl(1, "});");
24532435
}
24542436
rechercheSolr.setStart(i.intValue() + rechercheLignes);
24552437
rechercheReponse = clientSolrComputate.query(rechercheSolr);
@@ -2530,6 +2512,13 @@ public void pageCodeClasseJinja(String langueNom, JsonObject i18nPage) throws Ex
25302512
wVarsFqJs.tl(1, "vars.push({ var: '", entiteVar, "', "
25312513
, "var", i18nPage.getString(I18n.var_Indexe), ": '", entiteVar, (entiteDocValues ? "_docvalues" : (entiteStocke ? "_indexedstored" : "_indexed")), entiteSuffixeType, "'"
25322514
, ", ", i18nPage.getString(I18n.var_nomAffichage), ": ", entiteNomAffichage == null ? "null" : "'" + entiteNomAffichage + "'", "});");
2515+
2516+
2517+
// JS Tri //
2518+
auteurPageJsRecherche.l();
2519+
auteurPageJsRecherche.tl(1, "document.querySelector('#pageFacet", i18nPage.getString(I18n.var_Tri), classeNomSimple, "_", entiteVar, "')?.addEventListener('", "sl-".equals(composantsWebPrefixe) ? "sl-" : "", "change', (event) => {");
2520+
auteurPageJsRecherche.tl(2, i18nPage.getString(I18n.var_tri), "('", classeNomSimple, "', '", entiteVar, "', event.currentTarget.value);");
2521+
auteurPageJsRecherche.tl(1, "});");
25332522
}
25342523

25352524
if(entiteHtml) {
@@ -4778,9 +4767,11 @@ public void ecrirePageBarreLaterale(String langueNom, JsonObject i18nPage) throw
47784767
t(7, "<div");
47794768
s(" id=\"pageSearchVal-page", i18nPage.getString(I18n.var_Tri), "-", classeNomSimple, "\"");
47804769
l(">");
4770+
// JS Tri //
47814771
tl(7, "{% for key, value in varsFq.items() %}");
4772+
tl(7, "{% if default", i18nPage.getString(I18n.var_Tri), "Vars is defined and ((key + ' asc') in default", i18nPage.getString(I18n.var_Tri), "Vars or (key + ' desc') in default", i18nPage.getString(I18n.var_Tri), "Vars) %}");
47824773
t(9, "<div");
4783-
s(" class=\"pageSearchVal pageSearchVal-page", i18nPage.getString(I18n.var_Tri), "-", classeNomSimple, "-{{ key }} \"");
4774+
s(" class=\"pageSearchVal pageSearchVal-page", i18nPage.getString(I18n.var_Tri), "-", classeNomSimple, " pageSearchVal-page", i18nPage.getString(I18n.var_Tri), "-", classeNomSimple, "-{{ key }} \"");
47844775
s(" id=\"pageSearchVal-page", i18nPage.getString(I18n.var_Tri), "-", classeNomSimple, "-{{ key }}\"");
47854776
s(">");
47864777
// s("{% for item in default", i18nPage.getString(I18n.var_Tri), "Vars %}");
@@ -4792,12 +4783,15 @@ public void ecrirePageBarreLaterale(String langueNom, JsonObject i18nPage) throw
47924783
s("{% endif %}");
47934784
s("{% endif %}");
47944785
l("</div>");
4786+
tl(7, "{% endif %}");
47954787
tl(7, "{% endfor %}");
47964788
tl(7, "</div>");
47974789

47984790
tl(7, "{% for key, value in varsFq.items() %}");
4791+
// JS Tri //
47994792
tl(7, "<div>");
48004793
t(8, "<", composantsWebPrefixe, "radio-group");
4794+
s(" orientation=\"horizontal\"");
48014795
s(" name=\"pageFacet", i18nPage.getString(I18n.var_Tri), "\"");
48024796
s(" class=\"pageFacet", i18nPage.getString(I18n.var_Tri), " \"");
48034797
s(" id=\"pageFacet", i18nPage.getString(I18n.var_Tri), classeNomSimple, "_{{ key }}\"");

0 commit comments

Comments
 (0)