From: Charles du Jeu <charles.dujeu@gmail.com>
Date: Thu, 17 Sep 2009 09:21:38 +0000 (+0000)
Subject: Resources, craete/save, modal windows, etc.
X-Git-Tag: argeo-commons-2.1.30~1803
X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=829163c2a8aa042407a6fd2ee45d10cea69e933f

Resources, craete/save, modal windows, etc.

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

diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/RolesApplet.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/RolesApplet.js
index 3803968a9..f2f488d31 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/RolesApplet.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/RolesApplet.js
@@ -28,9 +28,41 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
   	 */
   	commands : {
   		init : {
+  			"new_role" : {
+  				label	 	: "Create Role", 
+  				icon 		: "org.argeo.security.ria/list-add.png",
+  				shortcut 	: "Control+n",
+  				enabled  	: true,
+  				menu	   	: "Roles",
+  				toolbar  	: "role",
+  				callback	: function(e){
+  					// Prompt for new name
+  				},
+  				command 	: null
+  			},   	
+  			"delete_role" : {
+  				label	 	: "Delete Role", 
+  				icon 		: "org.argeo.security.ria/list-remove.png",
+  				shortcut 	: "Control+s",
+  				enabled  	: true,
+  				menu	   	: "Roles",
+  				toolbar  	: "role",
+  				callback	: function(e){
+  					// Call service to delete
+					var crtUsers = this.getViewSelection().getNodes();
+					for(var i=0;i<crtUsers.length;i++){
+						alert("Delete " + crtUsers[i]);
+					}
+  				},
+  				selectionChange : function(viewName, data){
+  					if(viewName != "role") return;
+  					this.setEnabled(!(data == null || !data.length));  					
+  				},
+  				command 	: null
+  			},  			  			
   			"edit_role" : {
   				label	 	: "Edit Role", 
-  				icon 		: "ria/window-close.png",
+  				icon 		: "org.argeo.security.ria/document-properties.png",
   				shortcut 	: "Control+r",
   				enabled  	: true,
   				menu	   	: "Roles",
@@ -96,7 +128,7 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
   		if(this.getView().headerLabel) this.getView().headerLabel.setMargin(8);
   		this.getView().header.add(buttonPane, {edge:"east"});
   	
-  		this.toggleButton = new qx.ui.form.ToggleButton("Filter", "ria/go-right.png");
+  		this.toggleButton = new qx.ui.form.ToggleButton("Filter", "org.argeo.security.ria/go-next.png");
   		this.toggleButton.set({
   			show:"icon",
   			margin:2,
@@ -109,29 +141,40 @@ qx.Class.define("org.argeo.security.ria.RolesApplet",
   			this.setGuiMode(event.getData()?"filter":"clear");
   		}, this);
 		
-		this.saveButton = new qx.ui.form.Button("Save");
+		this.saveButton = new qx.ui.form.Button("Save", "org.argeo.security.ria/document-save.png");
   		this.saveButton.set({
-  			show:"label",
+  			show:"icon",
   			margin:2,
   			toolTip :new qx.ui.tooltip.ToolTip("Save changes"),
   			visibility : "excluded"
   		});
   		buttonPane.add(this.saveButton);		
 		
-		this.cancelButton = new qx.ui.form.Button("Cancel");
+		this.cancelButton = new qx.ui.form.Button("Cancel", "org.argeo.security.ria/window-close.png");
   		this.cancelButton.set({
-  			show:"label",
+  			show:"icon",
   			margin:2,
   			toolTip :new qx.ui.tooltip.ToolTip("Cancel changes"),
   			visibility : "excluded"  			
   		});
   		buttonPane.add(this.cancelButton);		
 		
-  		var listener = function(){
+  		this.saveButton.addListener("execute", function(){
+  			alert("Saving changes...");
   			this.setGuiMode(this.initialState);
-  		};
-  		this.saveButton.addListener("execute", listener, this);
-  		this.cancelButton.addListener("execute", listener, this);
+  		}, this);
+  		this.cancelButton.addListener("execute", function(){
+  			if(!this.getChooserSelectionModified()){
+  				this.setGuiMode(this.initialState);
+  				return;
+  			}
+			var modal = new org.argeo.ria.components.Modal("Warning");
+			modal.addConfirm("There are unsaved changes!\n Are you sure you want to close?");
+			modal.addListener("ok", function(){
+				this.setGuiMode(this.initialState);
+			}, this);
+			modal.attachAndShow();  		
+  		}, this);
   		
 		this.table.addListener("cellDblclick", function(cellEvent){
 			this.setGuiMode("edit");
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 7f18caaed..395d170c0 100644
--- 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
@@ -3,7 +3,7 @@
  * The only associated command is the "Close" command.
  */
 /* *************************************************
-#asset(resource/org.argeo.ria.sample/window-close.png)
+#asset(resource/org.argeo.security.ria/*)
 ****************************************************/
 qx.Class.define("org.argeo.security.ria.UserEditorApplet",
 {
@@ -31,7 +31,7 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
   		init : {
   			"save_user" : {
   				label	 	: "Save", 
-  				icon 		: "ria/window-close.png",
+  				icon 		: "org.argeo.security.ria/document-save.png",
   				shortcut 	: "Control+s",
   				enabled  	: true,
   				menu	   	: "Users",
@@ -50,14 +50,24 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
   			},
   			"close" : {
   				label	 	: "Close", 
-  				icon 		: "org.argeo.ria.sample/window-close.png",
+  				icon 		: "org.argeo.security.ria/window-close.png",
   				shortcut 	: "Control+w",
   				enabled  	: true,
   				menu	   	: "Users",
   				toolbar  	: "user",
   				callback	: function(e){
   					// Call service to delete
-  					this.getView().closeCurrent();  					
+					var iApplet = org.argeo.ria.components.ViewsManager.getInstance().getViewPaneById("editor").getContent();
+					if(!iApplet.getModified()){
+						this.getView().closeCurrent();
+						return;
+					}
+  					var modal = new org.argeo.ria.components.Modal("Warning");
+  					modal.addConfirm("There are unsaved changes!\n Are you sure you want to close?");
+  					modal.addListener("ok", function(){
+  						this.getView().closeCurrent();
+  					}, this);
+  					modal.attachAndShow();
   				},
   				command 	: null
   			}  			  			
@@ -118,10 +128,6 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
   		
   		// FIELDS
   		this.usernameField = new qx.ui.form.TextField();
-  		this.usernameField.addListener("changeValue", function(){
-  			this.setModified(true);
-  			this.getViewSelection().triggerEvent();
-  		}, this);
   		this.basicGB.add(new qx.ui.basic.Label("Username"), {row:0,column:0});  		
   		this.basicGB.add(this.usernameField, {row:0,column:1});
   		
@@ -135,14 +141,30 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
   		
   		this.naturesTab = new qx.ui.tabview.TabView("top");
   		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.naturesGB.add(this.naturesTab, {edge:"center"});
-  		  		
+  		  	  		
   	},
   	  	
+  	_attachListeners : function(){
+  		this.usernameField.addListener("changeValue", function(){
+  			this.setModified(true);
+  		}, this);
+  		this.rolesField.addListener("changeValue", function(){
+  			this.setModified(true);
+  		}, this);
+  		this.passPane.addListener("modified", function(){
+  			this.setModified(true);
+  		}, this);
+  		this.simpleNature.addListener("modified", function(){
+  			this.setModified(true);
+  		}, this);  		
+  	},
+  	
   	_initializeGroupBox: function(groupBox){
   		groupBox.setPadding(0);
   		groupBox.getChildrenContainer().setPadding(8);  		
@@ -157,6 +179,7 @@ qx.Class.define("org.argeo.security.ria.UserEditorApplet",
 	  		this.usernameField.setValue(userData);
   		}
   		this.setRolesList(["ROLE_ADMIN", "ROLE_USER"]);
+  		this._attachListeners();
   	},
   	  	 
 	addScroll : function(){
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 4522746ac..5eb44f42e 100644
--- 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
@@ -3,7 +3,7 @@
  * The only associated command is the "Close" command.
  */
 /* *************************************************
-#asset(resource/org.argeo.ria.sample/window-close.png)
+#asset(resource/org.argeo.security.ria/*)
 ****************************************************/
 qx.Class.define("org.argeo.security.ria.UsersApplet",
 {
@@ -29,12 +29,12 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
   	commands : {
   		init : {
   			"new_user" : {
-  				label	 	: "Create User", 
-  				icon 		: "ria/window-close.png",
+  				label	 	: "New User", 
+  				icon 		: "org.argeo.security.ria/list-add.png",
   				shortcut 	: "Control+n",
   				enabled  	: true,
   				menu	   	: "Users",
-  				toolbar  	: "user",
+  				toolbar  	: "userslist",
   				callback	: function(e){
   					// Call service to delete
   					var classObj = org.argeo.security.ria.UserEditorApplet;
@@ -42,47 +42,47 @@ qx.Class.define("org.argeo.security.ria.UsersApplet",
 					iView.load();
   				},
   				command 	: null
-  			},   			
-  			"edit_user" : {
-  				label	 	: "Edit User", 
-  				icon 		: "ria/window-close.png",
-  				shortcut 	: "Control+u",
+  			},   	
+  			"delete_user" : {
+  				label	 	: "Delete User", 
+  				icon 		: "org.argeo.security.ria/list-remove.png",
+  				shortcut 	: "Control+s",
   				enabled  	: true,
   				menu	   	: "Users",
-  				toolbar  	: "user",
+  				toolbar  	: "userslist",
   				callback	: function(e){
   					// Call service to delete
-					var crtUser = this.getViewSelection().getNodes()[0];
-  					var classObj = org.argeo.security.ria.UserEditorApplet;
-					var iView = org.argeo.ria.components.ViewsManager.getInstance().initIViewClass(classObj, "editor", crtUser);
-					iView.load(crtUser);					
+					var crtUsers = this.getViewSelection().getNodes();
+					for(var i=0;i<crtUsers.length;i++){
+						alert("Delete " + crtUsers[i]);
+					}
   				},
   				selectionChange : function(viewName, data){
   					if(viewName != "users") return;
-  					this.setEnabled(!(data == null || !data.length || data.length > 1));  					
+  					this.setEnabled(!(data == null || !data.length));  					
   				},
   				command 	: null
-  			},			
-  			"delete_user" : {
-  				label	 	: "Delete User", 
-  				icon 		: "ria/window-close.png",
-  				shortcut 	: "Control+s",
+  			},  			
+  			"edit_user" : {
+  				label	 	: "Edit User", 
+  				icon 		: "org.argeo.security.ria/document-properties.png",
+  				shortcut 	: "Control+u",
   				enabled  	: true,
   				menu	   	: "Users",
-  				toolbar  	: "user",
+  				toolbar  	: "userslist",
   				callback	: function(e){
   					// Call service to delete
-					var crtUsers = this.getViewSelection().getNodes();
-					for(var i=0;i<crtUsers.length;i++){
-						alert("Delete " + crtUsers[i]);
-					}
+					var crtUser = this.getViewSelection().getNodes()[0];
+  					var classObj = org.argeo.security.ria.UserEditorApplet;
+					var iView = org.argeo.ria.components.ViewsManager.getInstance().initIViewClass(classObj, "editor", crtUser);
+					iView.load(crtUser);					
   				},
   				selectionChange : function(viewName, data){
   					if(viewName != "users") return;
-  					this.setEnabled(!(data == null || !data.length));  					
+  					this.setEnabled(!(data == null || !data.length || data.length > 1));  					
   				},
   				command 	: null
-  			}			
+  			}
   		}
   	},
   	
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/INaturePane.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/INaturePane.js
index 84c612a2f..038a26d1a 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/INaturePane.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/INaturePane.js
@@ -1,5 +1,9 @@
 qx.Interface.define("org.argeo.security.ria.components.INaturePane", {
 	extend  : org.argeo.security.ria.components.IUserDataPane,
+	properties : {
+		natureUuid : {},
+		natureType : {}
+	},
 	members : {
 		getNatureLabel : function(){return true},
 		setData : function(dataMap, format){return true;}
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/IUserDataPane.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/IUserDataPane.js
index ca801520b..c3530b650 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/IUserDataPane.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/IUserDataPane.js
@@ -4,8 +4,10 @@ qx.Interface.define("org.argeo.security.ria.components.IUserDataPane", {
 		getData    : function(format){return true;},
 		validate : function(){return true;}
 	},
+	properties : {
+		valid : {}
+	},
 	events : {
-		"modified" : "qx.event.type.Event"
-			
+		"modified" : "qx.event.type.Event"			
 	}
 });
\ 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/PasswordCredentialImpl.js b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/PasswordCredentialImpl.js
index 66e38eacf..610e56d12 100644
--- a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/PasswordCredentialImpl.js
+++ b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/class/org/argeo/security/ria/components/PasswordCredentialImpl.js
@@ -4,14 +4,24 @@ qx.Class.define("org.argeo.security.ria.components.PasswordCredentialImpl", {
 	events : {
 		"modified" : "qx.event.type.Event"		
 	},
+	properties : {
+		valid : {
+			init : false
+		}
+	},
 	
 	construct : function(){
 		this.base(arguments);
 		this.setLayout(new qx.ui.layout.HBox(5, "center"));
 		this.add(new qx.ui.basic.Label("Password"), {flex:1});
-		this.add(new qx.ui.form.TextField(), {flex:2});
+		this.pass1 = new qx.ui.form.PasswordField();
+		this.add(this.pass1, {flex:2});
 		this.add(new qx.ui.basic.Label("Confirm Password"), {flex:1});
-		this.add(new qx.ui.form.TextField(), {flex:2});
+		this.pass2 = new qx.ui.form.PasswordField();
+		this.add(this.pass2, {flex:2});
+		this.pass1.addListener("changeValue", function(){this.fireEvent("modified");}, this);
+		this.pass2.addListener("changeValue", function(){this.fireEvent("modified");}, this);
+		this.pass2.addListener("changeValue", this.validate, this);
 	},
 	
 	members : {
@@ -19,7 +29,17 @@ qx.Class.define("org.argeo.security.ria.components.PasswordCredentialImpl", {
 			return this;
 		},
 		getData    : function(format){return true;},
-		validate : function(){return true;},
+		validate : function(){
+			if(this.pass1.getValue() == this.pass2.getValue()){
+				this.setValid(true);
+			}else{
+				// TODO WHEN TESTING 0.8.3
+				//this.pass1.setValid(false);
+				//this.pass2.setValid(false); 
+				this.setValid(false);
+			}
+			return this.getValid();
+		},
 		setEditMode : function(editMode){return true;}		
 	}
 });
\ 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 c76ec1ad2..bb0900b3c 100644
--- 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
@@ -4,10 +4,50 @@ qx.Class.define("org.argeo.security.ria.components.SimpleUserNatureImpl", {
 	events : {
 		"modified" : "qx.event.type.Event"		
 	},
+	properties : {
+		valid : {
+			init : false
+		},
+		natureUuid : {
+			init : ""
+		},
+		natureType : {
+			init : "SimpleUser"
+		},
+		dataMap : {
+			
+		}
+	},
 	
 	construct : function(){
-		this.base(arguments);
-		this.setLayout(new qx.ui.layout.Grid());
+		this.base(arguments);		
+  		var grid = new qx.ui.layout.Grid(5,5);
+  		this.setLayout(grid);
+  		grid.setColumnFlex(0,1);
+  		grid.setColumnAlign(0,"right", "middle");
+  		grid.setColumnFlex(1,3);
+		  		
+  		this.mailField = new qx.ui.form.TextField();
+  		this.fNameField = new qx.ui.form.TextField();
+  		this.nameField = new qx.ui.form.TextField();
+  		
+  		var labels = ["Email", "First Name", "Last Name"]; 
+  		this.fields = {
+  			"email" : this.mailField, 
+  			"firstName": this.fNameField, 
+  			"lastName" : this.nameField
+  		};
+  		
+  		for(var i=0;i<labels.length;i++){
+  			this.add(new qx.ui.basic.Label(labels[i]), {row:i,column:0});
+  		}
+  		var j=0;
+  		for(var key in this.fields){  			
+  			this.fields[key].addListener("changeValue", function(e){this.fireEvent("modified");}, this);
+  			this.add(this.fields[key], {row:j,column:1});
+  			j++;
+  		}
+  		
 	},
 		
 	members : {
@@ -15,10 +55,28 @@ qx.Class.define("org.argeo.security.ria.components.SimpleUserNatureImpl", {
 			return this;
 		},
 		getNatureLabel : function(){
-			return "Basic User";
+			return "Simple User";
+		},
+		setData    : function(dataMap, format){
+			this.setNatureUuid(dataMap["uuid"]);
+			this.setNatureType(dataMap["type"]);
+			for(var key in this.fields){
+				if(dataMap[key]){
+					this.fields[key].setValue(dataMap[key]);
+				}
+			}
+			this.setDataMap(dataMap);
+		},
+		getData    : function(format){
+			var dataMap = this.getDataMap();
+			for(var key in dataMap){
+				if(this.fields[key]){
+					dataMap[key] = this.fields[key].getValue();
+				}
+			}
+			this.setDataMap(dataMap);
+			return dataMap;
 		},
-		setData    : function(dataMap, format){return true;},
-		getData    : function(format){return true;},
 		validate : function(){return true;}
 	}
 });
\ No newline at end of file
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/document-properties.png b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/document-properties.png
new file mode 100644
index 000000000..f30992428
Binary files /dev/null and b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/document-properties.png differ
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/document-save.png b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/document-save.png
new file mode 100644
index 000000000..09f2d75d0
Binary files /dev/null and b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/document-save.png differ
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/go-next.png b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/go-next.png
new file mode 100644
index 000000000..9065e553b
Binary files /dev/null and b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/go-next.png differ
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/list-add.png b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/list-add.png
new file mode 100644
index 000000000..0478b7d5c
Binary files /dev/null and b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/list-add.png differ
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/list-remove.png b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/list-remove.png
new file mode 100644
index 000000000..bebd233e8
Binary files /dev/null and b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/list-remove.png differ
diff --git a/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/window-close.png b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/window-close.png
new file mode 100644
index 000000000..d4f48146e
Binary files /dev/null and b/security/runtime/org.argeo.security.ria/src/argeo-ria-lib/security/resource/org.argeo.security.ria/window-close.png differ