Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement time limits, project name 'read only' on edit, show remaining days of cold storage on index #65

Merged
merged 3 commits into from
Oct 27, 2023
Merged

Implement time limits, project name 'read only' on edit, show remaining days of cold storage on index #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c02f7b4
implement time limits for each project/user type and make project nam…
katmastt Oct 27, 2023
b73e9ca
Merge branch 'main' of github.com:katmastt/clima into main
katmastt Oct 27, 2023
694e592
show on index page remaining days for cold storage projects
katmastt Oct 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 24 additions & 13 deletions controllers/ProjectController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,8 @@ public function actionNewServiceRequest()
$limitsModel=new ServiceLimits;
$autoacceptModel=new ServiceAutoaccept;

$upperlimits=$limitsModel::find()->where(['user_type'=>$role])->one();

$service_autoaccept= ServiceAutoaccept::find()->where(['user_type'=>$role])->one();
$service_autoaccept_number=$service_autoaccept->autoaccept_number;

Expand Down Expand Up @@ -350,7 +352,7 @@ public function actionNewServiceRequest()


return $this->render('new_service_request',['service'=>$serviceModel, 'project'=>$projectModel,
'trls'=>$trls, 'form_params'=>$form_params, 'participating'=>$participating, 'errors'=>$errors, 'upperlimits'=>$upperlimits, 'autoacceptlimits'=>$autoacceptlimits,'autoaccept_allowed' => $autoaccept_allowed, 'role'=>$role, 'new_project_allowed'=>$new_project_allowed]);
'trls'=>$trls, 'form_params'=>$form_params, 'participating'=>$participating, 'errors'=>$errors, 'upperlimits'=>$upperlimits, 'autoacceptlimits'=>$autoacceptlimits,'autoaccept_allowed' => $autoaccept_allowed, 'role'=>$role, 'new_project_allowed'=>$new_project_allowed, 'upperlimits'=>$upperlimits]);



Expand Down Expand Up @@ -423,7 +425,7 @@ public function actionNewMachineComputeRequest()
$projectModel->user_list=$participant_ids;
$isValid = $projectModel->validate();
$isValid = $serviceModel->validate() && $isValid;
$isValid = $projectModel->machinesDuration30() && $isValid;
// $isValid = $projectModel->machinesDuration30() && $isValid;

if ($isValid)
{
Expand Down Expand Up @@ -489,7 +491,7 @@ public function actionNewColdStorageRequest()
$coldStorageModel=new ColdStorageRequest;
$projectModel=new ProjectRequest;
// $projectModel->duration=36;
$projectModel->end_date='2100-1-1';
// $projectModel->end_date='2100-1-1';
$projectModel->backup_services=false;

$limitsModel=new ColdStorageLimits;
Expand Down Expand Up @@ -566,7 +568,7 @@ public function actionNewColdStorageRequest()
$projectModel->user_list=$participant_ids;
$isValid = $projectModel->validate();
$isValid = $coldStorageModel->validate() && $isValid;
$projectModel->end_date='2100-1-1';
// $projectModel->end_date='2100-1-1';

if ($isValid)
{
Expand Down Expand Up @@ -646,6 +648,7 @@ public function actionNewOndemandRequest()
$limitsModel=new OndemandLimits;
$autoacceptModel=new OndemandAutoaccept;

$upperlimits=$limitsModel::find()->where(['user_type'=>$role])->one();

$ondemand_autoaccept= OndemandAutoaccept::find()->where(['user_type'=>$role])->one();
$ondemand_autoaccept_number=$ondemand_autoaccept->autoaccept_number;
Expand Down Expand Up @@ -759,7 +762,7 @@ public function actionNewOndemandRequest()


return $this->render('new_ondemand_request',['ondemand'=>$ondemandModel, 'project'=>$projectModel,
'maturities'=>$maturities, 'form_params'=>$form_params, 'participating'=>$participating, 'errors'=>$errors, 'upperlimits'=>$upperlimits, 'autoacceptlimits'=>$autoacceptlimits,'autoaccept_allowed' => $autoaccept_allowed, 'role'=>$role, 'new_project_allowed'=>$new_project_allowed]);
'maturities'=>$maturities, 'form_params'=>$form_params, 'participating'=>$participating, 'errors'=>$errors, 'upperlimits'=>$upperlimits, 'autoacceptlimits'=>$autoacceptlimits,'autoaccept_allowed' => $autoaccept_allowed, 'role'=>$role, 'new_project_allowed'=>$new_project_allowed, 'upperlimits'=>$upperlimits]);
}

//jupyter notebooks controller
Expand Down Expand Up @@ -1337,6 +1340,10 @@ public function actionViewRequest($id,$filter='all')
public function actionViewRequestUser($id,$filter='all',$return='index')
{

$superAdmin = 0;
if((Userw::hasRole('Admin', $superadminAllowed=true)) || (Userw::hasRole('Admin', $superadminAllowed=false)) || (Userw::hasRole('Moderator', $superadminAllowed=true)) || (Userw::hasRole('Moderator', $superadminAllowed=false))){
$superAdmin = 1;
}
$active_servers = 0;
$image = '';
ProjectRequest::recordViewed($id);
Expand Down Expand Up @@ -1475,7 +1482,7 @@ public function actionViewRequestUser($id,$filter='all',$return='index')

return $this->render($view_file,['project'=>$project_request,'details'=>$details, 'return'=>$return,
'filter'=>$filter,'usage'=>$usage,'user_list'=>$username_list, 'submitted'=>$submitted,'request_id'=>$id, 'type'=>$type, 'ends'=>$ends, 'start'=>$start, 'remaining_time'=>$remaining_time,
'project_owner'=>$project_owner, 'number_of_users'=>$number_of_users, 'maximum_number_users'=>$maximum_number_users, 'remaining_jobs'=>$remaining_jobs, 'expired'=>$expired, 'active_servers'=>$active_servers, 'image'=>$image]);
'project_owner'=>$project_owner, 'number_of_users'=>$number_of_users, 'maximum_number_users'=>$maximum_number_users, 'remaining_jobs'=>$remaining_jobs, 'expired'=>$expired, 'active_servers'=>$active_servers, 'image'=>$image, 'superAdmin'=>$superAdmin]);

}

Expand Down Expand Up @@ -2318,7 +2325,10 @@ public function actionEditProject($id)
{
$images = '';
$prequest=ProjectRequest::find()->where(['id'=>$id])->one();

$exceed_limits = 0;
if((Userw::hasRole('Admin', $superadminAllowed=true)) || (Userw::hasRole('Moderator', $superadminAllowed=true))){
$exceed_limits = 1;
}
if (empty($prequest))
{
return $this->render('error_unauthorized');
Expand Down Expand Up @@ -2461,7 +2471,8 @@ public function actionEditProject($id)
for ($i=1; $i<31; $i++)
$num_vms_dropdown[$i]=$i;

$prequest->end_date='2100-1-1';
// $prequest->end_date='2100-1-1';
$prequest->end_date=$ends;
$volume='';
if ($drequest->type=='hot')
{
Expand Down Expand Up @@ -2556,10 +2567,10 @@ public function actionEditProject($id)

$isValid = $prequest->validate();
$isValid = $drequest->validate() && $isValid;
if($prType==3)
{
$isValid = $prequest->machinesDuration30() && $isValid;
}
// if($prType==3)
// {
// $isValid = $prequest->machinesDuration30() && $isValid;
// }

$pchanged_tmp= ProjectRequest::ProjectModelChanged($pold,$prequest);
$pchanged=$pchanged_tmp[0];
Expand Down Expand Up @@ -2716,7 +2727,7 @@ public function actionEditProject($id)


return $this->render($view_file,['details'=>$drequest, 'project'=>$prequest,
'trls'=>$trls, 'form_params'=>$form_params, 'participating'=>$participating, 'errors'=>$errors, 'upperlimits'=>$upperlimits, 'autoacceptlimits'=>$autoacceptlimits,'maturities'=>$maturities, 'vm_exists'=>$vm_exists, 'ends'=>$ends, 'role'=>$role, 'num_vms_dropdown'=>$num_vms_dropdown, 'volume_exists'=>$volume_exists, 'images'=>$images, 'interval'=>$interval]);
'trls'=>$trls, 'form_params'=>$form_params, 'participating'=>$participating, 'errors'=>$errors, 'upperlimits'=>$upperlimits, 'autoacceptlimits'=>$autoacceptlimits,'maturities'=>$maturities, 'vm_exists'=>$vm_exists, 'ends'=>$ends, 'role'=>$role, 'num_vms_dropdown'=>$num_vms_dropdown, 'volume_exists'=>$volume_exists, 'images'=>$images, 'interval'=>$interval, 'exceed_limits'=>$exceed_limits]);


}
Expand Down
25 changes: 24 additions & 1 deletion views/project/edit_cold_storage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,30 @@
<div class="col-md-12">
<h3>Project details</h3>

<?= $form->field($project, 'name') ?>
<?= $form->field($project, 'name')->textInput(['readonly' => true, 'value' =>$project['name']]) ?>
<div style="margin-bottom: 20px;">
<?php if($exceed_limits == 0){
echo '<label> Project end date * </label>';
echo DatePicker::widget([
'model' => $project,
'attribute' => 'end_date',
'pluginOptions' => [
'endDate'=>"+".($upperlimits->duration-$interval)."D",
'autoclose'=>true,
'format'=>'yyyy-m-d'
]
]);}?>
<?php if($exceed_limits == 1){
echo '<label> Project end date * </label>';
echo DatePicker::widget([
'model' => $project,
'attribute' => 'end_date',
'pluginOptions' => [
'autoclose'=>true,
'format'=>'yyyy-m-d'
]
]);}?>
</div>
<?= $form->field($project, 'user_num') ?>

<?= Html::label($participating_label, 'user_search_box', ['class'=>'blue-label']) ?>
Expand Down
15 changes: 13 additions & 2 deletions views/project/edit_jupyter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@

<?= $form->field($project, 'name')->textInput(['readonly' => true, 'value' =>$project['name']]) ?>
<div style="margin-bottom: 20px;">
<?php echo '<label> Project end date * </label>';
<?php if($exceed_limits == 0){
echo '<label> Project end date * </label>';
echo DatePicker::widget([
'model' => $project,
'attribute' => 'end_date',
Expand All @@ -94,7 +95,17 @@
'autoclose'=>true,
'format'=>'yyyy-m-d'
]
]);?>
]);}?>
<?php if($exceed_limits == 1){
echo '<label> Project end date * </label>';
echo DatePicker::widget([
'model' => $project,
'attribute' => 'end_date',
'pluginOptions' => [
'autoclose'=>true,
'format'=>'yyyy-m-d'
]
]);}?>
</div>
<?= $form->field($details, 'participants_number')->label($participants_label) ?>

Expand Down
14 changes: 10 additions & 4 deletions views/project/edit_machine_compute.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,22 @@
<div class="row box">
<div class="col-md-6">
<h3>Project details</h3>
<?= $form->field($project, 'name') ?>
<?= $form->field($project, 'name')->textInput(['readonly' => true, 'value' =>$project['name']]) ?>
<div style="margin-bottom: 20px;">
<?php echo '<label> Project end date * </label>';
echo $form->field($project, 'end_date')->widget(DatePicker::className(),[
if($exceed_limits == 0){echo $form->field($project, 'end_date')->widget(DatePicker::className(),[
'pluginOptions' => [
'autoclose'=>true,
'format'=>'yyyy-m-d',
'endDate'=>'+30d'
'endDate'=>'+'.(90-$interval)."d"
]
])->label("");
])->label("");}
if($exceed_limits == 1){echo $form->field($project, 'end_date')->widget(DatePicker::className(),[
'pluginOptions' => [
'autoclose'=>true,
'format'=>'yyyy-m-d'
]
])->label("");}
?>
</div>
<?= $form->field($project, 'user_num') ?>
Expand Down
18 changes: 15 additions & 3 deletions views/project/edit_ondemand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,29 @@
<h3>Project details</h3>


<?= $form->field($project, 'name') ?>
<?= $form->field($project, 'name')->textInput(['readonly' => true, 'value' =>$project['name']]) ?>
<div style="margin-bottom: 20px;">
<?php echo '<label> Project end date * </label>';
<?php if($exceed_limits == 0){
echo '<label> Project end date * </label>';
echo DatePicker::widget([
'model' => $project,
'attribute' => 'end_date',
'pluginOptions' => [
'endDate'=>"+".($upperlimits->duration-$interval)."D",
'autoclose'=>true,
'format'=>'yyyy-m-d'
]
]);?>
]);}?>
<?php if($exceed_limits == 1){
echo '<label> Project end date * </label>';
echo DatePicker::widget([
'model' => $project,
'attribute' => 'end_date',
'pluginOptions' => [
'autoclose'=>true,
'format'=>'yyyy-m-d'
]
]);}?>
</div>
<?= $form->field($project, 'user_num') ?>
<?= Html::label($participating_label, 'user_search_box', ['class'=>'blue-label']) ?>
Expand Down
20 changes: 15 additions & 5 deletions views/project/edit_service.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,29 @@
<div class="row box">
<div class="col-md-6">
<h3>Project details</h3>
<?= $form->field($project, 'name') ?>
<?= $form->field($project, 'name')->textInput(['readonly' => true, 'value' =>$project['name']]) ?>
<div style="margin-bottom: 20px;">
<?php echo '<label> Project end date * </label>';
<?php if($exceed_limits == 0){
echo '<label> Project end date * </label>';
echo DatePicker::widget([
'model' => $project,
'attribute' => 'end_date',
'pluginOptions' => [
'endDate'=>"+".($upperlimits->duration-$interval)."D",
'autoclose'=>true,
'format'=>'yyyy-m-d'

]
]);
?>
]);}?>
<?php if($exceed_limits == 1){
echo '<label> Project end date * </label>';
echo DatePicker::widget([
'model' => $project,
'attribute' => 'end_date',
'pluginOptions' => [
'autoclose'=>true,
'format'=>'yyyy-m-d'
]
]);}?>
</div>
<?= $form->field($project, 'user_num') ?>

Expand Down
2 changes: 1 addition & 1 deletion views/project/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@
$projectTarget='_self';
$project_icon='<i class="fa fa-database" aria-hidden="true"></i>';
$title="Storage volume project";
$days='N/A';
$days=$res[1]. " days";
}


Expand Down
14 changes: 14 additions & 0 deletions views/project/new_cold_storage_request.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,20 @@
<h3>Project details</h3>

<?= $form->field($project, 'name') ?>
<!-- <?= $form->field($project, 'duration') ?> -->
<div style="margin-bottom: 20px;">
<?php echo '<label> Project end date * </label>';
echo DatePicker::widget([
'model' => $project,
'attribute' => 'end_date',
'options' => array('placeholder' => 'Enter date'),
'pluginOptions' => [
'endDate'=>"+".$upperlimits->duration."D",
'autoclose'=>true,
'padding-top'=>"500px;"
]
]);?>
</div>
<?= $form->field($project, 'user_num') ?>
<?= Html::label($participating_label, 'user_search_box', ['class'=>'blue-label']) ?>
<br/>
Expand Down
2 changes: 1 addition & 1 deletion views/project/new_machine_compute_request.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
'pluginOptions' => [
'autoclose'=>true,
'format'=>'yyyy-m-d',
'endDate'=>'+30d'
'endDate'=>'+90d'
]
])->label("");
?>
Expand Down
3 changes: 2 additions & 1 deletion views/project/new_ondemand_request.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,9 @@
echo DatePicker::widget([
'model' => $project,
'attribute' => 'end_date',
'options' => ['placeholder' => 'Enter date'],
'options' => array('placeholder' => 'Enter date'),
'pluginOptions' => [
'endDate'=>"+".$upperlimits->duration."D",
'autoclose'=>true,
'padding-top'=>"500px;"
]
Expand Down
3 changes: 2 additions & 1 deletion views/project/new_service_request.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,9 @@
echo DatePicker::widget([
'model' => $project,
'attribute' => 'end_date',
'options' => ['placeholder' => 'Enter date'],
'options' => array('placeholder' => 'Enter date'),
'pluginOptions' => [
'endDate'=>"+".$upperlimits->duration."D",
'autoclose'=>true,
'padding-top'=>"500px;"
]
Expand Down
2 changes: 1 addition & 1 deletion views/project/view_cold_request_user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

Headers::begin() ?>
<?php
if ($project_owner & (($project->status==1) || ($project->status==2)) & $expired!=1)
if (($project_owner || $superAdmin) & (($project->status==1) || ($project->status==2)) & $expired!=1)
{
if ($return == 'user_request'){
echo Headers::widget(
Expand Down
2 changes: 1 addition & 1 deletion views/project/view_jupyter_request_user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
*/
Headers::begin() ?>
<?php
if ($project_owner & (($project->status==1) || ($project->status==2)) & $expired!=1)
if (($project_owner || $superAdmin) & (($project->status==1) || ($project->status==2)) & $expired!=1)
{
if ($return == 'user_request') {
echo Headers::widget(
Expand Down
2 changes: 1 addition & 1 deletion views/project/view_machine_compute_request_user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

Headers::begin() ?>
<?php
if ($project_owner & (($project->status==1) || ($project->status==2)) & $expired!=1)
if (($project_owner || $superAdmin) & (($project->status==1) || ($project->status==2)) & $expired!=1)
{
if ($return == 'user_request'){
echo Headers::widget(
Expand Down
2 changes: 1 addition & 1 deletion views/project/view_ondemand_request_user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
*/
Headers::begin() ?>
<?php
if ($project_owner & (($project->status==1) || ($project->status==2)) & $expired!=1)
if (($project_owner || $superAdmin) & (($project->status==1) || ($project->status==2)) & $expired!=1)
{
if ($return == 'user_request') {
echo Headers::widget(
Expand Down
2 changes: 1 addition & 1 deletion views/project/view_service_request_user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

Headers::begin() ?>
<?php
if ($project_owner & (($project->status==1) || ($project->status==2)) & $expired!=1)
if (($project_owner || $superAdmin) & (($project->status==1) || ($project->status==2)) & $expired!=1)
{
if ($return == 'user_request'){
echo Headers::widget(
Expand Down
Loading