Merge pull request #68 from katmastt/main

Datepicker widget field read-only, jupyter email notification correction.
athenarc · Dec 13, 2023 · 8840653 · 8840653
2 parents 14a813b + a7a4954
commit 8840653
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 9 deletions.
diff --git a/models/JupyterRequestNew.php b/models/JupyterRequestNew.php
@@ -212,8 +212,9 @@ public function uploadNew($requestId)
             $username = User::returnUsernameById($request->submitted_by);
 
             $message_autoaccept="We are happy to inform you that your project '$project->name' has been automatically approved. <br /> You can access the project resources via the " . Yii::$app->params['name'] . " website"; 
-            $message_autoaccept_mod="We would like to inform you that the On-demand computation project '$project->name', submitted by user $username, has been automatically approved.";
-
+            // $message_autoaccept_mod="We would like to inform you that the On-demand computation project '$project->name', submitted by user $username, has been automatically approved.";
+            $message_autoaccept_mod="We would like to inform you that the On-demand notebooks project '$project->name', submitted by user $username, has been automatically approved.";
+
         }
 
         else
@@ -332,7 +333,7 @@ public function uploadNewEdit($requestId,$uchanged)
             $username = User::returnUsernameById($submitted_by);
             $warnings=  'Your request'.$autoaccept_allowed.' will be reviewed.';
             $project_id=$project->id;
-            $message="The books project '$project->name', created by user $username, has been modified and is pending approval.";
+            $message="The On-demand notebooks project '$project->name', created by user $username, has been modified and is pending approval.";
             EmailEventsModerator::NotifyByEmail('edit_project', $project_id,$message);
         }
 

diff --git a/models/ProjectRequest.php b/models/ProjectRequest.php
@@ -332,7 +332,7 @@ public function uploadNew($project_type)
             } elseif ($project_type == 3){
                 $project_typen = "Machine Compute";
             } else {
-                $project_typen = "Jupyter Notebook";
+                $project_typen = "On-demand Notebooks";
             }
 
             Yii::$app->db->createCommand()->update('project',['pending_request_id'=>$request_id], "id='$project_id'")->execute();

diff --git a/views/project/edit_cold_storage.php b/views/project/edit_cold_storage.php
@@ -76,6 +76,7 @@
             echo DatePicker::widget([
             'model' => $project, 
             'attribute' => 'end_date',
+            'options' => array('readonly' => 'readonly'),
             'pluginOptions' => [
             'endDate'=>"+".($upperlimits->duration-$interval)."D",
             'autoclose'=>true,
@@ -87,6 +88,7 @@
             echo DatePicker::widget([
             'model' => $project, 
             'attribute' => 'end_date',
+            'options' => array('readonly' => 'readonly'),
             'pluginOptions' => [
             'autoclose'=>true,
             'format'=>'yyyy-m-d'

diff --git a/views/project/edit_jupyter.php b/views/project/edit_jupyter.php
@@ -90,8 +90,10 @@
             echo DatePicker::widget([
             'model' => $project, 
             'attribute' => 'end_date',
+            'options' => array('readonly' => 'readonly'),
             'pluginOptions' => [
             'endDate'=>"+".($upperlimits->duration-$interval)."D",
+            'readonly' => 'true',
             'autoclose'=>true,
             'format'=>'yyyy-m-d'
             ]
@@ -101,6 +103,7 @@
             echo DatePicker::widget([
             'model' => $project, 
             'attribute' => 'end_date',
+            'options' => array('readonly' => 'readonly'),
             'pluginOptions' => [
             'autoclose'=>true,
             'format'=>'yyyy-m-d'

diff --git a/views/project/edit_machine_compute.php b/views/project/edit_machine_compute.php
@@ -49,13 +49,15 @@
                  <div style="margin-bottom: 20px;">
                 <?php echo '<label>  Project end date *  </label>';
                       if($exceed_limits == 0){echo  $form->field($project, 'end_date')->widget(DatePicker::className(),[
+                        'options' => array('readonly' => 'readonly'),
                         'pluginOptions' => [
                         'autoclose'=>true,
                         'format'=>'yyyy-m-d',
                         'endDate'=>'+'.(90-$interval)."d"
                         ]
                     ])->label("");}
                     if($exceed_limits == 1){echo  $form->field($project, 'end_date')->widget(DatePicker::className(),[
+                        'options' => array('readonly' => 'readonly'),
                         'pluginOptions' => [
                         'autoclose'=>true,
                         'format'=>'yyyy-m-d'

diff --git a/views/project/edit_ondemand.php b/views/project/edit_ondemand.php
@@ -83,6 +83,7 @@
             echo DatePicker::widget([
             'model' => $project, 
             'attribute' => 'end_date',
+            'options' => array('readonly' => 'readonly'),
             'pluginOptions' => [
             'endDate'=>"+".($upperlimits->duration-$interval)."D",
             'autoclose'=>true,
@@ -94,6 +95,7 @@
             echo DatePicker::widget([
             'model' => $project, 
             'attribute' => 'end_date',
+            'options' => array('readonly' => 'readonly'),
             'pluginOptions' => [
             'autoclose'=>true,
             'format'=>'yyyy-m-d'

diff --git a/views/project/edit_service.php b/views/project/edit_service.php
@@ -69,6 +69,7 @@
                     echo DatePicker::widget([
                     'model' => $project, 
                     'attribute' => 'end_date',
+                    'options' => array('readonly' => 'readonly'),
                     'pluginOptions' => [
                     'endDate'=>"+".($upperlimits->duration-$interval)."D",
                     'autoclose'=>true,
@@ -80,6 +81,7 @@
                     echo DatePicker::widget([
                     'model' => $project, 
                     'attribute' => 'end_date',
+                    'options' => array('readonly' => 'readonly'),
                     'pluginOptions' => [
                     'autoclose'=>true,
                     'format'=>'yyyy-m-d'

diff --git a/views/project/new_cold_storage_request.php b/views/project/new_cold_storage_request.php
@@ -71,11 +71,13 @@
             echo DatePicker::widget([
             'model' => $project, 
             'attribute' => 'end_date',
-            'options' => array('placeholder' => 'Enter date'),
+            'options' => array('placeholder' => 'Enter date',
+                                'readonly' => 'readonly'),
             'pluginOptions' => [
             'endDate'=>"+".$upperlimits->duration."D",
             'autoclose'=>true,
-            'padding-top'=>"500px;"
+            'padding-top'=>"500px;",
+            'readonly'=>true
             ]
         ]);?>
         </div>

diff --git a/views/project/new_jupyter_request.php b/views/project/new_jupyter_request.php
@@ -84,7 +84,8 @@
             echo DatePicker::widget([
             'model' => $project, 
             'attribute' => 'end_date',
-            'options' => array('placeholder' => 'Enter date'),
+            'options' => array('placeholder' => 'Enter date',
+                        'readonly' => 'readonly'),
             'pluginOptions' => [
             'endDate'=>"+".$upperlimits->duration."D",
             'autoclose'=>true,

diff --git a/views/project/new_machine_compute_request.php b/views/project/new_machine_compute_request.php
@@ -58,6 +58,8 @@
         <div style="margin-bottom: 20px;">
         <?php echo '<label>  Project end date *  </label>';
           echo  $form->field($project, 'end_date')->widget(DatePicker::className(),[
+            'options' => array('placeholder' => 'Enter date',
+            'readonly' => 'readonly'),
             'pluginOptions' => [
             'autoclose'=>true,
             'format'=>'yyyy-m-d',

diff --git a/views/project/new_ondemand_request.php b/views/project/new_ondemand_request.php
@@ -80,7 +80,8 @@
             echo DatePicker::widget([
             'model' => $project, 
             'attribute' => 'end_date',
-            'options' => array('placeholder' => 'Enter date'),
+            'options' => array('placeholder' => 'Enter date',
+            'readonly' => 'readonly'),
             'pluginOptions' => [
             'endDate'=>"+".$upperlimits->duration."D",
             'autoclose'=>true,

diff --git a/views/project/new_service_request.php b/views/project/new_service_request.php
@@ -78,7 +78,8 @@
             echo DatePicker::widget([
             'model' => $project, 
             'attribute' => 'end_date',
-            'options' => array('placeholder' => 'Enter date'),
+            'options' => array('placeholder' => 'Enter date',
+            'readonly' => 'readonly'),
             'pluginOptions' => [
             'endDate'=>"+".$upperlimits->duration."D",
             'autoclose'=>true,