Skip to content

Commit fa60691

Browse files
computatecomputate
committed
Fixing map result pages that have mixed results
1 parent d23474a commit fa60691

File tree

1 file changed

+45
-31
lines changed

1 file changed

+45
-31
lines changed

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

Lines changed: 45 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,11 @@ else if(BooleanUtils.isTrue(entiteSignature)) {
631631
t(12, "hint=\"").sx(entiteDescription).l("\"");
632632
}
633633

634-
tl(12, "class=\"button-on-left {{", langueConfig.getString(I18n.var_classeApiMethodeMethode), "}}_", entiteVar, " class", classeNomSimple, " input", classeNomSimple, "{{ ", i18nGlobale.getString(I18n.var_resultat), ".", classeVarId, " }}", entiteVarCapitalise, " \"");
634+
if(classeVarId != null) {
635+
tl(12, "class=\"button-on-left {{", langueConfig.getString(I18n.var_classeApiMethodeMethode), "}}_", entiteVar, " class", classeNomSimple, " input", classeNomSimple, "{{ ", i18nGlobale.getString(I18n.var_resultat), ".", classeVarId, " }}", entiteVarCapitalise, " \"");
636+
} else {
637+
tl(12, "class=\"button-on-left {{", langueConfig.getString(I18n.var_classeApiMethodeMethode), "}}_", entiteVar, " class", classeNomSimple, "\"");
638+
}
635639
tl(12, "name=\"set", entiteVarCapitalise, "\"");
636640
tl(12, "href=\"{{ ", i18nGlobale.getString(I18n.var_resultat), ".", entiteVar, " | e }}\"");
637641
tl(12, ">");
@@ -2477,7 +2481,11 @@ public void pageCodeClasseJinja(String langueNom, JsonObject i18nPage) throws Ex
24772481
wTd.t(9, "title=\"").sx(entiteDescription).l("\"");
24782482
}
24792483

2480-
wTd.tl(9, "class=\"button-on-left {{", i18nPage.getString(I18n.var_classeApiMethodeMethode), "}}_", entiteVar, " class", classeNomSimple, " input", classeNomSimple, "{{ ", i18nGlobale.getString(I18n.var_resultat), ".", classeVarId, " }}", entiteVarCapitalise, " \"");
2484+
if(classeVarId != null) {
2485+
wTd.tl(9, "class=\"button-on-left {{", i18nPage.getString(I18n.var_classeApiMethodeMethode), "}}_", entiteVar, " class", classeNomSimple, " input", classeNomSimple, "{{ ", i18nGlobale.getString(I18n.var_resultat), ".", classeVarId, " }}", entiteVarCapitalise, " \"");
2486+
} else {
2487+
wTd.tl(9, "class=\"button-on-left {{", i18nPage.getString(I18n.var_classeApiMethodeMethode), "}}_", entiteVar, " class", classeNomSimple, " \"");
2488+
}
24812489
wTd.tl(9, "name=\"set", entiteVarCapitalise, "\"");
24822490
wTd.tl(9, "href=\"{{ item.", entiteVar, " | e }}\"");
24832491
wTd.tl(9, ">");
@@ -3067,35 +3075,37 @@ public void ecrirePageHeadJinja(String langueNom, JsonObject i18nPage, Boolean e
30673075
// tl(4, ", customElements.whenDefined('select')");
30683076
// tl(4, ", customElements.whenDefined('", composantsWebPrefixe, "textarea')");
30693077
tl(3, "]).then(() => {");
3070-
l();
3071-
tl(4, "var ", classeVarId, " = {% if ", i18nPage.getString(I18n.var_resultat), ".", classeVarId, " is defined %}{{ ", i18nPage.getString(I18n.var_resultat), ".", classeVarId, " | tojson }}{% else %}null{% endif %};");
3072-
l();
3073-
if(!edition) {
3074-
s(wJsHtmInit);
3075-
}
3076-
tl(4, "if(", classeVarId, " == null) {");
3077-
tl(5, "document.querySelector('#grid-toggle-details')?.addEventListener('click', () => {");
3078-
tl(6, "document.querySelector('#site-results-grid').classList.remove('grid-mode-list', 'grid-mode-card');");
3079-
tl(6, "document.querySelector('#site-results-grid').classList.add('grid-mode-details');");
3080-
tl(5, "});");
3081-
tl(5, "document.querySelector('#grid-toggle-list')?.addEventListener('click', () => {");
3082-
tl(6, "document.querySelector('#site-results-grid').classList.remove('grid-mode-details', 'grid-mode-card');");
3083-
tl(6, "document.querySelector('#site-results-grid').classList.add('grid-mode-list');");
3084-
tl(5, "});");
3085-
tl(5, "document.querySelector('#grid-toggle-card')?.addEventListener('click', () => {");
3086-
tl(6, "document.querySelector('#site-results-grid').classList.remove('grid-mode-details', 'grid-mode-list');");
3087-
tl(6, "document.querySelector('#site-results-grid').classList.add('grid-mode-card');");
3088-
tl(5, "});");
3089-
tl(4, "} else {");
3090-
tl(5, "var o = document.querySelector('.", i18nPage.getString(I18n.var_page), i18nPage.getString(I18n.var_Formulaire), " .", varResultat, "')?.value;");
3091-
tl(5, "if(o)");
3092-
tl(6, "window.", varResultat, " = JSON.parse(o);");
3093-
tl(4, "{% if ", i18nPage.getString(I18n.var_resultat), ".", classeVarId, " is defined %}");
3094-
if(edition) {
3095-
s(wJsHtmEditionInit);
3078+
if(classeVarId != null) {
3079+
l();
3080+
tl(4, "var ", classeVarId, " = {% if ", i18nPage.getString(I18n.var_resultat), ".", classeVarId, " is defined %}{{ ", i18nPage.getString(I18n.var_resultat), ".", classeVarId, " | tojson }}{% else %}null{% endif %};");
3081+
l();
3082+
if(!edition) {
3083+
s(wJsHtmInit);
3084+
}
3085+
tl(4, "if(", classeVarId, " == null) {");
3086+
tl(5, "document.querySelector('#grid-toggle-details')?.addEventListener('click', () => {");
3087+
tl(6, "document.querySelector('#site-results-grid').classList.remove('grid-mode-list', 'grid-mode-card');");
3088+
tl(6, "document.querySelector('#site-results-grid').classList.add('grid-mode-details');");
3089+
tl(5, "});");
3090+
tl(5, "document.querySelector('#grid-toggle-list')?.addEventListener('click', () => {");
3091+
tl(6, "document.querySelector('#site-results-grid').classList.remove('grid-mode-details', 'grid-mode-card');");
3092+
tl(6, "document.querySelector('#site-results-grid').classList.add('grid-mode-list');");
3093+
tl(5, "});");
3094+
tl(5, "document.querySelector('#grid-toggle-card')?.addEventListener('click', () => {");
3095+
tl(6, "document.querySelector('#site-results-grid').classList.remove('grid-mode-details', 'grid-mode-list');");
3096+
tl(6, "document.querySelector('#site-results-grid').classList.add('grid-mode-card');");
3097+
tl(5, "});");
3098+
tl(4, "} else {");
3099+
tl(5, "var o = document.querySelector('.", i18nPage.getString(I18n.var_page), i18nPage.getString(I18n.var_Formulaire), " .", varResultat, "')?.value;");
3100+
tl(5, "if(o)");
3101+
tl(6, "window.", varResultat, " = JSON.parse(o);");
3102+
tl(4, "{% if ", i18nPage.getString(I18n.var_resultat), ".", classeVarId, " is defined %}");
3103+
if(edition) {
3104+
s(wJsHtmEditionInit);
3105+
}
3106+
tl(4, "{% endif %}");
3107+
tl(4, "}");
30963108
}
3097-
tl(4, "{% endif %}");
3098-
tl(4, "}");
30993109
tl(4, "var l = document.querySelector('.", i18nPage.getString(I18n.var_page), i18nPage.getString(I18n.var_Formulaire), " .", i18nPage.getString(I18n.var_liste), classeNomSimple, "')?.value;");
31003110
tl(4, "if(l)");
31013111
tl(5, "window.", i18nPage.getString(I18n.var_liste), classeNomSimple, " = JSON.parse(l);");
@@ -5420,7 +5430,11 @@ public void ecrirePageBoutonsRecherche(String langueNom, JsonObject i18nPage) th
54205430
////////////////
54215431
// tl(5, "<", composantsWebPrefixe, "tooltip placement=\"top\" content=\"", i18nPage.getString(I18n.str_Interroger_lAPI_REST_JSON_pour_), classeNomAdjectifPluriel, "\">");
54225432
t(6, "<", composantsWebPrefixe, "button class=\"", i18nPage.getString(I18n.var_BoutonsRecherche), "_", i18nPage.getString(I18n.var_Api), " ", i18nPage.getString(I18n.var_BoutonsRecherche), "_", i18nPage.getString(I18n.var_Api), "_", classeNomSimple, " \"", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", "");
5423-
s(" href=\"{{ apiUri }}{% if ", i18nPage.getString(I18n.var_resultat), ".", classeVarId, " is defined %}/{{ ", i18nPage.getString(I18n.var_resultat), ".", classeVarId, " }}{% else %}{{ queryStr }}{% endif %}\"");
5433+
if(classeVarId != null) {
5434+
s(" href=\"{{ apiUri }}{% if ", i18nPage.getString(I18n.var_resultat), ".", classeVarId, " is defined %}/{{ ", i18nPage.getString(I18n.var_resultat), ".", classeVarId, " }}{% else %}{{ queryStr }}{% endif %}\"");
5435+
} else {
5436+
s(" href=\"{{ apiUri }}{{ queryStr }}\"");
5437+
}
54245438
l(">");
54255439
tl(7, "<i slot=\"prefix\" class=\"{{ FONTAWESOME_STYLE }} fa-brackets-curly hover-box-shadow \"></i> ");
54265440
tl(7, i18nPage.getString(I18n.var_Api));

0 commit comments

Comments
 (0)