Merge pull request #3428 from ColoredCow/feat/approved_hours_col

Approved hrs column added to the project details
ColoredCow · Feb 28, 2024 · 35dcd24 · 35dcd24
2 parents c4beb4f + b8c20e3
commit 35dcd24
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 6 deletions.
diff --git a/Modules/EffortTracking/Config/config.php b/Modules/EffortTracking/Config/config.php
@@ -13,4 +13,5 @@
     ],
     'default_last_column_in_effort_sheet' => 'G',
     'default_start_column_in_effort_sheet' => 'C',
+    'default_monthly_approved_pipeline_column_in_effort_sheet' => 'B6',
 ];
diff --git a/Modules/EffortTracking/Services/EffortTrackingService.php b/Modules/EffortTracking/Services/EffortTrackingService.php
@@ -201,14 +201,18 @@ public function getEffortForProject($project)
             $sheet = $sheets->spreadsheet($sheetId)
                 ->range($range)
                 ->get();
-
             foreach ($sheet as $rows) {
                 if (count($rows) == 0) {
                     break;
                 }
                 $projectMembersCount++;
             }
 
+            $approvedPipelineRange = config('efforttracking.default_monthly_approved_pipeline_column_in_effort_sheet');
+            $approvedPipelineSheet = $sheets->spreadsheet($sheetId)
+                ->range($approvedPipelineRange)
+                ->get();
+
             try {
                 while (true) {
                     $lastColumn++;
@@ -296,6 +300,8 @@ public function getEffortForProject($project)
                         try {
                             $effortData['sheet_project'] = $sheetProject;
                             $this->updateEffort($effortData);
+                            $approvedPipelineSheetEffort = ! empty($approvedPipelineSheet[0][0]) ? $approvedPipelineSheet[0][0] : 0;
+                            $this->updateApprovedPipelineEffort($approvedPipelineSheetEffort, $effortData);
                             ProjectMeta::updateOrCreate(
                                 [
                                     'key' => config('project.meta_keys.last_updated_at.key'),
@@ -331,6 +337,18 @@ public function getColumnIndex($columnName, $sheetColumns)
         return false;
     }
 
+    public function updateApprovedPipelineEffort($approvedPipelineSheet, $effortData)
+    {
+        Project::updateOrCreate(
+            [
+                'id' => $effortData['sheet_project']['id'],
+            ],
+            [
+                'monthly_approved_pipeline' => $approvedPipelineSheet,
+            ]
+        );
+    }
+
     public function updateEffort(array $effortData)
     {
         $currentDate = now(config('constants.timezone.indian'))->today();

diff --git a/Modules/Project/Database/Migrations/2024_02_26_133946_add_approved_pipline_column.php b/Modules/Project/Database/Migrations/2024_02_26_133946_add_approved_pipline_column.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddApprovedPiplineColumn extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('projects', function (Blueprint $table) {
+            $table->string('monthly_approved_pipeline')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('projects', function (Blueprint $table) {
+            $table->dropColumn('monthly_approved_pipeline');
+        });
+    }
+}
diff --git a/Modules/Project/Resources/views/show.blade.php b/Modules/Project/Resources/views/show.blade.php
@@ -81,11 +81,19 @@
                         <span class="text-capitalize ml-2 fz-lg-22">{{ $project->total_estimated_hours }}
                     </div>
                 </div>
-                <div class="form-group col-md-6 pl-4">
-                    <h4 class="d-inline-block">
-                        <label for="name" class="font-weight-bold">Start Date:</label>
-                    </h4>
-                    <span class="text-capitalize ml-2 fz-lg-22">{{ optional($project->start_date)->format('d M Y')}}</span>
+                <div class="form-row">
+                    <div class="form-group col-md-6 pl-4">
+                        <h4 class="d-inline-block">
+                            <label for="name" class="font-weight-bold">Start Date:</label>
+                        </h4>
+                        <span class="text-capitalize ml-2 fz-lg-22">{{ optional($project->start_date)->format('d M Y')}}</span>
+                    </div>
+                    <div class="form-group offset-md-1 pl-4 col-md-5">
+                        <h4 class="d-inline-block">
+                            <label for="name" class="font-weight-bold">Monthly Approved Pipeline:</label>
+                        </h4>
+                        <span class="text-capitalize ml-2 fz-lg-22">{{ $project->monthly_approved_pipeline }}
+                    </div>
                 </div>
                 <div class="form-group col-md-6 pl-4">
                     <h4 class="d-inline-block">