Merge branch 'master' into upload_cdf_upgrade

Elena.Budnik
2 parents 905a78e2 dc5a7f83
Showing 5 changed files with 242 additions and 221 deletions Show diff stats
generic_data/jobs.json
js/app/models/AmdaNode.js
js/app/views/ExplorerUI.js
js/resources/css/amda.css
update_amda/makeTree.php
 {"nodes": [
- {"nodeType" : "bkgWorks", "text" : "Finished Jobs / Results", "id" : "result-treeRootNode", "children" :  
+ {"nodeType" : "bkgWorks", "text" : "Finished Jobs / Results", "id" : "result-treeBase", "children" :  
      [{"nodeType" : "bkgWorks","text" : "Plot","id" : "resPlot-treeRootNode" }, 
       {"nodeType" : "bkgWorks","text" : "Download","id" : "resDown-treeRootNode"},
       {"nodeType" : "bkgWorks","text" : "Data Mining","id" : "resSearch-treeRootNode"}, 
       {"nodeType" : "bkgWorks","text" : "Statistics","id" : "resStatistics-treeRootNode"}
 ]
   }, 
-  {"nodeType" : "bkgWorks", "text" : "Jobs in Progress", "id" : "bkgjobs-treeRootNode", "children" :  
+  {"nodeType" : "bkgWorks", "text" : "Jobs in Progress", "id" : "bkgjobs-treeBase", "children" :  
      [{"nodeType" : "bkgWorks","text" : "Plot","id" : "bkgPlot-treeRootNode" }, 
       {"nodeType" : "bkgWorks","text" : "Download","id" : "bkgDown-treeRootNode"},
       {"nodeType" : "bkgWorks","text" : "Data Mining","id" : "bkgSearch-treeRootNode"},
@@ -5,193 +5,197 @@
  * @extends Ext.data.Model
  * @brief   Generic Model of Node for AMDA project
  * @author  CDA
- * @version $Id: AmdaNode.js 2544 2014-10-03 10:21:56Z elena $
- * @todo
- *******************************************************************************
- *    FT Id     :   Date   : Name - Description
- *******************************************************************************
- *  :           :08/06/2011: CDA - Migration extjs4
  */
 Ext.define('amdaModel.AmdaNode', {
-    extend: 'Ext.data.TreeModel',
-
-    requires: ['amdaReader.ExplorerReader'],
-
-    fields: [
-        {name: 'leaf', type: 'boolean'},
-        {name: 'nodeType',type:'string'},
-        {name: 'id', type: 'string'},
-        {name:'text',type: 'string'},
-	{name:'info',type: 'string'},
-	{name: 'help', type: 'string', defaultValue: ''},
-	{name:'rootNode',  persist: false},
-	{name: 'ownerTreeId', persist: false},
-	{name: 'ownerTree',  persist: false},
-	{name: 'checked', defaultValue: null, persist: false}
-    ],
-
-    statics : {
-        NEW_DIR_NAME : 'new Folder',
-        MULTI_PREFIX : 'mult'
-    },
-
-    /**
-     * @cfg proxy used to load nodes
-     */
-    proxy: {
-        type: 'direct',
-      //  directFn: AmdaAction.getTree,
-	api :
-	{
-	  read: AmdaAction.getTree,
-	  update: AmdaAction.saveTree,
-	  create: AmdaAction.saveTree,
-	  destroy: AmdaAction.doNothing
+	extend: 'Ext.data.TreeModel',
+
+	requires: ['amdaReader.ExplorerReader'],
+
+	fields: [
+		{name: 'leaf', type: 'boolean'},
+		{name: 'nodeType',type:'string'},
+		{name: 'id', type: 'string'},
+		{name:'text',type: 'string'},
+		{name:'info',type: 'string'},
+		{name: 'help', type: 'string', defaultValue: ''},
+		{name:'rootNode',  persist: false},
+		{name: 'ownerTreeId', persist: false},
+		{name: 'ownerTree',  persist: false},
+		{name: 'checked', defaultValue: null, persist: false}
+	],
+
+	statics : {
+		NEW_DIR_NAME : 'new Folder',
+		MULTI_PREFIX : 'mult'
 	},
-        paramsAsHash : true,
-        reader: {
-            type: 'explorer'
-        }
-    },
-
-    /**
-     * Abstract getter of complete array of item context menu
-     * @return {Ext.Array} the complete array of item context menu
-     */
-    getAllContextMenuItems: Ext.emptyFn,
-
-    /**
-     * Abstract method call on click on item of context menu
-     */
-    onMenuItemClick: Ext.emptyFn,
-
-    /**
-     * Abstract Update Data method
-     */
-    update : Ext.emptyFn,
-
-    /**
-     * Abstract Rename Data method
-     */
-    rename : Ext.emptyFn,
-
-    /**
-     * Abstract Rename  D&D Data method
-     */
-    renameDD : Ext.emptyFn,
-
-    /**
-     * Abstract Create Data method
-     */
-    create : Ext.emptyFn,
-
-    /**
-     * filtering method of context menu
-     * @param {String} itemKind the kind of right clicked node
-     * @return {Ext.Array} the Array of filtered item menu
-     */
-    getFilteredContextMenu : function(itemKind) {
-        var menuitems = this.getAllContextMenuItems();
-        if (menuitems && menuitems.length){
-            for ( var i = 0; i < menuitems.length; i++) {
-                var currentItem = menuitems[i];
-                var myItemKind = Ext.util.Format.substr(currentItem.fnId, 0, 4);
-                if (myItemKind === itemKind) {
-                    currentItem.hidden = false;
-                }
-                else {
-                    currentItem.hidden = true;
-                }
-            }
-            return menuitems;
-        } else {
-            return null;
-        }
-    },
-
-    getMultiContextMenu : function(){
-        var menuitems = this.getMultiContextMenuItems();
-        if (menuitems && menuitems.length){
-            return menuitems;
-        } else {
-            return null;
-        }
-    },
-
-    /**
-     * get the kind of this node
-     * @returns itemKind string
-     */
-    getNodeKind : function() {
-	    var itemKind;
-	   // if id of this node have root subcategory suffix
-	    if (this.id && Ext.util.Format.substr(this.id, -(amdaUI.ExplorerUI.ROOT_SUFFIX.length), this.id.length) === amdaUI.ExplorerUI.ROOT_SUFFIX ) {
-	        itemKind = amdaUI.ExplorerUI.ITEM_KIND_ROOT;
-	    }
-	    // if this node is a leaf and have no child
-	    else if (this.isLeaf()) {
-	        itemKind = amdaUI.ExplorerUI.ITEM_KIND_LEAF;
-	    }
-	    else if (this.get('isParameter')) {
-                itemKind = amdaUI.ExplorerUI.ITEM_KIND_PARA;
-            }
-        else if (this.get('rank')) {
-                itemKind = amdaUI.ExplorerUI.ITEM_KIND_MISS;
-            }
-	    // other case
-	    else {
-	        itemKind = amdaUI.ExplorerUI.ITEM_KIND_DIRE;
-	    }
-	    return itemKind;
+
+	/**
+	* @cfg proxy used to load nodes
+	*/
+	proxy: {
+		type: 'direct',
+		api :
+		{
+			read: AmdaAction.getTree,
+			update: AmdaAction.saveTree,
+			create: AmdaAction.saveTree,
+			destroy: AmdaAction.doNothing
+		},
+		paramsAsHash : true,
+		reader: {
+			type: 'explorer'
+		}
+	},
+
+	/**
+	* Abstract getter of complete array of item context menu
+	* @return {Ext.Array} the complete array of item context menu
+	*/
+	getAllContextMenuItems: Ext.emptyFn,
+
+	/**
+	* Abstract method call on click on item of context menu
+	*/
+	onMenuItemClick: Ext.emptyFn,
+
+	/**
+	* Abstract Update Data method
+	*/
+	update : Ext.emptyFn,
+
+	/**
+	* Abstract Rename Data method
+	*/
+	rename : Ext.emptyFn,
+
+	/**
+	* Abstract Rename  D&D Data method
+	*/
+	renameDD : Ext.emptyFn,
+
+	/**
+	* Abstract Create Data method
+	*/
+	create : Ext.emptyFn,
+
+	/**
+	* filtering method of context menu
+	* @param {String} itemKind the kind of right clicked node
+	* @return {Ext.Array} the Array of filtered item menu
+	*/
+	getFilteredContextMenu : function(itemKind) {
+		var menuitems = this.getAllContextMenuItems();
+		
+		var realmenuitems = 0;
+		if (menuitems && menuitems.length){
+			for ( var i = 0; i < menuitems.length; i++) {
+					var currentItem = menuitems[i];
+					var myItemKind = Ext.util.Format.substr(currentItem.fnId, 0, 4);
+					if (myItemKind === itemKind) {
+						realmenuitems ++;
+						currentItem.hidden = false;
+					}
+					else {
+						currentItem.hidden = true;
+					}
+			}
+			if ( realmenuitems == 0 )
+				return null;
+
+			return menuitems;
+		} else {
+			return null;
+		}
+	},
+
+	getMultiContextMenu : function(){
+		var menuitems = this.getMultiContextMenuItems();
+		if (menuitems && menuitems.length){
+			return menuitems;
+		} else {
+			return null;
+		}
+	},
+
+	/**
+	* get the kind of this node
+	* @returns itemKind string
+	*/
+	getNodeKind : function() {
+		var itemKind;
+	// if id of this node have root subcategory suffix
+		if (this.id && Ext.util.Format.substr(this.id, -(amdaUI.ExplorerUI.ROOT_SUFFIX.length), this.id.length) === amdaUI.ExplorerUI.ROOT_SUFFIX ) {
+			itemKind = amdaUI.ExplorerUI.ITEM_KIND_ROOT;
+		}
+		// if this node is a leaf and have no child
+		else if (this.isLeaf()) {
+			itemKind = amdaUI.ExplorerUI.ITEM_KIND_LEAF;
+		}
+		else if (this.get('isParameter')) {
+					itemKind = amdaUI.ExplorerUI.ITEM_KIND_PARA;
+			}
+		else if (this.get('rank')) {
+					itemKind = amdaUI.ExplorerUI.ITEM_KIND_MISS;
+			}
+		// base
+		else if (this.id && Ext.util.Format.substr(this.id, -(amdaUI.ExplorerUI.CAT_SUFFIX.length), this.id.length) === amdaUI.ExplorerUI.CAT_SUFFIX ) {
+			itemKind = amdaUI.ExplorerUI.ITEM_KIND_BASE;
+		}
+		// other case
+		else {
+			itemKind = amdaUI.ExplorerUI.ITEM_KIND_DIRE;
+		}
+		
+		return itemKind;
+	},
+
+	/**
+	* Getter on context menu of this node
+	* @returns {Ext.menu.Menu} the contextMenu of this node
+	*/
+	getContextMenuItems : function() {
+		// set the node kind
+		var itemKind = this.getNodeKind();
+		// filter the global context menu by node kind
+		var menuItems = this.getFilteredContextMenu(itemKind);
+		// return the context menu for this node
+		return menuItems;
+	},
+
+	getContextMenuMultiItems : function() {
+		return this.getMultiContextMenu();
+	},
+
+	/**
+	* Method to retrieve the root node corresponding to the nodeType of this node
+	* @return {amdaModel.AmdaNode} the root node of category of this node
+	*/
+	getRootNode : function() {
+		if (!this.get('rootNode')) {
+			// if this node is the root of its category
+			if(this.getNodeKind() == amdaUI.ExplorerUI.ITEM_KIND_ROOT) {
+					this.set('rootNode',this);
+			} else {
+					// get resources tree panel
+					var tree = this.myGetOwnerTree();
+					var treeRoot = tree.getRootNode();
+					var rootNodeId = this.get('nodeType')+amdaUI.ExplorerUI.ROOT_SUFFIX;
+
+					this.set('rootNode',treeRoot.findChild( 'id', rootNodeId, true));
+			}
+		}
+		return this.get('rootNode');
 	},
  
-    /**
-     * Getter on context menu of this node
-     * @returns {Ext.menu.Menu} the contextMenu of this node
-     */
-    getContextMenuItems : function() {
-    	// set the node kind
-        var itemKind = this.getNodeKind();
-        // filter the global context menu by node kind
-        var menuItems = this.getFilteredContextMenu(itemKind);
-        // return the context menu for this node
-        return menuItems;
-    },
-
-    getContextMenuMultiItems : function() {
-        return this.getMultiContextMenu();
-    },
-
-    /**
-     * Method to retrieve the root node corresponding to the nodeType of this node
-     * @return {amdaModel.AmdaNode} the root node of category of this node
-     */
-    getRootNode : function() {
-        if (!this.get('rootNode')) {
-            // if this node is the root of its category
-            if(this.getNodeKind() == amdaUI.ExplorerUI.ITEM_KIND_ROOT) {
-                this.set('rootNode',this);
-            } else {
-                // get resources tree panel
-                var tree = this.myGetOwnerTree();
-                var treeRoot = tree.getRootNode();
-                var rootNodeId = this.get('nodeType')+amdaUI.ExplorerUI.ROOT_SUFFIX;
-
-                this.set('rootNode',treeRoot.findChild( 'id', rootNodeId, true));
-            }
-        }
-    	return this.get('rootNode');
-    },
-
-    /**
-     * getter on ownerTree (use ownerTreeId property)
-     * @return {Ext.tree.Panel} the tree which contains this node
-     */
-    myGetOwnerTree : function() {
-        if (!this.get('ownerTree')) {
-            this.set('ownerTree',Ext.getCmp(this.get('ownerTreeId')));
-        }
-        return this.get('ownerTree');
-    }
+	/**
+	* getter on ownerTree (use ownerTreeId property)
+	* @return {Ext.tree.Panel} the tree which contains this node
+	*/
+	myGetOwnerTree : function() {
+		if (!this.get('ownerTree')) {
+			this.set('ownerTree',Ext.getCmp(this.get('ownerTreeId')));
+		}
+		return this.get('ownerTree');
+	}
  
 });
@@ -96,7 +96,8 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 		CAT_SUFFIX: '-treeBase',
 		ROOT_SUFFIX: '-treeRootNode',
 		SUB_ROOT_SUFFIX : 'RootNode',
-
+		
+		ITEM_KIND_BASE : 'base',
 		ITEM_KIND_ROOT : 'root',
 		ITEM_KIND_LEAF : 'leaf',
 		ITEM_KIND_DIRE : 'dire',
@@ -679,7 +680,7 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 							{
 							case 'info' :
 								myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.info.id, true, function (module) {
-									module.createWindow(record.get('help'), record.get('info'));
+									module.createWindow(record.get('help'), record.get('text'));
 								});
 								break;
 							}
@@ -151,7 +151,7 @@ Custom tool typ icons
 }
  
 .ux-rangemenu-eq {
-    background-image: url(../images/16x16//equals.png) !important;
+    background-image: url(../images/16x16/equals.png) !important;
 }
 /*
 .icon-kill {
@@ -202,13 +202,13 @@ background-image: url(../images/16x16/error.png) !important;
     background-repeat: no-repeat;
 }
  
-.icon-addRsrc {
-     background-image:url( ../images/32x32/1309360076_misc_22.png ) !important;
-}
+/*.icon-addRsrc {*/
+     /*background-image:url( ../images/32x32/1309360076_misc_22.png ) !important;*/
+/*}*/
  
-.icon-removeRsrc {
-     background-image:url( ../images/32x32/1309360153_misc_21.png ) !important;
-}
+/*.icon-removeRsrc {*/
+     /*background-image:url( ../images/32x32/1309360153_misc_21.png ) !important;*/
+/*}*/
  
 .plotPanelBgColor  td {
 	color: black!important;
@@ -239,38 +239,48 @@ background-image: url(../images/16x16/error.png) !important;
     background-color: yellow !important;
 }
  
+/* datasets information windows */
  
-.infoWindow  ul {
-	 	 margin-left: 20px;
-	 	 list-style-type: disc;
+.infoWindow table.contact {
+    margin: -3px;
 }
  
-.infoWindow  li {
-	 	 list-style-type: disc;
+.infoWindow table.contact tr td:first-child {
+    vertical-align:top;
+    white-space: nowrap;
 }
  
-.infoWindow b {
+.infoWindow table.contact tr td p {
+    margin-top: 0;
+}
+
+.infoWindow h1 {
+    font-size: large;
     color: #555555;
-	}
+    text-transform: capitalize;
+    margin-left: -5px;
+}
  
 .infoWindow h2 {
-    padding-bottom: 3px;
-    margin-bottom: 1em;
-    color: #555555;
-	}
+    font-size: small;
+    color: #222222;
+    margin-left: -5px;
+    margin-bottom: 7px;
+}
  
-.infoMsg h2 {
-      padding-bottom: 3px;
-      color: #555555;
-	}
+.infoWindow p {
+    margin: 3px 0px;
+    text-align: justify;
+}
  
-.infoMsg  ul {
-      padding-top: 3px;
-      margin-left: 20px;
+.infoWindow ul {
+    padding-left: 20px;
+    text-align: justify;
 }
  
-.infoMsg  li {
-	 list-style-type: disc;
+.infoWindow b {
+    font-size: 95%;
+    color: #555555;
 }
  
 .plotPanelBgColor  td div {
@@ -55,6 +55,7 @@
 				{
 					foreach ($observatories as $obs)
 					{
+						echo $obs->getAttribute('xml:id') . PHP_EOL;
 						if ($obs->hasAttribute('target'))
 						{
 							$target = $obs->getAttribute('target');
@@ -77,16 +78,21 @@
  
 	// check ID duplication                        
 	$allIds = array();
-	foreach($localDom->getElementsByTagName('*') as $element)
-	{                                                                          
-		$allIds[] = $element->getAttribute('xml:id');
+	/** @var DOMElement $element */
+foreach($localDom->getElementsByTagName('*') as $element)
+	{
+		$id = $element->getAttribute('xml:id');
+		$allIds[] = $id;
+		if (!$id) {
+			echo 'No id in node ' . $element->tagName . PHP_EOL;
+		}
 	}
 	$arr = array_count_values($allIds);
  
-	print_r('DUPLICATED IDs : '.PHP_EOL);
-	foreach ($arr as $key => $value) 
-		if ($value > 1) print_r($key.'=>'.$value.PHP_EOL);
-                    
+	foreach ($arr as $key => $value) {
+		if ($value > 1) print_r("id '$key' is duplicated $value times." . PHP_EOL);
+	}
+
 	// set 'TBD' attribute - if the parameter is not checked yet
 	if (is_dir(TBD)) 
 	{