OpenConcerto

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

svn://code.openconcerto.org/openconcerto

Rev

Rev 174 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 174 Rev 180
Line 139... Line 139...
139 
                c.gridwidth = GridBagConstraints.REMAINDER;
 139 
                c.gridwidth = GridBagConstraints.REMAINDER;
140 
                c.weightx = 1;
 140 
                c.weightx = 1;
141 
                this.add(comboConvention, c);
 141 
                this.add(comboConvention, c);
142 
                c.gridwidth = 1;
 142 
                c.gridwidth = 1;
143 
 
 143 
 
- 
 
 144 
                // Contrat
- 
 
 145 
                c.fill = GridBagConstraints.BOTH;
- 
 
 146 
                JPanel panelContrat = new JPanel();
- 
 
 147 
                panelContrat.setOpaque(false);
- 
 
 148 
                panelContrat.setBorder(BorderFactory.createTitledBorder("Contrat de travail"));
- 
 
 149 
                panelContrat.setLayout(new GridBagLayout());
- 
 
 150 
                GridBagConstraints c2 = new DefaultGridBagConstraints();
- 
 
 151 
                c2.fill = GridBagConstraints.HORIZONTAL;
- 
 
 152 
                c2.weighty = 1;
- 
 
 153 
                c2.weightx = 1;
- 
 
 154 
                c2.anchor = GridBagConstraints.NORTH;
- 
 
 155 
                this.addView("ID_CONTRAT_SALARIE", REQ + ";" + DEC + ";" + SEP);
- 
 
 156 
                ElementSQLObject eltContrat = (ElementSQLObject) this.getView("ID_CONTRAT_SALARIE");
- 
 
 157 
                panelContrat.add(eltContrat, c2);
- 
 
 158 
 
- 
 
 159 
                c.gridx = 0;
- 
 
 160 
                c.gridy++;
- 
 
 161 
                c.gridheight = 1;
- 
 
 162 
                c.gridwidth = GridBagConstraints.REMAINDER;
- 
 
 163 
                c.weightx = 1;
- 
 
 164 
                this.add(panelContrat, c);
- 
 
 165 
                c.gridwidth = 1;
- 
 
 166 
                c.gridheight = 1;
- 
 
 167 
 
144 
                // Classement conventionnel
 168 
                // Classement conventionnel
145 
                c.fill = GridBagConstraints.BOTH;
 169 
                c.fill = GridBagConstraints.BOTH;
146 
                JPanel panelClassement = new JPanel();
 170 
                JPanel panelClassement = new JPanel();
147 
                panelClassement.setOpaque(false);
 171 
                panelClassement.setOpaque(false);
148 
                panelClassement.setBorder(BorderFactory.createTitledBorder("Classement conventionnel"));
 172 
                panelClassement.setBorder(BorderFactory.createTitledBorder("Classement conventionnel"));
Line 152... Line 176...
152 
                c.gridx = 0;
 176 
                c.gridx = 0;
153 
                c.gridy = 0;
 177 
                c.gridy = 0;
154 
                c.weightx = 1;
 178 
                c.weightx = 1;
155 
                panelClassement.add(eltClassement, c);
 179 
                panelClassement.add(eltClassement, c);
156 
 
 180 
 
157 
                c.gridy = 1;
 181 
                c.gridy = 2;
158 
                c.gridx = 0;
 182 
                c.gridx = 0;
159 
                c.gridwidth = 2;
 183 
                c.gridwidth = 2;
160 
                c.weightx = 0;
 184 
                c.weightx = 1;
161 
                this.add(panelClassement, c);
 185 
                this.add(panelClassement, c);
162 
 
 186 
 
163 
                // Classement conventionnel
 187 
                // Classement conventionnel
164 
                final SQLBase base = ((ComptaPropsConfiguration) Configuration.getInstance()).getSQLBaseSociete();
 188 
                final SQLBase base = ((ComptaPropsConfiguration) Configuration.getInstance()).getSQLBaseSociete();
165 
                if (base.getTable("COEFF_PRIME") != null) {
 189 
                if (base.getTable("COEFF_PRIME") != null) {
Line 172... Line 196...
172 
                    ElementSQLObject eltCoeff = (ElementSQLObject) this.getView("ID_COEFF_PRIME");
 196 
                    ElementSQLObject eltCoeff = (ElementSQLObject) this.getView("ID_COEFF_PRIME");
173 
                    c.gridx = 0;
 197 
                    c.gridx = 0;
174 
                    c.gridy = 0;
 198 
                    c.gridy = 0;
175 
                    c.weightx = 1;
 199 
                    c.weightx = 1;
176 
                    panelCoeff.add(eltCoeff, c);
 200 
                    panelCoeff.add(eltCoeff, c);
177 
                    c.gridy = 2;
 201 
                    c.gridy = 3;
178 
                    c.gridx = 0;
 202 
                    c.gridx = 0;
179 
                    c.gridwidth = 2;
 203 
                    c.gridwidth = 2;
180 
                    c.weightx = 0;
 204 
                    c.weightx = 0;
181 
                    this.add(panelCoeff, c);
 205 
                    this.add(panelCoeff, c);
182 
                    c.gridwidth = 1;
 206 
                    c.gridwidth = 1;
183 
                }
 207 
                }
184 
                // Contrat
 - 
 
185 
                c.fill = GridBagConstraints.BOTH;
 - 
 
186 
                JPanel panelContrat = new JPanel();
 - 
 
187 
                panelContrat.setOpaque(false);
 - 
 
188 
                panelContrat.setBorder(BorderFactory.createTitledBorder("Contrat de travail"));
 - 
 
189 
                panelContrat.setLayout(new GridBagLayout());
 - 
 
190 
                GridBagConstraints c2 = new DefaultGridBagConstraints();
 - 
 
191 
                c2.fill = GridBagConstraints.HORIZONTAL;
 - 
 
192 
                c2.weighty = 1;
 - 
 
193 
                c2.weightx = 1;
 - 
 
194 
                c2.anchor = GridBagConstraints.NORTH;
 - 
 
195 
                this.addView("ID_CONTRAT_SALARIE", REQ + ";" + DEC + ";" + SEP);
 - 
 
196 
                ElementSQLObject eltContrat = (ElementSQLObject) this.getView("ID_CONTRAT_SALARIE");
 - 
 
197 
                panelContrat.add(eltContrat, c2);
 - 
 
198 
 
 - 
 
199 
                c.gridx = 2;
 - 
 
200 
                c.gridy = 1;
 - 
 
201 
                c.gridheight = 4;
 - 
 
202 
                c.gridwidth = GridBagConstraints.REMAINDER;
 - 
 
203 
                c.weightx = 1;
 - 
 
204 
                this.add(panelContrat, c);
 - 
 
205 
                c.gridwidth = 1;
 - 
 
206 
                c.gridheight = 1;
 - 
 
207 
 
 208 
 
208 
                /***********************************************************************************
 209 
                /***********************************************************************************
209 
                 * DATE ENTREE / SORTIE
 210 
                 * DATE ENTREE / SORTIE
210 
                 **********************************************************************************/
 211 
                 **********************************************************************************/
211 
                JPanel panelEntreeSortie = new JPanel();
 212 
                JPanel panelEntreeSortie = new JPanel();
Line 246... Line 247...
246 
                 * = new JTextField(5, false);
 247 
                 * = new JTextField(5, false);
247 
                 *
248 
                 *
248 
                 * c.gridy++; c.gridx = 0; c.fill = GridBagConstraints.HORIZONTAL;
 249 
                 * c.gridy++; c.gridx = 0; c.fill = GridBagConstraints.HORIZONTAL;
249 
                 * panelEntreeSortie.add(labelAnc, c); c.gridx++; panelEntreeSortie.add(textAnc, c);
 250 
                 * panelEntreeSortie.add(labelAnc, c); c.gridx++; panelEntreeSortie.add(textAnc, c);
250 
                 */
 251 
                 */
251 
                c.gridx = 0;
 252 
                c.gridx = 2;
252 
                c.gridy = 3;
 253 
                c.gridy = 2;
253 
                c.gridwidth = 2;
 254 
                c.gridwidth = 2;
254 
                this.add(panelEntreeSortie, c);
 255 
                this.add(panelEntreeSortie, c);
255 
                c.gridwidth = 1;
 256 
                c.gridwidth = 1;
256 
 
 257 
 
257 
                JPanel panelPeni = new JPanel();
 258 
                JPanel panelPeni = new JPanel();
Line 305... Line 306...
305 
                // Salaire de base
 306 
                // Salaire de base
306 
                JLabel labelSalaireBase = new JLabel(getLabelFor("SALAIRE_MOIS"));
 307 
                JLabel labelSalaireBase = new JLabel(getLabelFor("SALAIRE_MOIS"));
307 
                labelSalaireBase.setHorizontalAlignment(SwingConstants.RIGHT);
 308 
                labelSalaireBase.setHorizontalAlignment(SwingConstants.RIGHT);
308 
                JTextField salaireBase = new JTextField();
 309 
                JTextField salaireBase = new JTextField();
309 
                c.gridx++;
 310 
                c.gridx++;
- 
 
 311 
 
310 
                c.weightx = 0;
 312 
                c.weightx = 0;
311 
                panelBase.add(labelSalaireBase, c);
 313 
                panelBase.add(labelSalaireBase, c);
312 
                c.gridx++;
 314 
                c.gridx++;
313 
                c.weightx = 1;
 315 
                c.weightx = 1;
314 
                panelBase.add(salaireBase, c);
 316 
                panelBase.add(salaireBase, c);