WebSVN - OpenConcerto - Diff - Rev 174 and 177 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/humanresources/payroll/element/ContratSalarieSQLElement.java

 import org.openconcerto.ui.DefaultGridBagConstraints;
 import org.openconcerto.ui.JDate;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
                 JTextField textNature = new JTextField();
                 this.add(labelNature, c);
                 c.gridx++;
                 c.weightx = 1;
+                c.gridwidth = 3;
                 this.add(textNature, c);
+                c.gridwidth = 1;
                 // Catégorie socioprofessionnelle
                 JLabel labelCatSocio = new JLabel(getLabelFor("ID_CODE_EMPLOI"));
                 labelCatSocio.setHorizontalAlignment(SwingConstants.RIGHT);
                 ElementComboBox selCodeCatSocio = new ElementComboBox();
                 selCodeCatSocio.setInfoIconVisible(false);
                 this.add(labelCatSocio, c);
                 c.gridx++;
                 c.weightx = 1;
                 this.add(selCodeCatSocio, c);
                 JLabel complPCSLabel = new JLabel(getLabelFor("COMPLEMENT_PCS"));
                 complPCSLabel.setHorizontalAlignment(SwingConstants.RIGHT);
                 JTextField complPCS = new JTextField();
-                c.gridy++;
+                c.gridx++;
-                c.gridx = 0;
                 c.weightx = 0;
                 this.add(complPCSLabel, c);
                 c.gridx++;
                 c.weightx = 1;
                 this.add(complPCS, c);
-                addView(complPCS,"COMPLEMENT_PCS");
+                addView(complPCS, "COMPLEMENT_PCS");
+                JLabel objetSpecLabel = new JLabel(getLabelFor("SPECTACLE_OBJET"));
+                objetSpecLabel.setHorizontalAlignment(SwingConstants.RIGHT);
+                JTextField objetSpec = new JTextField();
+                c.gridy++;
+                c.gridx = 0;
+                c.weightx = 0;
+                this.add(objetSpecLabel, c);
+                c.gridx++;
+                c.weightx = 1;
+                this.add(objetSpec, c);
+                addView(objetSpec, "SPECTACLE_OBJET");
+                objetSpec.setEditable(false);
+                JLabel jourContratLabel = new JLabel(getLabelFor("SPECTACLE_JOUR_CONTRAT"));
+                jourContratLabel.setHorizontalAlignment(SwingConstants.RIGHT);
+                JTextField jourContrat = new JTextField();
+                c.gridx++;
+                c.weightx = 0;
+                this.add(jourContratLabel, c);
+                c.gridx++;
+                c.weightx = 1;
+                this.add(jourContrat, c);
+                addView(jourContrat, "SPECTACLE_JOUR_CONTRAT");
+                jourContrat.setEditable(false);
+                final ElementComboBox selCaractActivite = new ElementComboBox();
+                selCaractActivite.setInfoIconVisible(false);
+                this.addRequiredSQLObject(selCaractActivite, "ID_CODE_CARACT_ACTIVITE");
+                selCaractActivite.addModelListener("wantedID", new PropertyChangeListener() {
+                    @Override
+                    public void propertyChange(PropertyChangeEvent evt) {
+                        final boolean b = selCaractActivite.getSelectedRow() != null && selCaractActivite.getSelectedRow().getString("CODE").equals("04");
+                        objetSpec.setEditable(b);
+                        jourContrat.setEditable(b);
+                        if (!b) {
+                            objetSpec.setText("");
+                            ;
+                            jourContrat.setText("");
+                        }
+                    }
+                });
                 // Contrat de travail
                 JLabel labelContratTravail = new JLabel(getLabelFor("ID_CODE_CONTRAT_TRAVAIL"));
                 labelContratTravail.setHorizontalAlignment(SwingConstants.RIGHT);
                 ElementComboBox selContratTravail = new ElementComboBox();
                 selContratTravail.setInfoIconVisible(false);
                 // Droit Contrat de travail
                 JLabel labelDroitContrat = new JLabel(getLabelFor("ID_CODE_DROIT_CONTRAT"));
                 labelDroitContrat.setHorizontalAlignment(SwingConstants.RIGHT);
                 ElementComboBox selDroitContrat = new ElementComboBox();
                 selDroitContrat.setInfoIconVisible(false);
-                c.gridy++;
+                c.gridx++;
-                c.gridx = 0;
                 c.weightx = 0;
                 this.add(labelDroitContrat, c);
                 c.gridx++;
                 c.weightx = 1;
                 this.add(selDroitContrat, c);
                 // caracteristiques activité
                 JLabel labelCaractActivite = new JLabel(getLabelFor("ID_CODE_CARACT_ACTIVITE"));
                 labelCaractActivite.setHorizontalAlignment(SwingConstants.RIGHT);
-                ElementComboBox selCaractActivite = new ElementComboBox();
-                selCaractActivite.setInfoIconVisible(false);
                 c.gridy++;
                 c.gridx = 0;
                 c.weightx = 0;
                 this.add(labelCaractActivite, c);
                 c.gridx++;
                 // Statut profesionnel
                 JLabel labelStatutProf = new JLabel(getLabelFor("ID_CODE_STATUT_PROF"));
                 labelStatutProf.setHorizontalAlignment(SwingConstants.RIGHT);
                 ElementComboBox selStatutProf = new ElementComboBox();
                 selStatutProf.setInfoIconVisible(false);
-                c.gridy++;
+                c.gridx++;
-                c.gridx = 0;
                 c.weightx = 0;
                 this.add(labelStatutProf, c);
                 c.gridx++;
                 c.weightx = 1;
                 this.add(selStatutProf, c);
                 c.gridy++;
                 c.gridx = 0;
                 c.weightx = 0;
                 this.add(labelStatutCat, c);
                 c.gridx++;
-                c.weighty = 1;
                 c.weightx = 1;
                 this.add(selStatutCat, c);
                 // Statut categoriel
                 JLabel labelStatutCatConv = new JLabel(getLabelFor("ID_CODE_STATUT_CAT_CONV"));
                 labelStatutCatConv.setHorizontalAlignment(SwingConstants.RIGHT);
                 ElementComboBox selStatutCatConv = new ElementComboBox();
                 selStatutCatConv.setInfoIconVisible(false);
-                c.gridy++;
+                c.gridx++;
-                c.gridx = 0;
                 c.weightx = 0;
                 this.add(labelStatutCatConv, c);
                 c.gridx++;
-                c.weighty = 1;
                 c.weightx = 1;
                 this.add(selStatutCatConv, c);
                 List<String> dsnFF = Arrays.asList("ID_CONTRAT_MODALITE_TEMPS", "ID_CONTRAT_REGIME_MALADIE", "ID_CONTRAT_REGIME_VIEILLESSE", "ID_CONTRAT_DETACHE_EXPATRIE",
-                        "ID_CONTRAT_DISPOSITIF_POLITIQUE");
+                        "ID_CONTRAT_DISPOSITIF_POLITIQUE", "ID_CONTRAT_MOTIF_RECOURS");
+                int p = 0;
                 for (String ffName : dsnFF) {
                     JLabel labelFF = new JLabel(getLabelFor(ffName));
                     labelFF.setHorizontalAlignment(SwingConstants.RIGHT);
                     ElementComboBox selFF = new ElementComboBox();
                     selFF.setInfoIconVisible(false);
+                    if (p % 2 == 0) {
-                    c.gridy++;
+                        c.gridy++;
-                    c.gridx = 0;
+                        c.gridx = 0;
-                    c.weightx = 0;
+                    } else {
-                    this.add(labelFF, c);
-                    c.gridx++;
+                        c.gridx++;
-                    c.weighty = 1;
-                    c.weightx = 1;
-                    this.add(selFF, c);
-                    this.addRequiredSQLObject(selFF, ffName);
+                    }
-                JLabel labelFF = new JLabel(getLabelFor("ID_CONTRAT_MOTIF_RECOURS"));
-                labelFF.setHorizontalAlignment(SwingConstants.RIGHT);
-                ElementComboBox selFF = new ElementComboBox();
-                selFF.setInfoIconVisible(false);
-                c.gridy++;
+                    p++;
-                c.gridx = 0;
-                c.weightx = 0;
+                    c.weightx = 0;
-                this.add(labelFF, c);
+                    this.add(labelFF, c);
-                c.gridx++;
+                    c.gridx++;
-                c.weighty = 1;
+                    c.weighty = 1;
-                c.weightx = 1;
+                    c.weightx = 1;
-                this.add(selFF, c);
+                    this.add(selFF, c);
-                this.addSQLObject(selFF, "ID_CONTRAT_MOTIF_RECOURS");
+                    if (ffName.equals("ID_CONTRAT_MOTIF_RECOURS")) {
+                        this.addSQLObject(selFF, ffName);
+                    } else {
+                        this.addRequiredSQLObject(selFF, ffName);
+                    }
+                }
                 // Code Arrco, agirc retirés du contrat et ajoutés dans les caisses de cotisations
                 // Code UGRR
                 // c.weighty = 1;
                 // c.weightx = 1;
                 // this.add(textCodeRegimeRetraite, c);
                 // addRequiredSQLObject(textCodeRegimeRetraite, "CODE_REGIME_RETRAITE_DSN");
-                JLabel labelDateModif = new JLabel(getLabelFor("DATE_MODIFICATION"));
+                // JLabel labelDateModif = new JLabel(getLabelFor("DATE_MODIFICATION"));
-                labelDateModif.setHorizontalAlignment(SwingConstants.RIGHT);
+                // labelDateModif.setHorizontalAlignment(SwingConstants.RIGHT);
-                JDate textDateModif = new JDate();
+                // JDate textDateModif = new JDate();
-                c.gridy++;
+                // c.gridy++;
-                c.gridx = 0;
+                // c.gridx = 0;
-                c.weightx = 0;
+                // c.weightx = 0;
-                this.add(textDateModif, c);
+                // this.add(textDateModif, c);
-                c.gridx++;
+                // c.gridx++;
-                c.weighty = 1;
+                // c.weighty = 1;
-                c.weightx = 1;
+                // c.weightx = 1;
-                this.add(textDateModif, c);
+                // this.add(textDateModif, c);
-                addSQLObject(textDateModif, "DATE_MODIFICATION");
+                // addSQLObject(textDateModif, "DATE_MODIFICATION");
                 // JLabel labelCM = new JLabel(getLabelFor("ID_INFOS_SALARIE_PAYE_MODIFIE"));
                 // labelCM.setHorizontalAlignment(SwingConstants.RIGHT);
                 // ElementComboBox selCM = new ElementComboBox();
                 // final SQLElement elementInfosPaye =
                 c.gridy++;
                 c.gridx = 0;
                 c.weightx = 0;
                 this.add(labelDateDebut, c);
                 c.gridx++;
-                c.weighty = 1;
                 c.weightx = 1;
                 this.add(textDateDebut, c);
                 addSQLObject(textDateDebut, "DATE_DEBUT", REQ);
                 JLabel labelDateFin = new JLabel(getLabelFor("DATE_PREV_FIN"));
                 labelDateFin.setHorizontalAlignment(SwingConstants.RIGHT);
                 JDate textDateFin = new JDate();
-                c.gridy++;
+                c.gridx++;
-                c.gridx = 0;
                 c.weightx = 0;
                 this.add(labelDateFin, c);
                 c.gridx++;
-                c.weighty = 1;
                 c.weightx = 1;
                 this.add(textDateFin, c);
                 addSQLObject(textDateFin, "DATE_PREV_FIN");
+                JLabel labelAmen = new JLabel(getLabelFor("ID_CODE_AMENAGEMENT_PARTIEL"));
+                labelAmen.setHorizontalAlignment(SwingConstants.RIGHT);
+                ElementComboBox selAmen = new ElementComboBox();
+                selAmen.setInfoIconVisible(false);
+                c.gridy++;
+                c.gridx = 0;
+                c.weightx = 0;
+                this.add(labelAmen, c);
+                c.gridx++;
+                c.weightx = 1;
+                this.add(selAmen, c);
+                this.addSQLObject(selAmen, "ID_CODE_AMENAGEMENT_PARTIEL");
+                JLabel labelSupsension = new JLabel(getLabelFor("ID_CODE_SUSPENSION"));
+                labelSupsension.setHorizontalAlignment(SwingConstants.RIGHT);
+                ElementComboBox selSupsension = new ElementComboBox();
+                selSupsension.setInfoIconVisible(false);
+                c.gridx++;
+                c.weightx = 0;
+                this.add(labelSupsension, c);
+                c.gridx++;
+                c.weightx = 1;
+                this.add(selSupsension, c);
+                this.addSQLObject(selSupsension, "ID_CODE_SUSPENSION");
+                JLabel labelDateDebutSusp = new JLabel(getLabelFor("DATE_DEBUT_SUSPENSION"));
+                labelDateDebutSusp.setHorizontalAlignment(SwingConstants.RIGHT);
+                JDate textDateDebutSups = new JDate();
+                c.gridy++;
+                c.gridx = 0;
+                c.weightx = 0;
+                this.add(labelDateDebutSusp, c);
+                c.gridx++;
+                c.weightx = 1;
+                this.add(textDateDebutSups, c);
+                this.addSQLObject(textDateDebutSups, "DATE_DEBUT_SUSPENSION");
+                JLabel labelDateFinSups = new JLabel(getLabelFor("DATE_FIN_SUSPENSION"));
+                labelDateFinSups.setHorizontalAlignment(SwingConstants.RIGHT);
+                JDate textDateFinSuspension = new JDate();
+                c.gridx++;
+                c.weightx = 0;
+                this.add(labelDateFinSups, c);
+                c.gridx++;
+                c.weightx = 1;
+                this.add(textDateFinSuspension, c);
+                this.addSQLObject(textDateFinSuspension, "DATE_FIN_SUSPENSION");
                 this.addRequiredSQLObject(selCodeCatSocio, "ID_CODE_EMPLOI");
                 this.addRequiredSQLObject(selContratTravail, "ID_CODE_CONTRAT_TRAVAIL");
-                this.addRequiredSQLObject(selCaractActivite, "ID_CODE_CARACT_ACTIVITE");
                 this.addRequiredSQLObject(selDroitContrat, "ID_CODE_DROIT_CONTRAT");
                 this.addRequiredSQLObject(selStatutProf, "ID_CODE_STATUT_PROF");
                 this.addRequiredSQLObject(selStatutCat, "ID_CODE_STATUT_CATEGORIEL");
                 this.addRequiredSQLObject(selStatutCatConv, "ID_CODE_STATUT_CAT_CONV");
                 this.addRequiredSQLObject(textNature, "NATURE");

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

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/core/humanresources/payroll/element/ContratSalarieSQLElement.java - Rev 174 → 177