Skip to content

Commit 10d2073

Browse files
computatecomputate
committed
Allows for custom timezones for dates in model
1 parent 0d70b1a commit 10d2073

File tree

3 files changed

+62
-16
lines changed

3 files changed

+62
-16
lines changed

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
package org.computate.frFR.java;
1515

1616
import java.time.Instant;
17+
import java.time.ZonedDateTime;
1718
import java.util.ArrayList;
1819
import java.util.Collection;
1920
import java.util.Date;
@@ -446,13 +447,25 @@ public void ecrireGenApiServiceImpl1(String classeLangueNom) throws Exception {
446447
entiteNomSimpleComplet = (String)doc.get("entiteNomSimpleComplet_" + classeLangueNom + "_stored_string");
447448
entiteNomSimpleCompletGenerique = (String)doc.get("entiteNomSimpleCompletGenerique_" + classeLangueNom + "_stored_string");
448449
entiteNomSimple = (String)doc.get("entiteNomSimple_" + classeLangueNom + "_stored_string");
450+
Boolean entiteEstListe = (StringUtils.equals(entiteNomCanonique, ArrayList.class.getCanonicalName()) || StringUtils.equals(entiteNomCanonique, List.class.getCanonicalName()));
449451

450452
/////////////////////////
451453
// classePageTemplates //
452454
/////////////////////////
453455

454456
if(classePageAvecTemplate && entiteDefinir) {
455-
wPageTemplates.tl(3, "page.persistForClass(", classeNomSimple, ".VAR_", entiteVar, ", ", classeNomSimple, ".staticSet", entiteVarCapitalise, "(", i18nGlobale.getString(I18n.var_requeteSite), "2, (String)", i18nGlobale.getString(I18n.var_resultat), ".get(", classeNomSimple, ".VAR_", entiteVar, ")));");
457+
if((
458+
StringUtils.equals(entiteNomCanonique, ZonedDateTime.class.getCanonicalName())
459+
|| entiteEstListe && StringUtils.equals(entiteNomCanoniqueGenerique, ZonedDateTime.class.getCanonicalName()))) {
460+
if(classeVarZone != null) {
461+
wPageTemplates.tl(3, "page.persistForClass(", classeNomSimple, ".VAR_", entiteVar, ", ", classeNomSimple, ".staticSet", entiteVarCapitalise, "(", i18nGlobale.getString(I18n.var_requeteSite), "2, (String)", i18nGlobale.getString(I18n.var_resultat), ".get(", classeNomSimple, ".VAR_", entiteVar, "), Optional.ofNullable(page.get", StringUtils.capitalize(classeVarZone), "()).map(v -> ZoneId.of(v)).orElse(Optional.ofNullable(", langueConfigGlobale.getString(I18n.var_requeteSite), ").map(r -> r.get", langueConfigGlobale.getString(I18n.var_Config), "()).map(config -> config.getString(", classePartsConfigCles.nomSimple(langueNom), ".", langueConfigGlobale.getString(I18n.var_SITE_ZONE), ")).map(z -> ZoneId.of(z)).orElse(ZoneId.of(\"UTC\")))));");
462+
} else {
463+
wPageTemplates.tl(3, "page.persistForClass(", classeNomSimple, ".VAR_", entiteVar, ", ", classeNomSimple, ".staticSet", entiteVarCapitalise, "(", i18nGlobale.getString(I18n.var_requeteSite), "2, (String)", i18nGlobale.getString(I18n.var_resultat), ".get(", classeNomSimple, ".VAR_", entiteVar, "), Optional.ofNullable(", langueConfigGlobale.getString(I18n.var_requeteSite), ").map(r -> r.get", langueConfigGlobale.getString(I18n.var_Config), "()).map(config -> config.getString(", classePartsConfigCles.nomSimple(langueNom), ".", langueConfigGlobale.getString(I18n.var_SITE_ZONE), ")).map(z -> ZoneId.of(z)).orElse(ZoneId.of(\"UTC\"))));");
464+
}
465+
} else {
466+
wPageTemplates.tl(3, "page.persistForClass(", classeNomSimple, ".VAR_", entiteVar, ", ", classeNomSimple, ".staticSet", entiteVarCapitalise, "(", i18nGlobale.getString(I18n.var_requeteSite), "2, (String)", i18nGlobale.getString(I18n.var_resultat), ".get(", classeNomSimple, ".VAR_", entiteVar, ")));");
467+
}
468+
456469
}
457470

458471
/////////////////

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

Lines changed: 39 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4149,22 +4149,26 @@ else if(entiteSetUpper)
41494149
}
41504150
tl(1, "@JsonIgnore");
41514151
tl(1, "public void set", entiteVarCapitalise, "(String o) {");
4152-
tl(2, "this.", entiteVar, " = ", classeNomSimple, ".staticSet", entiteVarCapitalise, "(", classeContientRequeteSite ? (langueConfig.getString(I18n.var_requeteSite) + "_") : "null", ", o);");
4152+
if(classeVarZone == null)
4153+
tl(2, "ZoneId zoneId = Optional.ofNullable(", langueConfig.getString(I18n.var_requeteSite), "_).map(r -> r.get", langueConfig.getString(I18n.var_Config), "()).map(config -> config.getString(", classePartsConfigCles.nomSimple(langueNom), ".", langueConfig.getString(I18n.var_SITE_ZONE), ")).map(z -> ZoneId.of(z)).orElse(ZoneId.of(\"UTC\"));");
4154+
else
4155+
tl(2, "ZoneId zoneId = Optional.ofNullable(", classeVarZone, ").map(v -> ZoneId.of(v)).orElse(Optional.ofNullable(", langueConfig.getString(I18n.var_requeteSite), "_).map(r -> r.get", langueConfig.getString(I18n.var_Config), "()).map(config -> config.getString(", classePartsConfigCles.nomSimple(langueNom), ".", langueConfig.getString(I18n.var_SITE_ZONE), ")).map(z -> ZoneId.of(z)).orElse(ZoneId.of(\"UTC\")));");
4156+
tl(2, "this.", entiteVar, " = ", classeNomSimple, ".staticSet", entiteVarCapitalise, "(", classeContientRequeteSite ? (langueConfig.getString(I18n.var_requeteSite) + "_") : "null", ", o, zoneId);");
41534157
tl(1, "}");
41544158
tl(1, "@JsonIgnore");
41554159
tl(1, "public void set", entiteVarCapitalise, "(Date o) {");
41564160
tl(2, "this.", entiteVar, " = o == null ? null : ZonedDateTime.ofInstant(o.toInstant(), ZoneId.of(", langueConfig.getString(I18n.var_requeteSite), "_.get", langueConfig.getString(I18n.var_Config), "().getString(", classePartsConfigCles.nomSimple(langueNom), ".", langueConfig.getString(I18n.var_SITE_ZONE), "))).truncatedTo(ChronoUnit.MILLIS);");
41574161
tl(1, "}");
41584162
}
4159-
tl(1, "public static ", entiteNomSimpleCompletGenerique == null ? entiteNomSimpleComplet : entiteNomSimpleCompletGenerique, " staticSet", entiteVarCapitalise, "(", classePartsRequeteSite.getEtendBase() ? classePartsRequeteSite.getNomSimpleSuperGenerique() : classePartsRequeteSite.nomSimple(langueNom), " ", langueConfig.getString(I18n.var_requeteSite), "_, String o) {");
4163+
tl(1, "public static ", entiteNomSimpleCompletGenerique == null ? entiteNomSimpleComplet : entiteNomSimpleCompletGenerique, " staticSet", entiteVarCapitalise, "(", classePartsRequeteSite.getEtendBase() ? classePartsRequeteSite.getNomSimpleSuperGenerique() : classePartsRequeteSite.nomSimple(langueNom), " ", langueConfig.getString(I18n.var_requeteSite), "_, String o, ZoneId zoneId) {");
41604164
tl(2, "if(StringUtils.endsWith(o, \"]\"))");
41614165
tl(3, "return o == null ? null : ZonedDateTime.parse(o, ", classePartsZonedDateTimeSerializer.nomSimple(langueNom), ".ZONED_DATE_TIME_FORMATTER);");
41624166
tl(2, "else if(StringUtils.endsWith(o, \"Z\"))");
4163-
tl(3, "return o == null ? null : Instant.parse(o).atZone(Optional.ofNullable(", langueConfig.getString(I18n.var_requeteSite), "_).map(r -> r.get", langueConfig.getString(I18n.var_Config), "()).map(config -> config.getString(", classePartsConfigCles.nomSimple(langueNom), ".", langueConfig.getString(I18n.var_SITE_ZONE), ")).map(z -> ZoneId.of(z)).orElse(ZoneId.of(\"UTC\"))).truncatedTo(ChronoUnit.MILLIS);");
4167+
tl(3, "return o == null ? null : Instant.parse(o).atZone(zoneId).truncatedTo(ChronoUnit.MILLIS);");
41644168
tl(2, "else if(StringUtils.contains(o, \"T\"))");
41654169
tl(3, "return o == null ? null : ZonedDateTime.parse(o, ", classePartsZonedDateTimeSerializer.nomSimple(langueNom), ".UTC_DATE_TIME_FORMATTER).truncatedTo(ChronoUnit.MILLIS);");
41664170
tl(2, "else");
4167-
tl(3, "return o == null ? null : LocalDate.parse(o, DateTimeFormatter.ISO_DATE).atStartOfDay(ZoneId.of(", langueConfig.getString(I18n.var_requeteSite), "_.get", langueConfig.getString(I18n.var_Config), "().getString(", classePartsConfigCles.nomSimple(langueNom), ".", langueConfig.getString(I18n.var_SITE_ZONE), "))).truncatedTo(ChronoUnit.MILLIS);");
4171+
tl(3, "return o == null ? null : LocalDate.parse(o, DateTimeFormatter.ISO_DATE).atStartOfDay(zoneId).truncatedTo(ChronoUnit.MILLIS);");
41684172
tl(1, "}");
41694173
staticSet = true;
41704174
}
@@ -4474,7 +4478,11 @@ else if(entiteSetUpper)
44744478
tl(1, "/** Example: 2011-12-03T10:15:30+01:00 **/");
44754479
}
44764480
tl(1, "public ", classeNomSimple, " add", entiteVarCapitalise, "(String o) {");
4477-
tl(2, entiteNomSimpleCompletGenerique, " p = ", classeNomSimple, ".staticSet", entiteVarCapitalise, "(", classeContientRequeteSite ? (langueConfig.getString(I18n.var_requeteSite) + "_") : "null", ", o);");
4481+
if(classeVarZone == null)
4482+
tl(2, "ZoneId zoneId = Optional.ofNullable(", langueConfig.getString(I18n.var_requeteSite), "_).map(r -> r.get", langueConfig.getString(I18n.var_Config), "()).map(config -> config.getString(", classePartsConfigCles.nomSimple(langueNom), ".", langueConfig.getString(I18n.var_SITE_ZONE), ")).map(z -> ZoneId.of(z)).orElse(ZoneId.of(\"UTC\"));");
4483+
else
4484+
tl(2, "ZoneId zoneId = Optional.ofNullable(", classeVarZone, ").map(v -> ZoneId.of(v)).orElse(Optional.ofNullable(", langueConfig.getString(I18n.var_requeteSite), "_).map(r -> r.get", langueConfig.getString(I18n.var_Config), "()).map(config -> config.getString(", classePartsConfigCles.nomSimple(langueNom), ".", langueConfig.getString(I18n.var_SITE_ZONE), ")).map(z -> ZoneId.of(z)).orElse(ZoneId.of(\"UTC\")));");
4485+
tl(2, entiteNomSimpleCompletGenerique, " p = ", classeNomSimple, ".staticSet", entiteVarCapitalise, "(", classeContientRequeteSite ? (langueConfig.getString(I18n.var_requeteSite) + "_") : "null", ", o, zoneId);");
44784486
tl(2, "add", entiteVarCapitalise, "(p);");
44794487
tl(2, "return (", classeNomSimple, ")this;");
44804488
tl(1, "}");
@@ -4814,7 +4822,8 @@ else if("java.util.Set".equals(entiteNomCanonique) || "java.util.HashSet".equals
48144822
}
48154823
else if(entiteNomCanoniqueGenerique.toString().equals(ZonedDateTime.class.getCanonicalName())) {
48164824
tl(1, "public static String staticSearchStr", entiteVarCapitalise, "(", classePartsRequeteSite.getEtendBase() ? classePartsRequeteSite.getNomSimpleSuperGenerique() : classePartsRequeteSite.nomSimple(langueNom), " ", langueConfig.getString(I18n.var_requeteSite), "_, ", entiteSolrNomSimple2, " o) {");
4817-
tl(2, "return ", classeNomSimple, ".staticSearch", entiteVarCapitalise, "(", langueConfig.getString(I18n.var_requeteSite), "_, ", classeNomSimple, ".staticSet", entiteVarCapitalise, "(", langueConfig.getString(I18n.var_requeteSite), "_, o));");
4825+
tl(2, "ZoneId zoneId = ZoneId.of(\"UTC\");");
4826+
tl(2, "return ", classeNomSimple, ".staticSearch", entiteVarCapitalise, "(", langueConfig.getString(I18n.var_requeteSite), "_, ", classeNomSimple, ".staticSet", entiteVarCapitalise, "(", langueConfig.getString(I18n.var_requeteSite), "_, o, zoneId));");
48184827
tl(1, "}");
48194828
}
48204829
else if(entiteNomCanoniqueGenerique.toString().equals(LocalDateTime.class.getCanonicalName())) {
@@ -4855,7 +4864,8 @@ else if(entiteNomSimpleCompletGenerique.toString().equals("Polygon")) {
48554864
}
48564865
else if(entiteNomCanonique.toString().equals(ZonedDateTime.class.getCanonicalName())) {
48574866
tl(1, "public static String staticSearchStr", entiteVarCapitalise, "(", classePartsRequeteSite.getEtendBase() ? classePartsRequeteSite.getNomSimpleSuperGenerique() : classePartsRequeteSite.nomSimple(langueNom), " ", langueConfig.getString(I18n.var_requeteSite), "_, ", entiteSolrNomSimple, " o) {");
4858-
tl(2, "return ", classeNomSimple, ".staticSearch", entiteVarCapitalise, "(", langueConfig.getString(I18n.var_requeteSite), "_, ", classeNomSimple, ".staticSet", entiteVarCapitalise, "(", langueConfig.getString(I18n.var_requeteSite), "_, o));");
4867+
tl(2, "ZoneId zoneId = ZoneId.of(\"UTC\");");
4868+
tl(2, "return ", classeNomSimple, ".staticSearch", entiteVarCapitalise, "(", langueConfig.getString(I18n.var_requeteSite), "_, ", classeNomSimple, ".staticSet", entiteVarCapitalise, "(", langueConfig.getString(I18n.var_requeteSite), "_, o, zoneId));");
48594869
tl(1, "}");
48604870
}
48614871
else if(entiteNomCanonique.toString().equals(LocalDateTime.class.getCanonicalName())) {
@@ -4908,7 +4918,14 @@ else if(entiteNomSimple.toString().equals("Polygon")) {
49084918

49094919
l();
49104920
tl(1, "public static String staticSearchFq", entiteVarCapitalise, "(", classePartsRequeteSite.getEtendBase() ? classePartsRequeteSite.getNomSimpleSuperGenerique() : classePartsRequeteSite.nomSimple(langueNom), " ", langueConfig.getString(I18n.var_requeteSite), "_, String o) {");
4911-
tl(2, "return ", classeNomSimple, ".staticSearch", entiteVarCapitalise, "(", langueConfig.getString(I18n.var_requeteSite), "_, ", classeNomSimple, ".staticSet", entiteVarCapitalise, "(", langueConfig.getString(I18n.var_requeteSite), "_, o)).toString();");
4921+
4922+
if(StringUtils.equals(entiteNomCanonique, ZonedDateTime.class.getCanonicalName())
4923+
|| entiteEstListe && StringUtils.equals(entiteNomCanoniqueGenerique, ZonedDateTime.class.getCanonicalName())) {
4924+
tl(2, "ZoneId zoneId = ZoneId.of(\"UTC\");");
4925+
tl(2, "return ", classeNomSimple, ".staticSearch", entiteVarCapitalise, "(", langueConfig.getString(I18n.var_requeteSite), "_, ", classeNomSimple, ".staticSet", entiteVarCapitalise, "(", langueConfig.getString(I18n.var_requeteSite), "_, o, zoneId)).toString();");
4926+
} else {
4927+
tl(2, "return ", classeNomSimple, ".staticSearch", entiteVarCapitalise, "(", langueConfig.getString(I18n.var_requeteSite), "_, ", classeNomSimple, ".staticSet", entiteVarCapitalise, "(", langueConfig.getString(I18n.var_requeteSite), "_, o)).toString();");
4928+
}
49124929
tl(1, "}");
49134930
}
49144931
}
@@ -4965,7 +4982,16 @@ else if(entiteNomSimple.toString().equals("Polygon")) {
49654982
///////////////
49664983

49674984
wStaticSet.tl(2, "case \"", entiteVar, "\":");
4968-
wStaticSet.tl(3, "return ", classeNomSimple, ".staticSet", entiteVarCapitalise, "(", langueConfig.getString(I18n.var_requeteSite), "_, o);");
4985+
if((
4986+
StringUtils.equals(entiteNomCanonique, ZonedDateTime.class.getCanonicalName())
4987+
|| entiteEstListe && StringUtils.equals(entiteNomCanoniqueGenerique, ZonedDateTime.class.getCanonicalName()))) {
4988+
if(classeVarZone != null) {
4989+
wStaticSet.tl(3, "return ", classeNomSimple, ".staticSet", entiteVarCapitalise, "(", langueConfig.getString(I18n.var_requeteSite), "_, v, Optional.ofNullable(o.get", StringUtils.capitalize(classeVarZone), "()).map(zoneId -> ZoneId.of(v)).orElse(Optional.ofNullable(", langueConfig.getString(I18n.var_requeteSite), "_).map(r -> r.get", langueConfig.getString(I18n.var_Config), "()).map(config -> config.getString(", classePartsConfigCles.nomSimple(langueNom), ".", langueConfig.getString(I18n.var_SITE_ZONE), ")).map(z -> ZoneId.of(z)).orElse(ZoneId.of(\"UTC\"))));");
4990+
} else {
4991+
}
4992+
} else {
4993+
wStaticSet.tl(3, "return ", classeNomSimple, ".staticSet", entiteVarCapitalise, "(", langueConfig.getString(I18n.var_requeteSite), "_, v);");
4994+
}
49694995

49704996
////////////////
49714997
// staticSearch //
@@ -5925,12 +5951,12 @@ public void genCodeClasseFin(String langueNom, JsonObject langueConfig) throws E
59255951
tl(1, "///////////////");
59265952
tl(0);
59275953
t(1);
5928-
s("public static Object staticSet", langueConfig.getString(I18n.var_PourClasse), "(String ", langueConfig.getString(I18n.var_entite), "Var, ", classePartsRequeteSite.getEtendBase() ? classePartsRequeteSite.getNomSimpleSuperGenerique() : classePartsRequeteSite.nomSimple(langueNom), " ", langueConfig.getString(I18n.var_requeteSite), "_, String o)");
5954+
s("public static Object staticSet", langueConfig.getString(I18n.var_PourClasse), "(String ", langueConfig.getString(I18n.var_entite), "Var, ", classePartsRequeteSite.getEtendBase() ? classePartsRequeteSite.getNomSimpleSuperGenerique() : classePartsRequeteSite.nomSimple(langueNom), " ", langueConfig.getString(I18n.var_requeteSite), "_, String v, ", classeNomSimple, " o)");
59295955
l(" {");
5930-
tl(2, "return staticSet", classeNomSimple, "(", langueConfig.getString(I18n.var_entite), "Var, ", langueConfig.getString(I18n.var_requeteSite), "_, o);");
5956+
tl(2, "return staticSet", classeNomSimple, "(", langueConfig.getString(I18n.var_entite), "Var, ", langueConfig.getString(I18n.var_requeteSite), "_, v, o);");
59315957
tl(1, "}");
59325958
t(1);
5933-
s("public static Object staticSet", classeNomSimple, "(String ", langueConfig.getString(I18n.var_entite), "Var, ", classePartsRequeteSite.getEtendBase() ? classePartsRequeteSite.getNomSimpleSuperGenerique() : classePartsRequeteSite.nomSimple(langueNom), " ", langueConfig.getString(I18n.var_requeteSite), "_, String o)");
5959+
s("public static Object staticSet", classeNomSimple, "(String ", langueConfig.getString(I18n.var_entite), "Var, ", classePartsRequeteSite.getEtendBase() ? classePartsRequeteSite.getNomSimpleSuperGenerique() : classePartsRequeteSite.nomSimple(langueNom), " ", langueConfig.getString(I18n.var_requeteSite), "_, String v, ", classeNomSimple, " o)");
59345960
l(" {");
59355961
tl(2, "switch(", langueConfig.getString(I18n.var_entite), "Var) {");
59365962
s(wStaticSet.toString());
@@ -5939,7 +5965,7 @@ public void genCodeClasseFin(String langueNom, JsonObject langueConfig) throws E
59395965
if(classeEstBase)
59405966
tl(4, "return null;");
59415967
else
5942-
tl(4, "return ", classeNomSimpleSuperGenerique, ".staticSet", classeNomSimpleSuperGenerique, "(", langueConfig.getString(I18n.var_entite), "Var, ", langueConfig.getString(I18n.var_requeteSite), "_, o);");
5968+
tl(4, "return ", classeNomSimpleSuperGenerique, ".staticSet", classeNomSimpleSuperGenerique, "(", langueConfig.getString(I18n.var_entite), "Var, ", langueConfig.getString(I18n.var_requeteSite), "_, v, o);");
59435969

59445970
tl(2, "}");
59455971
tl(1, "}");

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,15 +419,22 @@ else if("LocalDateTime".equals(entiteNomSimple) || "ZonedDateTime".equals(entite
419419
t(11, "hint=\"").sx(entiteDescription).l("\"");
420420
}
421421
if(entiteNomAffichage != null) {
422-
t(11, "label=\"").sx(entiteNomAffichage).l(" {{ formatZonedDateTime(", i18nGlobale.getString(I18n.var_resultat), ".", entiteVar, ", \"'['VV']'\", defaultLocaleId, defaultZoneId) | e }}\"");
422+
if(classeVarZone == null)
423+
t(11, "label=\"").sx(entiteNomAffichage).l(" {{ formatZonedDateTime(", i18nGlobale.getString(I18n.var_resultat), ".", entiteVar, ", \"'['VV']'\", defaultLocaleId, defaultZoneId) | e }}\"");
424+
else
425+
t(11, "label=\"").sx(entiteNomAffichage).l(" {{ formatZonedDateTime(", i18nGlobale.getString(I18n.var_resultat), ".", entiteVar, ", \"'['VV']'\", defaultLocaleId, ", i18nGlobale.getString(I18n.var_resultat), ".", classeVarZone, ") | e }}\"");
423426
}
424427

425428
tl(11, "class=\"label-on-left {{", langueConfig.getString(I18n.var_classeApiMethodeMethode), "}}_", entiteVar, " datetimepicker set", entiteVarCapitalise, " class", classeNomSimple, " input", classeNomSimple, "{{ ", i18nGlobale.getString(I18n.var_resultat), ".", classeVarId, " }}", entiteVarCapitalise, " \"");
426429
tl(11, "placeholder=\"", entiteDefaut == null ? langueConfig.getString(I18n.str_ddDashMMDashyyyy_HHColonmm_VV) : entiteDefaut, "\"");
427430
tl(11, "data-timeformat=\"", langueConfig.getString(I18n.str_ddDashMMDashyyyy_HHColonmm_VV), "\"");
428431
tl(11, "id=\"{{", langueConfig.getString(I18n.var_classeApiMethodeMethode), "}}_", entiteVar, "\"");
429432
// tl(4, ".a(\"value\", ", entiteVar, " == null ? \"\" : DateTimeFormatter.ofPattern(\"", langueConfig.getString(ConfigCles.var_EEE_d_MMM_yyyy_HAposhAposmmColonss_zz_VV), "\").format(", entiteVar, "));");
430-
tl(11, "value=\"{%- if \"Page\" == ", langueConfig.getString(I18n.var_classeApiMethodeMethode), " and ", i18nGlobale.getString(I18n.var_resultat), ".", entiteVar, " is defined %}{{ formatZonedDateTime(", i18nGlobale.getString(I18n.var_resultat), ".", entiteVar, ", \"yyyy-MM-dd'T'HH:mm\", defaultLocaleId, defaultZoneId) | e }}{%- endif %}\"");
433+
434+
if(classeVarZone == null)
435+
tl(11, "value=\"{%- if \"Page\" == ", langueConfig.getString(I18n.var_classeApiMethodeMethode), " and ", i18nGlobale.getString(I18n.var_resultat), ".", entiteVar, " is defined %}{{ formatZonedDateTime(", i18nGlobale.getString(I18n.var_resultat), ".", entiteVar, ", \"yyyy-MM-dd'T'HH:mm\", defaultLocaleId, defaultZoneId) | e }}{%- endif %}\"");
436+
else
437+
tl(11, "value=\"{%- if \"Page\" == ", langueConfig.getString(I18n.var_classeApiMethodeMethode), " and ", i18nGlobale.getString(I18n.var_resultat), ".", entiteVar, " is defined %}{{ formatZonedDateTime(", i18nGlobale.getString(I18n.var_resultat), ".", entiteVar, ", \"yyyy-MM-dd'T'HH:mm\", defaultLocaleId, ", i18nGlobale.getString(I18n.var_resultat), ".", classeVarZone, ") | e }}{%- endif %}\"");
431438
tl(1, "{%- if 'Page' == ", langueConfig.getString(I18n.var_classeApiMethodeMethode), " %}");
432439
tl(1, "{%- endif %}");
433440
tl(11, "data-", classeVarId, "={{ ", i18nGlobale.getString(I18n.var_resultat), ".", classeVarId, " | tojson }}");

0 commit comments

Comments
 (0)