Skip to content

Commit 33f6fcc

Browse files
computatecomputate
authored
Merge pull request #29 from computate/computate
Fixed some page layout issues, Fixed a bug with JsonArray serialization with solr
2 parents 1ea960f + 9658a7e commit 33f6fcc

File tree

3 files changed

+39
-35
lines changed

3 files changed

+39
-35
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2873,7 +2873,7 @@ else if(StringUtils.containsAny(classeApiMethode, i18nGlobale.getString(I18n.var
28732873
tl(11, "JsonArray bodyVals = (JsonArray)bodyVal;");
28742874
tl(11, "Object valsObj = o.", i18nGlobale.getString(I18n.var_obtenir), i18nGlobale.getString(I18n.var_PourClasse), "(f);");
28752875
tl(11, "Collection<?> vals = valsObj instanceof JsonArray ? ((JsonArray)valsObj).getList() : (Collection<?>)valsObj;");
2876-
tl(11, "if(bodyVals.size() == vals.size()) {");
2876+
tl(11, "if(vals != null && bodyVals.size() == vals.size()) {");
28772877
tl(12, "Boolean match = true;");
28782878
tl(12, "for(Object val : vals) {");
28792879
tl(13, "if(val != null) {");
@@ -2889,7 +2889,8 @@ else if(StringUtils.containsAny(classeApiMethode, i18nGlobale.getString(I18n.var
28892889
tl(12, "vals.clear();");
28902890
tl(12, "body2.put(\"set\" + StringUtils.capitalize(f), bodyVal);");
28912891
tl(11, "} else {");
2892-
tl(12, "vals.clear();");
2892+
tl(12, "if(vals != null)");
2893+
tl(13, "vals.clear();");
28932894
tl(12, "body2.put(\"set\" + StringUtils.capitalize(f), bodyVal);");
28942895
tl(11, "}");
28952896
tl(10, "} else {");
@@ -2967,7 +2968,7 @@ else if(StringUtils.containsAny(classeApiMethode, i18nGlobale.getString(I18n.var
29672968
tl(9, "JsonArray bodyVals = (JsonArray)bodyVal;");
29682969
tl(9, "Object valsObj = o.", i18nGlobale.getString(I18n.var_obtenir), i18nGlobale.getString(I18n.var_PourClasse), "(f);");
29692970
tl(9, "Collection<?> vals = valsObj instanceof JsonArray ? ((JsonArray)valsObj).getList() : (Collection<?>)valsObj;");
2970-
tl(9, "if(bodyVals.size() == vals.size()) {");
2971+
tl(9, "if(vals != null && bodyVals.size() == vals.size()) {");
29712972
tl(10, "Boolean match = true;");
29722973
tl(10, "for(Object val : vals) {");
29732974
tl(11, "if(val != null) {");
@@ -2985,7 +2986,8 @@ else if(StringUtils.containsAny(classeApiMethode, i18nGlobale.getString(I18n.var
29852986
tl(10, "body2.put(\"set\" + StringUtils.capitalize(f), bodyVal);");
29862987
// tl(10, "}");
29872988
tl(9, "} else {");
2988-
tl(10, "vals.clear();");
2989+
tl(10, "if(vals != null)");
2990+
tl(11, "vals.clear();");
29892991
tl(10, "body2.put(\"set\" + StringUtils.capitalize(f), bodyVal);");
29902992
tl(9, "}");
29912993
tl(8, "} else {");

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5119,10 +5119,10 @@ else if(entiteNomSimple.toString().equals("Polygon")) {
51195119
tl(3, "doc.put(\"", entiteVar, (entiteDocValues ? "_docvalues" : (entiteStocke ? "_indexedstored" : "_indexed")), entiteSuffixeType, "\", new JsonObject().put(\"type\", \"LineString\").put(\"coordinates\", pointsArray).toString());");
51205120
}
51215121
else if(entiteNomSimple.toString().equals("JsonObject")) {
5122-
tl(3, "doc.put(\"", entiteVar, (entiteDocValues ? "_docvalues" : (entiteStocke ? "_indexedstored" : "_indexed")), entiteSuffixeType, "\", ", entiteVar, ".toString());");
5122+
tl(3, "doc.put(\"", entiteVar, (entiteDocValues ? "_docvalues" : (entiteStocke ? "_indexedstored" : "_indexed")), entiteSuffixeType, "\", ", entiteVar, ".encode());");
51235123
}
51245124
else if(entiteNomSimple.toString().equals("JsonArray")) {
5125-
tl(3, "doc.put(\"", entiteVar, (entiteDocValues ? "_docvalues" : (entiteStocke ? "_indexedstored" : "_indexed")), entiteSuffixeType, "\", ", entiteVar, ".toString());");
5125+
tl(3, "doc.put(\"", entiteVar, (entiteDocValues ? "_docvalues" : (entiteStocke ? "_indexedstored" : "_indexed")), entiteSuffixeType, "\", ", entiteVar, ".encode());");
51265126
}
51275127
else if(entiteNomSimple.toString().equals("BigDecimal")) {
51285128
tl(3, "doc.put(\"", entiteVar, (entiteDocValues ? "_docvalues" : (entiteStocke ? "_indexedstored" : "_indexed")), entiteSuffixeType, "\", ", entiteVar, ".doubleValue());");

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

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5536,43 +5536,44 @@ public void ecrirePageRechercheJinja(String langueNom, JsonObject i18nPage) thro
55365536
tl(0, "{%- include ", classePageBarreLateraleTemplate, " %}");
55375537
tl(0, "{%- include ", classePageRechercheSuggereTemplate, " %}");
55385538

5539-
tl(5, "<form action=\"", classeApiUri, "\" id=\"", classeApiClasseNomSimple, "Form\" class=\"", i18nPage.getString(I18n.var_page), i18nPage.getString(I18n.var_Formulaire), " \" onsubmit=\"event.preventDefault(); return false; \">");
5540-
t(6, "<input");
5539+
tl(5, "<div>");
5540+
tl(6, "<form action=\"", classeApiUri, "\" id=\"", classeApiClasseNomSimple, "Form\" class=\"", i18nPage.getString(I18n.var_page), i18nPage.getString(I18n.var_Formulaire), " \" onsubmit=\"event.preventDefault(); return false; \">");
5541+
t(7, "<input");
55415542
s(" name=\"focusId\"");
55425543
s(" type=\"hidden\"");
55435544
l("/>");
5544-
t(6, "<input");
5545+
t(7, "<input");
55455546
s(" name=\"", i18nPage.getString(I18n.var_page), i18nPage.getString(I18n.var_Reponse), "\"");
55465547
s(" id=\"", i18nPage.getString(I18n.var_page), i18nPage.getString(I18n.var_Reponse), "\"");
55475548
s(" class=\"", i18nPage.getString(I18n.var_page), i18nPage.getString(I18n.var_Reponse), "\" ");
55485549
s(" value='{{ toJsonObjectStringInApostrophes(", i18nPage.getString(I18n.var_page), i18nPage.getString(I18n.var_Reponse), ") }}'");
55495550
s(" type=\"hidden\"");
55505551
l("/>");
5551-
t(6, "<input");
5552+
t(7, "<input");
55525553
s(" name=\"", i18nPage.getString(I18n.var_liste), classeNomSimple, "\"");
55535554
s(" id=\"", i18nPage.getString(I18n.var_liste), classeNomSimple, "\"");
55545555
s(" class=\"", i18nPage.getString(I18n.var_liste), classeNomSimple, "\" ");
55555556
s(" value='{{ toJsonArrayStringInApostrophes(", i18nPage.getString(I18n.var_liste), classeNomSimple, ") }}'");
55565557
s(" type=\"hidden\"");
55575558
l("/>");
5558-
tl(5, "</form>");
5559+
tl(6, "</form>");
55595560

5560-
tl(4, "<div id=\"site-calendar-box\">");
5561+
tl(6, "<div id=\"site-calendar-box\">");
55615562
// tl(7, "<h3 id=\"site-calendar-title\">Calendar</h3>");
5562-
tl(5, "<div id=\"site-calendar\"><!-- // --></div>");
5563-
tl(4, "</div>");
5563+
tl(7, "<div id=\"site-calendar\"><!-- // --></div>");
5564+
tl(6, "</div>");
55645565

5565-
tl(4, "<div class=\"", composantsWebPrefixe, "stack ", composantsWebPrefixe, "gap-m \">");
5566-
tl(5, "<", composantsWebPrefixe, "tooltip for=\"", i18nPage.getString(I18n.var_retourner_a_), classeNomSimple, "\">", i18nPage.getString(I18n.str_retourner_a_), classeTousNom, "</", composantsWebPrefixe, "tooltip>");
5567-
tl(5, "<", composantsWebPrefixe, "breadcrumb>");
5568-
tl(6, "<", composantsWebPrefixe, "breadcrumb-item id=\"", i18nPage.getString(I18n.var_retourner_a_), classeNomSimple, "\"", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " href=\"{{ SITE_BASE_URL }}{{ pageUri }}\">");
5569-
tl(7, classeIcone);
5570-
tl(7, classeTousNom);
5571-
tl(6, "</", composantsWebPrefixe, "breadcrumb-item>");
5572-
tl(6, "<", composantsWebPrefixe, "breadcrumb-item>");
5573-
t(7).sx(classeRechercherTousNom).l();
5574-
tl(6, "</", composantsWebPrefixe, "breadcrumb-item>");
5575-
tl(5, "</", composantsWebPrefixe, "breadcrumb>");
5566+
tl(6, "<div class=\"", composantsWebPrefixe, "stack ", composantsWebPrefixe, "gap-m \">");
5567+
tl(7, "<", composantsWebPrefixe, "tooltip for=\"", i18nPage.getString(I18n.var_retourner_a_), classeNomSimple, "\">", i18nPage.getString(I18n.str_retourner_a_), classeTousNom, "</", composantsWebPrefixe, "tooltip>");
5568+
tl(7, "<", composantsWebPrefixe, "breadcrumb>");
5569+
tl(8, "<", composantsWebPrefixe, "breadcrumb-item id=\"", i18nPage.getString(I18n.var_retourner_a_), classeNomSimple, "\"", "wa-".equals(composantsWebPrefixe) ? " variant=\"brand\"" : " variant=\"primary\" outline", " href=\"{{ SITE_BASE_URL }}{{ pageUri }}\">");
5570+
tl(9, classeIcone);
5571+
tl(9, classeTousNom);
5572+
tl(8, "</", composantsWebPrefixe, "breadcrumb-item>");
5573+
tl(8, "<", composantsWebPrefixe, "breadcrumb-item>");
5574+
t(9).sx(classeRechercherTousNom).l();
5575+
tl(8, "</", composantsWebPrefixe, "breadcrumb-item>");
5576+
tl(7, "</", composantsWebPrefixe, "breadcrumb>");
55765577

55775578
tl(0, "{% include ", classePageFormulaireRechercheTemplate, " %}");
55785579

@@ -5584,33 +5585,34 @@ public void ecrirePageRechercheJinja(String langueNom, JsonObject i18nPage) thro
55845585
// tl(6, "{{ htm", i18nPage.getString(I18n.var_BoutonsPagination), classePageNomSimple, "() }}");
55855586

55865587
tl(0, "{% include ", classePageBoutonsRechercheTemplate, " %}");
5587-
tl(5, "<div class=\"", composantsWebPrefixe, "stack ", composantsWebPrefixe, "gap-0 \">");
5588+
tl(7, "<div class=\"", composantsWebPrefixe, "stack ", composantsWebPrefixe, "gap-0 \">");
55885589
tl(0, "{% include ", classePageBoutonsPaginationTemplate, " %}");
5589-
tl(6, "<div class=\"card-like-thing background-color-surface-border\" id=\"site-results-grid\">");
5590-
tl(7, "<div>");
5590+
tl(8, "<div class=\"card-like-thing background-color-surface-border\" id=\"site-results-grid\">");
5591+
tl(9, "<div>");
55915592
s(wTh);
5592-
tl(7, "</div>");
5593+
tl(9, "</div>");
55935594
// TODO
55945595
// tl(2, "Map<String, Map<String, List<String>>> highlighting = ", langueConfig.getString(ConfigCles.var_liste), classeApiClasseNomSimple, ".getResponse().getHighlighting();");
5595-
tl(7, "{% for item in ", i18nPage.getString(I18n.var_liste), classeApiClasseNomSimple, "%}");
5596+
tl(9, "{% for item in ", i18nPage.getString(I18n.var_liste), classeApiClasseNomSimple, "%}");
55965597
// TODO
55975598
// tl(3, classeApiClasseNomSimple, " o = ", langueConfig.getString(ConfigCles.var_liste), classeApiClasseNomSimple, ".getList().get(i);");
55985599
// tl(3, "Map<String, List<String>> highlights = highlighting == null ? null : highlighting.get(o.getId());");
55995600
// tl(3, "List<String> highlightList = highlights == null ? null : highlights.get(highlights.keySet().stream().findFirst().orElse(null));");
56005601
// tl(3, "String uri = ", classeEntiteVars.contains("pageUri") ? "o.getPageUri()" : (q(classePageUriMethode, "/") + " + o.get" + StringUtils.capitalize(classeVarClePrimaire) + "()"), ";");
5601-
tl(7, "<div>");
5602+
tl(9, "<div>");
56025603
// tl(6, "<a href=\"{{ item.", classeVarUrlPageAffichage, " }}\">");
56035604
s(wTd);
56045605
// tl(6, "</a>");
5605-
tl(7, "</div>");
5606-
tl(7, "{% endfor %}");
5606+
tl(9, "</div>");
5607+
tl(9, "{% endfor %}");
56075608
// TODO
56085609
// tl(3, "SimpleOrderedMap facets = (SimpleOrderedMap)Optional.ofNullable(", langueConfig.getString(ConfigCles.var_liste), classeApiClasseNomSimple, ".getResponse()).map(QueryResponse::getResponse).map(r -> r.get(\"facets\")).orElse(new SimpleOrderedMap());");
56095610
s(wFoot);
5610-
tl(6, "</div>");
5611+
tl(8, "</div>");
56115612
tl(0, "{% include ", classePageBoutonsPaginationTemplate, " %}");
5613+
tl(7, "</div>");
5614+
tl(6, "</div>");
56125615
tl(5, "</div>");
5613-
tl(4, "</div>");
56145616
tl(0, "{% endif %}");
56155617

56165618
tl(0, "{%- endblock htmBody", i18nPage.getString(I18n.var_Milieu), classePageNomSimple, " %}");

0 commit comments

Comments
 (0)