OpenConcerto

Dépôt officiel du code source de l'ERP OpenConcerto
sonarqube

svn://code.openconcerto.org/openconcerto

Compare Revisions

Regard whitespace Rev 143 → Rev 144

/trunk/OpenConcerto/src/org/openconcerto/erp/core/humanresources/employe/element/EtatCivilSQLElement.java
205,13 → 205,28
c.weightx = 0;
panelNaissance.add(labelPaysNaissance, c);
c.gridx++;
c.gridwidth = GridBagConstraints.REMAINDER;
c.gridwidth = 1;
c.weightx = 1;
c.weighty = 1;
panelNaissance.add(this.comboPays, c);
c.gridwidth = 1;
 
// Nationnalite
c.weightx = 0;
JLabel labelNationnalite = new JLabel(getLabelFor("NATIONNALITE"));
labelNationnalite.setHorizontalAlignment(SwingConstants.RIGHT);
c.gridy++;
c.gridx = 0;
panelNaissance.add(labelNationnalite, c);
c.gridx++;
c.gridwidth = 1;
c.weightx = 1;
JTextField fieldNation = new JTextField();
panelNaissance.add(fieldNation, c);
addView(fieldNation, "NATIONNALITE");
c.gridwidth = 1;
 
c.gridx = 0;
c.weighty = 0;
c.gridy = 1;
c.weightx = 0;
218,6 → 233,7
c.gridwidth = GridBagConstraints.REMAINDER;
c.anchor = GridBagConstraints.NORTHWEST;
this.add(panelNaissance, c);
 
c.anchor = GridBagConstraints.WEST;
c.gridwidth = 1;
 
236,11 → 252,22
labelNumeroSS.setHorizontalAlignment(SwingConstants.RIGHT);
panelSituation.add(labelNumeroSS, c);
c.gridx++;
c.gridwidth = GridBagConstraints.REMAINDER;
c.gridwidth = 1;
c.weightx = 1;
panelSituation.add(this.numeroSS, c);
 
c.weightx = 0;
c.gridwidth = 1;
c.gridx++;
panelSituation.add(new JLabel("CNPS", SwingConstants.RIGHT), c);
c.gridx++;
c.gridwidth = 1;
c.weightx = 1;
JTextField fieldCNPS = new JTextField();
panelSituation.add(fieldCNPS, c);
c.weightx = 0;
c.gridwidth = 1;
addView(fieldCNPS, "CNPS");
 
// Situation familiale
JLabel labelSitutationFamiliale = new JLabel(getLabelFor("ID_SITUATION_FAMILIALE"));
252,7 → 279,7
c.gridy++;
panelSituation.add(labelSitutationFamiliale, c);
c.gridx++;
c.gridwidth = GridBagConstraints.REMAINDER;
c.gridwidth = 1;
c.weightx = 1;
panelSituation.add(this.comboSituationFam, c);
c.gridwidth = 1;
287,10 → 314,173
c.gridy = 2;
c.anchor = GridBagConstraints.NORTHWEST;
c.gridwidth = GridBagConstraints.REMAINDER;
c.weighty = 1;
c.weighty = 0;
this.add(panelSituation, c);
 
/***********************************************************************************
* PIECE IDENTITE
**********************************************************************************/
JPanel panelIdentite = new JPanel();
panelIdentite.setOpaque(false);
panelIdentite.setBorder(BorderFactory.createTitledBorder("Pièce d'identité"));
panelIdentite.setLayout(new GridBagLayout());
// TYPE_PIECE_IDENTITE
c.gridy = 0;
c.gridx = 0;
c.gridwidth = 1;
JTextField fieldTypePiece = new JTextField();
JLabel typePieceLabel = new JLabel(getLabelFor("TYPE_PIECE_IDENTITE"));
typePieceLabel.setHorizontalAlignment(SwingConstants.RIGHT);
panelIdentite.add(typePieceLabel, c);
c.gridx++;
c.gridwidth = 1;
c.weightx = 1;
panelIdentite.add(fieldTypePiece, c);
addView(fieldTypePiece, "TYPE_PIECE_IDENTITE");
 
c.weightx = 0;
c.gridwidth = 1;
c.gridx++;
 
panelIdentite.add(new JLabel(getLabelFor("NUMERO_PIECE")), c);
c.gridx++;
c.gridwidth = 1;
c.weightx = 1;
JTextField fieldNumeroPiece = new JTextField();
panelIdentite.add(fieldNumeroPiece, c);
c.weightx = 0;
c.gridwidth = 1;
addView(fieldNumeroPiece, "NUMERO_PIECE");
 
// Date debut
JLabel labelDateDebut = new JLabel(getLabelFor("DATE_DEBUT_PIECE"));
labelDateDebut.setHorizontalAlignment(SwingConstants.RIGHT);
c.gridx = 0;
c.gridy++;
panelIdentite.add(labelDateDebut, c);
c.gridx++;
c.gridwidth = 1;
c.weightx = 1;
JDate fieldDateDebut = new JDate();
panelIdentite.add(fieldDateDebut, c);
addView(fieldDateDebut, "DATE_DEBUT_PIECE");
c.gridwidth = 1;
c.weightx = 0;
 
// Nombre d'enfants
JLabel labelDateFin = new JLabel(getLabelFor("DATE_FIN_PIECE"));
labelDateFin.setHorizontalAlignment(SwingConstants.RIGHT);
JDate fieldDateFin = new JDate();
c.gridx++;
panelIdentite.add(labelDateFin, c);
c.gridx++;
c.weightx = 1;
panelIdentite.add(fieldDateFin, c);
addView(fieldDateFin, "DATE_FIN_PIECE");
c.weightx = 0;
 
c.gridx = 0;
c.gridy = 3;
c.anchor = GridBagConstraints.NORTHWEST;
c.gridwidth = GridBagConstraints.REMAINDER;
c.weighty = 0;
this.add(panelIdentite, c);
 
/***********************************************************************************
* FAMILLE
**********************************************************************************/
JPanel panelFamille = new JPanel();
panelFamille.setOpaque(false);
panelFamille.setBorder(BorderFactory.createTitledBorder("Famille"));
panelFamille.setLayout(new GridBagLayout());
// TYPE_PIECE_IDENTITE
c.gridy = 0;
c.gridx = 0;
c.gridwidth = 1;
JTextField fieldPere = new JTextField();
JLabel pereLabel = new JLabel(getLabelFor("NOM_PERE"));
pereLabel.setHorizontalAlignment(SwingConstants.RIGHT);
panelFamille.add(pereLabel, c);
c.gridx++;
c.gridwidth = 1;
c.weightx = 1;
panelFamille.add(fieldPere, c);
addView(fieldPere, "NOM_PERE");
 
c.weightx = 0;
c.gridwidth = 1;
c.gridx++;
panelFamille.add(new JLabel(getLabelFor("NOM_MERE")), c);
c.gridx++;
c.gridwidth = 1;
c.weightx = 1;
JTextField fieldNomMere = new JTextField();
panelFamille.add(fieldNomMere, c);
c.weightx = 0;
c.gridwidth = 1;
addView(fieldNomMere, "NOM_MERE");
 
// Nom
JLabel labelConjointNom = new JLabel(getLabelFor("CONJOINT_NOM"));
labelConjointNom.setHorizontalAlignment(SwingConstants.RIGHT);
c.gridx = 0;
c.gridy++;
panelFamille.add(labelConjointNom, c);
c.gridx++;
c.gridwidth = 1;
c.weightx = 1;
JTextField fieldConjointNom = new JTextField();
panelFamille.add(fieldConjointNom, c);
addView(fieldConjointNom, "CONJOINT_NOM");
c.gridwidth = 1;
c.weightx = 0;
 
c.weightx = 0;
c.gridwidth = 1;
c.gridx++;
panelFamille.add(new JLabel(getLabelFor("CONJOINT_PROFESSION")), c);
c.gridx++;
c.gridwidth = 1;
c.weightx = 1;
JTextField fieldProfession = new JTextField();
panelFamille.add(fieldProfession, c);
c.weightx = 0;
c.gridwidth = 1;
addView(fieldProfession, "CONJOINT_PROFESSION");
 
// Nombre d'enfants
JLabel labelDateNaissanceConjoint = new JLabel(getLabelFor("CONJOINT_DATE_NAISSANCE"));
labelDateNaissanceConjoint.setHorizontalAlignment(SwingConstants.RIGHT);
JDate fieldDateNaissanceConjoint = new JDate();
c.gridx = 0;
c.gridy++;
panelFamille.add(labelDateNaissanceConjoint, c);
c.gridx++;
c.weightx = 1;
panelFamille.add(fieldDateNaissanceConjoint, c);
addView(fieldDateNaissanceConjoint, "CONJOINT_DATE_NAISSANCE");
c.weightx = 0;
 
c.weightx = 0;
c.gridwidth = 1;
c.gridx++;
panelFamille.add(new JLabel(getLabelFor("CONJOINT_LIEU_NAISSANCE")), c);
c.gridx++;
c.gridwidth = 1;
c.weightx = 1;
JTextField fieldLieuNaissanceConjoint = new JTextField();
panelFamille.add(fieldLieuNaissanceConjoint, c);
c.weightx = 0;
c.gridwidth = 1;
addView(fieldLieuNaissanceConjoint, "CONJOINT_LIEU_NAISSANCE");
 
c.gridx = 0;
c.gridy = 4;
c.anchor = GridBagConstraints.NORTHWEST;
c.gridwidth = GridBagConstraints.REMAINDER;
c.weighty = 1;
this.add(panelFamille, c);
 
this.addRequiredSQLObject(this.dateNaissance, "DATE_NAISSANCE");
this.addSQLObject(this.lieuNaissance, "COMMUNE_NAISSANCE");
this.addSQLObject(this.nbEnfants, "NB_ENFANTS");