ajout options d'export

EsupPortail · Sep 24, 2024 · bda5a1f · bda5a1f
1 parent 518ff03
commit bda5a1f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/src/main/java/fr/univlorraine/ecandidat/controllers/CandidatureCtrCandController.java b/src/main/java/fr/univlorraine/ecandidat/controllers/CandidatureCtrCandController.java
@@ -1203,6 +1203,9 @@ private OnDemandFile generateExport(final String code,
 					case "dtNaissHide":
 						listValeur.add(MethodUtils.formatDate(candidature.getCandidat().getDatNaissCandidat(), formatterDate));
 						break;
+					case "villeNaissHide":
+						listValeur.add(candidature.getCandidat().getLibVilleNaissCandidat());
+						break;
 					case "nationaliteHide":
 						listValeur.add(MethodUtils.formatToExport(candidat.getSiScolPaysNat().getLicPay()));
 						break;
@@ -1388,6 +1391,9 @@ private OnDemandFile generateExport(final String code,
 					case "userAnnulHide":
 						listValeur.add(MethodUtils.formatToExport(candidature.getUserAnnulCand()));
 						break;
+					case "questionReponseHide":
+						listValeur.add(formatLongCellSize(candidature.getQuestionCands().stream().map(e -> e.getQuestion().getLibQuestion() + " : " + e.getReponseQuestionCand()).collect(Collectors.joining(" / "))));
+						break;
 					case "postItHide":
 						listValeur.add(formatLongCellSize(getPostIt(candidature).stream().map(e -> e.getMessagePostIt()).collect(Collectors.joining(" / "))));
 						break;

diff --git a/src/main/java/fr/univlorraine/ecandidat/views/windows/CtrCandExportWindow.java b/src/main/java/fr/univlorraine/ecandidat/views/windows/CtrCandExportWindow.java
@@ -109,6 +109,7 @@ public CtrCandExportWindow() {
 		setOptionLeft.add(new ExportListCandidatureOption("nomUsuHide", applicationContext.getMessage("export.option.nomUsu", null, UI.getCurrent().getLocale())));
 		setOptionLeft.add(new ExportListCandidatureOption("prenomHide", applicationContext.getMessage("export.option.prenom", null, UI.getCurrent().getLocale())));
 		setOptionLeft.add(new ExportListCandidatureOption("dtNaissHide", applicationContext.getMessage("export.option.dtnaiss", null, UI.getCurrent().getLocale())));
+		setOptionLeft.add(new ExportListCandidatureOption("villeNaissHide", applicationContext.getMessage("export.option.villenaiss", null, UI.getCurrent().getLocale())));
 		setOptionLeft.add(new ExportListCandidatureOption("nationaliteHide", applicationContext.getMessage("export.option.nationalite", null, UI.getCurrent().getLocale())));
 		setOptionLeft.add(new ExportListCandidatureOption("langueHide", applicationContext.getMessage("export.option.langue", null, UI.getCurrent().getLocale())));
 		setOptionLeft.add(new ExportListCandidatureOption("etuIdHide", applicationContext.getMessage("export.option.etuId", null, UI.getCurrent().getLocale())));
@@ -121,10 +122,10 @@ public CtrCandExportWindow() {
 		setOptionLeft.add(new ExportListCandidatureOption("bacHide", applicationContext.getMessage("export.option.bac", null, UI.getCurrent().getLocale())));
 		setOptionLeft.add(new ExportListCandidatureOption("adresseHide", applicationContext.getMessage("export.option.adresse", null, UI.getCurrent().getLocale())));
 		setOptionLeft.add(new ExportListCandidatureOption("adresseDiviseHide", applicationContext.getMessage("export.option.adresse.div", null, UI.getCurrent().getLocale())));
-		setOptionLeft.add(new ExportListCandidatureOption("etablissementHide", applicationContext.getMessage("export.option.etablissement", null, UI.getCurrent().getLocale())));
 
 		/* Options */
 		final LinkedHashSet<ExportListCandidatureOption> setOptionMiddle = new LinkedHashSet<>();
+		setOptionMiddle.add(new ExportListCandidatureOption("etablissementHide", applicationContext.getMessage("export.option.etablissement", null, UI.getCurrent().getLocale())));
 		setOptionMiddle.add(new ExportListCandidatureOption("lastDipHide", applicationContext.getMessage("export.option.lastDip", null, UI.getCurrent().getLocale())));
 		setOptionMiddle.add(new ExportListCandidatureOption("lastLibDipHide", applicationContext.getMessage("export.option.lastLibDip", null, UI.getCurrent().getLocale())));
 		/* Infos de la candidature */
@@ -163,6 +164,7 @@ public CtrCandExportWindow() {
 		setOptionRight.add(new ExportListCandidatureOption("codOpiHide", applicationContext.getMessage("export.option.codOpi", null, UI.getCurrent().getLocale())));
 		setOptionRight.add(new ExportListCandidatureOption("datAnnulHide", applicationContext.getMessage("export.option.datAnnul", null, UI.getCurrent().getLocale())));
 		setOptionRight.add(new ExportListCandidatureOption("userAnnulHide", applicationContext.getMessage("export.option.userAnnul", null, UI.getCurrent().getLocale())));
+		setOptionRight.add(new ExportListCandidatureOption("questionReponseHide", applicationContext.getMessage("export.option.questionReponse", null, UI.getCurrent().getLocale())));
 		if (parametreController.getIsExportBlocNote()) {
 			setOptionRight.add(new ExportListCandidatureOption("postItHide", applicationContext.getMessage("export.option.postit", null, UI.getCurrent().getLocale())));
 		}

diff --git a/src/main/resources/i18n/backoffice/backoffice-messages.properties b/src/main/resources/i18n/backoffice/backoffice-messages.properties
@@ -183,6 +183,8 @@ btnMail = Messagerie
 
 btnRefresh = Rafra\u00EEchir
 
+btnRestore = Restaurer
+
 btnSelectAll = Tout s\u00E9lectionner
 
 btnValid = Valider
@@ -772,6 +774,7 @@ export.option.preselectDate           = Pr\u00E9s\u00E9l. Date
 export.option.preselectHeure          = Pr\u00E9s\u00E9l. Heure
 export.option.preselectLieu           = Pr\u00E9s\u00E9l. Lieu
 export.option.preselection            = Pr\u00E9s\u00E9lection
+export.option.questionReponse         = Questions / R\u00E9ponses
 export.option.rang                    = Rang
 export.option.rangReel                = Rang r\u00E9el
 export.option.regime                  = R\u00E9gime
@@ -783,6 +786,7 @@ export.option.temFc                   = T\u00E9moin FC
 export.option.typeTrait               = Type de traitement
 export.option.typeTraitValid          = Type de traitement valid\u00E9
 export.option.userAnnul               = Annul\u00E9 par
+export.option.villenaiss              = Ville de naissance
 export.window                         = Export de candidatures
 
 faq.btnNouveau                    = Nouvelle entr\u00E9e FAQ