Skip to content

Commit fc5b2f2

Browse files
committed
Fixed the JavaScript for facet fields
1 parent 14db840 commit fc5b2f2

File tree

1 file changed

+14
-11
lines changed

1 file changed

+14
-11
lines changed

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

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,6 +1007,7 @@ public void pageCodeClasseJava(String langueNom, JsonObject langueConfig) throws
10071007

10081008
wJsInit = ToutEcrivain.create(" ");
10091009
wJsEditionInit = ToutEcrivain.create(" ");
1010+
wJsRechercheInit = ToutEcrivain.create(" ");
10101011
wWebsocket = ToutEcrivain.create(" ");
10111012
wWebsocketInput1 = ToutEcrivain.create(" ");
10121013
wWebsocketInput2 = ToutEcrivain.create(" ");
@@ -1154,15 +1155,15 @@ public void pageCodeClasseJava(String langueNom, JsonObject langueConfig) throws
11541155
&& !langueConfig.getString(I18n.var_utilisateurCle).equals(entiteVar)
11551156
&& !langueConfig.getString(I18n.var_sauvegardes).equals(entiteVar)
11561157
) {
1157-
wJsEditionInit.tl(5, "document.querySelector('#fq", classeNomSimple, "_", entiteVar, "')?.addEventListener('", composantsWebPrefixe, "change', (event) => {");
1158-
wJsEditionInit.tl(6, "fqChange('", classeNomSimple, "', event.target);");
1159-
wJsEditionInit.tl(5, "});");
1160-
wJsEditionInit.tl(5, "document.querySelector('#buttonFacet", classeNomSimple, "_", entiteVar, "')?.addEventListener('click', (event) => {");
1161-
wJsEditionInit.tl(6, "facetFieldChange('", classeNomSimple, "', event.target);");
1162-
wJsEditionInit.tl(5, "});");
1163-
wJsEditionInit.tl(5, "document.querySelector('#pageFacetPivot", classeNomSimple, "_", entiteVar, "')?.addEventListener('", composantsWebPrefixe, "change', (event) => {");
1164-
wJsEditionInit.tl(6, "facetPivotChange('", classeNomSimple, "', event.target);");
1165-
wJsEditionInit.tl(5, "});");
1158+
wJsRechercheInit.tl(5, "document.querySelector('#fq", classeNomSimple, "_", entiteVar, "')?.addEventListener('", composantsWebPrefixe, "change', (event) => {");
1159+
wJsRechercheInit.tl(6, "fqChange('", classeNomSimple, "', event.currentTarget);");
1160+
wJsRechercheInit.tl(5, "});");
1161+
wJsRechercheInit.tl(5, "document.querySelector('#buttonFacet", classeNomSimple, "_", entiteVar, "')?.addEventListener('click', (event) => {");
1162+
wJsRechercheInit.tl(6, "facetFieldChange('", classeNomSimple, "', event.currentTarget);");
1163+
wJsRechercheInit.tl(5, "});");
1164+
wJsRechercheInit.tl(5, "document.querySelector('#pageFacetPivot", classeNomSimple, "_", entiteVar, "')?.addEventListener('", composantsWebPrefixe, "change', (event) => {");
1165+
wJsRechercheInit.tl(6, "facetPivotChange('", classeNomSimple, "', event.currentTarget);");
1166+
wJsRechercheInit.tl(5, "});");
11661167
}
11671168

11681169
if("Boolean".equals(entiteNomSimple) && entiteVar.equals(langueConfig.getString(I18n.var_archive))) {
@@ -4044,6 +4045,7 @@ else if(entiteAttribuer) {
40444045

40454046
auteurPageJsEdition.s(wJsEditionInit);
40464047

4048+
auteurPageJsRecherche.s(wJsRechercheInit);
40474049
auteurPageJsRecherche.tl(0, "});");
40484050
auteurPageJsEdition.tl(0, "});");
40494051
}
@@ -4560,7 +4562,8 @@ public void ecrirePageBarreLaterale(String langueNom, JsonObject i18nPage) throw
45604562
s(" id=\"pageFacetField", classeNomSimple, "_{{ key }}\"");
45614563
l(">");
45624564
tl(11, "{% for facetFieldKey, facetFieldValue in value.facetField.counts.items() %}");
4563-
tl(11, "<", composantsWebPrefixe, "tooltip content=\"", String.format(i18nPage.getString(I18n.str_au_total_avec_), "{{ facetFieldValue | e }}", classeNomSingulier, "{{ value.facetField.var | e }}", "{{ facetFieldKey | e }}"), "\">");
4565+
tl(11, "<div>");
4566+
tl(12, "<", composantsWebPrefixe, "tooltip content=\"", String.format(i18nPage.getString(I18n.str_au_total_avec_), "{{ facetFieldValue | e }}", classeNomSingulier, "{{ value.facetField.var | e }}", "{{ facetFieldKey | e }}"), "\"></", composantsWebPrefixe, "tooltip>");
45644567
t(12, "<div");
45654568
s(" class=\"cursor-pointer \"");
45664569
s(" data-class=\"", classeNomSimple, "\"");
@@ -4572,7 +4575,7 @@ public void ecrirePageBarreLaterale(String langueNom, JsonObject i18nPage) throw
45724575
s(": ");
45734576
s("{{ facetFieldKey }}");
45744577
l("</div>");
4575-
tl(11, "</", composantsWebPrefixe, "tooltip>");
4578+
tl(11, "</div>");
45764579
tl(11, "{% endfor %}");
45774580
tl(10, "</div>");
45784581

0 commit comments

Comments
 (0)