WebSVN - OpenConcerto - Diff - Rev 156 and 174 - /trunk/OpenConcerto/src/org/openconcerto/sql/users/UserCommonSQLElement.java

 import org.openconcerto.sql.model.SQLSelect;
 import org.openconcerto.sql.model.SQLTable;
 import org.openconcerto.sql.model.Where;
 import org.openconcerto.sql.request.ComboSQLRequest;
 import org.openconcerto.sql.sqlobject.itemview.SimpleRowItemView;
+import org.openconcerto.sql.ui.IColorChooser;
 import org.openconcerto.sql.ui.Login;
 import org.openconcerto.sql.view.QuickAssignPanel;
 import org.openconcerto.sql.view.list.ITableModel;
 import org.openconcerto.sql.view.list.RowValuesTableModel;
 import org.openconcerto.sql.view.list.SQLTableElement;
             this.setLayout(layout);
             // Login
             c.gridx = 0;
             c.insets = new Insets(2, 2, 1, 2);
-            final JLabel labelLogin = new JLabel(getLabelFor("LOGIN"));
+            final JLabel labelLogin = new JLabel(getLabelFor("LOGIN"), SwingConstants.RIGHT);
-            labelLogin.setHorizontalAlignment(SwingConstants.RIGHT);
             this.add(labelLogin, c);
             final JTextField textLogin = new JTextField();
             c.gridx++;
             DefaultGridBagConstraints.lockMinimumSize(textLogin);
             c.weightx = 1;
             c.gridy++;
             c.gridwidth = 1;
             c.gridx = 0;
             c.weightx = 0;
             c.insets = new Insets(2, 2, 1, 2);
-            final JLabel labelPass = new JLabel(getLabelFor("PASSWORD"));
+            final JLabel labelPass = new JLabel(getLabelFor("PASSWORD"), SwingConstants.RIGHT);
-            labelPass.setHorizontalAlignment(SwingConstants.RIGHT);
             this.add(labelPass, c);
             this.passField = new JPasswordField(15);
             c.gridx++;
             c.weightx = 1;
             DefaultGridBagConstraints.lockMinimumSize(this.getPassField());
             this.add(this.getPassField(), c);
             // Confirmation password
             c.gridx++;
             c.weightx = 0;
-            final JLabel labelConfirmationPass = new JLabel(getLabelFor("PASSWORD_CONFIRM"));
+            final JLabel labelConfirmationPass = new JLabel(getLabelFor("PASSWORD_CONFIRM"), SwingConstants.RIGHT);
-            labelConfirmationPass.setHorizontalAlignment(SwingConstants.RIGHT);
             this.add(labelConfirmationPass, c);
             this.passFieldConfirm = new JPasswordField(15);
             c.gridx++;
             c.weightx = 1;
             DefaultGridBagConstraints.lockMinimumSize(this.getPassFieldConfirm());
             // Nom
             c.gridx = 0;
             c.gridy++;
             c.weightx = 0;
-            final JLabel labelNom = new JLabel(getLabelFor("NOM"));
+            final JLabel labelNom = new JLabel(getLabelFor("NOM"), SwingConstants.RIGHT);
-            labelNom.setHorizontalAlignment(SwingConstants.RIGHT);
             this.add(labelNom, c);
             final JTextField textNom = new JTextField();
             c.gridx++;
             c.weightx = 1;
             this.add(textNom, c);
             // Prenom
             c.gridx++;
             c.weightx = 0;
-            final JLabel labelPrenom = new JLabel(getLabelFor("PRENOM"));
+            final JLabel labelPrenom = new JLabel(getLabelFor("PRENOM"), SwingConstants.RIGHT);
-            labelPrenom.setHorizontalAlignment(SwingConstants.RIGHT);
             this.add(labelPrenom, c);
             final JTextField textPrenom = new JTextField();
             c.gridx++;
             c.weightx = 1;
             this.add(textPrenom, c);
             // Surnom
             c.gridx = 0;
             c.gridy++;
             c.weightx = 0;
-            final JLabel labelSurnom = new JLabel(getLabelFor("SURNOM"));
+            final JLabel labelSurnom = new JLabel(getLabelFor("SURNOM"), SwingConstants.RIGHT);
-            labelSurnom.setHorizontalAlignment(SwingConstants.RIGHT);
             this.add(labelSurnom, c);
             final JTextField textSurnom = new JTextField();
             c.gridx++;
             c.weightx = 1;
             this.add(textSurnom, c);
             c.gridwidth = 1;
             c.gridx = 0;
             c.weightx = 0;
             if (getTable().contains("MAIL")) {
-                final JLabel labelMail = new JLabel(getLabelFor("MAIL"));
+                final JLabel labelMail = new JLabel(getLabelFor("MAIL"), SwingConstants.RIGHT);
-                labelMail.setHorizontalAlignment(SwingConstants.RIGHT);
                 c.anchor = GridBagConstraints.NORTHWEST;
                 this.add(labelMail, c);
                 c.gridx++;
                 final JTextField textMail = new JTextField();
                 c.gridwidth = 1;
                 c.weightx = 1;
                 this.add(textMail, c);
                 this.addView(textMail, "MAIL");
+            }
             if (getTable().contains("OUT")) {
                 c.gridx++;
                 final JCheckBox boxOut = new JCheckBox(getLabelFor("OUT"));
                 c.gridwidth = 1;
                 c.weightx = 1;
                     this.add(boxDisabled, c);
                     this.addView(boxDisabled, "DISABLED");
+                }
+            }
             c.gridy++;
+            if (getTable().contains("COMPTE_NUMERO")) {
+                final JLabel labelMail = new JLabel(getLabelFor("COMPTE_NUMERO"));
+                labelMail.setHorizontalAlignment(SwingConstants.RIGHT);
+                c.anchor = GridBagConstraints.NORTHWEST;
+                this.add(labelMail, c);
+                c.gridx++;
+                final JTextField textMail = new JTextField();
+                c.gridwidth = 1;
+                c.weightx = 1;
+                c.gridy++;
+                this.add(textMail, c);
+                this.addView(textMail, "COMPTE_NUMERO");
+            }
             if (getTable().contains("TEL")) {
                 c.gridx = 0;
-                final JLabel labelTel = new JLabel(getLabelFor("TEL"));
+                final JLabel labelTel = new JLabel(getLabelFor("TEL"), SwingConstants.RIGHT);
                 c.gridwidth = 1;
                 c.weightx = 0;
                 this.add(labelTel, c);
                 final JTextField fieldTel = new JTextField(20);
                 c.gridx++;
                 c.weightx = 1;
                 c.gridwidth = GridBagConstraints.REMAINDER;
                 this.add(boxCalUser, c);
                 this.addView(boxCalUser, "CALENDAR_USER");
+            }
+            if (getTable().contains("COLOR")) {
+                c.gridy++;
+                c.gridx = 0;
+                final JLabel labelTel = new JLabel(getLabelFor("COLOR"), SwingConstants.RIGHT);
+                c.gridwidth = 1;
+                c.weightx = 0;
+                this.add(labelTel, c);
+                final IColorChooser colorChooser = new IColorChooser(getLabelFor("COLOR"));
+                c.gridx++;
+                c.weightx = 1;
+                c.fill = GridBagConstraints.HORIZONTAL;
+                this.add(colorChooser, c);
+                this.addView(colorChooser, "COLOR");
+            }
             final boolean gestionHoraire = false;
             if (Configuration.getInstance().getAppName().startsWith("OpenConcerto") && gestionHoraire) {
                 c.gridwidth = 1;

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

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/sql/users/UserCommonSQLElement.java - Rev 156 → 174