Merge pull request #103 from stats4sd/custom-indicators

Custom indicators
stats4sd · Dec 18, 2024 · bc974ed · bc974ed
2 parents 51500e3 + c498b47
commit bc974ed
Show file tree

Hide file tree

Showing 14 changed files with 198 additions and 412 deletions.
diff --git a/app/Imports/CustomIndicatorChoicesImport.php b/app/Imports/CustomIndicatorChoicesImport.php
diff --git a/app/Imports/CustomIndicatorSurveyImport.php b/app/Imports/CustomIndicatorSurveyImport.php
diff --git a/app/Imports/CustomIndicatorWorkbookImport.php b/app/Imports/CustomIndicatorWorkbookImport.php
diff --git a/app/Imports/XlsformTemplate/XlsformTemplateChoiceListImport.php b/app/Imports/XlsformTemplate/XlsformTemplateChoiceListImport.php
@@ -35,10 +35,15 @@ public function model(array $row): ChoiceList
     {
         $row = collect($row);
 
-        $localisable = match ($row['localisable']) {
-            'true', 'yes', 'TRUE', 'YES', 'Yes', 'True', '1', 1, true => true,
-            default => false,
-        };
+        if (isset($row['localisable'])) {
+            $localisable = match ($row['localisable']) {
+                'true', 'yes', 'TRUE', 'YES', 'Yes', 'True', '1', 1, true => true,
+                default => false,
+            };
+        }
+        else {
+            $localisable = false;
+        }
 
         return new ChoiceList([
             'template_id' => $this->xlsformTemplate->id,

diff --git a/app/Livewire/CustomIndicators.php b/app/Livewire/CustomIndicators.php
@@ -29,42 +29,6 @@ public function mount()
         $this->team = Team::find(auth()->user()->latestTeam->id);
     }
 
-    public function downloadHouseholdTemplate()
-    {
-        $hasHousehold = LocalIndicator::query()
-        ->where('team_id', $this->team->id)
-        ->where('is_custom', 1)
-        ->where('survey', 'household')
-        ->exists();
-
-        if (!$hasHousehold) {
-            $this->addError('validation', 'No confirmed custom indicators assigned to the Household survey.');
-            return;
-        }
-
-        $currentDate = Carbon::now()->format('Y-m-d');
-        $filename = "HOLPA - {$this->team->name} - Custom Indicator Household Template - {$currentDate}.xlsx";
-        return Excel::download(new CustomIndicatorExport($this->team, 'household'), $filename);
-    }
-
-    public function downloadFieldworkTemplate()
-    {
-        $hasFieldwork = LocalIndicator::query()
-        ->where('team_id', $this->team->id)
-        ->where('is_custom', 1)
-        ->where('survey', 'fieldwork')
-        ->exists();
-
-        if (!$hasFieldwork) {
-            $this->addError('validation', 'No confirmed custom indicators assigned to the Fieldwork survey.');
-            return;
-        }
-
-        $currentDate = Carbon::now()->format('Y-m-d');
-        $filename = "HOLPA - {$this->team->name} - Custom Indicator Fieldwork Template - {$currentDate}.xlsx";
-        return Excel::download(new CustomIndicatorExport($this->team, 'fieldwork'), $filename);
-    }
-
     public function table(Table $table): Table
     {
         return $table
@@ -74,7 +38,7 @@ public function table(Table $table): Table
                 TextColumn::make('name')->label(''),
                 CheckboxColumn::make('is_custom')->label('Confirm and add'),
                 SelectColumn::make('survey')
-                    ->label('Survey')
+                    ->label('Select the survey')
                     ->disabled(fn ($record) => $record->is_custom !== 1)
                     ->options([
                     'household' => 'Household',
@@ -84,15 +48,41 @@ public function table(Table $table): Table
             ->paginated(false)
             ->emptyStateHeading('No custom indicators');
     }
-
-
+
+    private function hasCustomIndicatorsWithSurvey(string $survey): bool
+    {
+        return LocalIndicator::query()
+            ->where('team_id', $this->team->id)
+            ->where('is_custom', 1)
+            ->where('survey', $survey)
+            ->exists();
+    }
+
+    private function hasUnassignedCustomIndicators(): bool
+    {
+        return $this->team->localIndicators()->where('is_custom', 1)->whereNull('survey')->exists();
+    }
 
     public function resetIndicators()
     {
         // Reset the 'is_custom' flag to 0 for all local indicators belonging to this team
         $this->team->localIndicators()->update(['is_custom' => 0]);
     }
 
+    public function downloadHouseholdTemplate()
+    {
+        $currentDate = Carbon::now()->format('Y-m-d');
+        $filename = "HOLPA - {$this->team->name} - Custom Indicator Household Template - {$currentDate}.xlsx";
+        return Excel::download(new CustomIndicatorExport($this->team, 'household'), $filename);
+    }
+
+    public function downloadFieldworkTemplate()
+    {
+        $currentDate = Carbon::now()->format('Y-m-d');
+        $filename = "HOLPA - {$this->team->name} - Custom Indicator Fieldwork Template - {$currentDate}.xlsx";
+        return Excel::download(new CustomIndicatorExport($this->team, 'fieldwork'), $filename);
+    }
+
     public function render()
     {
         return view('livewire.custom-indicators');