Skip to content

Commit 146ab96

Browse files
computatecomputate
committed
2 parents 5637736 + 8bcc761 commit 146ab96

File tree

3 files changed

+46
-15
lines changed

3 files changed

+46
-15
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2996,7 +2996,7 @@ else if(!StringUtils.containsAny(classeApiMethode, "POST", "PUT"))
29962996
tl(4, "vars", classeNomSimple, "(", i18nGlobale.getString(I18n.var_requeteSite), ").onSuccess(a -> {");
29972997
tl(5, i18nGlobale.getString(I18n.var_creer), classeNomSimple, "(", i18nGlobale.getString(I18n.var_requeteSite), ").onSuccess(", uncapitalizeClasseNomSimple, " -> {");
29982998
tl(6, "sql", classeApiMethode, classeNomSimple, "(", uncapitalizeClasseNomSimple, ", inheritPk).onSuccess(b -> {");
2999-
tl(7, i18nGlobale.getString(I18n.var_definir), classeNomSimple, "(", uncapitalizeClasseNomSimple, ").onSuccess(c -> {");
2999+
tl(7, i18nGlobale.getString(I18n.var_definir), classeNomSimple, "(", uncapitalizeClasseNomSimple, ", false).onSuccess(c -> {");
30003000
tl(8, i18nGlobale.getString(I18n.var_attribuer), classeNomSimple, "(", uncapitalizeClasseNomSimple, ").onSuccess(d -> {");
30013001
tl(9, i18nGlobale.getString(I18n.var_indexer), classeNomSimple, "(", uncapitalizeClasseNomSimple, ").onSuccess(o2 -> {");
30023002
tl(10, "promise1.complete(", uncapitalizeClasseNomSimple, ");");
@@ -3140,7 +3140,7 @@ else if(classeApiMethode.equals(i18nGlobale.getString(I18n.var_PUTCopie))) {
31403140

31413141
tl(4, i18nGlobale.getString(I18n.var_creer), classeNomSimple, "(", i18nGlobale.getString(I18n.var_requeteSite), ").onSuccess(", uncapitalizeClasseNomSimple, " -> {");
31423142
tl(5, "sql", classeApiMethode, classeNomSimple, "(", uncapitalizeClasseNomSimple, ", jsonObject).onSuccess(b -> {");
3143-
tl(6, i18nGlobale.getString(I18n.var_definir), classeNomSimple, "(", uncapitalizeClasseNomSimple, ").onSuccess(c -> {");
3143+
tl(6, i18nGlobale.getString(I18n.var_definir), classeNomSimple, "(", uncapitalizeClasseNomSimple, ", false).onSuccess(c -> {");
31443144
tl(7, i18nGlobale.getString(I18n.var_attribuer), classeNomSimple, "(", uncapitalizeClasseNomSimple, ").onSuccess(d -> {");
31453145
tl(8, i18nGlobale.getString(I18n.var_indexer), classeNomSimple, "(", uncapitalizeClasseNomSimple, ").onSuccess(o2 -> {");
31463146
tl(9, "promise1.complete(", uncapitalizeClasseNomSimple, ");");
@@ -3207,7 +3207,7 @@ else if(classeApiMethode.contains("PATCH")) {
32073207
tl(4, i18nGlobale.getString(I18n.var_requeteSite), ".set", i18nGlobale.getString(I18n.var_ConnexionSql), "(", i18nGlobale.getString(I18n.var_connexionSql), ");");
32083208
tl(4, "vars", classeNomSimple, "(", i18nGlobale.getString(I18n.var_requeteSite), ").onSuccess(a -> {");
32093209
tl(5, "sql", classeApiMethode, classeNomSimple, "(o, inheritPk).onSuccess(", uncapitalizeClasseNomSimple, " -> {");
3210-
tl(6, i18nGlobale.getString(I18n.var_definir), classeNomSimple, "(", uncapitalizeClasseNomSimple, ").onSuccess(c -> {");
3210+
tl(6, i18nGlobale.getString(I18n.var_definir), classeNomSimple, "(", uncapitalizeClasseNomSimple, ", true).onSuccess(c -> {");
32113211
tl(7, i18nGlobale.getString(I18n.var_attribuer), classeNomSimple, "(", uncapitalizeClasseNomSimple, ").onSuccess(d -> {");
32123212
tl(8, i18nGlobale.getString(I18n.var_indexer), classeNomSimple, "(", uncapitalizeClasseNomSimple, ").onSuccess(o2 -> {");
32133213
tl(9, "if(", i18nGlobale.getString(I18n.var_requeteApi), " != null) {");
@@ -3279,8 +3279,8 @@ else if(classeApiMethode.contains("PATCH")) {
32793279
if(classeModele) {
32803280
if(classeApiMethode.contains("POST")) {
32813281
l();
3282-
tl(1, "public Future<Void> sql", classeApiMethode, classeNomSimple, "(", classeNomSimple, " o, Boolean inheritPk) {");
3283-
tl(2, "Promise<Void> promise = Promise.promise();");
3282+
tl(1, "public Future<", classeNomSimple, "> sql", classeApiMethode, classeNomSimple, "(", classeNomSimple, " o, Boolean inheritPk) {");
3283+
tl(2, "Promise<", classeNomSimple, "> promise = Promise.promise();");
32843284
tl(2, "try {");
32853285
tl(3, classePartsRequeteSite.nomSimple(classeLangueNom), " ", i18nGlobale.getString(I18n.var_requeteSite), " = o.get", i18nGlobale.getString(I18n.var_RequeteSite), "_();");
32863286
tl(3, classePartsRequeteApi.nomSimple(classeLangueNom), " ", i18nGlobale.getString(I18n.var_requeteApi), " = ", i18nGlobale.getString(I18n.var_requeteSite), ".get", i18nGlobale.getString(I18n.var_RequeteApi), "_();");
@@ -3354,7 +3354,7 @@ else if(classeApiMethode.contains("PATCH")) {
33543354
tl(3, "}");
33553355
tl(3, "CompositeFuture.all(futures1).onSuccess(a -> {");
33563356
tl(4, "CompositeFuture.all(futures2).onSuccess(b -> {");
3357-
tl(5, "promise.complete();");
3357+
tl(5, "promise.complete(o2);");
33583358
tl(4, "}).onFailure(ex -> {");
33593359
tl(5, "LOG.error(String.format(\"sql", classeApiMethode, classeNomSimple, " ", i18nGlobale.getString(I18n.str_a_échoué), ". \"), ex);");
33603360
tl(5, "promise.fail(ex);");
@@ -4268,7 +4268,7 @@ public void ecrireGenApiServiceImpl3(String classeLangueNom) throws Exception {
42684268
/////////////
42694269
l();
42704270
if(classeModele) {
4271-
tl(1, "public Future<Void> ", i18nGlobale.getString(I18n.var_definir), classeNomSimple, "(", classeNomSimple, " o) {");
4271+
tl(1, "public Future<Void> ", i18nGlobale.getString(I18n.var_definir), classeNomSimple, "(", classeNomSimple, " o, Boolean patch) {");
42724272
tl(2, "Promise<Void> promise = Promise.promise();");
42734273
tl(2, "try {");
42744274
tl(3, classePartsRequeteSite.nomSimple(classeLangueNom), " ", i18nGlobale.getString(I18n.var_requeteSite), " = o.get", i18nGlobale.getString(I18n.var_RequeteSite), "_();");

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,7 @@ public class EcrireGenClasse extends EcrireClasse {
509509
protected ToutEcrivain wNomAffichageMethode;
510510
protected ToutEcrivain wClasseNomSimpleMethode;
511511
protected ToutEcrivain wDescriptionMethode;
512+
protected ToutEcrivain wNgsiTypeMethode;
512513
protected ToutEcrivain wHtmColonneMethode;
513514
protected ToutEcrivain wHtmLigneMethode;
514515
protected ToutEcrivain wHtmCelluleMethode;
@@ -955,6 +956,7 @@ public class EcrireGenClasse extends EcrireClasse {
955956
* Var.enUS: entityDescription
956957
*/
957958
String entiteDescription;
959+
String entiteNgsiType;
958960

959961
Integer entiteHtmLigne;
960962
Integer entiteHtmCellule;
@@ -1288,6 +1290,7 @@ public void genCodeInit() throws Exception {
12881290

12891291
wClasseNomSimpleMethode = ToutEcrivain.create();
12901292
wDescriptionMethode = ToutEcrivain.create();
1293+
wNgsiTypeMethode = ToutEcrivain.create();
12911294
wHtmColonneMethode = ToutEcrivain.create();
12921295
wHtmLigneMethode = ToutEcrivain.create();
12931296
wHtmCelluleMethode = ToutEcrivain.create();
@@ -3006,6 +3009,7 @@ public void genCodeEntite(String langueNom, JsonObject langueConfig) throws Exce
30063009
entiteVar = doc.getString("entiteVar_" + langueNom + "_stored_string");
30073010
entiteVarUrl = doc.getString("entiteVarUrl_" + langueNom + "_stored_string");
30083011
entiteDescription = doc.getString("entiteDescription_" + langueNom + "_stored_string");
3012+
entiteNgsiType = doc.getString("entiteNgsiType_stored_string");
30093013
entiteSuffixeType = doc.getString("entiteSuffixeType_stored_string");
30103014
entiteVarCapitalise = doc.getString("entiteVarCapitalise_" + langueNom + "_stored_string");
30113015
entiteAttribuerVarSuggere = doc.getString("entiteAttribuerVarSuggere_" + langueNom + "_stored_string");
@@ -5367,6 +5371,10 @@ else if(entiteIndexe
53675371
wDescriptionMethode.tl(2, "case VAR_", entiteVar, ":");
53685372
wDescriptionMethode.tl(3, "return \"", StringEscapeUtils.escapeJava(entiteDescription), "\";");
53695373
}
5374+
if(entiteNgsiType != null) {
5375+
wNgsiTypeMethode.tl(2, "case VAR_", entiteVar, ":");
5376+
wNgsiTypeMethode.tl(3, "return \"", StringEscapeUtils.escapeJava(entiteNgsiType), "\";");
5377+
}
53705378
if(entiteNomSimple != null) {
53715379
wClasseNomSimpleMethode.tl(2, "case VAR_", entiteVar, ":");
53725380
wClasseNomSimpleMethode.tl(3, "return \"", entiteNomSimple, "\";");
@@ -5571,6 +5579,7 @@ public void genCodeClasseFin(String langueNom, JsonObject langueConfig) throws E
55715579
wNomAffichageStatic.flushClose();
55725580
wNomAffichageMethode.flushClose();
55735581
wDescriptionMethode.flushClose();
5582+
wNgsiTypeMethode.flushClose();
55745583
wClasseNomSimpleMethode.flushClose();
55755584
wHtmColonneMethode.flushClose();
55765585
wHtmLigneMethode.flushClose();
@@ -6134,6 +6143,21 @@ public void genCodeClasseFin(String langueNom, JsonObject langueConfig) throws E
61346143
tl(2, "}");
61356144
tl(1, "}");
61366145

6146+
//////////////
6147+
// NgsiType //
6148+
//////////////
6149+
if(classeFiware) {
6150+
6151+
l();
6152+
tl(1, "public static String ngsiType(String var) {");
6153+
tl(2, "switch(var) {");
6154+
s(wNgsiTypeMethode);
6155+
tl(3, "default:");
6156+
tl(4, "return null;");
6157+
tl(2, "}");
6158+
tl(1, "}");
6159+
}
6160+
61376161
/////////////////
61386162
// HtmColonne //
61396163
/////////////////

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

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ else if("LocalDate".equals(entiteNomSimple)) {
385385
// if(entiteDescription != null)
386386
// tl(16, "title=\"", entiteDescription, " (", langueConfig.getString(ConfigCles.var_DDDashMMDashYYYY), ")\"");
387387
// tl(5, "value=\", ", entiteVar, " == null ? \"\" : DateTimeFormatter.ofPattern(\"", langueConfig.getString(ConfigCles.var_ddDashMMDashyyyy), "\").format(", entiteVar, "));");
388-
tl(11, "value=\"{{", uncapitalizeClasseNomSimple, "_.", entiteVar, "}}\"");
388+
tl(11, "value=\"{{", uncapitalizeClasseNomSimple, "_.", entiteVar, " | e }}\"");
389389
tl(1, "{%- if 'Page' == ", langueConfig.getString(I18n.var_classeApiMethodeMethode), " %}");
390390
tl(1, "{%- endif %}");
391391
tl(11, "data-", classeModele ? classeVarClePrimaire : classeVarCleUnique, "=\"{{ ", classeModele ? classeVarClePrimaire : classeVarCleUnique, " }}\"");
@@ -417,7 +417,7 @@ else if("LocalDateTime".equals(entiteNomSimple) || "ZonedDateTime".equals(entite
417417
tl(11, "data-timeformat=\"", langueConfig.getString(I18n.str_ddDashMMDashyyyy_HHColonmm_VV), "\"");
418418
tl(11, "id=\"{{", langueConfig.getString(I18n.var_classeApiMethodeMethode), "}}_", entiteVar, "\"");
419419
// tl(4, ".a(\"value\", ", entiteVar, " == null ? \"\" : DateTimeFormatter.ofPattern(\"", langueConfig.getString(ConfigCles.var_EEE_d_MMM_yyyy_HAposhAposmmColonss_zz_VV), "\").format(", entiteVar, "));");
420-
tl(11, "value=\"{%- if ", uncapitalizeClasseNomSimple, "_.", entiteVar, " is defined %}{{ formatZonedDateTime(", uncapitalizeClasseNomSimple, "_.", entiteVar, ", \"", langueConfig.getString(I18n.str_ddDashMMDashyyyy_HHColonmm_VV), "\", defaultLocaleId, defaultZoneId) }}{%- endif %}\"");
420+
tl(11, "value=\"{%- if ", uncapitalizeClasseNomSimple, "_.", entiteVar, " is defined %}{{ formatZonedDateTime(", uncapitalizeClasseNomSimple, "_.", entiteVar, ", \"", langueConfig.getString(I18n.str_ddDashMMDashyyyy_HHColonmm_VV), "\", defaultLocaleId, defaultZoneId) | e }}{%- endif %}\"");
421421
tl(1, "{%- if 'Page' == ", langueConfig.getString(I18n.var_classeApiMethodeMethode), " %}");
422422
tl(1, "{%- endif %}");
423423
tl(11, "data-", classeModele ? classeVarClePrimaire : classeVarCleUnique, "=\"{{ ", classeModele ? classeVarClePrimaire : classeVarCleUnique, " }}\"");
@@ -453,7 +453,7 @@ else if("LocalTime".equals(entiteNomSimple)) {
453453
tl(11, "class=\"label-on-left timepicker set", entiteVarCapitalise, " class", classeNomSimple, " input", classeNomSimple, "{{", classeModele ? classeVarClePrimaire : classeVarCleUnique, "}}", entiteVarCapitalise, " \"");
454454
tl(11, "placeholder=\"", langueConfig.getString(I18n.var_HHColonMM), "\"");
455455
tl(11, "id=\"{{", langueConfig.getString(I18n.var_classeApiMethodeMethode), "}}_", entiteVar, "\"");
456-
tl(11, "value=\"{{", uncapitalizeClasseNomSimple, "_.", entiteVar, "}}\"");
456+
tl(11, "value=\"{{", uncapitalizeClasseNomSimple, "_.", entiteVar, " | e }}\"");
457457
tl(11, "data-", classeModele ? classeVarClePrimaire : classeVarCleUnique, "=\"{{ ", classeModele ? classeVarClePrimaire : classeVarCleUnique, " }}\"");
458458
tl(11, "></sl-input>");
459459
}
@@ -546,7 +546,7 @@ else if(entiteImageBase64Url != null) {
546546

547547
tl(10, "<h5>", langueConfig.getString(I18n.str_Télécharger_image), "</h5>");
548548
tl(10, "<form method=\"POST\" enctype=\"multipart/form-data\" action=\"", entiteImageBase64Url, "\" class=\"\">");
549-
tl(11, "<input type=\"hidden\" name=\"", classeModele ? classeVarClePrimaire : classeVarCleUnique, "\" value=\"{{", classeModele ? classeVarClePrimaire : classeVarCleUnique, "}}\"/>");
549+
tl(11, "<input type=\"hidden\" name=\"", classeModele ? classeVarClePrimaire : classeVarCleUnique, "\" value=\"{{", classeModele ? classeVarClePrimaire : classeVarCleUnique, " | e }}\"/>");
550550
tl(11, "<input type=\"hidden\" name=\"", langueConfig.getString(I18n.var_classeNomSimple), "\" value=\"", classeNomSimple, "\"/>");
551551
tl(11, "<sl-input name=\"", langueConfig.getString(I18n.var_fichier), "\" type=\"file\" onchange=\"fetch('", entiteImageBase64Url, "', { method: 'POST', body: new FormData(this.form)}); \"></sl-input>");
552552
tl(10, "</form>");
@@ -594,7 +594,7 @@ else if(BooleanUtils.isTrue(entiteSignature)) {
594594
}
595595
else {
596596
if(entiteMultiligne)
597-
tl(9, "<sl-textarea");
597+
tl(9, "<sl-textarea resize=\"auto\"");
598598
else {
599599
tl(9, "<sl-input");
600600
}
@@ -632,14 +632,20 @@ else if(BooleanUtils.isTrue(entiteSignature)) {
632632
tl(1, "{%- endif %}");
633633

634634
if(entiteMultiligne) {
635-
tl(11, ">", "{{", uncapitalizeClasseNomSimple, "_.", entiteVar, "}}");
635+
tl(0, "{%- if \"Page\" == ", langueConfig.getString(I18n.var_classeApiMethodeMethode), " %}");
636+
if("JsonArray".equals(entiteNomSimpleVertxJson) || "JsonObject".equals(entiteNomSimpleVertxJson))
637+
tl(11, "value=\"{{ to", entiteNomSimpleVertxJson, "String(", uncapitalizeClasseNomSimple, "_.", entiteVar, ") | e }}\"");
638+
else
639+
tl(11, "value=\"{{", uncapitalizeClasseNomSimple, "_.", entiteVar, " | e }}\"");
640+
tl(0, "{%- endif %}");
641+
tl(11, ">");
636642
}
637643
else {
638644
tl(1, "{%- if \"Page\" == ", langueConfig.getString(I18n.var_classeApiMethodeMethode), " %}");
639645
if("JsonArray".equals(entiteNomSimpleVertxJson) || "JsonObject".equals(entiteNomSimpleVertxJson))
640-
tl(11, "value=\"{{ to", entiteNomSimpleVertxJson, "String(", uncapitalizeClasseNomSimple, "_.", entiteVar, ") }}\"");
646+
tl(11, "value=\"{{ to", entiteNomSimpleVertxJson, "String(", uncapitalizeClasseNomSimple, "_.", entiteVar, ") | e }}\"");
641647
else
642-
tl(11, "value=\"{{", uncapitalizeClasseNomSimple, "_.", entiteVar, "}}\"");
648+
tl(11, "value=\"{{", uncapitalizeClasseNomSimple, "_.", entiteVar, " | e }}\"");
643649
tl(1, "{%- endif %}");
644650
}
645651

@@ -3349,6 +3355,7 @@ else if(i18nPage.getString(I18n.var_PUTCopie).equals(classeApiMethode))
33493355
tl(0, "{%- block websocket", classePageSuperNomSimple, " %}");
33503356
tl(0, "{%- block websocket", classePageNomSimple, " %}");
33513357
tl(4, "window.eventBus = new EventBus('/eventbus');");
3358+
tl(4, "window.eventBus.enableReconnect(true);");
33523359
tl(4, "websocket", classeApiClasseNomSimple, "(websocket", classeApiClasseNomSimple, "Inner);");
33533360
tl(0, "{%- endblock websocket", classePageNomSimple, " %}");
33543361
tl(0, "{%- endblock websocket", classePageSuperNomSimple, " %}");

0 commit comments

Comments
 (0)