message format

Elena.Budnik
1 parent cdf22cdd
Showing 2 changed files with 37 additions and 37 deletions Show diff stats
js/app/AmdaApp.js
php/classes/UserWsTransfer.php
@@ -590,15 +590,14 @@ Ext.define(&#39;amdaApp.AmdaApp&#39;, {
 			if (isMigration) { // isSpecialInfo
 				myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.info.id, true, function(module) {
-					module.createWindow(isSpecialInfo, 'Welcome on AMDA', true);
-					var win = myDesktopApp.getDesktop().getWindow(myDesktopApp.dynamicModules.info.id);
-					
+					module.createWindow(isSpecialInfo, 'Welcome on AMDA', true);	
 					if ( isOldWS ) {
+						var win = myDesktopApp.getDesktop().getWindow(myDesktopApp.dynamicModules.info.id);
 						win.on({
 							show : function() {
 									Ext.Msg.show({                            
 											title:'Welcome on new AMDA',
-											msg: 'It is your first visit of the new version of AMDA.<br/>'+
+											msg: 'It is your first visit on the new version of AMDA.<br/>'+
 											'Do you want to copy here your workspace from the old AMDA ?',                           
 											buttons: Ext.Msg.YESNO,
 											icon: Ext.Msg.QUESTION,
@@ -611,9 +610,7 @@ Ext.define(&#39;amdaApp.AmdaApp&#39;, {
 														loadMask.hide();
 														if (res.success == true) {
-																myDesktopApp.infoMsg('<b>Your Wokspace has been copied</b><br/><br/> ' + 
-																'<b>Note : </b><br/><br> Plot Requests  have not been copied - too many modifs!<br/>' +
-																'Derived params made from Remote params have not been copied<br/><br/>' +  res.msg);
+																myDesktopApp.infoMsg('<b>Your Wokspace has been copied to new AMDA</b><br/><br/> ' + res.msg);
 														}
 														else {
 																myDesktopApp.errorMsg(res.error);
@@ -187,11 +187,11 @@ class UserWsTransfer {
 	public function transferDerived() 
 	{
-		$msg = '<b>WS (Derived) Params:</b><br/>';
-		
+		$msg = '<br/><b><i>Derived Params:</i></b><br/><br/>';
+		$msg .= '<i>Note</i> : Parameters made from Remote Base parameters are not copied <br/><br/>';
 		if (!$this->oldWs->load($this->oldWsDir.'WsParams.xml')) {
 			error_log('cannot load WsParams.xml for '.TRANSFERUSER,1,email);
-			return array('success' => false, 'error' => 'Sorry, we failed to get your WsParams from old AMDA');
+			return array('success' => false, 'error' => 'Sorry, we failed to get your Derived Params from old AMDA');
 		}
 		if (!file_exists($this->newWsDir.'WsParams.xml'))
@@ -212,7 +212,7 @@ class UserWsTransfer {
 		}
 		$paramXml = new DomDocument("1.0");
-		$msg .= '<b>Not copied :</b><br/>';
+		$msg .= 'Not copied derived parameters :<br/>';
 		foreach ($wsParamsOld as $param) {        
 			$id = $param->getAttribute('xml:id');
@@ -221,21 +221,21 @@ class UserWsTransfer {
 			$expression = $param->getAttribute('buildchain');
 			if ($this->deleteParam($expression,$deleted)) {
-						$msg .= '<b>'.$name.'</b> : obsolete <br/> '.$expression.'<br/>';
+						$msg .= '<li><i>'.$name.'</i> : uses obsolete param<br/> '.$expression.'<br/>';
 					// error_log( 'For INFO : DELETED '.$expression,1,email);
 						$this->ws_deleted[] = $name;
 						continue;
 			}
 			if ($this->deleteParam($expression,$notready)) {
-						$msg .= '<b>'.$name.'</b> : not ready yet <br/> '.$expression.'<br/>';
+						$msg .= '<li><i>'.$name.'</i> : uses param not ready yet <br/> '.$expression.'<br/>';
 					// error_log( 'For INFO : DELETED '.$expression,1,email);
 						$this->ws_deleted[] = $name;
 						continue;
 			}
 			if ($this->deleteParam($expression,$notreadyFunctions)) {
-						$msg .= '<b>'.$name.'</b> : function not ready yet <br/> '.$expression.'<br/>';
+						$msg .= '<li><i>'.$name.'</i> : uses function not ready yet <br/> '.$expression.'<br/>';
 					// error_log( 'For INFO : DELETED '.$expression,1,email);
 						$this->ws_deleted[] = $name;
 						continue;
@@ -243,14 +243,14 @@ class UserWsTransfer {
 			if (!empty($this->wsd_deleted))
 					if ($this->deleteParam($expression,$this->wsd_deleted)) {
-						$msg .= '<b>'.$name.'</b> : uses obsolete myData param<br/> '.$expression.'<br/>';
+						$msg .= '<li><i>'.$name.'</i> : uses obsolete myData param<br/> '.$expression.'<br/>';
 					// error_log( 'For INFO : DELETED '.$expression,1,email);
 						$this->ws_deleted[] = $name;
 						continue;
 			}
 			if ($this->deleteParam($expression,array("CDAWEB","MAPSKP","VEXGRAZ","IMPEX"))) {
-						$msg .= '<b>'.$name.'</b> : uses remote params <br/> '.$expression.'<br/>';
+						$msg .= '<li><i>'.$name.'</i> : uses remote params <br/> '.$expression.'<br/>';
 						$this->ws_deleted[] = $name;
 						continue;
 			}
@@ -281,7 +281,7 @@ class UserWsTransfer {
 						unlink($this->newWsDir.$id.'.xml');
 						$paramsToRemove[] = $param; 
 						$this->ws_deleted[] = $name;
-						$msg .= '<b>'.$name.'</b> : uses obsolete / not ready ws param : <br/> '.$expression.'<br/>';
+						$msg .= '<li><i>'.$name.'</i> : uses obsolete / not ready ws param : <br/> '.$expression.'<br/>';
 					}
 				}
 			}
@@ -294,13 +294,13 @@ class UserWsTransfer {
 		$this->newWs->save($this->newWsDir.'WsParams.xml');
 		$copied = $newParams->length - count($paramsToRemove);
-		$msg .= '<br/><b>Copied : </b>'.$copied.' derived parameters<br/><br/>';
+		$msg .= '<br/><i>Copied : </i>'.$copied.' derived parameters<br/><br/>';
 		return array('success' => true, 'msg' => $msg);
 	}
 	public function transferTimeTables() 
 	{    
-		$msg = '<b>Time Tables:</b><br/>'; 
+		$msg = '<b><i>Time Tables:</i></b><br/><br/>'; 
 		// get old time tab list
 		$this->newWs->load($this->oldWsDir.'Tt.xml');
@@ -318,19 +318,19 @@ class UserWsTransfer {
 		}
 		$this->newWs->save($this->newWsDir.'Tt.xml');
-		$msg .= '<b>Copied : </b>'.$timeTabs->length.' time tables<br/><br/>';
+		$msg .= '<i>Copied : </i>'.$timeTabs->length.' time tables<br/><br/>';
 		return array('success' => true, 'msg' => $msg);
 	}
 	public function transferConditions() 
 	{
-		$msg = '<b>DataMining Requests</b><br/>';
-		
+		$msg = '<b><i>Requests</i></b><br/><br/>';
+		$msg .= '<i>Note :</i> Plot requests are not copied : too much difference new-old AMDA<br/<br/><br/>';
 		$oldRequestXml = new DomDocument("1.0");
 		$newRequestXml = new DomDocument("1.0");
 		if (!$oldRequestXml->load($this->oldWsDir.'Request.xml')){
-			$msg .= ' cannot copy<br/>';
+			$msg .= ' No Requests File<br/>';
 			return array('success' => true, 'msg' => $msg);
 		}
@@ -346,6 +346,7 @@ class UserWsTransfer {
 		$deleted = $this->getObsolete();
 		$notready = $this->getNotready();
+		$msg .= 'Not copied DataMining requests :<br/>';
 		foreach ($condNodes as $condNode) {
 			$id = $condNode->getAttribute('xml:id');
@@ -355,13 +356,13 @@ class UserWsTransfer {
 			$condObj = json_decode($cond[0]);
 			$expression = $condObj->expression;
 			if ($this->deleteParam($expression, $deleted)) {
-						$msg .= '<b>'.$name.'</b> : obsolete <br/> '.$expression.'<br/>';
+						$msg .= '<li><i>'.$name.'</i> : uses obsolete param<br/> '.$expression.'<br/>';
 						$cond_deleted[] = $name;
  						continue;
  			}
  			if ($this->deleteParam($expression,$notready)) {
-						$msg .= '<b>'.$name.'</b> : not ready yet <br/> '.$expression.'<br/>';
+						$msg .= '<li><i>'.$name.'</i> : uses param not ready yet<br/> '.$expression.'<br/>';
 					// error_log( 'For INFO : DELETED '.$expression,1,email);
 						$cond_deleted[] = $name;
 						continue;
@@ -369,7 +370,7 @@ class UserWsTransfer {
 			if (!empty($this->wsd_deleted))
 					if ($this->deleteParam($expression,$this->wsd_deleted)) {
-						$msg .= '<b>'.$name.'</b> : uses obsolete myData param<br/> '.$expression.'<br/>';
+						$msg .= '<li><i>'.$name.'</i> : uses obsolete myData param<br/> '.$expression.'<br/>';
 					// error_log( 'For INFO : DELETED '.$expression,1,email);
 						$cond_deleted[] = $name;
 						continue;
@@ -377,14 +378,14 @@ class UserWsTransfer {
 			if (!empty($this->ws_deleted))
 					if ($this->deleteParam($expression,$this->ws_deleted)) {
-						$msg .= '<b>'.$name.'</b> : uses obsolete Derived param<br/> '.$expression.'<br/>';
+						$msg .= '<li><i>'.$name.'</i> : uses obsolete drived param<br/> '.$expression.'<br/>';
 					// error_log( 'For INFO : DELETED '.$expression,1,email);
 						$cond_deleted[] = $name;
 						continue;
 			}
 			if ($this->deleteParam($expression,array("CDAWEB","MAPSKP","VEXGRAZ","IMPEX"))) {
-						$msg .= '<b>'.$name.'</b> : uses remote params <br/> '.$expression.'<br/>';
+						$msg .= '<li><i>'.$name.'</i> : uses remote params <br/> '.$expression.'<br/>';
 						$cond_deleted[] = $name;
 						continue;
 			}
@@ -396,14 +397,14 @@ class UserWsTransfer {
 		}
 		$newRequestXml->save($this->newWsDir.'Request.xml');
-		$msg .= ' <br/>';
 		return array('success' => true, 'msg' => $msg);
 	}
 	public function transferMyData() 
 	{
-		$msg = '<b>My Data:</b><br/>';
+		$msg = '<b><i>MyData Parameters / My Files:</i></b><br/><br/>';
+		$msg.= '<i>Note :</i> CEF format is not implemented<br/><br/>';
 		if (!$this->oldWs->load($this->oldWsDir.'WsParams.xml')) {
 			error_log('cannot load WsParams.xml for '.TRANSFERUSER,1,email);
@@ -422,7 +423,7 @@ class UserWsTransfer {
 		$wsdParamsOld = $this->oldWs->getElementsByTagName('mydata');
 		if ($wsdParamsOld->length == 0) {
-				return array('success' => true, 'msg' => 'No parameters');
+				return array('success' => true, 'msg' => 'You have no MyData parameters');
 		}
 		if (!$BaseXml->load(OLDUSERPATH.TRANSFERUSER.'/DATA/base.xml')) {
@@ -435,7 +436,8 @@ class UserWsTransfer {
 		$this->newWs->load($this->newWsDir.'WsParams.xml');
 		$paramDom = new DomDocument("1.0");
-
+     
+      $msg.= ' Not copied parameters : <br/>';
 		foreach ($wsdParamsOld as $wsdParamOld) {
 			$format = $wsdParamOld->getAttribute('format');
 			$name = $wsdParamOld->getAttribute('name');
@@ -443,7 +445,7 @@ class UserWsTransfer {
 			$mask = $wsdParamOld->getAttribute('mask');
 			if ($format == 'cef') {
 				$deletedVi[] = $mask;
-				$msg .= '<b>'.$name.'</b> : CEF format is not implemented <br/>';
+				$msg .= '<li><i>'.$name.'</i><br/>';
 				$this->wsd_deleted[] = 'wsd_'.$name;
 			}
 			else {
@@ -505,11 +507,11 @@ class UserWsTransfer {
 			if ($node)
 				$node->parentNode->removeChild($node);
 		}
-
+      $msg .= 'Not copied files :<br/>';
 		foreach ($deletedFiles as $vi) {
 			$node = $FilesXml->getElementById($vi);
 			if ($node) {
-				$msg .= '<b>'.$vi.'</b> : CEF format is not implemented <br/>';
+				$msg .= '<li><i>'.$vi.'</i> <br/>';
 				$node->parentNode->removeChild($node);
 			}
 		}
@@ -521,7 +523,7 @@ class UserWsTransfer {
 	public function transferFilters() 
 	{
-		$msg = '<b>Filters:</b><br/>'; 
+		$msg = '<br/><br/><b><i>Filters:</i></b><br/><br/>'; 
 		if (!curl_init($this->oldWsDir.'Filters.xml')) {
 				return array('success' => true, 'msg' => 'No filters at old AMDA');
@@ -533,7 +535,8 @@ class UserWsTransfer {
 		}
 	   $filterXml->save($this->newWsDir.'Filters.xml');
-		return array('success' => true, 'msg' => '<b>Filters</b> have been copied');
+	   $msg .= 'Filters have been copied</br>';
+		return array('success' => true, 'msg' => $msg);
 	}
 }
 ?>
 \ No newline at end of file