Skip to content

Commit 08d68c6

Browse files
committed
Added custom divs and websocket chart updates
1 parent d6aa5c8 commit 08d68c6

3 files changed

Lines changed: 25 additions & 0 deletions

File tree

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1028,6 +1028,7 @@ public class EcrireGenClasse extends EcrireClasse {
10281028
String entiteDescription;
10291029
String entiteNgsiType;
10301030
JsonObject entiteWaChart;
1031+
JsonObject entiteDiv;
10311032

10321033
Integer entiteHtmLigne;
10331034
Integer entiteHtmCellule;

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,19 @@ public void genCodeEntiteHtm(String langueNom, JsonObject i18nClasse, JsonObject
354354
// if(entiteModifier && (entiteDefinir || entiteAttribuer)) {
355355

356356
// tl(0, "{%- if ", langueConfig.getString(I18n.var_authPourEcrire), "Bool == true %}");
357+
if(entiteDiv != null) {
358+
tl(8, "{% if 'Page' == ", i18nClasse.getString(I18n.var_classeApiMethodeMethode), " -%}");
359+
tl(8, "</div>");
360+
tl(8, "<div");
361+
entiteDiv.fieldNames().forEach(attrNom -> {
362+
String attrVal = entiteDiv.getString(attrNom);
363+
t(11, attrNom, "=\"");
364+
sx(attrVal);
365+
l("\"");
366+
});
367+
tl(10, ">");
368+
tl(9, "{% endif -%}");
369+
}
357370

358371
tl(1, "{%- if 'Page' == ", i18nClasse.getString(I18n.var_classeApiMethodeMethode), " %}");
359372
tl(8, "<form class=\"subgrid-2col \" id=\"", i18nClasse.getString(I18n.var_Page), i18nClasse.getString(I18n.var_Formulaire), "_", entiteVar, "\">");
@@ -1391,6 +1404,7 @@ public void pageVarsStaticInit(String classeLangueNom, String langueNom, JsonObj
13911404
entiteDescription = (String)entiteDocumentSolr.get("entiteDescription_" + langueNom + "_stored_string");
13921405
entiteNomAffichage = (String)entiteDocumentSolr.get("entiteNomAffichage_" + langueNom + "_stored_string");
13931406
entiteWaChart = Optional.ofNullable((String)entiteDocumentSolr.get("entiteWaChart_stored_string")).map(s -> new JsonObject(s)).orElse(null);
1407+
entiteDiv = Optional.ofNullable((String)entiteDocumentSolr.get("entiteDiv_stored_string")).map(s -> new JsonObject(s)).orElse(null);
13941408
entiteFiwareType = (String)entiteDocumentSolr.get("entiteFiwareType_stored_string");
13951409
entiteEtape = (String)entiteDocumentSolr.get("entiteEtape_stored_string");
13961410
entiteCacherPOST = (Boolean)entiteDocumentSolr.get("entiteCacherPOST_stored_boolean");
@@ -1798,6 +1812,12 @@ public void pageVarsStaticInit(String classeLangueNom, String langueNom, JsonObj
17981812
wWebsocketInput3.tl(7, "item.value = input", entiteVarCapitalise, ".getAttribute('value');");
17991813
wWebsocketInput3.tl(6, "else");
18001814
wWebsocketInput3.tl(7, "item.textContent = input", entiteVarCapitalise, ".textContent;");
1815+
if(entiteWaChart != null) {
1816+
wWebsocketInput3.tl(6, "for (let i = 0; i < item.chart.data.datasets.length; i++) {");
1817+
wWebsocketInput3.tl(7, "item.chart.data.datasets[i].data = JSON.parse(input", entiteVarCapitalise, ".textContent).data.datasets[i].data;");
1818+
wWebsocketInput3.tl(6, "}");
1819+
wWebsocketInput3.tl(6, "item.chart.update();");
1820+
}
18011821
wWebsocketInput3.tl(5, "});");
18021822
wWebsocketInput3.tl(5, i18nClasse.getString(I18n.var_ajouterLueur), "(document.querySelector('.", classeNomSimple, "_Page_", entiteVar, "'));");
18031823
wWebsocketInput3.tl(4, "}");

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3620,6 +3620,10 @@ else if("LocalTime".equals(entiteMapCleType) && NumberUtils.isCreatable(entiteMa
36203620
indexerStockerSolr(entiteDoc, "entiteWaChart", entiteWaChart.toString());
36213621
}
36223622

3623+
JsonObject entiteDiv = regexYamlObject("div", methodeCommentaire);
3624+
if(entiteDiv != null) {
3625+
indexerStockerSolr(entiteDoc, "entiteDiv", entiteDiv.toString());
3626+
}
36233627

36243628
Boolean entiteHighlighting = indexerStockerSolr(entiteDoc, "entiteHighlighting", regexTrouve("^Highlighting: (true)$", methodeCommentaire));
36253629
Boolean entiteHtml = entiteDefinir || regexTrouve("^Html: (true)$", methodeCommentaire);

0 commit comments

Comments
 (0)