Skip to content

Commit f7d8353

Browse files
committed
Fixing bugs with updating BigDecimal fields
1 parent 20071fd commit f7d8353

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3060,7 +3060,7 @@ else if(StringUtils.contains(classeApiMethode, "PATCH")) {
30603060
tl(8, "if(", classeLangueConfig.getString(ConfigCles.var_requeteApi), " != null) {");
30613061
tl(9, classeLangueConfig.getString(ConfigCles.var_requeteApi), ".setNumPATCH(", classeLangueConfig.getString(ConfigCles.var_requeteApi), ".getNumPATCH() + ", classeLangueConfig.getString(ConfigCles.var_liste), classeNomSimple, ".getResponse().getResponse().getDocs().size());");
30623062
tl(9, "if(", classeLangueConfig.getString(ConfigCles.var_requeteApi), ".getNumFound() == 1L)");
3063-
tl(10, "o2.", classeLangueConfig.getString(ConfigCles.var_requeteApi), classeNomSimple, "();");
3063+
tl(10, "o", classeSauvegarde ? "2" : "", ".", classeLangueConfig.getString(ConfigCles.var_requeteApi), classeNomSimple, "();");
30643064
tl(9, "eventBus.publish(\"websocket", classeNomSimple, "\", JsonObject.mapFrom(", classeLangueConfig.getString(ConfigCles.var_requeteApi), ").toString());");
30653065
tl(8, "}");
30663066
tl(8, classeLangueConfig.getString(ConfigCles.var_gestionnaireEvenements), ".handle(Future.succeededFuture(ServiceResponse.completedWithJson(Buffer.buffer(new JsonObject().encodePrettily()))));");

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5293,6 +5293,9 @@ else if(entiteIndexe
52935293
// requeteApi //
52945294
//////////////////
52955295

5296+
if(entiteNomSimple.toString().equals("BigDecimal"))
5297+
wRequeteApi.tl(3, "if(!Objects.equals(", entiteVar, ", original.get", entiteVarCapitalise, "()) && ", entiteVar, " != null && ", entiteVar, ".compareTo(original.get", entiteVarCapitalise, "()) != 0)");
5298+
else
52965299
wRequeteApi.tl(3, "if(!Objects.equals(", entiteVar, ", original.get", entiteVarCapitalise, "()))");
52975300
wRequeteApi.tl(4, langueConfig.getString(ConfigCles.var_requeteApi), ".addVars(\"", entiteVar, "\");");
52985301

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -526,16 +526,17 @@ else if("LocalTime".equals(entiteNomSimple)) {
526526
} else {
527527
wWebsocketInput.tl(6, "$(this).val(val);");
528528
}
529+
wWebsocketInput.tl(6, langueConfig.getString(ConfigCles.var_ajouterLueur), "($(this));");
529530
wWebsocketInput.tl(4, "});");
530531
wWebsocketInput.tl(4, "$('.var", classeNomSimple, "' + pk + '", entiteVarCapitalise, "').each(function() {");
531532
wWebsocketInput.tl(5, "if(val !== $(this).text())");
532533
if(entiteNomSimple.startsWith("Json")) {
533534
wWebsocketInput.tl(6, "$(this).val(JSON.stringify(val));");
534535
} else {
535-
wWebsocketInput.tl(6, "$(this).val(val);");
536+
wWebsocketInput.tl(6, "$(this).text(val);");
536537
}
538+
wWebsocketInput.tl(6, langueConfig.getString(ConfigCles.var_ajouterLueur), "($(this));");
537539
wWebsocketInput.tl(4, "});");
538-
wWebsocketInput.tl(4, langueConfig.getString(ConfigCles.var_ajouterLueur), "($('.input", classeNomSimple, "' + pk + '", entiteVarCapitalise, "'));");
539540
wWebsocketInput.tl(3, "}");
540541
}
541542
}
@@ -1761,7 +1762,9 @@ else if("LocalDate".equals(entiteNomSimple)) {
17611762
String classeApiTypeMediaMethode = classeDoc.getString("classeApiTypeMedia200" + classeApiMethode + "_" + langueNom + "_stored_string");
17621763
String classeApiMethodeMethode = classeDoc.getString("classeApiMethode" + classeApiMethode + "_" + langueNom + "_stored_string");
17631764

1764-
if(classeApiMethode.equals(langueConfig.getString(ConfigCles.var_PageRecherche)) || classeApiMethode.equals("PATCH") || classeApiMethode.equals("POST") || classeApiMethode.equals(langueConfig.getString(ConfigCles.var_PUTCopie)) || classeApiMethode.equals(langueConfig.getString(ConfigCles.var_PUTFusion)) || classeApiMethode.equals("PUTImport")) {
1765+
if(classeApiMethode.equals(langueConfig.getString(ConfigCles.var_PageRecherche))) {
1766+
l("{{#partial \"htm", langueConfig.getString(ConfigCles.var_Formulaire), "_", classeApiOperationIdMethode, "\"}}{{> htm", langueConfig.getString(ConfigCles.var_Formulaire), classePageNomSimple, "_", classeApiOperationIdMethode, " classApiMethodMethod=\"Page\"}}{{/partial}}");
1767+
} else if(classeApiMethode.equals("PATCH") || classeApiMethode.equals("POST") || classeApiMethode.equals(langueConfig.getString(ConfigCles.var_PUTCopie)) || classeApiMethode.equals(langueConfig.getString(ConfigCles.var_PUTFusion)) || classeApiMethode.equals("PUTImport")) {
17651768
l("{{#partial \"htm", langueConfig.getString(ConfigCles.var_Formulaire), "_", classeApiOperationIdMethode, "\"}}{{> htm", langueConfig.getString(ConfigCles.var_Formulaire), classePageNomSimple, "_", classeApiOperationIdMethode, " classApiMethodMethod=\"", classeApiMethodeMethode, "\"}}{{/partial}}");
17661769
}
17671770
}

0 commit comments

Comments
 (0)