poc/pds
1
0
Fork 1
Code Issues Pull Requests 12 Actions 10 Packages Projects Releases Wiki Activity

Added view rights against plant on import and export
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 9s
Details

Browse Source
This commit is contained in:
dhanabalan
2026-01-13 16:02:45 +05:30
parent 7a988b7280
commit 3c4a09f571
2 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Filament/Exports/GuardPatrolEntryExporter.php
View File

@@ -24,8 +24,8 @@ class GuardPatrolEntryExporter extends Exporter
}), }),
// ExportColumn::make('id') // ExportColumn::make('id')
// ->label('ID'), // ->label('ID'),
ExportColumn::make('plant.name') ExportColumn::make('plant.code')
->label('PLANT'), ->label('PLANT CODE'),
ExportColumn::make('guardNames.name') ExportColumn::make('guardNames.name')
->label('GUARD NAME'), ->label('GUARD NAME'),
ExportColumn::make('checkPointNames.name') ExportColumn::make('checkPointNames.name')

48
app/Filament/Imports/GuardPatrolEntryImporter.php
View File

@@ -23,10 +23,10 @@ class GuardPatrolEntryImporter extends Importer
return [ return [
ImportColumn::make('plant') ImportColumn::make('plant')
->requiredMapping() ->requiredMapping()
->exampleHeader('Plant Name') ->exampleHeader('Plant Code')
->example('Ransar Industries-I') ->example('1000')
->label('Plant Name') ->label('Plant Code')
->relationship(resolveUsing: 'name') ->relationship(resolveUsing: 'code')
->rules(['required']), ->rules(['required']),
ImportColumn::make('guardNames') ImportColumn::make('guardNames')
->requiredMapping() ->requiredMapping()
@@ -68,27 +68,27 @@ class GuardPatrolEntryImporter extends Importer
public function resolveRecord(): ?GuardPatrolEntry public function resolveRecord(): ?GuardPatrolEntry
{ {
$warnMsg = []; $warnMsg = [];
$plant = Plant::where('name', $this->data['plant'])->first(); $plantCod = $this->data['plant'];
$plant = null;
$guardNames = null; $guardNames = null;
$checkPointNames = null; $checkPointNames = null;
$patrolDateTime = null; // $fdateTime = null; $patrolDateTime = null; // $fdateTime = null;
if (Str::length($plantCod) < 4 || ! is_numeric($plantCod) || ! preg_match('/^[1-9]\d{3,}$/', $plantCod)) {
$warnMsg[] = 'Invalid plant code found';
} else {
$plant = Plant::where('code', $plantCod)->first();
if (! $plant) { if (! $plant) {
$warnMsg[] = "Plant not found"; // '" . $this->data['plant'] . "' $warnMsg[] = 'Plant not found'; // '" . $plantCod . "'
} } else {
else
{
$guardNames = GuardName::where('plant_id', $plant->id)->where('name', $this->data['guardNames'])->first(); $guardNames = GuardName::where('plant_id', $plant->id)->where('name', $this->data['guardNames'])->first();
if (! $guardNames) { if (! $guardNames) {
$warnMsg[] = "Guard name not found"; $warnMsg[] = 'Guard name not found';
} } else {
else
{
$checkPointNames = CheckPointName::where('plant_id', $plant->id)->where('name', $this->data['checkPointNames'])->first(); $checkPointNames = CheckPointName::where('plant_id', $plant->id)->where('name', $this->data['checkPointNames'])->first();
if (! $checkPointNames) { if (! $checkPointNames) {
$warnMsg[] = "Check point name not found"; $warnMsg[] = 'Check point name not found';
} } else {
else
{
$patrolTime = $this->data['patrol_time']; // $fromDate = $this->data['from_datetime']; $patrolTime = $this->data['patrol_time']; // $fromDate = $this->data['from_datetime'];
$formats = ['d-m-Y H:i', 'd-m-Y H:i:s']; // '07-05-2025 08:00' or '07-05-2025 08:00:00' $formats = ['d-m-Y H:i', 'd-m-Y H:i:s']; // '07-05-2025 08:00' or '07-05-2025 08:00:00'
@@ -105,12 +105,11 @@ class GuardPatrolEntryImporter extends Importer
if (! isset($patrolDateTime)) { if (! isset($patrolDateTime)) {
// throw new \Exception('Invalid date time format'); // throw new \Exception('Invalid date time format');
$warnMsg[] = "Invalid 'Patrol DateTime' format. Expected DD-MM-YYYY HH:MM:SS"; $warnMsg[] = "Invalid 'Patrol DateTime' format. Expected DD-MM-YYYY HH:MM:SS";
} } else {
else
{
$guardEntryFound = GuardPatrolEntry::where('plant_id', $plant->id)->where('guard_name_id', $guardNames->id)->where('check_point_name_id', $checkPointNames->id)->where('patrol_time', $patrolDateTime->format('Y-m-d H:i:s'))->first(); $guardEntryFound = GuardPatrolEntry::where('plant_id', $plant->id)->where('guard_name_id', $guardNames->id)->where('check_point_name_id', $checkPointNames->id)->where('patrol_time', $patrolDateTime->format('Y-m-d H:i:s'))->first();
if ($guardEntryFound) { if ($guardEntryFound) {
$warnMsg[] = "Duplicate guard patrol entry found"; $warnMsg[] = 'Duplicate guard patrol entry found';
}
} }
} }
} }
@@ -119,7 +118,7 @@ class GuardPatrolEntryImporter extends Importer
$createdBy = Filament::auth()->user()->name; // ?? 'Admin' $createdBy = Filament::auth()->user()->name; // ?? 'Admin'
if (! $createdBy) { if (! $createdBy) {
$warnMsg[] = "Invalid created by name found"; $warnMsg[] = 'Invalid created by name found';
} }
if (! empty($warnMsg)) { if (! empty($warnMsg)) {
@@ -130,14 +129,15 @@ class GuardPatrolEntryImporter extends Importer
'plant_id' => $plant->id, 'plant_id' => $plant->id,
'guard_name_id' => $guardNames->id, 'guard_name_id' => $guardNames->id,
'check_point_name_id' => $checkPointNames->id, 'check_point_name_id' => $checkPointNames->id,
'patrol_time' => $patrolDateTime->format('Y-m-d H:i:s') 'patrol_time' => $patrolDateTime->format('Y-m-d H:i:s'),
], ],
[ [
'reader_code' => null, 'reader_code' => null,
'created_by' => $createdBy, 'created_by' => $createdBy,
'updated_by' => $createdBy 'updated_by' => $createdBy,
] ]
); );
return null; return null;
// // return GuardPatrolEntry::firstOrNew([ // // return GuardPatrolEntry::firstOrNew([
// // // Update existing records, matching them by `$this->data['column_name']` // // // Update existing records, matching them by `$this->data['column_name']`