WebSVN - OpenConcerto - Diff - Rev 151 and 156 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/humanresources/payroll/element/FichePayeSQLElement.java

                 this.dernMois = 0;
                 this.dernAnnee = 0;
                 this.setLayout(new GridBagLayout());
-                final GridBagConstraints c = new DefaultGridBagConstraints();
-                // Tree elt Fiche de Paye On the left
-                c.fill = GridBagConstraints.BOTH;
-                c.weightx = 1;
-                c.weighty = 1;
-                c.gridheight = GridBagConstraints.REMAINDER;
                 final RubriquePayeTree tree = new RubriquePayeTree();
                 tree.expandRow(0);
+                JPanel panelLeft = new JPanel(new GridBagLayout());
+                GridBagConstraints cLeft = new DefaultGridBagConstraints();
+                cLeft.fill = GridBagConstraints.BOTH;
+                cLeft.weightx = 1;
+                cLeft.weighty = 1;
+                cLeft.gridheight = GridBagConstraints.REMAINDER;
+                panelLeft.add(tree, cLeft);
                 this.paneTreeLeft = new JScrollPane(tree);
                 // this.add(this.paneTreeLeft, c);
                 // Panel Fiche paye on the right
                 // Salarie
-                JPanel panelRight = new JPanel();
+                JPanel panelRight = new JPanel(new GridBagLayout());
-                panelRight.setLayout(new GridBagLayout());
+                final GridBagConstraints c = new DefaultGridBagConstraints();
+                // Tree elt Fiche de Paye On the left
                 c.fill = GridBagConstraints.HORIZONTAL;
                 c.weightx = 1;
                 c.weighty = 0;
                 c.gridheight = 1;
                 c.gridwidth = 2;
                 this.selSalCombo = new ElementComboBox();
                 // c.gridx++;
                 panelRight.add(this.selSalCombo, c);
                 // Mois
-                c.gridy++;
-                // c.gridx++;
-                c.fill = GridBagConstraints.HORIZONTAL;
-                c.weightx = 1;
-                c.weighty = 0;
-                c.gridheight = 1;
-                c.gridwidth = 3;
                 JLabel labelMois = new JLabel("Fiche de paye du mois de");
                 this.selMois = new ElementComboBox(true, 20);
                 JLabel labelDu = new JLabel("Du");
                 JLabel labelAu = new JLabel("Au");
                 this.dateDu = new JDate();
                 // JTextField textMois = new JTextField();
                 JLabel labelAnnee = new JLabel("Année");
                 this.textAnnee = new JTextField();
+                {
-                    this.pDate = new JPanel();
+                    this.pDate = new JPanel(new GridBagLayout());
+                    GridBagConstraints cDate = new DefaultGridBagConstraints();
+                    cDate.weightx = 0;
+                    cDate.gridx = GridBagConstraints.RELATIVE;
                     this.pDate.setOpaque(false);
-                    this.pDate.add(labelMois);
+                    this.pDate.add(labelMois, cDate);
+                    cDate.weightx = 1;
-                    this.pDate.add(this.selMois);
+                    this.pDate.add(this.selMois, cDate);
+                    cDate.weightx = 0;
-                    this.pDate.add(labelAnnee);
+                    this.pDate.add(labelAnnee, cDate);
+                    cDate.weightx = 1;
-                    this.pDate.add(this.textAnnee);
+                    this.pDate.add(this.textAnnee, cDate);
+                    cDate.weightx = 0;
-                    this.pDate.add(labelDu);
+                    this.pDate.add(labelDu, cDate);
+                    cDate.weightx = 0;
-                    this.pDate.add(this.dateDu);
+                    this.pDate.add(this.dateDu, cDate);
+                    cDate.weightx = 0;
-                    this.pDate.add(labelAu);
+                    this.pDate.add(labelAu, cDate);
+                    cDate.weightx = 0;
-                    this.pDate.add(this.dateAu);
+                    this.pDate.add(this.dateAu, cDate);
+                    c.gridy++;
+                    // c.gridx++;
+                    c.fill = GridBagConstraints.HORIZONTAL;
+                    c.weightx = 1;
+                    c.weighty = 0;
+                    c.gridheight = 1;
+                    c.gridwidth = 2;
                     panelRight.add(this.pDate, c);
+                }
-                c.gridx += 2;
+                // c.gridx += 2;
-                c.weightx = 1;
+                // c.weightx = 1;
-                c.gridwidth = 1;
+                // c.gridwidth = 1;
-                c.fill = GridBagConstraints.HORIZONTAL;
+                // c.fill = GridBagConstraints.HORIZONTAL;
-                panelRight.add(new JPanel(), c);
+                // panelRight.add(new JPanel(), c);
                 // Action Button
-                c.gridx++;
-                c.fill = GridBagConstraints.HORIZONTAL;
-                c.weightx = 0;
-                c.weighty = 0;
-                JPanel pButtons = new JPanel();
+                JPanel pButtons = new JPanel(new GridBagLayout());
                 pButtons.setOpaque(false);
                 JButton buttonUp = new JNiceButton(IListFrame.class.getResource("fleche_haut.png"));
                 JButton buttonDown = new JNiceButton(IListFrame.class.getResource("fleche_bas.png"));
                 JButton buttonRemove = new JNiceButton(SQLComponent.class.getResource("delete.png"));
+                {
+                    GridBagConstraints cButtons = new DefaultGridBagConstraints();
+                    cButtons.weightx = 0;
+                    cButtons.fill = GridBagConstraints.NONE;
+                    cButtons.gridx = GridBagConstraints.RELATIVE;
-                    pButtons.add(buttonUp);
+                    pButtons.add(buttonUp, cButtons);
-                    pButtons.add(buttonDown);
+                    pButtons.add(buttonDown, cButtons);
-                    pButtons.add(buttonRemove);
+                    pButtons.add(buttonRemove, cButtons);
+                }
+                c.gridx += 2;
+                c.fill = GridBagConstraints.NONE;
+                c.weightx = 0;
+                c.weighty = 0;
+                c.gridwidth = 1;
                 panelRight.add(pButtons, c);
                 // Table
                 c.fill = GridBagConstraints.BOTH;
                 c.weightx = 1;
                 c.weighty = 1;
-                c.gridx = 1;
+                c.gridx = 0;
                 c.gridy++;
                 c.gridwidth = GridBagConstraints.REMAINDER;
                 this.model = new FichePayeModel(1);
                 final JTable table = new JTable(this.model);
                 panelRight.add(new JScrollPane(table), c);
                 FichePayeRenderer rend = new FichePayeRenderer();
                 table.setDefaultRenderer(String.class, rend);
                 table.setDefaultRenderer(Float.class, rend);
                 // Import profil
-                c.gridx = 1;
+                c.gridx = 0;
                 c.gridy++;
                 c.weightx = 0;
                 c.weighty = 0;
                 c.gridwidth = 1;
                 c.fill = GridBagConstraints.HORIZONTAL;
-                JLabel labelProfil = new JLabel("Importer depuis un profil prédéfini");
+                JLabel labelProfil = new JLabel("Lié à un profil prédéfini");
                 panelRight.add(labelProfil, c);
                 c.gridwidth = 1;
                 this.comboSelProfil = new ElementComboBox();
                 // this.comboSelProfil = new ElementComboBox();
                 this.comboSelProfil.setListIconVisible(false);
                 c.gridx++;
                 c.gridwidth = 1;
+                c.weightx = 1;
                 // this.comboSelProfil.init(eltProfil.getTable().getField("NOM"), null);
                 panelRight.add(this.comboSelProfil, c);
                 JButton buttonImportProfil = new JButton("Importer");
                 c.gridx++;
+                c.weightx = 0;
                 panelRight.add(buttonImportProfil, c);
                 // Total Periode
-                JPanel panelTotal = new JPanel();
+                JPanel panelTotal = new JPanel(new GridBagLayout());
                 panelTotal.setBorder(BorderFactory.createTitledBorder("Total période"));
-                panelTotal.setLayout(new GridBagLayout());
                 GridBagConstraints cPanel = new DefaultGridBagConstraints();
                 JLabel labelInfosConges = new JLabel(getLabelFor("DETAILS_CONGES"));
                 panelTotal.add(labelInfosConges, cPanel);
                 ITextArea textConges = new ITextArea();
                 panelTotal.add(textCice, cPanel);
                 textCice.setEditable(false);
                 textCice.setEnabled(false);
                 this.addSQLObject(textCice, "CICE");
-                c.gridx = 1;
+                c.gridx = 0;
                 c.gridy++;
+                c.fill = GridBagConstraints.HORIZONTAL;
+                c.weightx = 1;
+                c.weighty = 0;
                 c.gridwidth = GridBagConstraints.REMAINDER;
                 panelRight.add(panelTotal, c);
                 // Cumuls
                 c.gridx++;
                 c.gridwidth = 1;
                 this.buttonGenCompta = new JButton("Generer la comptabilité");
                 // panelRight.add(buttonGenCompta, c);
+                GridBagConstraints cGlobal = new DefaultGridBagConstraints();
-                c.gridx = 0;
+                cGlobal.gridx = 0;
-                c.gridy = 0;
+                cGlobal.gridy = 0;
-                c.gridwidth = 1;
+                cGlobal.gridwidth = 1;
-                c.gridheight = 1;
+                cGlobal.gridheight = 1;
-                c.fill = GridBagConstraints.BOTH;
+                cGlobal.fill = GridBagConstraints.BOTH;
-                c.weightx = 1;
+                cGlobal.weightx = 1;
-                c.weighty = 1;
+                cGlobal.weighty = 1;
-                this.add(new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, this.paneTreeLeft, panelRight), c);
+                this.add(new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, this.paneTreeLeft, panelRight), cGlobal);
                 // Listeners
                 this.buttonGenCompta.addActionListener(new ActionListener() {
                     public void actionPerformed(ActionEvent e) {
                         try {
                         e.printStackTrace();
+                    }
                     // Calcul des congés
                     SQLRow rowCumulConge = rowSal.getForeignRow("ID_CUMULS_CONGES");
+                    SQLRow rowVarSalFiche = row.getForeignRow("ID_VARIABLE_SALARIE");
-                    SQLRow rowVarSal = row.getForeignRow("ID_VARIABLE_SALARIE");
+                    SQLRow rowVarSal = rowSal.getForeignRow("ID_VARIABLE_SALARIE");
                     float congeCumule = rowCumulConge.getFloat("ACQUIS");
                     float congeRestant = rowCumulConge.getFloat("RESTANT");
-                    float prisPeriode = rowVarSal.getFloat("CONGES_PRIS");
+                    float prisPeriode = rowVarSalFiche.getFloat("CONGES_PRIS");
                     congeRestant += prisPeriode;
                     congeCumule -= row.getFloat("CONGES_ACQUIS");
                     SQLRowValues rowValsCumulsConges = new SQLRowValues(rowCumulConge.getTable());
                         rowValsCumulsConges.update(rowCumulConge.getID());
                     } catch (SQLException e) {
                         e.printStackTrace();
+                    }
+                    // Annulation du cumul des variables
+                    final SQLRowValues rowVals = rowVarSal.asRowValues();
+                    for (final SQLField field : rowVarSalFiche.getTable().getContentFields()) {
+                        if (!field.getName().endsWith("_DEFAULT_VAL") && !field.getName().endsWith("_CUMUL_VAL")) {
+                            if (rowVarSalFiche.getTable().contains(field.getName() + "_CUMUL_VAL")) {
+                                final float valPeriode = rowVarSalFiche.getObject(field.getName()) == null ? 0.0F : rowVarSalFiche.getFloat(field.getName());
+                                final float valCumul = rowVarSal.getObject(field.getName() + "_CUMUL_VAL") == null ? 0.0F : rowVarSal.getFloat(field.getName() + "_CUMUL_VAL");
+                                rowVals.put(field.getName() + "_CUMUL_VAL", valCumul - valPeriode);
+                            }
+                        }
+                    }
+                    try {
+                        rowVals.update();
+                    } catch (SQLException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+    }
+            }
         });
         // Remise à 0 des variables sal
         final SQLRowValues rowVals = new SQLRowValues(tableVariableSal);
         for (final SQLField field : tableVariableSal.getContentFields()) {
-            if (!field.getName().endsWith("_DEFAULT_VAL")) {
+            if (!field.getName().endsWith("_DEFAULT_VAL") && !field.getName().endsWith("_CUMUL_VAL")) {
+                if (tableVariableSal.contains(field.getName() + "_CUMUL_VAL")) {
+                    final float valPeriode = rowVarSal.getObject(field.getName()) == null ? 0.0F : rowVarSal.getFloat(field.getName());
+                    final float valCumul = rowVarSal.getObject(field.getName() + "_CUMUL_VAL") == null ? 0.0F : rowVarSal.getFloat(field.getName() + "_CUMUL_VAL");
+                    rowVals.put(field.getName() + "_CUMUL_VAL", valCumul + valPeriode);
+                }
                 if (tableVariableSal.contains(field.getName() + "_DEFAULT_VAL")) {
                     rowVals.put(field.getName(), rowVarSal.getObject(field.getName() + "_DEFAULT_VAL"));
                 } else {
                     if (field.getType().getJavaType() == Integer.class) {
                         rowVals.put(field.getName(), 0);
                     } else {
                         rowVals.put(field.getName(), Float.valueOf(0));
+                    }
+                }
+            }
+        }
         rowVals.put("HEURE_TRAV", rowSalInfosPaye.getObject("DUREE_MOIS"));
         if (tableVariableSal.contains("NB_JOUR_MOIS")) {
         final SQLTable tableFiche = conf.getRootSociete().getTable("FICHE_PAYE");
         final SQLRow rowFiche = tableFiche.getRow(id);
         final SQLRow rowSal = rowFiche.getForeignRow("ID_SALARIE");
         final SQLRowValues rowValsFiche = new SQLRowValues(tableFiche);
-        for (final String fk : Arrays.asList("ID_VARIABLE_SALARIE", "ID_CUMULS_CONGES", "ID_CUMULS_PAYE", "ID_REGLEMENT_PAYE")) {
+        for (final String fk : Arrays.asList("ID_PAS", "ID_VARIABLE_SALARIE", "ID_CUMULS_CONGES", "ID_CUMULS_PAYE", "ID_REGLEMENT_PAYE")) {
             final SQLRow fRow = rowSal.getForeignRow(fk);
             final SQLRowValues copy = dir.getElement(fRow.getTable()).createCopy(fRow, null);
             // make sure the copy will be inserted by the update()
             assert copy.getIDNumber() == null;
             rowValsFiche.put(fk, copy);
         return ((anneeClot == 0) ? true : annee > anneeClot) || ((moisClot == 0 || moisClot == 13) ? true : mois > moisClot);
+    }
     @Override
     protected String createCode() {
-        return createCodeFromPackage() + ".payslip";
+        return createCodeOfPackage() + ".payslip";
+    }
+}

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/FichePayeSQLElement.java - Rev 151 → 156