Merge branch 'dev' into post-demo-fixes

stats4sd · Jan 6, 2025 · e973c45 · e973c45
2 parents d0fb97f + 91554d6
commit e973c45
Show file tree

Hide file tree

Showing 220 changed files with 1,671 additions and 2,127 deletions.
diff --git a/app/Console/Commands/Temp.php b/app/Console/Commands/Temp.php
@@ -2,8 +2,8 @@
 
 namespace App\Console\Commands;
 
-use App\Models\XlsformTemplates\XlsformTemplate;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Auth;
 
 class Temp extends Command
 {
@@ -24,11 +24,8 @@ class Temp extends Command
     /**
      * Execute the console command.
      */
-    public function handle()
+    public function handle(): void
     {
-       $xlsformTemplate = XlsformTemplate::first();
-
-       dd($xlsformTemplate->surveyRows->count());
-
+       Auth::user()->canDoSomething();
     }
 }
diff --git a/app/Exports/XlsformExport/XlsformChoicesExport.php b/app/Exports/XlsformExport/XlsformChoicesExport.php
@@ -2,17 +2,16 @@
 
 namespace App\Exports\XlsformExport;
 
-use App\Models\Language;
+use App\Models\XlsformLanguages\Language;
+use App\Models\XlsformLanguages\XlsformTemplateLanguage;
+use App\Models\Xlsforms\ChoiceListEntry;
 use App\Models\Xlsforms\Xlsform;
-use App\Models\XlsformTemplateLanguage;
-use App\Models\XlsformTemplates\ChoiceListEntry;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use Maatwebsite\Excel\Concerns\FromCollection;
 use Maatwebsite\Excel\Concerns\ShouldAutoSize;
 use Maatwebsite\Excel\Concerns\WithColumnWidths;
 use Maatwebsite\Excel\Concerns\WithHeadings;
-use Maatwebsite\Excel\Concerns\WithMapping;
 use Maatwebsite\Excel\Concerns\WithStyles;
 use Maatwebsite\Excel\Concerns\WithTitle;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;

diff --git a/app/Exports/XlsformExport/XlsformSurveyExport.php b/app/Exports/XlsformExport/XlsformSurveyExport.php
@@ -2,26 +2,21 @@
 
 namespace App\Exports\XlsformExport;
 
-use App\Models\Language;
-use App\Models\Locale;
 use App\Models\Team;
-use App\Models\XlsformModule;
-use App\Models\XlsformModuleVersion;
+use App\Models\XlsformLanguages\Language;
+use App\Models\Xlsforms\SurveyRow;
 use App\Models\Xlsforms\Xlsform;
-use App\Models\XlsformTemplateLanguage;
-use App\Models\XlsformTemplates\SurveyRow;
+use App\Models\Xlsforms\XlsformModule;
+use App\Models\Xlsforms\XlsformModuleVersion;
 use Illuminate\Support\Collection;
 use Maatwebsite\Excel\Concerns\FromCollection;
 use Maatwebsite\Excel\Concerns\ShouldAutoSize;
 use Maatwebsite\Excel\Concerns\WithColumnWidths;
 use Maatwebsite\Excel\Concerns\WithHeadings;
-use Maatwebsite\Excel\Concerns\WithMapping;
 use Maatwebsite\Excel\Concerns\WithStyles;
 use Maatwebsite\Excel\Concerns\WithTitle;
-use Maatwebsite\Excel\Row;
 use PhpOffice\PhpSpreadsheet\Style\Fill;
 use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
-use Stats4sd\FilamentOdkLink\Models\OdkLink\XlsformTemplate;
 
 class XlsformSurveyExport implements FromCollection, WithHeadings, WithTitle, WithStyles, ShouldAutoSize, WithColumnWidths
 {

diff --git a/app/Exports/XlsformExport/XlsformWorkbookExport.php b/app/Exports/XlsformExport/XlsformWorkbookExport.php
@@ -2,9 +2,9 @@
 
 namespace App\Exports\XlsformExport;
 
-use App\Models\LanguageStringType;
-use App\Models\Locale;
 use App\Models\Team;
+use App\Models\XlsformLanguages\LanguageStringType;
+use App\Models\XlsformLanguages\Locale;
 use App\Models\Xlsforms\Xlsform;
 use Illuminate\Support\Collection;
 use Maatwebsite\Excel\Concerns\WithMultipleSheets;

diff --git a/app/Exports/XlsformTemplateLanguageExport.php b/app/Exports/XlsformTemplateLanguageExport.php
@@ -2,8 +2,8 @@
 
 namespace App\Exports;
 
-use App\Models\XlsformTemplateLanguage;
-use App\Models\XlsformTemplates\XlsformTemplate;
+use App\Models\XlsformLanguages\XlsformTemplateLanguage;
+use App\Models\Xlsforms\XlsformTemplate;
 use Maatwebsite\Excel\Concerns\FromArray;
 use Maatwebsite\Excel\Concerns\WithBackgroundColor;
 use Maatwebsite\Excel\Concerns\WithColumnWidths;

diff --git a/app/Filament/Admin/Resources/ChoiceListResource.php b/app/Filament/Admin/Resources/ChoiceListResource.php
@@ -4,16 +4,15 @@
 
 use App\Filament\Admin\Resources\ChoiceListResource\Pages;
 use App\Filament\Admin\Resources\ChoiceListResource\RelationManagers;
-use App\Models\XlsformModuleVersion;
-use App\Models\XlsformTemplates\ChoiceList;
-use App\Models\XlsformTemplates\XlsformTemplate;
+use App\Models\Xlsforms\ChoiceList;
+use App\Models\Xlsforms\XlsformModuleVersion;
+use App\Models\Xlsforms\XlsformTemplate;
 use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
 
 class ChoiceListResource extends Resource
 {

diff --git a/.../Admin/Resources/ChoiceListResource/RelationManagers/ChoiceListEntriesRelationManager.php b/.../Admin/Resources/ChoiceListResource/RelationManagers/ChoiceListEntriesRelationManager.php
@@ -2,11 +2,10 @@
 
 namespace App\Filament\Admin\Resources\ChoiceListResource\RelationManagers;
 
-use App\Filament\App\Clusters\Localisations\Resources\ChoiceListEntryResource;
-use App\Models\LanguageStringType;
-use App\Models\XlsformTemplateLanguage;
-use App\Models\XlsformTemplates\ChoiceList;
-use App\Models\XlsformTemplates\ChoiceListEntry;
+use App\Models\XlsformLanguages\LanguageStringType;
+use App\Models\XlsformLanguages\XlsformTemplateLanguage;
+use App\Models\Xlsforms\ChoiceList;
+use App\Models\Xlsforms\ChoiceListEntry;
 use Filament\Forms;
 use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\Repeater;
@@ -16,8 +15,6 @@
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
 
 class ChoiceListEntriesRelationManager extends RelationManager
 {

diff --git a/app/Filament/Admin/Resources/DomainResource.php b/app/Filament/Admin/Resources/DomainResource.php
@@ -4,14 +4,12 @@
 
 use App\Filament\Admin\Resources\DomainResource\Pages;
 use App\Filament\Admin\Resources\DomainResource\RelationManagers;
-use App\Models\Domain;
+use App\Models\Holpa\Domain;
 use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
 
 class DomainResource extends Resource
 {

diff --git a/app/Filament/Admin/Resources/GlobalIndicatorResource.php b/app/Filament/Admin/Resources/GlobalIndicatorResource.php
@@ -2,15 +2,15 @@
 
 namespace App\Filament\Admin\Resources;
 
+use App\Filament\Admin\Resources\GlobalIndicatorResource\Pages;
+use App\Filament\Admin\Resources\GlobalIndicatorResource\RelationManagers;
+use App\Models\Holpa\GlobalIndicator;
+use App\Models\Holpa\Theme;
 use Filament\Forms;
-use Filament\Tables;
-use App\Models\Theme;
 use Filament\Forms\Form;
-use Filament\Tables\Table;
-use App\Models\GlobalIndicator;
 use Filament\Resources\Resource;
-use App\Filament\Admin\Resources\GlobalIndicatorResource\Pages;
-use App\Filament\Admin\Resources\GlobalIndicatorResource\RelationManagers;
+use Filament\Tables;
+use Filament\Tables\Table;
 
 class GlobalIndicatorResource extends Resource
 {

diff --git a/app/Filament/Admin/Resources/TeamResource.php b/app/Filament/Admin/Resources/TeamResource.php
@@ -8,8 +8,8 @@
 use App\Models\Team;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Stats4sd\FilamentTeamManagement\Filament\Admin\Resources\TeamResource\RelationManagers\UsersRelationManager;
 use Stats4sd\FilamentTeamManagement\Filament\Admin\Resources\TeamResource\RelationManagers\InvitesRelationManager;
+use Stats4sd\FilamentTeamManagement\Filament\Admin\Resources\TeamResource\RelationManagers\UsersRelationManager;
 
 class TeamResource extends \Stats4sd\FilamentTeamManagement\Filament\Admin\Resources\TeamResource
 {

diff --git a/app/Filament/Admin/Resources/TeamResource/RelationManagers/LocalesRelationManager.php b/app/Filament/Admin/Resources/TeamResource/RelationManagers/LocalesRelationManager.php
@@ -2,14 +2,11 @@
 
 namespace App\Filament\Admin\Resources\TeamResource\RelationManagers;
 
-use App\Models\Language;
 use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
 
 class LocalesRelationManager extends RelationManager
 {

diff --git a/app/Filament/Admin/Resources/TeamResource/RelationManagers/XlsformsRelationManager.php b/app/Filament/Admin/Resources/TeamResource/RelationManagers/XlsformsRelationManager.php
@@ -8,7 +8,6 @@
 use Filament\Tables\Actions\CreateAction;
 use Filament\Tables\Table;
 use Maatwebsite\Excel\Facades\Excel;
-use Stats4sd\FilamentOdkLink\Jobs\UpdateXlsformTitleInFile;
 use Stats4sd\FilamentOdkLink\Services\OdkLinkService;
 
 class XlsformsRelationManager extends \Stats4sd\FilamentOdkLink\Filament\Resources\TeamResource\RelationManagers\XlsformsRelationManager

diff --git a/app/Filament/Admin/Resources/ThemeResource.php b/app/Filament/Admin/Resources/ThemeResource.php
@@ -2,15 +2,15 @@
 
 namespace App\Filament\Admin\Resources;
 
+use App\Filament\Admin\Resources\ThemeResource\Pages;
+use App\Filament\Admin\Resources\ThemeResource\RelationManagers;
+use App\Models\Holpa\Domain;
+use App\Models\Holpa\Theme;
 use Filament\Forms;
-use Filament\Tables;
-use App\Models\Theme;
-use App\Models\Domain;
 use Filament\Forms\Form;
-use Filament\Tables\Table;
 use Filament\Resources\Resource;
-use App\Filament\Admin\Resources\ThemeResource\Pages;
-use App\Filament\Admin\Resources\ThemeResource\RelationManagers;
+use Filament\Tables;
+use Filament\Tables\Table;
 
 class ThemeResource extends Resource
 {

diff --git a/app/Filament/Admin/Resources/XlsformModuleResource.php b/app/Filament/Admin/Resources/XlsformModuleResource.php
@@ -2,16 +2,13 @@
 
 namespace App\Filament\Admin\Resources;
 
-use App\Filament\Admin\Resources\XlsformTemplateModuleTypeResource\Pages;
-use App\Filament\Admin\Resources\XlsformTemplateModuleTypeResource\RelationManagers;
-use App\Models\XlsformModule;
+use App\Filament\Admin\Resources\XlsformModuleResource\Pages\ManageXlsformModule;
+use App\Models\Xlsforms\XlsformModule;
 use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
 
 class XlsformModuleResource extends Resource
 {
@@ -69,7 +66,7 @@ public static function getRelations(): array
     public static function getPages(): array
     {
         return [
-            'index' => Pages\ManageXlsformModule::route('/'),
+            'index' => ManageXlsformModule::route('/'),
         ];
     }
 }
diff --git a/app/Filament/Admin/Resources/XlsformModuleResource/Pages/ManageXlsformModule.php b/app/Filament/Admin/Resources/XlsformModuleResource/Pages/ManageXlsformModule.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Admin\Resources\XlsformTemplateModuleTypeResource\Pages;
+namespace App\Filament\Admin\Resources\XlsformModuleResource\Pages;
 
 use App\Filament\Admin\Resources\XlsformModuleResource;
 use Filament\Actions;

diff --git a/app/Filament/Admin/Resources/XlsformModuleVersionResource.php b/app/Filament/Admin/Resources/XlsformModuleVersionResource.php
@@ -2,19 +2,15 @@
 
 namespace App\Filament\Admin\Resources;
 
-use App\Filament\Admin\Resources\XlsformTemplateModuleResource\Pages;
-use App\Filament\Admin\Resources\XlsformTemplateModuleResource\RelationManagers;
-use App\Models\XlsformModule;
-use App\Models\XlsformModuleVersion;
+use App\Filament\Admin\Resources\XlsformModuleVersionResource\Pages\ManageXlsformModuleVersion;
+use App\Models\Xlsforms\XlsformModule;
+use App\Models\Xlsforms\XlsformModuleVersion;
 use Awcodes\Shout\Components\Shout;
 use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\SoftDeletingScope;
-use Stats4sd\FilamentOdkLink\Models\OdkLink\Interfaces\WithXlsFormDrafts;
 
 class XlsformModuleVersionResource extends Resource
 {
@@ -79,7 +75,7 @@ public static function table(Table $table): Table
     public static function getPages(): array
     {
         return [
-            'index' => Pages\ManageXlsformModuleVersion::route('/'),
+            'index' =>  ManageXlsformModuleVersion::route('/'),
         ];
     }
 }
diff --git a/...ilament/Admin/Resources/XlsformModuleVersionResource/Pages/ManageXlsformModuleVersion.php b/...ilament/Admin/Resources/XlsformModuleVersionResource/Pages/ManageXlsformModuleVersion.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Filament\Admin\Resources\XlsformTemplateModuleResource\Pages;
+namespace App\Filament\Admin\Resources\XlsformModuleVersionResource\Pages;
 
 use App\Filament\Admin\Resources\XlsformModuleVersionResource;
 use Filament\Actions;

diff --git a/app/Filament/Admin/Resources/XlsformTemplateResource.php b/app/Filament/Admin/Resources/XlsformTemplateResource.php
@@ -4,7 +4,7 @@
 
 use App\Filament\Admin\Resources\XlsformTemplateResource\Pages;
 use App\Filament\Admin\Resources\XlsformTemplateResource\RelationManagers;
-use App\Models\XlsformTemplates\XlsformTemplate;
+use App\Models\Xlsforms\XlsformTemplate;
 use Stats4sd\FilamentOdkLink\Filament\Resources\XlsformTemplateResource as OdkLinkXlsformTemplateResource;
 
 class XlsformTemplateResource extends OdkLinkXlsformTemplateResource

diff --git a/app/Filament/Admin/Resources/XlsformTemplateResource/Pages/CreateXlsformTemplate.php b/app/Filament/Admin/Resources/XlsformTemplateResource/Pages/CreateXlsformTemplate.php
@@ -3,7 +3,7 @@
 namespace App\Filament\Admin\Resources\XlsformTemplateResource\Pages;
 
 use App\Filament\Admin\Resources\XlsformTemplateResource;
-use App\Models\XlsformTemplates\XlsformTemplate;
+use App\Models\Xlsforms\XlsformTemplate;
 use Filament\Forms\Components\Wizard\Step;
 use Filament\Forms\Get;
 use Stats4sd\FilamentOdkLink\Filament\Resources\XlsformTemplateResource\Pages\CreateXlsformTemplate as OdkLinkCreateXlsformTemplate;