Skip to content

Commit 8f8259e

Browse files
khergalantkhergalant
committed
Merge branch 'develop'
2 parents 236abf7 + aac052a commit 8f8259e

31 files changed

+466
-221
lines changed

‎pom.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<groupId>fr.univlorraine</groupId>
2424
<artifactId>ecandidat</artifactId>
2525
<packaging>war</packaging>
26-
<version>2.4.6-SNAPSHOT</version>
26+
<version>2.4.7-SNAPSHOT</version>
2727
<name>ecandidat</name>
2828

2929
<properties>
@@ -42,7 +42,7 @@
4242
<cglib.version>3.2.5</cglib.version>
4343

4444
<!-- Vaadin -->
45-
<vaadin.version>7.7.43</vaadin.version>
45+
<vaadin.version>7.7.44</vaadin.version>
4646
<vaadin.spring.version>1.0.2</vaadin.spring.version>
4747

4848
<!-- Spring -->
@@ -59,14 +59,14 @@
5959
<xdocreport.version>2.0.1</xdocreport.version>
6060
<jett.version>0.10.0</jett.version>
6161
<pdfbox.version>2.0.25</pdfbox.version>
62-
<bouncycastle.version>1.77</bouncycastle.version>
62+
<bouncycastle.version>1.78.1</bouncycastle.version>
6363
<opencmis.version>1.1.0</opencmis.version>
6464
<tika.version>2.9.1</tika.version>
6565
<opencsv.version>5.3</opencsv.version>
6666
<clamav-client.version>1.0.1</clamav-client.version>
6767

6868
<!-- Base de données et utilitaires -->
69-
<mysql.connector.version>8.0.32</mysql.connector.version>
69+
<mysql.connector.version>8.4.0</mysql.connector.version>
7070
<ojdbc8.version>19.3.0.0</ojdbc8.version>
7171
<eclipselink.version>2.7.3</eclipselink.version>
7272
<javax.persistence-api.version>2.2</javax.persistence-api.version>
@@ -77,13 +77,13 @@
7777
<flywaydb.version>4.2.0</flywaydb.version>
7878

7979
<!-- WS Apogee -->
80-
<apo.ws.version>6.50.01</apo.ws.version>
81-
<apo.ws.prod.version>6.50.01</apo.ws.prod.version>
80+
<apo.ws.version>6.50.30</apo.ws.version>
81+
<apo.ws.prod.version>6.50.30</apo.ws.prod.version>
8282
<apo.ws-utils.version>1.0.2</apo.ws-utils.version>
8383

8484
<!-- Outils -->
8585
<commons.beanutils.version>1.9.4</commons.beanutils.version>
86-
<commons-io.version>2.8.0</commons-io.version>
86+
<commons-io.version>2.17.0</commons-io.version>
8787
<tools.univlorraine.version>1.5.11</tools.univlorraine.version>
8888
<lombok.version>1.18.6</lombok.version>
8989
<jackson.version>2.15.4</jackson.version>

‎src/main/java/fr/univlorraine/ecandidat/config/LaunchAppConfig.java

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@
4646
import fr.univlorraine.ecandidat.controllers.LockCandidatController;
4747
import fr.univlorraine.ecandidat.controllers.NomenclatureController;
4848
import fr.univlorraine.ecandidat.entities.ecandidat.Adresse;
49+
import fr.univlorraine.ecandidat.entities.ecandidat.Adresse_;
50+
import fr.univlorraine.ecandidat.entities.ecandidat.Candidat;
51+
import fr.univlorraine.ecandidat.entities.ecandidat.Candidat_;
52+
import fr.univlorraine.ecandidat.entities.ecandidat.CompteMinima;
53+
import fr.univlorraine.ecandidat.entities.ecandidat.CompteMinima_;
4954
import fr.univlorraine.ecandidat.services.siscol.SiScolGenericService;
5055
import fr.univlorraine.ecandidat.utils.ConstanteUtils;
5156
import fr.univlorraine.ecandidat.utils.MethodUtils;
@@ -157,27 +162,47 @@ public void preprocessTemplate() {
157162
/** Modifie la valeur de certaines annotations */
158163
public void preprocessAnnotations() {
159164
try {
160-
final int size = siScolService.getSizeFieldAdresse();
161-
if (size != ConstanteUtils.SIZE_FIELD_ADRESSE_DEFAULT) {
162-
logger.info("Modification des annotations adresse, size = " + size);
163-
changeAnnotationAdresse(Adresse.FIELD_ADR1, size);
164-
changeAnnotationAdresse(Adresse.FIELD_ADR2, size);
165-
changeAnnotationAdresse(Adresse.FIELD_ADR3, size);
166-
changeAnnotationAdresse(Adresse.FIELD_LIB_COM_ETR, size);
165+
/* Adresse */
166+
final int sizeChampsAdr = siScolService.getSizeFieldAdresse();
167+
if (sizeChampsAdr != ConstanteUtils.SIZE_FIELD_ADRESSE_DEFAULT) {
168+
logger.info("Modification des annotations adresse, size = " + sizeChampsAdr);
169+
changeAnnotation(Adresse.class, Adresse_.ADR1_ADR, sizeChampsAdr);
170+
changeAnnotation(Adresse.class, Adresse_.ADR2_ADR, sizeChampsAdr);
171+
changeAnnotation(Adresse.class, Adresse_.ADR3_ADR, sizeChampsAdr);
172+
changeAnnotation(Adresse.class, Adresse_.LIB_COM_ETR_ADR, sizeChampsAdr);
167173
}
174+
175+
/* Noms */
176+
final int sizeChampsNom = siScolService.getSizeFieldNom();
177+
if (sizeChampsNom != ConstanteUtils.SIZE_FIELD_NOM_DEFAULT) {
178+
logger.info("Modification des annotations noms, size = " + sizeChampsNom);
179+
changeAnnotation(CompteMinima.class, CompteMinima_.NOM_CPT_MIN, sizeChampsNom);
180+
changeAnnotation(Candidat.class, Candidat_.NOM_PAT_CANDIDAT, sizeChampsNom);
181+
changeAnnotation(Candidat.class, Candidat_.NOM_USU_CANDIDAT, sizeChampsNom);
182+
}
183+
184+
/* Prenoms */
185+
final int sizeChampsPrenom = siScolService.getSizeFieldPrenom();
186+
if (sizeChampsPrenom != ConstanteUtils.SIZE_FIELD_PRENOM_DEFAULT) {
187+
logger.info("Modification des annotations prenom, size = " + sizeChampsPrenom);
188+
changeAnnotation(CompteMinima.class, CompteMinima_.PRENOM_CPT_MIN, sizeChampsPrenom);
189+
changeAnnotation(Candidat.class, Candidat_.PRENOM_CANDIDAT, sizeChampsPrenom);
190+
changeAnnotation(Candidat.class, Candidat_.AUTRE_PREN_CANDIDAT, sizeChampsPrenom);
191+
}
192+
168193
} catch (final Exception e) {
169194
logger.warn("Erreur a la modification des annotations", e);
170195
}
171196
}
172197

173198
/**
174-
* Modifie la taille des champs d'adresse
199+
* Modifie la taille des champs
175200
* @param fieldName
176201
* @throws Exception
177202
*/
178-
private void changeAnnotationAdresse(final String fieldName, final int size) throws Exception {
203+
private void changeAnnotation(final Class<?> clazz, final String fieldName, final int size) throws Exception {
179204
try {
180-
final Field field = Adresse.class.getDeclaredField(fieldName);
205+
final Field field = clazz.getDeclaredField(fieldName);
181206

182207
final Column fieldAnnotationColumn = field.getAnnotation(Column.class);
183208
MethodUtils.changeAnnotationValue(fieldAnnotationColumn, "length", size);

‎src/main/java/fr/univlorraine/ecandidat/controllers/CandidatureController.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,12 @@ public List<SimpleTablePresentation> getInformationsCandidature(final Candidatur
682682
applicationContext.getMessage("candidature." + ConstanteUtils.CANDIDATURE_OPI, null, UI.getCurrent().getLocale()),
683683
opi));
684684
}
685-
685+
/* Regime */
686+
if (candidature.getSiScolRegime() != null) {
687+
liste.add(new SimpleTablePresentation("candidature." + ConstanteUtils.CANDIDATURE_REGIME,
688+
applicationContext.getMessage("candidature." + ConstanteUtils.CANDIDATURE_REGIME, null, UI.getCurrent().getLocale()),
689+
candidature.getSiScolRegime().getLibRgi()));
690+
}
686691
/* Exoneration */
687692
if (candidature.getSiScolCatExoExt() != null) {
688693
liste.add(new SimpleTablePresentation("candidature." + ConstanteUtils.CANDIDATURE_EXO,
@@ -1348,6 +1353,7 @@ private ByteArrayInputStream generateDossier(final Candidature candidature,
13481353
adresseController.getLibelleAdresse(commission.getAdresse(), "\n"),
13491354
commission.getMailComm(),
13501355
commission.getTelComm(),
1356+
commission.getUrlComm(),
13511357
formation,
13521358
MethodUtils.formatToExportHtml(i18nController.getI18nTraduction(commission.getI18nCommentRetourComm())));
13531359

‎src/main/java/fr/univlorraine/ecandidat/controllers/CandidatureCtrCandController.java

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -888,6 +888,32 @@ public boolean editDatRetour(final List<Candidature> listeCandidature, final Can
888888
return true;
889889
}
890890

891+
/**
892+
* @param listeCandidature
893+
* @param bean
894+
* @return modifie les infos de montant des droits
895+
*/
896+
public boolean editRegime(final List<Candidature> listeCandidature, final Candidature bean) {
897+
if (checkLockListCandidature(listeCandidature)) {
898+
return false;
899+
}
900+
final String user = userController.getCurrentUserLogin();
901+
902+
for (Candidature candidature : listeCandidature) {
903+
Assert.notNull(candidature, applicationContext.getMessage("assert.notNull", null, UI.getCurrent().getLocale()));
904+
/* Verrou */
905+
if (!lockCandidatController.getLockOrNotifyCandidature(candidature)) {
906+
continue;
907+
}
908+
candidature.setSiScolRegime(bean.getSiScolRegime());
909+
candidature.setUserModCand(user);
910+
candidature = candidatureRepository.save(candidature);
911+
}
912+
Notification.show(applicationContext.getMessage("candidature.action.siScolRegime.notif", null, UI.getCurrent().getLocale()),
913+
Type.TRAY_NOTIFICATION);
914+
return true;
915+
}
916+
891917
/**
892918
* @param listeCandidature
893919
* @param bean
@@ -1177,6 +1203,9 @@ private OnDemandFile generateExport(final String code,
11771203
case "dtNaissHide":
11781204
listValeur.add(MethodUtils.formatDate(candidature.getCandidat().getDatNaissCandidat(), formatterDate));
11791205
break;
1206+
case "villeNaissHide":
1207+
listValeur.add(candidature.getCandidat().getLibVilleNaissCandidat());
1208+
break;
11801209
case "nationaliteHide":
11811210
listValeur.add(MethodUtils.formatToExport(candidat.getSiScolPaysNat().getLicPay()));
11821211
break;
@@ -1338,6 +1367,9 @@ private OnDemandFile generateExport(final String code,
13381367
case "datNewRetourHide":
13391368
listValeur.add(MethodUtils.formatToExport(MethodUtils.formatDate(candidature.getDatNewRetourCand(), formatterDate)));
13401369
break;
1370+
case "regimeHide":
1371+
listValeur.add(MethodUtils.formatToExport(candidature.getSiScolRegime() != null ? candidature.getSiScolRegime().getDisplayLibelle() : null));
1372+
break;
13411373
case "catExoHide":
13421374
listValeur.add(MethodUtils.formatToExport(candidature.getSiScolCatExoExt() != null ? candidature.getSiScolCatExoExt().getDisplayLibelle() : null));
13431375
break;
@@ -1359,6 +1391,9 @@ private OnDemandFile generateExport(final String code,
13591391
case "userAnnulHide":
13601392
listValeur.add(MethodUtils.formatToExport(candidature.getUserAnnulCand()));
13611393
break;
1394+
case "questionReponseHide":
1395+
listValeur.add(formatLongCellSize(candidature.getQuestionCands().stream().map(e -> e.getQuestion().getLibQuestion() + " : " + e.getReponseQuestionCand()).collect(Collectors.joining(" / "))));
1396+
break;
13621397
case "postItHide":
13631398
listValeur.add(formatLongCellSize(getPostIt(candidature).stream().map(e -> e.getMessagePostIt()).collect(Collectors.joining(" / "))));
13641399
break;

0 commit comments

Comments
 (0)