private void generateInfosCollectivite(StringBuilder sb, PESAller pesAller) {
sb.append(" <h2>Informations collectivité</h2>");
- sb.append(" <ul>");
- sb.append("<li>Identifiant du poste : ").append(pesAller.getEnTetePES().getIdPost().getV()).append("</li>");
- sb.append("<li>Code collectivité : ").append(pesAller.getEnTetePES().getCodCol().getV()).append("</li>");
- sb.append("<li>Code budget : ").append(pesAller.getEnTetePES().getCodBud().getV()).append("</li>");
- sb.append("<li>Identifiant de la collectivité : ").append(pesAller.getEnTetePES().getIdColl().getV()).append("</li>");
- if(pesAller.getEnTetePES().getFinJur() != null && !pesAller.getEnTetePES().getFinJur().getV().isEmpty()) sb.append("<li>Finess juridique : ").append(pesAller.getEnTetePES().getFinJur().getV()).append("</li>");
- if(pesAller.getEnTetePES().getLibelleColBud() != null && !pesAller.getEnTetePES().getLibelleColBud().getV().isEmpty()) sb.append("<li>Libelle collectivité : ").append(pesAller.getEnTetePES().getLibelleColBud().getV()).append("</li>");
- sb.append(" </ul>");
+
+ sb.append("<br/>");
+ sb.append("Identifiant du poste : ").append(pesAller.getEnTetePES().getIdPost().getV());
+ sb.append("<br/>");
+ sb.append("Code collectivité : ").append(pesAller.getEnTetePES().getCodCol().getV());
+ sb.append("<br/>");
+ sb.append("Code budget : ").append(pesAller.getEnTetePES().getCodBud().getV());
+ sb.append("<br/>");
+ sb.append("Identifiant de la collectivité : ").append(pesAller.getEnTetePES().getIdColl().getV());
+ if(pesAller.getEnTetePES().getFinJur() != null && !pesAller.getEnTetePES().getFinJur().getV().isEmpty()) sb.append("<br/>").append("Finess juridique : ").append(pesAller.getEnTetePES().getFinJur().getV());
+ if(pesAller.getEnTetePES().getLibelleColBud() != null && !pesAller.getEnTetePES().getLibelleColBud().getV().isEmpty()) sb.append("<br/>").append("Libelle collectivité : ").append(pesAller.getEnTetePES().getLibelleColBud().getV());
}
private void generateInfosPJ(StringBuilder sb, PESAller pesAller) {
ConfigHandler config = getWizardProcess().getConfigHandler();
List<TPESPJs.PJ> pjs = pesAller.getPESPJ().getPJ();
+
+ // Informations sur les factures
TPESFacture facture = pesAller.getPESFacture();
if(facture != null){
- sb.append(" <h2>Informations sur les Factures</h2>");
- sb.append("La facture contient ").append(facture.getFactureIndiv().size()).append(" factures individuelles");
+ sb.append("<h2>Informations sur les Factures</h2>");
+ sb.append("<br/>");
+ sb.append("La facture contient ").append(facture.getFactureIndiv().size()).append(" factures individuelles").append("<br/><br/>");
}
+
+ // Informations sur les PJ
sb.append(" <h2>Informations sur les PJ</h2>");
- sb.append("<h3>").append(pjs.size()).append(" PJ générée");
+ sb.append("<br/>");
+ sb.append(pjs.size()).append(" PJ générée");
if(pjs.size() > 1){
sb.append("s");
}
- sb.append(" : </h3>");
+ sb.append(" :");
sb.append(" <ul>");
for(TPESPJ pj:pjs){
List<TPESRefCompta> refsComptas = pj.getRefCompta();
- sb.append(" <li>Nom de la PJ : ").append(pj.getNomPJ().getV()).append(" (").append(refsComptas.size()).append(" réf");
+ sb.append(" <li>").append(pj.getNomPJ().getV()).append(" (").append(refsComptas.size()).append(" réf");
if(refsComptas.size() > 1){
sb.append("s");
}
*/
package com.axyus.generator.pespj.ui;
-import com.axyus.generator.pespj.utilities.CursorWaiter;
import com.axyus.generator.pespj.utils.ControlUtils;
import com.axyus.swing.components.AbstractWizardPanel;
import fr.gouv.finances.dgfip.xemelios.tools.ToolServiceProviderFactory;
private void idCollFocusLost(java.awt.event.FocusEvent evt) {//GEN-FIRST:event_idCollFocusLost
if(ControlUtils.verifCleLuhn(idColl.getText(), true, false) && isInXemelios()){
- CursorWaiter.setBusy(this, true);
+ setBusy(true);
XemeliosToolServiceProvider serviceProvider = ToolServiceProviderFactory.newInstance().getServiceProvider();
final List<XemeliosToolServiceProvider.XemeliosCollectivite> collectivites = serviceProvider.getAllLibellesFromReferentielBySiret("ref-collec-spl",idColl.getText());
List<String> collectivitesString = new ArrayList<String>();
if(collectivites != null && !collectivites.isEmpty()){
libelleCollectiviteBudget.setModel(new DefaultComboBoxModel(collectivitesString.toArray()));
}
- CursorWaiter.setBusy(this, false);
+ setBusy(false);
}
}//GEN-LAST:event_idCollFocusLost
package com.axyus.generator.pespj.ui;
import com.axyus.generator.pespj.GeneratorPesPjWizardProcess;
-import com.axyus.generator.pespj.steps.ReferenceComptableStep;
-import com.axyus.generator.pespj.utilities.CursorWaiter;
import com.axyus.generator.pespj.utils.ConfigHandler;
import com.axyus.generator.pespj.utils.ControlUtils;
import com.axyus.generator.pespj.utils.DateUtils;
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.util.Date;
import javax.swing.DefaultComboBoxModel;
import javax.swing.JFileChooser;
+import javax.swing.JPanel;
import javax.swing.JTextArea;
import javax.swing.JTable;
import org.apache.commons.io.FilenameUtils;
}//GEN-LAST:event_edit_pj_buttonActionPerformed
private void browse_buttonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_browse_buttonActionPerformed
- CursorWaiter.setBusy(this, true);
+ setBusy(true);
JFileChooser chooseFileDialog = new JFileChooser(System.getProperty("user.home"));
chooseFileDialog.setDialogTitle("Sélectionez une PJ");
int response = chooseFileDialog.showDialog(this, "Sélectionner");
- CursorWaiter.setBusy(this, false);
+ setBusy(false);
if(response == JFileChooser.APPROVE_OPTION){
File selectedFile = chooseFileDialog.getSelectedFile();
if (selectedFile != null) {
if (canAddPj()) {
if (!isModeEdition()) {
try {
- CursorWaiter.setBusy(this, true);
+ setBusy(true);
TableModelPJ tableModel = ((TableModelPJ) tablePjs.getModel());
tableModel.add(new PJfile(pieceJustificative.getText(),GeneratePesUtils.generatePj(pieceJustificative.getText(),
((Pair) typePj.getSelectedItem()).key, nomPj.getText(),
idUnique.getText(), description.getText())));
} finally {
- CursorWaiter.setBusy(this, false);
+ setBusy(false);
resetChamps();
}
} else {
indexPjEdition=-1;
} finally {
- CursorWaiter.setBusy(this, false);
+ setBusy(false);
resetChamps();
}
}
public void setPesAller(PESAller pes) {
this.pesAller = pes;
}
+
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton add_pj;
private javax.swing.JButton browse_button;
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.utilities.CursorWaiter;
import com.axyus.generator.pespj.utils.ConfigHandler;
import com.axyus.generator.pespj.utils.ControlUtils;
import com.axyus.generator.pespj.utils.GeneratePesUtils;
if(canAddRefCompta()){
if (!isModeEdition()) {
try {
- CursorWaiter.setBusy(this, true);
-
+ setBusy(true);
TPESRefCompta refCompta = GeneratePesUtils.generateRefCompta((Pair) domaines.getSelectedItem(), exercice.getText(),
(Pair) type_piece.getSelectedItem(), num_piece.getText(),
num_ligne_piece.getText(), null);
refreshReferencesComptables();
} finally {
- CursorWaiter.setBusy(this, false);
+ setBusy(false);
resetChamps();
}
} else {
try {
- CursorWaiter.setBusy(this, true);
+ setBusy(true);
int selectedRow = tableRefsComptas.getSelectedRow();
TableModelReferenceComptable tableModel = ((TableModelReferenceComptable) tableRefsComptas.getModel());
refreshReferencesComptables();
} finally {
- CursorWaiter.setBusy(this, false);
+ setBusy(false);
resetChamps();
inModeEdition(false);
}
+++ /dev/null
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package com.axyus.generator.pespj.utilities;
-
-import java.awt.Cursor;
-import javax.swing.JPanel;
-
-/**
- *
- * @author jp.tessier
- */
-public class CursorWaiter {
-
- public static void setBusy(JPanel jpanel, boolean isBusy) {
- if (isBusy) {
- jpanel.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
- } else {
- jpanel.setCursor(Cursor.getDefaultCursor());
- }
- }
-
-}
package com.axyus.swing.components;
import com.axyus.swing.components.wizard.WizardDialog;
+import java.awt.Cursor;
import java.awt.event.ActionEvent;
import javax.swing.JPanel;
this.wizardDialog = wizardDialog;
}
-
+ public void setBusy(boolean isBusy) {
+ if (isBusy) {
+ this.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
+ } else {
+ this.setCursor(Cursor.getDefaultCursor());
+ }
+ }
}