Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions app/Contracts/HasVulnerabilityData.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,17 @@

use App\DataTransferObjects\VulnerabilityData;
use App\DataTransferObjects\VulnerabilityListItem;
use Illuminate\Database\Eloquent\Model;

interface HasVulnerabilityData
{
/**
* Detailed vulnerability data, used in vulnerability chips.
*
* @return VulnerabilityData
*/
public function vulnerabilityData(): VulnerabilityData;
public function vulnerabilityData(?Model $record = null): VulnerabilityData;

/**
* Key-value pair of vulnerability data, used in vulnerability lists.
*
* @return VulnerabilityListItem
*/
public function vulnerabilityListItem(): VulnerabilityListItem;
public function vulnerabilityListItem(?Model $record = null): VulnerabilityListItem;
}
4 changes: 2 additions & 2 deletions app/Filament/Infolists/Components/VulnerabilityChips.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ protected function setUp(): void

return collect($record?->{$this->getName()})
->map(fn (mixed $vulnerability) => match (true) {
$vulnerability instanceof HasVulnerabilityData => $vulnerability->vulnerabilityData(),
default => $vulnerabilities->get($vulnerability)?->vulnerabilityData(),
$vulnerability instanceof HasVulnerabilityData => $vulnerability->vulnerabilityData($record),
default => $vulnerabilities->get($vulnerability)?->vulnerabilityData($record),
})
->filter();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -300,21 +300,19 @@ public static function configure(Schema $schema): Schema
->live()
->searchable(),

Section::make()
->heading(__('field.section_details', ['section' => $categories->get('PREG')]))
->columns()
->columnSpanFull()
// ->pointer()
->visible(fn (Get $get) => Vulnerability::isPregnancy($get('cat_rep')))
->components([
Select::make('cat_preg')
->label($categories->get('PREG'))
->placeholder(__('placeholder.select_many'))
->options($vulnerabilities->get('PREG'))
->rule(new MultipleIn($vulnerabilities->get('PREG')->keys()))
->multiple()
->searchable(),
]),
Select::make('cat_preg')
->label(__('field.section_details', ['section' => $categories->get('PREG')]))
->placeholder(__('placeholder.select_many'))
->options($vulnerabilities->get('PREG'))
->rule(new MultipleIn($vulnerabilities->get('PREG')->keys()))
->multiple()
->searchable()
->visible(fn (Get $get) => Vulnerability::isPregnancy($get('cat_rep'))),

TextInput::make('cat_rep_notes')
->label(__('field.cat_rep_notes'))
->visible(fn (Get $get) => Vulnerability::isOtherRep($get('cat_rep')))
->maxLength(100),
]),

Subsection::make()
Expand Down
3 changes: 2 additions & 1 deletion app/Models/Catagraphy.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ class Catagraphy extends Model
'cat_pov',
'cat_preg',
'cat_rep',
'cat_rep_notes',
'has_health_issues',
'cat_ssa',
'cat_vif',
Expand Down Expand Up @@ -218,7 +219,7 @@ public function allVulnerabilitiesItems(): Attribute
{
return Attribute::make(
get: fn () => $this->all_vulnerabilities
->map(fn (HasVulnerabilityData $vulnerability) => $vulnerability->vulnerabilityListItem())
->map(fn (HasVulnerabilityData $vulnerability) => $vulnerability->vulnerabilityListItem($this))
)->shouldCache();
}

Expand Down
4 changes: 2 additions & 2 deletions app/Models/Disability.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public function getCertificateVulnerabilityAttribute(): string
return $this->has_certificate ? 'VDH_01' : 'VDH_02';
}

public function vulnerabilityData(): VulnerabilityData
public function vulnerabilityData(?Model $record = null): VulnerabilityData
{
$categories = VulnerabilityCategory::cachedList();
$vulnerabilities = Vulnerability::cachedList();
Expand Down Expand Up @@ -86,7 +86,7 @@ public function vulnerabilityData(): VulnerabilityData
);
}

public function vulnerabilityListItem(): VulnerabilityListItem
public function vulnerabilityListItem(?Model $record = null): VulnerabilityListItem
{
$vulnerabilities = Vulnerability::cachedList();

Expand Down
4 changes: 2 additions & 2 deletions app/Models/Disease.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public function orphaDiagnostic(): BelongsTo
return $this->belongsTo(OrphaDiagnostic::class);
}

public function vulnerabilityData(): VulnerabilityData
public function vulnerabilityData(?Model $record = null): VulnerabilityData
{
$categories = VulnerabilityCategory::cachedList();
$vulnerabilities = Vulnerability::cachedList();
Expand Down Expand Up @@ -100,7 +100,7 @@ public function vulnerabilityData(): VulnerabilityData
);
}

public function vulnerabilityListItem(): VulnerabilityListItem
public function vulnerabilityListItem(?Model $record = null): VulnerabilityListItem
{
$vulnerabilities = Vulnerability::cachedList();

Expand Down
4 changes: 2 additions & 2 deletions app/Models/Suspicion.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class Suspicion extends Model implements HasVulnerabilityData
'notes' => 'string',
];

public function vulnerabilityData(): VulnerabilityData
public function vulnerabilityData(?Model $record = null): VulnerabilityData
{
$categories = VulnerabilityCategory::cachedList();
$vulnerabilities = Vulnerability::cachedList();
Expand Down Expand Up @@ -69,7 +69,7 @@ public function vulnerabilityData(): VulnerabilityData
);
}

public function vulnerabilityListItem(): VulnerabilityListItem
public function vulnerabilityListItem(?Model $record = null): VulnerabilityListItem
{
$vulnerabilities = Vulnerability::cachedList();
$category = $vulnerabilities->get($this->category);
Expand Down
20 changes: 18 additions & 2 deletions app/Models/Vulnerability/Vulnerability.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
use App\Concerns\ModelAsOptions;
use App\Contracts\HasVulnerabilityData;
use App\DataTransferObjects\VulnerabilityData;
use App\DataTransferObjects\VulnerabilityEntry;
use App\DataTransferObjects\VulnerabilityListItem;
use App\Models\Appointment;
use App\Models\Beneficiary;
Expand Down Expand Up @@ -158,17 +159,32 @@ public static function isPregnancy(?string $code = null): bool
return \in_array($code, ['VGR_01', 'VGR_04']);
}

public function vulnerabilityData(): VulnerabilityData
public static function isOtherRep(?string $code = null): bool
{
return $code === 'VGR_17';
}

public function vulnerabilityData(?Model $record = null): VulnerabilityData
{
$entries = [];

if (static::isOtherRep($this->id)) {
$entries[] = new VulnerabilityEntry(
label: $this->name,
value: $record->cat_rep_notes ?? '—',
);
}

return new VulnerabilityData(
name: $this->name,
category: $this->category->name,
color: $this->color,
valid: $this->is_valid,
entries: $entries,
);
}

public function vulnerabilityListItem(): VulnerabilityListItem
public function vulnerabilityListItem(?Model $record = null): VulnerabilityListItem
{
return new VulnerabilityListItem(
label: $this->name,
Expand Down
Binary file added database/data/260418-vulnerabilities.xlsx
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?php

declare(strict_types=1);

use App\Imports\VulnerabilitiesImport;
use Illuminate\Database\Migrations\Migration;
use Maatwebsite\Excel\Facades\Excel;

return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Excel::import(new VulnerabilitiesImport, database_path('data/260418-vulnerabilities.xlsx'));
}
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?php

declare(strict_types=1);

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('catagraphies', function (Blueprint $table) {
$table->string('cat_rep_notes')
->nullable()
->after('cat_rep');
});
}
};
1 change: 1 addition & 0 deletions lang/ro/field.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
'cat_diz_dx' => 'Diagnostic ICD-10',
'cat_diz_iph' => 'Beneficiază de indemnizație/ pensie handicap',
'cat_diz_cert' => 'Deține certificat pentru dizabilitate',
'cat_rep_notes' => 'Observații vulnerabilitate reproductivă',
'cat_ss_yes' => 'Prezintă boli sau probleme de sănătate',
'cat_ss_no' => 'Fără boli sau probleme de sănătate',
'cat_ss_orph' => 'Diagnostic ORPHA',
Expand Down