gestion bareme null

EsupPortail · Jul 10, 2023 · f1a41e6 · f1a41e6
1 parent c8e5cef
commit f1a41e6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/fr/univlorraine/mondossierweb/ui/view/inscriptions/InscriptionsView.java b/src/main/java/fr/univlorraine/mondossierweb/ui/view/inscriptions/InscriptionsView.java
@@ -1273,7 +1273,7 @@ private Component getSessionFinaleDetails(CheminDTO o, boolean compact) {
 		return null;
 	}
 
-	private Component createLabelNote(int bareme, BigDecimal note, Absence absence, boolean compact) {
+	private Component createLabelNote(Integer bareme, BigDecimal note, Absence absence, boolean compact) {
 		Div result = new Div();
 		result.setHeight(CSSColorUtils.EM_1_5);
 		if(compact) {

diff --git a/src/main/java/fr/univlorraine/mondossierweb/utils/Utils.java b/src/main/java/fr/univlorraine/mondossierweb/utils/Utils.java
@@ -352,10 +352,10 @@ private static boolean insertInList(List<CheminDTO> list, String cheminParent, C
 		return false;
 	}
 
-	public static String displayNote(BigDecimal note, int bareme, Boolean avecBareme) {
+	public static String displayNote(BigDecimal note, Integer bareme, Boolean avecBareme) {
 		String n = displayBigDecimal(note);
 
-		if(StringUtils.hasText(n) && avecBareme!=null && avecBareme.booleanValue()) {
+		if(StringUtils.hasText(n) && bareme != null && avecBareme != null && avecBareme.booleanValue()) {
 			n += "/" + bareme;
 		}
 		return n;