Merge branch 'tooltipJobs' into 'master'

Tooltip jobs Improve tooltips in jobs tab in Workspace explorer. Issue: https://projects.irap.omp.eu/issues/4861 See merge request !1

Merge branch 'tooltipJobs' into 'master'
Tooltip jobs Improve tooltips in jobs tab in Workspace explorer. Issue: https://projects.irap.omp.eu/issues/4861 See merge request !1
Myriam Bouchemit
2 parents 91c2a59a 8fc77945
Showing 5 changed files with 181 additions and 59 deletions Show diff stats
.gitignore
src/InputOutput/IHMImpl/Process/IHMInputOutputRunningInfoProcessClass.php
src/InputOutput/IHMImpl/Tools/IHMJobsManagerClass.php
src/Request/ProcessRequestImpl/ProcessRequestClass.php
src/Request/ProcessRequestImpl/ProcessRequestDataClass.php
 .project
+.idea
@@ -39,6 +39,8 @@ class IHMInputOutputRunningInfoProcessClass extends IHMInputOutputInfoProcessAbs
 			if (!$jobInfo['success'])
 				continue;
  
+			$jobInfo['runningPath'] = $d->getRunningPath();
+
 			switch ($jobInfo['status'])
 			{
 				case 'in_progress' :
@@ -199,6 +199,12 @@ class IHMJobsManagerClass {
 			return $res;
  
 		$job = $this->jobXml->getElementById($id);
+
+		$attributes = [];
+		foreach( $job->attributes as $attrName => $attrNode) {
+			$attributes[$attrName] = $attrNode->nodeValue;
+		}
+
 		$format = 'unknown';
 		$compression = 'unknown';
 		if($job)
@@ -252,95 +258,157 @@ class IHMJobsManagerClass {
 	/*
 	 * @brief Add a new job
 	*/
-	public function addJob($obj, $id, $folder,
-			$running, $start, $result, $exitcode)
+	public function addJob($obj, $id, $folder, $running, $start, $result, $exitcode)
 	{
+		$obj = get_object_vars($obj); // Allow access to elements where the key is in dash-separated form.
 		$res = $this->init();
 		if (!$res['success'])
 			return $res;
  
-		$newJob = $this->jobXml->createElement('job');
-
-		$newJob->setAttribute('xml:id', $id);
-		$newJob->setAttribute('jobType', $obj->nodeType);
-
-		switch ($obj->nodeType)
-		{
-			case 'condition' :
+		$infos = [];
+		switch ($obj['nodeType']) {
+			// Data mining
+			case 'condition':
 				$name = 'datamining_'.time();
-				$info = $obj->expression;
+				if($obj['name'] != '') {
+					$infos['Name'] = $obj['name'];
+				}
+				$infos['Condition'] = $obj['expression'];
+				$infos['Start date'] = $obj['startDate'];
+				$infos['Stop date'] = $obj['stopDate'];
 				break;
-			case 'statistics' :
+
+			case 'statistics':
 				$name = 'statistics_'.time();
-				$info = isset($obj->expression) ? $obj->expression : "";
+				$infos['Name'] =  $obj['name']; // TODO: name toujours égal à 'test' (?)
+
+				// TODO : lire data/user/TT/tt_0.xml -> trouver ttname + nbIntervals
+
+				if(array_key_exists('timeTables', $obj)) {
+					$ttXml = new DomDocument();
+					$ttXml->load(USERWSDIR . 'Tt.xml');
+
+					$ttIntervals = [];
+					foreach ($ttXml->getElementsByTagName('timetab') as $tt) {
+						$ttIntervals[$tt->getAttribute('name')] = $tt->getAttribute('intervals');
+					}
+
+					if(count($obj['timeTables']) == 1) {
+						$infos['Time table'] = $obj['timeTables'][0]->timeTableName;
+						$infos['Nb Intervals'] = $ttIntervals[$infos['Time table']];
+					} else {
+						foreach ($obj['timeTables'] as $tt) {
+							if($tt === reset($obj['timeTables'])) {
+								$infos['Time tables'] = $tt->timeTableName . '(' . $ttIntervals[$tt->timeTableName] . ' int.)';
+							} else {
+								$infos['Time tables'] .= ', ' . $tt->timeTableName . '(' . $ttIntervals[$tt->timeTableName] . ' int.)';
+							}
+						}
+					}
+				} else {
+					$infos['Start date'] = $obj['startDate'];
+					$infos['Stop date'] = $obj['stopDate'];
+				}
+
+				if(array_key_exists('expression', $obj)) {
+					$infos['Expression'] =  $obj['expression'];
+				}
+				$params = [];
+				foreach ($obj['parameter'] as $param) {
+					$params[] = $param->function . '(' . $param->paramid . ')';
+				}
+				if(count($params) == 1) {
+					$infos['Parameter'] = $params[0];
+				} else {
+					$infos['Parameters'] = '<ul><li>' . join('</li><li>', $params) . '</li></ul>';
+				}
 				break;
-			case 'download' :
-				if ($obj->downloadSrc == '2') //fits image
-					$name = "download_fits_".time();
-				else
-					$name = "download_data_".time();
-				$info = '';
-				foreach ($obj->list as $param)
-				{
-					if ($obj->downloadSrc == '2') //fits image
-						$info = $info.' '.$param->url;
-					else
-						$info = $info.' '.$param->name; //data
+
+			case 'download':
+				$name = $obj['downloadSrc'] == '2' ? "download_fits_".time() : "download_data_".time();
+				$params = [];
+				foreach ($obj['list'] as $param) {
+					$params[] = $param->paramid;
+				}
+				if(count($params) == 1) {
+					$infos['Parameter'] = $params[0];
+				} else {
+					$infos['Parameters'] = join(', ', $params);
 				}
+				$infos['Start date'] = $obj['startDate'];
+				$infos['Stop date'] = $obj['stopDate'];
 				break;
-			case 'request'	 :
+
+			// Plot
+			case 'request':
 				$name = "request_".time();
-				$info = '';
-				for ($i=0; $i < count($obj->children); $i++) {
-					for ($j=0; $j < count($obj->children[$i]->children); $j++) {
-						$info = $info.' '.$obj->children[$i]->children[$j]->name;
+
+				$infos['Output'] = strtolower($obj['file-format']) . ' (' . strtolower($obj['file-output']) . ')';
+				foreach ($obj['tabs'] as $tab) {
+					if($tab->id == $obj['last-plotted-tab']) {
+						$infos['Start date'] = $tab->startDate;
+						$infos['Stop date'] = $tab->stopDate;
+
+						$strPanels = [];
+
+						foreach ($tab->panels as $panel) {
+							$strParams = '';
+							foreach ($panel->params as $param) {
+								$strParams .= $param->paramid . ($param === end($panel->params) ? '' : ', ');
+							}
+							$infos['• Panel ' . $panel->id] = $strParams;
+						}
+
+						continue;
 					}
 				}
 				break;
+
 			default:
 				$name = "unknown_".time();
-				$info = '';
 		}
+		$infos['Started at'] = gmdate("Y-m-d H:i:s", $start);
  
-		$newJob->setAttribute('name', $name);
-		$newJob->setAttribute('info', $info);
+		$strInfo = '';
+		foreach ($infos as $key => $info) {
+			$strInfo .= ($key == 'Started at' ? '<hr/>' : '') . '<b>' . $key . '</b>: ' . $info . '<br/>';
+		}
  
+		$newJob = $this->jobXml->createElement('job');
+		$newJob->setAttribute('xml:id', $id);
+		$newJob->setAttribute('jobType', $obj['nodeType']);
+		$newJob->setAttribute('name', $name);
+		$newJob->setAttribute('info', $strInfo);
 		$newJob->setAttribute('folder', $folder);
-
 		$newJob->setAttribute('result', $result);
-
 		$newJob->setAttribute('start', date('d-m-Y H:i:s', $start));
-
-		$newJob->setAttribute('result', $result);
-
 		//to know if know if it's an immediate job or not
 		$newJob->setAttribute('immediate', !$running);
  
-		$sendToSamp = isset($obj->sendToSamp) ? $obj->sendToSamp : FALSE;
+		$sendToSamp = isset($obj['sendToSamp']) ? $obj['sendToSamp'] : FALSE;
 		if ($sendToSamp) {
 			 $newJob->setAttribute('sendToSamp', "true");
 		}
  
+		$key = $obj['nodeType'];
 		if ($running)
 		{
-			$rootJobNode = $this->jobXml->getElementById($this->bkgRootNode[$obj->nodeType]);
+			$rootJobNode = $this->jobXml->getElementById($this->bkgRootNode[$key]);
 			if (!$rootJobNode)
 			{
-				$key = $obj->nodeType;
 				$rootJobNode =  $this->jobXml->createElement("$key");
-				$rootJobNode->setAttribute('xml:id', $this->bkgRootNode[$obj->nodeType]);
+				$rootJobNode->setAttribute('xml:id', $this->bkgRootNode[$key]);
 				$jobsInProgress = $this->jobXml->getElementsByTagName('jobsInProgress')->item(0);
 				$jobsInProgress->appendChild($rootJobNode);
 			}
 		}
 		else
 		{
-			$rootJobNode = $this->jobXml->getElementById($this->resRootNode[$obj->nodeType]);
+			$rootJobNode = $this->jobXml->getElementById($this->resRootNode[$key]);
 			if (!$rootJobNode)
 			{
-				$key = $obj->nodeType;
 				$rootJobNode =  $this->jobXml->createElement("$key");
-				$rootJobNode->setAttribute('xml:id', $this->resRootNode[$obj->nodeType]);
+				$rootJobNode->setAttribute('xml:id', $this->resRootNode[$key]);
 				$jobsFinished = $this->jobXml->getElementsByTagName('jobsFinished')->item(0);
 				$jobsFinished->appendChild($rootJobNode);
 			}
@@ -369,20 +437,58 @@ class IHMJobsManagerClass {
  
 		$job = $this->jobXml->getElementById($id);
  
-		if (!isset($job))
+		if (!isset($job)) {
 			return array("success" => false, "message" => "Cannot found job");
-			
+		}
+
 		$jobstatus = $this->getJobStatus($running,$exitcode);
 		$job->setAttribute('status', $jobstatus);
  
-		if ($running)
+		$infos = [];
+
+		if ($running) {
 			$job->setAttribute('stop', 'unknown');
-		else if ($job->getAttribute('stop') == '' || $job->getAttribute('stop') == 'unknown')
-		{
+		} else if ($job->getAttribute('stop') == '' || $job->getAttribute('stop') == 'unknown') {
 			$job->setAttribute('stop', date('d-m-Y H:i:s', time()));
+
+			$start = new DateTime($job->getAttribute('start'));
+			$interval = (new DateTime('now'))->diff($start);
+			$infos['Job duration'] = $interval->format('%Hh %Im %Ss');
+
+			$resPath = glob(USERWORKINGDIR . $job->getAttribute('folder') . '/' . $job->getAttribute('result') . '*')[0];
+
+			if($job->getAttribute('jobType') == 'condition') {
+				error_log('resPath: ' . $resPath);
+				$resXml = new DomDocument();
+				$resXml->load($resPath);
+				$infos['nb intervals'] = $resXml->getElementsByTagName('nbIntervals')->item(0)->nodeValue;
+			}
+
+			$fileSize = filesize($resPath);
+			if ($fileSize < 1024) {
+				$strSize = number_format($fileSize, 2, '.', ' ') . 'b';
+			} else if($fileSize < 1024*1024) {
+				$strSize = number_format($fileSize/1024, 2, '.', ' ') . 'kb';
+			} else if($fileSize < 1024*1024*1024) {
+				$strSize = number_format($fileSize/(1024*1024), 2, '.', ' ') . 'mb';
+			} else {
+				$strSize = number_format($fileSize/(1024*1024*1024), 2, '.', ' ') . 'gb';
+			}
+			$infos['File size'] = $strSize;
+
 			$this->jobXml->getElementById($this->resRootNode[$job->getAttribute('jobType')])->appendChild($job);
 		}
-			
+
+		if($exitcode != 0) {
+			$infos['Error code'] = $exitcode;
+		}
+
+		$strInfo = $job->getAttribute('info');
+		foreach ($infos as $key => $info) {
+			$strInfo .= '<b>' . $key . '</b>: ' . $info . '<br/>';
+		}
+		$job->setAttribute('info', $strInfo);
+
 		$res = $this->jobXml->save($this->jobXmlName);
  
 		if (!$res)
@@ -76,6 +76,8 @@ class ProcessRequestClass extends RequestAbstractClass
 	*/
 	private function updateProcess($processInfo)
 	{
+		$this->requestData->setRunningPath($processInfo['runningpath']);
+
 		$this->requestData->setId($processInfo['id']);
 		if ($processInfo['isrunning'])
 			$this->requestData->setStatus(ProcessStatusEnumClass::RUNNING);
@@ -46,6 +46,7 @@ class ProcessRequestDataClass extends RequestDataClass
 	private $status          = ProcessStatusEnumClass::UNKNOWN;
 	private $exitCode        = 0;
 	private $start           = 0;
+	private $runningPath = "";
  
 	public function getManagerFilePath()
 	{
@@ -107,6 +108,16 @@ class ProcessRequestDataClass extends RequestDataClass
 		$this->id = $id;
 	}
  
+	public function getRunningPath()
+	{
+		return $this->runningPath;
+	}
+
+	public function setRunningPath($runningPath)
+	{
+		$this->runningPath = $runningPath;
+	}
+
 	public function getType()
 	{
 		return $this->type;
@@ -117,14 +128,14 @@ class ProcessRequestDataClass extends RequestDataClass
 		$this->type = $type;
 	}
  
-	public function getBatchEnable()
-	{
-		return $this->batchEnable;
-	}
-
-	public function setBatchEnable($batchEnable)
-	{
-		$this->batchEnable = $batchEnable;
+	public function getBatchEnable()
+	{
+		return $this->batchEnable;
+	}
+
+	public function setBatchEnable($batchEnable)
+	{
+		$this->batchEnable = $batchEnable;
 	}
  
 	public function getStatus()