CoWorker Nature

git-svn-id: https://svn.argeo.org/commons/trunk@2951 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UserEditorApplet.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UserEditorApplet.js
index 1960ff8dc65bd89b27e915db01660dbfc4bec9f2..772cf2e7fc18deb8ec57ce34581573a1c0d38225 100644 (file)
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UserEditorApplet.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UserEditorApplet.js
@@ -147,12 +147,19 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
                this.passGB.add(this.passPane.getContainer());
                
                this.naturesTab = new qx.ui.tabview.TabView("top");
-               this.simpleNature = new org.argeo.security.ria.components.SimpleUserNatureImpl();
                
+               this.simpleNature = new org.argeo.security.ria.components.SimpleUserNatureImpl();               
                var page1 = new qx.ui.tabview.Page(this.simpleNature.getNatureLabel());
                page1.setLayout(new qx.ui.layout.Dock());
                page1.add(this.simpleNature.getContainer(), {edge:"center"});
                this.naturesTab.add(page1);
+               
+               this.coWorkerNature = new org.argeo.security.ria.components.CoworkerNatureImpl();               
+               var page2 = new qx.ui.tabview.Page(this.coWorkerNature.getNatureLabel());
+               page2.setLayout(new qx.ui.layout.Dock());
+               page2.add(this.coWorkerNature.getContainer(), {edge:"center"});
+               this.naturesTab.add(page2);
+               
                this.naturesGB.add(this.naturesTab, {edge:"center"});
                                        
        },
@@ -170,6 +177,9 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
                this.simpleNature.addListener("modified", function(){
                        this.setModified(true);
                }, this);               
+               this.coWorkerNature.addListener("modified", function(){
+                       this.setModified(true);
+               }, this);               
        },
        
        _initializeGroupBox: function(groupBox){

diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UsersApplet.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UsersApplet.js
index a44d3bb06bcc1edf50c28d3464bc074e24cf6c6f..f5e13c121a2862d5dcfbf02f3cc96bdd325e0224 100644 (file)
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UsersApplet.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/UsersApplet.js
@@ -133,18 +133,18 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
                        this.getCommands()["edit_user"].command.execute();
                }, this);
                
-               this.setGuiMode("chooser");
+               this.setGuiMode("clear");
        },
        
        _applyGuiMode : function(newMode, oldMode){
                this.table.getSelectionModel().clearSelection();
                this.resetHiddenRows();
                if(newMode == "filter"){
-                       this.table.getSelectionModel().setSelectionMode(qx.ui.table.selection.Model.SINGLE_INTERVAL_SELECTION);
+                       this.table.getSelectionModel().setSelectionMode(qx.ui.table.selection.Model.SINGLE_SELECTION);
                }else if(newMode == "chooser"){
                        this.table.getSelectionModel().setSelectionMode(qx.ui.table.selection.Model.MULTIPLE_INTERVAL_SELECTION_TOGGLE);
                }else if(newMode == "clear"){
-                       this.table.getSelectionModel().setSelectionMode(qx.ui.table.selection.Model.SINGLE_INTERVAL_SELECTION);
+                       this.table.getSelectionModel().setSelectionMode(qx.ui.table.selection.Model.SINGLE_SELECTION);
                }
        },
        

diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/CoworkerNatureImpl.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/CoworkerNatureImpl.js
new file mode 100644 (file)
index 0000000..da11c72
--- /dev/null
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/CoworkerNatureImpl.js
@@ -0,0 +1,48 @@
+qx.Class.define("org.argeo.security.ria.components.CoworkerNatureImpl", {\r
+       extend : org.argeo.security.ria.components.SimpleUserNatureImpl,\r
+       properties : {\r
+               natureType : {\r
+                       refine : true,\r
+                       init : "Coworker"\r
+               }\r
+       },\r
+       \r
+       construct : function(){\r
+               this.base(arguments);           \r
+       },\r
+               \r
+       members : {\r
+               _createGui : function(){\r
+                       var grid = new qx.ui.layout.Grid(5,5);\r
+                       this.setLayout(grid);\r
+                       grid.setColumnFlex(0,1);\r
+                       grid.setColumnAlign(0,"right", "middle");\r
+                       grid.setColumnFlex(1,3);\r
+                                       \r
+                       this.descField = new qx.ui.form.TextField();\r
+                       this.mobileField = new qx.ui.form.TextField();\r
+                       this.phoneField = new qx.ui.form.TextField();\r
+                       \r
+                       var labels = ["Description", "Mobile Phone", "Home Phone"]; \r
+                       this.fields = {\r
+                               "description" : this.descField, \r
+                               "mobile": this.mobileField, \r
+                               "telephoneNumber" : this.phoneField\r
+                       };\r
+                       \r
+                       for(var i=0;i<labels.length;i++){\r
+                               this.add(new qx.ui.basic.Label(labels[i]), {row:i,column:0});\r
+                       }\r
+                       var j=0;\r
+                       for(var key in this.fields){                    \r
+                               this.fields[key].addListener("changeValue", function(e){this.fireEvent("modified");}, this);\r
+                               this.add(this.fields[key], {row:j,column:1});\r
+                               j++;\r
+                       }                       \r
+               },\r
+               \r
+               getNatureLabel : function(){\r
+                       return "Co-Worker";\r
+               }\r
+       }\r
+});
\ No newline at end of file

diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/SimpleUserNatureImpl.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/SimpleUserNatureImpl.js
index bb0900b3c2702b0f112cd44879e3b39c32204b3c..4b5e4c84b3f1687f8e71c1f92a401c3214f26782 100644 (file)
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/SimpleUserNatureImpl.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/SimpleUserNatureImpl.js
@@ -20,37 +20,40 @@ qx.Class.define("org.argeo.security.ria.components.SimpleUserNatureImpl", {
        },\r
        \r
        construct : function(){\r
-               this.base(arguments);           \r
-               var grid = new qx.ui.layout.Grid(5,5);\r
-               this.setLayout(grid);\r
-               grid.setColumnFlex(0,1);\r
-               grid.setColumnAlign(0,"right", "middle");\r
-               grid.setColumnFlex(1,3);\r
-                               \r
-               this.mailField = new qx.ui.form.TextField();\r
-               this.fNameField = new qx.ui.form.TextField();\r
-               this.nameField = new qx.ui.form.TextField();\r
-               \r
-               var labels = ["Email", "First Name", "Last Name"]; \r
-               this.fields = {\r
-                       "email" : this.mailField, \r
-                       "firstName": this.fNameField, \r
-                       "lastName" : this.nameField\r
-               };\r
-               \r
-               for(var i=0;i<labels.length;i++){\r
-                       this.add(new qx.ui.basic.Label(labels[i]), {row:i,column:0});\r
-               }\r
-               var j=0;\r
-               for(var key in this.fields){                    \r
-                       this.fields[key].addListener("changeValue", function(e){this.fireEvent("modified");}, this);\r
-                       this.add(this.fields[key], {row:j,column:1});\r
-                       j++;\r
-               }\r
-               \r
+               this.base(arguments);   \r
+               this._createGui();\r
        },\r
                \r
        members : {\r
+               \r
+               _createGui : function(){\r
+                       var grid = new qx.ui.layout.Grid(5,5);\r
+                       this.setLayout(grid);\r
+                       grid.setColumnFlex(0,1);\r
+                       grid.setColumnAlign(0,"right", "middle");\r
+                       grid.setColumnFlex(1,3);\r
+                                       \r
+                       this.mailField = new qx.ui.form.TextField();\r
+                       this.fNameField = new qx.ui.form.TextField();\r
+                       this.nameField = new qx.ui.form.TextField();\r
+                       \r
+                       var labels = ["Email", "First Name", "Last Name"]; \r
+                       this.fields = {\r
+                               "email" : this.mailField, \r
+                               "firstName": this.fNameField, \r
+                               "lastName" : this.nameField\r
+                       };\r
+                       \r
+                       for(var i=0;i<labels.length;i++){\r
+                               this.add(new qx.ui.basic.Label(labels[i]), {row:i,column:0});\r
+                       }\r
+                       var j=0;\r
+                       for(var key in this.fields){                    \r
+                               this.fields[key].addListener("changeValue", function(e){this.fireEvent("modified");}, this);\r
+                               this.add(this.fields[key], {row:j,column:1});\r
+                               j++;\r
+                       }                       \r
+               },\r
                getContainer  : function(){\r
                        return this;\r
                },\r