Use TES for task execution

athenarc · Jan 17, 2022 · 86375e9 · 86375e9
1 parent d9fc1bc
commit 86375e9
Show file tree

Hide file tree

Showing 11 changed files with 786 additions and 1,573 deletions.
diff --git a/components/RoCrateModal.php b/components/RoCrateModal.php
@@ -79,8 +79,8 @@ public static function addModal($jobid)
 			$fields=WorkflowInput::find()->where(['workflow_id'=>$software_id])->orderBy(['position'=> SORT_ASC])->all();
 			if (!empty($fields))
 			{
-				$fields=Workflow::getRerunFieldValues($jobid,$fields);
-				if ($fields==false)
+				$fields_tmp=Workflow::getRerunFieldValues($jobid,$fields);
+				if ($fields_tmp==false)
 				{
 					$fields=[];
 				}
@@ -90,7 +90,6 @@ public static function addModal($jobid)
 
 		$model=RoCrate::find()->where(['jobid'=>$jobid])->one();
 
-		//print_r($history->jobid);
 		$disabled_fields=false;
 		if(!empty($model))
 		{
@@ -188,8 +187,7 @@ public static function addModal($jobid)
 		echo	'</div>';
 		echo "<div class='input-file-fields'>";
 		$i=0;
-		// print_r($history->jobid);
-		// exit(0);
+
 		foreach ($fields as $field) 
 		{
 

diff --git a/components/RunFormWidget.php b/components/RunFormWidget.php
@@ -61,13 +61,14 @@ public static function showOutputField($commandsDisabled,$outFolder,$username,$t
             $runType='workflow';
         }
         echo Html::hiddenInput('mountcaller',null ,['id'=>'mountcaller']);
+        $disabledBox=$commandsDisabled ? 'disabled-box' : '';
         ?>
         <div class="row">
                 <div class="col-md-12"> <h3>Output directory <i class="fa fa-question-circle question-symbol"  title="Select the folder where the output of the <?=$runType?> will be placed")> </i></h3> </div>
             </div>
             <div class="row">
                 <div class="col-md-12">     
-                    <?=Html::textInput('outFolder',$outFolder,['id' => 'outFolder','class'=>'mount-field','readonly'=>true,])?>
+                    <?=Html::textInput('outFolder',$outFolder,['id' => 'outFolder','class'=>"mount-field $disabledBox",'readonly'=>true,])?>
                     <?=Html::a("$select_icon Select",'javascript:void(0);',['class'=>'select-output-button btn btn-success btn-md','disabled'=>($commandsDisabled)])?>
                     <?=Html::a("$clear_icon Clear",'javascript:void(0);',['class'=>'clear-output-button btn btn-danger btn-md','disabled'=>($commandsDisabled)])?>
                 </div>