Skip to content

Commit 128021e

Browse files
khergalantkhergalant
committed
Correction download
Correction license
1 parent 82349bc commit 128021e

File tree

10 files changed

+120
-78
lines changed

10 files changed

+120
-78
lines changed

‎pom.xml

Lines changed: 1 addition & 1 deletion
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.2.10-SNAPSHOT</version>
26+
<version>2.2.9-SNAPSHOT</version>
2727
<name>ecandidat</name>
2828

2929
<prerequisites>

‎src/main/java/fr/univlorraine/ecandidat/MainUI.java

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
1-
/** ESUP-Portail eCandidat - Copyright (c) 2016 ESUP-Portail consortium
2-
* Licensed under the Apache License, Version 2.0 (the "License");
3-
* you may not use this file except in compliance with the License.
4-
* You may obtain a copy of the License at
5-
* http://www.apache.org/licenses/LICENSE-2.0
6-
* Unless required by applicable law or agreed to in writing, software
7-
* distributed under the License is distributed on an "AS IS" BASIS,
8-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9-
* See the License for the specific language governing permissions and
10-
* limitations under the License. */
1+
/**
2+
* ESUP-Portail eCandidat - Copyright (c) 2016 ESUP-Portail consortium
3+
*
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
1117
package fr.univlorraine.ecandidat;
1218

1319
import java.io.EOFException;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1200,7 +1200,7 @@ public OnDemandFile downlaodMultipleDossier(final List<Candidature> liste, final
12001200
return null;
12011201
} else if (liste.size() == 1) {
12021202
Candidature candidature = liste.get(0);
1203-
return downloadDossier(candidature, getInformationsCandidature(candidature, false), getInformationsDateCandidature(candidature, false), adresseController.getLibelleAdresseCommission(candidature.getFormation().getCommission(), "<br>"), candidaturePieceController.getPjCandidature(candidature), candidaturePieceController.getFormulaireCandidature(candidature));
1203+
return downloadDossier(candidature, getInformationsCandidature(candidature, false), getInformationsDateCandidature(candidature, false), adresseController.getLibelleAdresseCommission(candidature.getFormation().getCommission(), "<br>"), candidaturePieceController.getPjCandidature(candidature), candidaturePieceController.getFormulaireCandidature(candidature), true);
12041204
} else {
12051205
String nomFichier = applicationContext.getMessage("candidature.download.multiple.file", new Object[] {commission.getLibComm(),
12061206
DateTimeFormatter.ofPattern("yyyyMMdd-HHmmss").format(LocalDateTime.now())}, UI.getCurrent().getLocale());
@@ -1223,7 +1223,7 @@ private OnDemandFile downlaodMultipleDossierZip(final List<Candidature> liste, f
12231223
OnDemandFile bisDossier = null;
12241224
try {
12251225
// le dossier outStream
1226-
bisDossier = downloadDossier(candidature, getInformationsCandidature(candidature, false), getInformationsDateCandidature(candidature, false), adresseController.getLibelleAdresseCommission(candidature.getFormation().getCommission(), "<br>"), candidaturePieceController.getPjCandidature(candidature), candidaturePieceController.getFormulaireCandidature(candidature));
1226+
bisDossier = downloadDossier(candidature, getInformationsCandidature(candidature, false), getInformationsDateCandidature(candidature, false), adresseController.getLibelleAdresseCommission(candidature.getFormation().getCommission(), "<br>"), candidaturePieceController.getPjCandidature(candidature), candidaturePieceController.getFormulaireCandidature(candidature), parametreController.getIsDownloadMultipleAddPj());
12271227
String fileName = applicationContext.getMessage("candidature.download.file", new Object[] {
12281228
candidature.getCandidat().getCompteMinima().getNumDossierOpiCptMin() + "_"
12291229
+ candidature.getCandidat().getNomPatCandidat() + "_"
@@ -1272,7 +1272,7 @@ private OnDemandFile downlaodMultipleDossierPdf(final List<Candidature> liste, f
12721272
for (Candidature candidature : liste) {
12731273
OnDemandFile bisDossier = null;
12741274
try {
1275-
bisDossier = downloadDossier(candidature, getInformationsCandidature(candidature, false), getInformationsDateCandidature(candidature, false), adresseController.getLibelleAdresseCommission(candidature.getFormation().getCommission(), "<br>"), candidaturePieceController.getPjCandidature(candidature), candidaturePieceController.getFormulaireCandidature(candidature));
1275+
bisDossier = downloadDossier(candidature, getInformationsCandidature(candidature, false), getInformationsDateCandidature(candidature, false), adresseController.getLibelleAdresseCommission(candidature.getFormation().getCommission(), "<br>"), candidaturePieceController.getPjCandidature(candidature), candidaturePieceController.getFormulaireCandidature(candidature), parametreController.getIsDownloadMultipleAddPj());
12761276
;
12771277
ut.addSource(bisDossier.getInputStream());
12781278
} catch (Exception e) {
@@ -1314,7 +1314,7 @@ private OnDemandFile downlaodMultipleDossierPdf(final List<Candidature> liste, f
13141314
public OnDemandFile downloadDossier(final Candidature candidature,
13151315
final List<SimpleTablePresentation> listePresentation,
13161316
final List<SimpleTablePresentation> listeDatePresentation, final String adresse,
1317-
final List<PjPresentation> listePj, final List<FormulairePresentation> listeForm) {
1317+
final List<PjPresentation> listePj, final List<FormulairePresentation> listeForm, final Boolean addPj) {
13181318
String fileName = applicationContext.getMessage("candidature.download.file", new Object[] {
13191319
candidature.getCandidat().getCompteMinima().getNumDossierOpiCptMin() + "_"
13201320
+ candidature.getCandidat().getNomPatCandidat() + "_"
@@ -1355,7 +1355,7 @@ public OnDemandFile downloadDossier(final Candidature candidature,
13551355
}
13561356
}
13571357

1358-
if (parametreController.getIsDownloadMultipleAddPj() && nbFilePJ > 0
1358+
if (addPj && nbFilePJ > 0
13591359
&& !fileController.isFileServiceMaintenance(applicationContext.getMessage("file.service.maintenance.dossier", null, UI.getCurrent().getLocale()))) {
13601360
for (PjPresentation e : listePj) {
13611361
// listePj.forEach(e->{

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

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
1-
/** ESUP-Portail eCandidat - Copyright (c) 2016 ESUP-Portail consortium
2-
* Licensed under the Apache License, Version 2.0 (the "License");
3-
* you may not use this file except in compliance with the License.
4-
* You may obtain a copy of the License at
5-
* http://www.apache.org/licenses/LICENSE-2.0
6-
* Unless required by applicable law or agreed to in writing, software
7-
* distributed under the License is distributed on an "AS IS" BASIS,
8-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9-
* See the License for the specific language governing permissions and
10-
* limitations under the License. */
1+
/**
2+
* ESUP-Portail eCandidat - Copyright (c) 2016 ESUP-Portail consortium
3+
*
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
1117
package fr.univlorraine.ecandidat.controllers;
1218

1319
import java.io.BufferedInputStream;

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

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
1-
/** ESUP-Portail eCandidat - Copyright (c) 2016 ESUP-Portail consortium
2-
* Licensed under the Apache License, Version 2.0 (the "License");
3-
* you may not use this file except in compliance with the License.
4-
* You may obtain a copy of the License at
5-
* http://www.apache.org/licenses/LICENSE-2.0
6-
* Unless required by applicable law or agreed to in writing, software
7-
* distributed under the License is distributed on an "AS IS" BASIS,
8-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9-
* See the License for the specific language governing permissions and
10-
* limitations under the License. */
1+
/**
2+
* ESUP-Portail eCandidat - Copyright (c) 2016 ESUP-Portail consortium
3+
*
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
1117
package fr.univlorraine.ecandidat.controllers;
1218

1319
import java.io.InputStream;

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

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
1-
/** ESUP-Portail eCandidat - Copyright (c) 2016 ESUP-Portail consortium
2-
* Licensed under the Apache License, Version 2.0 (the "License");
3-
* you may not use this file except in compliance with the License.
4-
* You may obtain a copy of the License at
5-
* http://www.apache.org/licenses/LICENSE-2.0
6-
* Unless required by applicable law or agreed to in writing, software
7-
* distributed under the License is distributed on an "AS IS" BASIS,
8-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9-
* See the License for the specific language governing permissions and
10-
* limitations under the License. */
1+
/**
2+
* ESUP-Portail eCandidat - Copyright (c) 2016 ESUP-Portail consortium
3+
*
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
1117
package fr.univlorraine.ecandidat.controllers;
1218

1319
import java.io.InputStream;
@@ -456,7 +462,7 @@ public void downloadDossier() {
456462
if (cpt != null && cpt.getCandidat() != null && cpt.getCandidat().getCandidatures().size() > 0) {
457463
logger.debug("Download dossier candidat : " + cpt.getNumDossierOpiCptMin());
458464
Candidature candidature = cpt.getCandidat().getCandidatures().get(0);
459-
candidatureController.downloadDossier(candidature, candidatureController.getInformationsCandidature(candidature, false), candidatureController.getInformationsDateCandidature(candidature, false), adresseController.getLibelleAdresseCommission(candidature.getFormation().getCommission(), "<br>"), candidaturePieceController.getPjCandidature(candidature), candidaturePieceController.getFormulaireCandidature(candidature));
465+
candidatureController.downloadDossier(candidature, candidatureController.getInformationsCandidature(candidature, false), candidatureController.getInformationsDateCandidature(candidature, false), adresseController.getLibelleAdresseCommission(candidature.getFormation().getCommission(), "<br>"), candidaturePieceController.getPjCandidature(candidature), candidaturePieceController.getFormulaireCandidature(candidature), true);
460466
}
461467
}
462468
}

‎src/main/java/fr/univlorraine/ecandidat/repositories/CandidatureRepository.java

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
1-
/** ESUP-Portail eCandidat - Copyright (c) 2016 ESUP-Portail consortium
2-
* Licensed under the Apache License, Version 2.0 (the "License");
3-
* you may not use this file except in compliance with the License.
4-
* You may obtain a copy of the License at
5-
* http://www.apache.org/licenses/LICENSE-2.0
6-
* Unless required by applicable law or agreed to in writing, software
7-
* distributed under the License is distributed on an "AS IS" BASIS,
8-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9-
* See the License for the specific language governing permissions and
10-
* limitations under the License. */
1+
/**
2+
* ESUP-Portail eCandidat - Copyright (c) 2016 ESUP-Portail consortium
3+
*
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
1117
package fr.univlorraine.ecandidat.repositories;
1218

1319
import java.util.List;

‎src/main/java/fr/univlorraine/ecandidat/utils/MethodUtils.java

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
1-
/** ESUP-Portail eCandidat - Copyright (c) 2016 ESUP-Portail consortium
2-
* Licensed under the Apache License, Version 2.0 (the "License");
3-
* you may not use this file except in compliance with the License.
4-
* You may obtain a copy of the License at
5-
* http://www.apache.org/licenses/LICENSE-2.0
6-
* Unless required by applicable law or agreed to in writing, software
7-
* distributed under the License is distributed on an "AS IS" BASIS,
8-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9-
* See the License for the specific language governing permissions and
10-
* limitations under the License. */
1+
/**
2+
* ESUP-Portail eCandidat - Copyright (c) 2016 ESUP-Portail consortium
3+
*
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
1117
package fr.univlorraine.ecandidat.utils;
1218

1319
import java.io.Closeable;

‎src/main/java/fr/univlorraine/ecandidat/views/template/CandidatureViewTemplate.java

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
1-
/** ESUP-Portail eCandidat - Copyright (c) 2016 ESUP-Portail consortium
2-
* Licensed under the Apache License, Version 2.0 (the "License");
3-
* you may not use this file except in compliance with the License.
4-
* You may obtain a copy of the License at
5-
* http://www.apache.org/licenses/LICENSE-2.0
6-
* Unless required by applicable law or agreed to in writing, software
7-
* distributed under the License is distributed on an "AS IS" BASIS,
8-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
9-
* See the License for the specific language governing permissions and
10-
* limitations under the License. */
1+
/**
2+
* ESUP-Portail eCandidat - Copyright (c) 2016 ESUP-Portail consortium
3+
*
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
1117
package fr.univlorraine.ecandidat.views.template;
1218

1319
import java.time.LocalDate;

‎src/main/java/fr/univlorraine/ecandidat/views/windows/CandidatureWindow.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1002,7 +1002,7 @@ public OnDemandFile getOnDemandFile() {
10021002
return null;
10031003
}
10041004
}
1005-
return candidatureController.downloadDossier(candidature, listePresentation, listeDatePresentation, labelAdr.getValue(), pjContainer.getItemIds(), formulaireContainer.getItemIds());
1005+
return candidatureController.downloadDossier(candidature, listePresentation, listeDatePresentation, labelAdr.getValue(), pjContainer.getItemIds(), formulaireContainer.getItemIds(), true);
10061006
}
10071007
}, btnDownload);
10081008

0 commit comments

Comments
 (0)