info message depends on group + nettoyage

Elena.Budnik
1 parent fc76cba2
Showing 1 changed file with 21 additions and 44 deletions Show diff stats
php/classes/AmdaAction.php
@@ -225,18 +225,15 @@ class AmdaAction
 							{
 								$info = $child->getAttribute('desc');
  
-								if ($child->hasAttribute('dataStart') && $child->hasAttribute('dataStop'))
-								{
+								if ($child->hasAttribute('dataStart') && $child->hasAttribute('dataStop')) {
 									$info .= "<br/>Time Range: ".$child->getAttribute('dataStart')."-".$child->getAttribute('dataStop');
 								}
  
-								if ($child->getAttribute('dataStart') == 'depending on mission')
-								{
+								if ($child->getAttribute('dataStart') == 'depending on mission') {
 									$info .= "<br/>Time Range: ".$child->getAttribute('dataStart');
 								}
  
-								if ($child->getAttribute('restriction') > 1)
-								{
+								if ($child->getAttribute('restriction') > 1) {
 									$restricted  = $child->getAttribute('restriction');
 									$info .= "<br/><b>Time Restriction</b>: -$restricted days";
 								}
@@ -248,21 +245,14 @@ class AmdaAction
 							{
 								$isParameter = true;
  
-								if ($child->parentNode->hasAttribute('dataStart'))
-								{
+								if ($child->parentNode->hasAttribute('dataStart')) {
 									$globalStart = $child->parentNode->getAttribute('dataStart');
 									$globalStop = $child->parentNode->getAttribute('dataStop');
 								}
  
-								if ($child->parentNode->getAttribute('restriction') > 1 )
-								{
+								if ($child->parentNode->getAttribute('restriction') > 1 ) {
 									$timeRestriction = true;
-
 								}
-								/*------------------- to show not tested parameters ------*/
-								if ($child->getAttribute('tbd'))
-									$info .= "<br/><b>Not tested yet</b>";
-								/*------------------- --------------------------------------*/
 							}
  
 							$component_info = array();
@@ -270,14 +260,12 @@ class AmdaAction
 							{
 								$isParameter = true;
  
-								if ($child->parentNode->parentNode->hasAttribute('dataStart'))
-								{
+								if ($child->parentNode->parentNode->hasAttribute('dataStart')) {
 									$globalStart = $child->parentNode->parentNode->getAttribute('dataStart');
 									$globalStop = $child->parentNode->parentNode->getAttribute('dataStop');
 								}
  
-								if ($child->parentNode->parentNode->getAttribute('restriction') > 1)
-								{
+								if ($child->parentNode->parentNode->getAttribute('restriction') > 1) {
 									$timeRestriction = true;
 								}
  
@@ -292,19 +280,16 @@ class AmdaAction
  
 							if ($child->tagName == 'parameter' && $child->hasAttribute('display_type'))
 							{
-								if ($child->getAttribute('display_type') == 'spectrogram')
-								{
+								if ($child->getAttribute('display_type') == 'spectrogram') {
 										$needsArgs = true;
 										$isSpectra = true;
 								}
-								elseif ($child->getAttribute('display_type') == 'stackplot')
-								{
+								elseif ($child->getAttribute('display_type') == 'stackplot') {
 										$isStack = true;
 								}
 							}
  
-							if ($isParameter)
-							{
+							if ($isParameter) {
 								$objectMgr = new AliasMgr();
 								$alias = $objectMgr->getAlias($id);
  
@@ -314,25 +299,20 @@ class AmdaAction
 									'leaf' => $isLeaf, 'isParameter' => $isParameter,
 									'isSpectra' => $isSpectra,'isStack' => $isStack, 'needsArgs' => $needsArgs, 'help' => $help, 'notyet' => $not_yet);
 							}
-							else
-							{
-								if ($child->tagName == 'mission' || $child->tagName == 'observatory')
-								{
-									$disable = $child->hasAttribute('restriction');
+							else {
+
+								if ($child->tagName == 'mission' || $child->tagName == 'observatory') {
 									$rank = $child->getAttribute('rank');
 								}
-								else
-								{
-									$disable = $child->hasAttribute('restriction');
-								}
-
-								if ($disable)
-								{
-									if ($disable == 1) {
-										$info .=  "<br/><b>Sorry ! Not finished yet...</b>";
-									}
+								 
+								$disable = $child->hasAttribute('restriction');
+								
+								if ($disable) {
+									if ($child->hasAttribute("group") && $child->getAttribute("group") !== "TBD") {
+											$info .=  "<br/><b>Restricted Access</b>";
+										}
 									else {
-										$disable = false;
+										$info .=  "<br/><b>Sorry! Not finished yet...</b>";
 									}
 								}
  
@@ -410,9 +390,6 @@ class AmdaAction
 								case 'THEMIS' :
 									$rank = 5;
 									break;
-								case 'MAPSKP' :
-									$rank = 9;
-									break;
 								default:
 							}