From f224d45201adf1025dd477ccd96b159bf4ada691 Mon Sep 17 00:00:00 2001
From: katmastt <aimastor@di.uoa.gr>
Date: Mon, 8 Jan 2024 12:08:21 +0000
Subject: [PATCH] start date of a project is now selected from start_date field
 of project table

---
 controllers/ProjectController.php             | 41 +++++++++++--------
 models/ProjectRequest.php                     |  2 +-
 views/project/view_cold_request.php           |  2 +-
 views/project/view_jupyter_request.php        |  2 +-
 .../project/view_machine_compute_request.php  |  2 +-
 views/project/view_ondemand_request.php       |  2 +-
 views/project/view_service_request.php        |  2 +-
 7 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/controllers/ProjectController.php b/controllers/ProjectController.php
index b950853..8cac736 100644
--- a/controllers/ProjectController.php
+++ b/controllers/ProjectController.php
@@ -1006,19 +1006,22 @@ public function actionViewRequest($id,$filter='all')
         $project_request = ProjectRequest::findOne($id);
         $project_status = ProjectRequest::STATUSES[$project_request->status];
 
+        $project=Project::find()->where(['id'=>$project_request->project_id])->one();
+        $start = date('Y-m-d', strtotime($project->start_date));
+
         if (!Userw::hasRole('Admin',$superadminAllowed=true) && (!Userw::hasRole('Moderator',$superadminAllowed=true)) )
         {
             return $this->render('//site/error_unauthorized');
         }
 
-        if(is_null($project_request->approval_date))
-        {
-            $start = date('Y-m-d', strtotime($project_request->submission_date));
-        }
-        else
-        {
-            $start = date('Y-m-d', strtotime($project_request->approval_date));
-        }
+        // if(is_null($project_request->approval_date))
+        // {
+        //     $start = date('Y-m-d', strtotime($project_request->submission_date));
+        // }
+        // else
+        // {
+        //     $start = date('Y-m-d', strtotime($project_request->approval_date));
+        // }
         if(is_null($project_request->end_date))
         {
             $ends=date('Y-m-d', strtotime($start. " + $project_request->duration months"));
@@ -1349,6 +1352,8 @@ public function actionViewRequestUser($id,$filter='all',$return='index')
         ProjectRequest::recordViewed($id);
         $project_request=ProjectRequest::findOne($id);
         $project=Project::find()->where(['id'=>$project_request->project_id])->one();
+
+        $start = date('Y-m-d', strtotime($project->start_date));
         
         $user_list=$project_request->user_list->getValue();
         $users=User::find()->where(['id'=>$user_list])->all();
@@ -1367,14 +1372,15 @@ public function actionViewRequestUser($id,$filter='all',$return='index')
         // }
       
 
-        if(is_null($project_request->approval_date))
-        {
-            $start = date('Y-m-d', strtotime($project_request->submission_date));
-        }
-        else
-        {
-            $start = date('Y-m-d', strtotime($project_request->approval_date));
-        }
+        // if(is_null($project_request->approval_date))
+        // {
+        //     $start = date('Y-m-d', strtotime($project_request->submission_date));
+        // }
+        // else
+        // {
+        //     $start = date('Y-m-d', strtotime($project_request->approval_date));
+        // }
+
         if(is_null($project_request->end_date))
         {
             $ends=date('Y-m-d', strtotime($start. " + $project_request->duration months"));
@@ -2325,6 +2331,7 @@ public function actionEditProject($id)
     {
         $images = '';
         $prequest=ProjectRequest::find()->where(['id'=>$id])->one();
+        $project=Project::find()->where(['id'=>$prequest->project_id])->one();
         $exceed_limits = 0;
         if((Userw::hasRole('Admin', $superadminAllowed=true)) || (Userw::hasRole('Moderator', $superadminAllowed=true))){
             $exceed_limits = 1;
@@ -2382,7 +2389,7 @@ public function actionEditProject($id)
         $vm_exists=false;
 
         $date3=new \DateTime(date("Y-m-d"));
-        $start=new \DateTime($prequest->approval_date);
+        $start=new \DateTime($project->start_date);
         $today= new \DateTime();
         
         $interval=$start->diff($today)->format("%d" );
diff --git a/models/ProjectRequest.php b/models/ProjectRequest.php
index a59e98d..f01964f 100644
--- a/models/ProjectRequest.php
+++ b/models/ProjectRequest.php
@@ -300,7 +300,7 @@ public function uploadNew($project_type)
         {            
             $submitted_by=User::findByUsername(Userw::getCurrentUser()['username'])->id;
 
-            Yii::$app->db->createCommand()->insert('project', ['name' => $this->name,'project_type'=> $project_type])->execute();
+            Yii::$app->db->createCommand()->insert('project', ['name' => $this->name,'project_type'=> $project_type, 'start_date' => 'NOW()'])->execute();
             $project_id=$id = Yii::$app->db->getLastInsertID();
 
             Yii::$app->db->createCommand()->insert('project_request', [
diff --git a/views/project/view_cold_request.php b/views/project/view_cold_request.php
index 18c880f..5bff8f7 100644
--- a/views/project/view_cold_request.php
+++ b/views/project/view_cold_request.php
@@ -64,7 +64,7 @@
                 <tr>
                     <th class="col-md-6 text-right" scope="col">Started on:</th>
                     <td class="col-md-6 text-left" scope="col">
-                        <?= ProjectValueDisplay::startDate($start,$requestHistory); ?>
+                        <?= $start ?>
                     </td>
                 </tr>
                 <?php
diff --git a/views/project/view_jupyter_request.php b/views/project/view_jupyter_request.php
index 3ffbe0c..f0a3b78 100644
--- a/views/project/view_jupyter_request.php
+++ b/views/project/view_jupyter_request.php
@@ -80,7 +80,7 @@
 			<tr>
 				<th class="col-md-6 text-right" scope="col">Started on:</th>
 				<td class="col-md-6 text-left" scope="col">
-                    <?= ProjectValueDisplay::startDate($start,$requestHistory); ?>
+					<?= $start ?>
                 </td>
 			</tr>
 			<tr>
diff --git a/views/project/view_machine_compute_request.php b/views/project/view_machine_compute_request.php
index 4199501..c9ab68d 100644
--- a/views/project/view_machine_compute_request.php
+++ b/views/project/view_machine_compute_request.php
@@ -66,7 +66,7 @@
 			<tr>
 				<th class="col-md-6 text-right" scope="col">Started on:</th>
 				<td class="col-md-6 text-left" scope="col">
-                    <?= ProjectValueDisplay::startDate($start,$requestHistory); ?>
+					<?= $start ?>
                 </td>
 			</tr>
 			<?php
diff --git a/views/project/view_ondemand_request.php b/views/project/view_ondemand_request.php
index 7799927..540ac2b 100644
--- a/views/project/view_ondemand_request.php
+++ b/views/project/view_ondemand_request.php
@@ -80,7 +80,7 @@
 			<tr>
 				<th class="col-md-6 text-right" scope="col">Started on:</th>
 				<td class="col-md-6 text-left" scope="col">
-                    <?= ProjectValueDisplay::startDate($start,$requestHistory); ?>
+					<?= $start ?>
                 </td>
 			</tr>
 			<tr>
diff --git a/views/project/view_service_request.php b/views/project/view_service_request.php
index 5804bd6..1ed5e70 100644
--- a/views/project/view_service_request.php
+++ b/views/project/view_service_request.php
@@ -66,7 +66,7 @@
                 <tr>
                     <th class="col-md-6 text-right" scope="col">Started on:</th>
                     <td class="col-md-6 text-left" scope="col">
-                        <?= ProjectValueDisplay::startDate($start,$requestHistory); ?>
+                        <?= $start ?>
                     </td>
                 </tr>
                 <?php