*/
package com.axyus.generator.pespj.utils;
-import fr.gouv.minefi.cp.helios.pes_v2.rev0.aller.TPESPJ;
import fr.gouv.minefi.cp.helios.pes_v2.rev0.aller.TPESPJs;
/**
if (runContextAdapter.isPesFileImportSupported()) {
this.importXemeliosConfirmationStep = new ImportXemeliosResultStep();
+ this.importXemeliosConfirmationStep.setPreviousEnable(false);
this.allSteps = new Step[]{accueilStep, pjStep, referenceComptableStep, generationResultStep, importXemeliosConfirmationStep};
} else {
this.allSteps = new Step[]{accueilStep, pjStep, referenceComptableStep, generationResultStep};
import com.axyus.generator.pespj.GeneratorPesPjWizardProcess;
import com.axyus.generator.pespj.ui.ReferenceComptableUI;
import com.axyus.generator.pespj.ui.renderer.TableModelReferenceComptable;
+import com.axyus.generator.pespj.utilities.PropertiesUtils;
import com.axyus.generator.pespj.utils.Constants;
import com.axyus.generator.pespj.utils.DateUtils;
import com.axyus.generator.pespj.utils.GeneratePesUtils;
}
}
- String directoryPath = getWizardProcess().getProperties().getProperty(Constants.PROPERTIES_LAST_DIRECTORY_SAVE);
- if(directoryPath == null){
- directoryPath = System.getProperty("user.home");
- }
+ String directoryPath = PropertiesUtils.getDiretoryByProperty(getWizardProcess().getProperties(), Constants.PROPERTIES_LAST_DIRECTORY_SAVE, System.getProperty("user.home"));
JFileChooser chooseFileDialog = new JFileChooser(new File(directoryPath));
FileNameExtensionFilter xmlfilter = new FileNameExtensionFilter("xml files (*.xml)", "xml");
chooseFileDialog.setFileFilter(xmlfilter);
chooseFileDialog.setDialogTitle("Enregistrer sous ...");
int responseConfirm = JOptionPane.showConfirmDialog(getWizardProcess().getWizardDialog(),
- "Vous êtes sur le point de générer le PES PJ, vous ne pourrez pas revenir en arrière.\n Etes-vous sûr de vouloir continuer ?",
+ "Vous êtes sur le point de générer le PES PJ, vous ne pourrez plus modifier les données.\n\nEtes-vous sûr de vouloir continuer ?",
"Confirmer la génération",
JOptionPane.YES_NO_OPTION);
// Génration du flux XML
try {
JAXBContext context = JAXBContext.newInstance(PESAller.class);
- pesPjFile = chooseFileDialog.getSelectedFile();
-
+
Marshaller m = context.createMarshaller();
m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
m.setProperty(Marshaller.JAXB_ENCODING, ENCODING);
<Component id="browse_button" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
- <EmptySpace min="-2" max="-2" attributes="0"/>
<Component id="jLabel6" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" min="-2" max="-2" attributes="0"/>
<Component id="jSeparator6" pref="431" max="32767" attributes="1"/>
package com.axyus.generator.pespj.ui;
import com.axyus.generator.pespj.GeneratorPesPjWizardProcess;
+import com.axyus.generator.pespj.ui.renderer.PairComboBoxRenderer;
+import com.axyus.generator.pespj.ui.renderer.TableModelPJ;
+import com.axyus.generator.pespj.utilities.PropertiesUtils;
import com.axyus.generator.pespj.utils.ConfigHandler;
+import com.axyus.generator.pespj.utils.Constants;
import com.axyus.generator.pespj.utils.ControlUtils;
import com.axyus.generator.pespj.utils.DateUtils;
import com.axyus.generator.pespj.utils.GeneratePesUtils;
import com.axyus.generator.pespj.utils.GeneratorUtils;
+import com.axyus.generator.pespj.utils.PJfile;
import com.axyus.generator.pespj.utils.Pair;
import com.axyus.swing.components.AbstractWizardPanel;
-import com.axyus.generator.pespj.ui.renderer.PairComboBoxRenderer;
-import com.axyus.generator.pespj.ui.renderer.TableModelPJ;
-import com.axyus.generator.pespj.utils.Constants;
-import com.axyus.generator.pespj.utils.PJfile;
import fr.gouv.minefi.cp.helios.pes_v2.rev0.aller.PESAller;
import fr.gouv.minefi.cp.helios.pes_v2.rev0.aller.TPESPJs;
-import java.awt.Cursor;
import java.awt.event.ItemEvent;
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
import java.io.File;
import java.util.Date;
import javax.swing.DefaultComboBoxModel;
-import javax.swing.JDialog;
import javax.swing.JFileChooser;
import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextArea;
import javax.swing.JTable;
+import javax.swing.JTextArea;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
private void browse_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_browse_buttonActionPerformed
setBusy(true);
- String directoryPath = ((GeneratorPesPjWizardProcess) getWizardDialog().getWizardProcess()).getProperties().getProperty(Constants.PROPERTIES_LAST_DIRECTORY_PJ);
- if(directoryPath == null){
- directoryPath = System.getProperty("user.home");
- }
+ String directoryPath = PropertiesUtils.getDiretoryByProperty(((GeneratorPesPjWizardProcess) getWizardDialog().getWizardProcess()).getProperties(), Constants.PROPERTIES_LAST_DIRECTORY_PJ, System.getProperty("user.home"));
JFileChooser chooseFileDialog = new JFileChooser(directoryPath);
chooseFileDialog.setDialogTitle("Sélectionez une PJ");
int response = chooseFileDialog.showDialog(this, "Sélectionner");
tableModel.add(new PJfile(pieceJustificative.getText(),GeneratePesUtils.generatePj(pieceJustificative.getText(),
((Pair) typePj.getSelectedItem()).key, nomPj.getText(),
idUnique.getText(), description.getText())));
- JOptionPane.showMessageDialog(getWizardDialog(), "La PJ a été ajoutée avec succès.\nLe formulaire de saisie a été réinitialisé.");
+ JOptionPane.showMessageDialog(getWizardDialog(), "La PJ a été ajoutée avec succès.\nLe formulaire de saisie va être réinitialisé.");
} finally {
setBusy(false);
resetChamps();
*/
package com.axyus.generator.pespj.ui;
-import com.axyus.generator.pespj.ui.renderer.TableModelReferenceComptable;
-import com.axyus.generator.pespj.ui.renderer.PjComboBoxRenderer;
-import com.axyus.generator.pespj.ui.renderer.PairComboBoxRenderer;
import com.axyus.generator.pespj.GeneratorPesPjWizardProcess;
+import com.axyus.generator.pespj.ui.renderer.PairComboBoxRenderer;
+import com.axyus.generator.pespj.ui.renderer.PjComboBoxRenderer;
+import com.axyus.generator.pespj.ui.renderer.TableModelReferenceComptable;
import com.axyus.generator.pespj.utils.ConfigHandler;
import com.axyus.generator.pespj.utils.ControlUtils;
import com.axyus.generator.pespj.utils.GeneratePesUtils;
import com.axyus.generator.pespj.utils.PJfile;
import com.axyus.generator.pespj.utils.Pair;
import com.axyus.swing.components.AbstractWizardPanel;
-import fr.gouv.minefi.cp.helios.pes_v2.rev0.aller.TPESPJ;
import fr.gouv.minefi.cp.helios.pes_v2.rev0.aller.TPESRefCompta;
import java.awt.event.ItemEvent;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import javax.swing.DefaultComboBoxModel;
+import javax.swing.JOptionPane;
import javax.swing.JTable;
-import javax.swing.JTextField;
/**
*
(Pair) type_piece.getSelectedItem(), num_piece.getText(),
num_ligne_piece.getText(), null);
((PJfile) pj_traitee_combobox.getSelectedItem()).getPj().getRefCompta().add(refCompta);
-
+ JOptionPane.showMessageDialog(getWizardDialog(), "La référence comptable a été ajoutée avec succès à la PJ ("
+ + ((PJfile) pj_traitee_combobox.getSelectedItem()).getPj().getNomPJ().getV()
+ + " - "
+ + ((PJfile) pj_traitee_combobox.getSelectedItem()).getPj().getIdUnique().getV()
+ + ").\nLe formulaire de saisie va être réinitialisé.");
refreshReferencesComptables();
} finally {
setBusy(false);
if(tableRefsComptas.getRowCount() > 0 && tableRefsComptas.getSelectedRow() >= 0){
TableModelReferenceComptable tabRef = (TableModelReferenceComptable) tableRefsComptas.getModel();
tabRef.remove(tableRefsComptas.getSelectedRow());
- List<TPESRefCompta> refsComptas = ((PJfile) pj_traitee_combobox.getSelectedItem()).getPj().getRefCompta();
- refsComptas.clear();
- refsComptas.addAll(((TableModelReferenceComptable) tableRefsComptas.getModel()).getRefs());
resetChamps();
}
}//GEN-LAST:event_deleteRefComptaActionPerformed
--- /dev/null
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.axyus.generator.pespj.utilities;
+
+import java.util.Properties;
+
+/**
+ *
+ * @author jp.tessier
+ */
+public abstract class PropertiesUtils {
+
+ /**
+ *
+ * @param props properties where find the value
+ * @param key property key
+ * @param defaultDir directory to return if null
+ * @return The value of the property or the default directory
+ */
+ public static String getDiretoryByProperty(Properties props, String key, String defaultDir) {
+ String directoryPath = props.getProperty(key);
+ if(directoryPath == null){
+ return defaultDir;
+ }
+ return directoryPath;
+ }
+
+}
<name>${artifactId}</name>
<url>http://axyus.com</url>
<properties>
- <applicationVersion>2.0.0</applicationVersion>
+ <applicationVersion>2.2.0</applicationVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<prerequisites>
xsi:noNamespaceSchemaLocation="../../defs/technical-component-definition.xsd">
<name>generator-pes-pj</name>
<description>Générateur de PES PJ</description>
- <release>5.2.1.0</release>
+ <release>5.2.2.0</release>
<url>http://xemelios.org/updatesV5/generator-pes-pj</url>
<type>COMPOSANT</type>
<destination>
<file>${xemelios.tools.directory}/generator-pes-pj.jar</file>
</deletes>
<release-notes>
+ <release v="5.2.2.0">
+ <note visibility="public">Le Finess Juridique n'est valorisé dans le flux que lorsqu'il est saisi</note>
+ <note visibility="public">L'encoding a été modifié en ISO-8859-1</note>
+ <note visibility="public">Messages d'avertissements ajoutés</note>
+ <note visibility="public">Corrections de quelques anomalies de comportement</note>
+ <note visibility="public">Sauvegarde des emplacements de sélection de PJ et de sauvegarde</note>
+ </release>
<release v="5.2.1.0">
<note visibility="public">Suppression de l'ancien Générateur PES PJ</note>
</release>