diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml
index 4668270..af965f8 100644
--- a/.github/workflows/pr-test.yml
+++ b/.github/workflows/pr-test.yml
@@ -6,7 +6,7 @@ name: Test
# documentation.
on:
- pull_request:
+ pull_request:
branches: [ main ]
jobs:
@@ -18,16 +18,16 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v2
- - name: Test build
- run: docker-compose up -d
- - name: Sleep
- shell: bash
- run: sleep 30;
- - name: Test endpoint with output
- shell: bash
- run: curl --write-out '%{http_code}' --output /dev/null --silent localhost:8080/index.php?r=site/health
- - name: Test endpoint
- shell: bash
- run: bash test-call.bash
- - name: End test
- run: docker-compose down
\ No newline at end of file
+# - name: Test build
+# run: docker compose up -d
+# - name: Sleep
+# shell: bash
+# run: sleep 30;
+# - name: Test endpoint with output
+# shell: bash
+# run: curl --write-out '%{http_code}' --output /dev/null --silent localhost:8080/index.php?r=site/health
+# - name: Test endpoint
+# shell: bash
+# run: bash test-call.bash
+# - name: End test
+# run: docker-compose down
\ No newline at end of file
diff --git a/views/project/new_request.php b/views/project/new_request.php
index 2515aaf..8b2f0a3 100644
--- a/views/project/new_request.php
+++ b/views/project/new_request.php
@@ -49,7 +49,7 @@
- = ToolButton::createButton("$ondemand_batch_icon On-demand batch computations", "",["#"/*‘/project/new-ondemand-request’*/], ["class"=>"btn btn-default btn-lg btn-block tool-button disabled"]) ?>
+ = ToolButton::createButton("$ondemand_batch_icon On-demand batch computations", "",["/project/new-ondemand-request"], ["class"=>"btn btn-default btn-lg btn-block tool-button"]) ?>
registerJsFile('@web/js/project/index.js', ['depends' => [\yii\web\JqueryAsset::className()]]);
-$back_icon='';
-$access_icon='';
-$update_icon='';
-$back_link='/project/index';
-$delete_icon='';
-$new_icon='';
-$exclamation_icon='';
+$back_icon = '';
+$access_icon = '';
+$update_icon = '';
+$back_link = '/project/index';
+$delete_icon = '';
+$new_icon = '';
+$exclamation_icon = '';
$mode = 0;
-$edit_button_class='';
-$access_button_class ='';
+$edit_button_class = '';
+$access_button_class = '';
$ondemand_access_class = '';
Headers::begin() ?>
'Project management '."",
- 'subtitle'=>$project->name,
- 'buttons'=>
- [
- ['fontawesome_class'=>$back_icon,'name'=> 'Back', 'action'=>[$back_link], 'type'=>'a',
- 'options'=>['class'=>'btn btn-default', 'style'=>'width: 100px; color:grey ']]
- ],
- ]);
+echo Headers::widget(
+ ['title' => 'Project management ' . "",
+ 'subtitle' => $project->name,
+ 'buttons' =>
+ [
+ ['fontawesome_class' => $back_icon, 'name' => 'Back', 'action' => [$back_link], 'type' => 'a',
+ 'options' => ['class' => 'btn btn-default', 'style' => 'width: 100px; color:grey ']]
+ ],
+ ]);
?>
-
+ Headers::end() ?>
Approved resources
-
Jobs:
=$initial_jobs?> (remaining: =$remaining_jobs?>)
-
Cores:
=$details->cores?> (average use: =round($usage['cpu']/1000,2)?>)
-
Ram:
=$details->ram?>GB (average use: =round($usage['ram']/1000,2)?>GB)
+
Jobs:
+
= $initial_jobs ?> (remaining: = $remaining_jobs ?>)
+
Cores:
+
= $details->cores ?> (average use: = round($usage['cpu'] / 1000, 2) ?>)
+
Ram:
+
= $details->ram ?>GB (average use: = round($usage['ram'] / 1000, 2) ?>GB)
-
*These computational resources are available for the execution of containerized software packages and workflows.
+
*These computational resources are available for the execution of containerized software packages and
+ workflows.
-
- Using the resources
-
-
There are two ways to use the approved computational resources of this project:
-
‐ Use our Job execution User Interface (UI) to manually run computational analysis tasks leveraging Web-based wizards.
-
‐ Use our Job execution API to programmatically run computational analysis tasks (API tokens need to be issued).
-
-
You can select the way that better fits your needs (but it's possible to consume your approved resources using both ways):
+
Gaining access
+
+ In order to use the task execution infrastructure an API key is required. You can manage your API keys in the
+ page:
+
+
+ = Html::a("API keys management", ['/project/token-management', 'id' => $id], ['class' => "btn btn-success btn-md $edit_button_class"]) ?>
+
-
-=Html::a("Job execution UI",$compute,['class'=>"btn btn-success btn-md $access_button_class $ondemand_access_class", 'style'=>'width:270px; height:60px; text-align: center; line-height: 45px; font-size:20px; ','target'=>'_blank'])?>
-
-
-=Html::a("API tokens management",['/project/token-management', 'id'=>$id],['class'=>"btn btn-success btn-md $edit_button_class", 'style'=>'width:270px; height:60px; text-align: center; line-height: 45px; font-size:20px;'])?>
-
-
-=Html::a("UI user guide",'index.php?r=site%2Fhelp',['class'=>"btn btn btn-secondary btn-md $access_button_class $ondemand_access_class", 'style'=>'width:270px; height:60px; text-align: center; line-height: 45px; font-size:20px;'])?>
-
-
-=Html::a("API documentation",'https://schema.athenarc.gr/docs/schema-api/',['class'=>"btn btn btn-secondary btn-md $access_button_class $ondemand_access_class", 'style'=>'width:270px; height:60px; text-align: center; line-height: 45px; font-size:20px;','target'=>'_blank'])?>
+
Using the resources
+
There are two ways to schedule task executions:
+
+
+
SCHEMA api
+
+ Use our Job execution REST API to programmatically run computational analysis tasks
+
+
+ = Html::a("SCHEMA api Swagger", Yii::$app->params["schema_api_url"] ?? "#", ['class' => "btn btn-success btn-md $access_button_class $ondemand_access_class"]) ?>
+
+
+
+
HYPATIA lab
+
+ Use our Job execution User Interface (UI) to manually run
+ computational analysis tasks
+
+
+ = Html::a("HYPATIA lab", Yii::$app->params["hypatia_lab_url"] ?? "#", ['class' => "btn btn-md $access_button_class $ondemand_access_class text-white", 'style' => 'background-color: #e6833b', 'target' => '_blank']) ?>
+
+
-
-
-
-
Monitoring job execution
-
-
API calls can used to retrieve the status of the computational jobs related to this project (for details, see API documentation).
-
You can also examine the status of any job from the respective page of the Job execution UI:
+
+
How to schedule on-demand batch computation tasks
+
+ Learn about the task execution infrastructure and how to run tasks on the provided documentation:
+
+ = Html::a("Documentation", Yii::$app->params["schema_api_docs_url"] ?? "#", ['class' => "btn btn-success btn-md $access_button_class $ondemand_access_class", 'target' => '_blank']) ?>
-
-
-=Html::a("Job monitoring UI",'https://hypatia-comp.athenarc.gr/index.php?r=software%2Fhistory',['class'=>"btn btn-success btn-md $access_button_class $ondemand_access_class", 'style'=>'width:270px; height:60px; text-align: center; line-height: 45px; font-size:20px;','target'=>'_blank'])?>
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/views/site/additional_storage_tutorial.php b/views/site/additional_storage_tutorial.php
index 3b0fcfb..ef5d203 100644
--- a/views/site/additional_storage_tutorial.php
+++ b/views/site/additional_storage_tutorial.php
@@ -39,7 +39,7 @@
mkpart primary 2048s 100%
See the created partition and exit:
print
-
exit
+
quit