diff --git a/app/Exports/ParkingPatternSpaceExport.php b/app/Exports/ParkingPatternSpaceExport.php index 5feb0a7..487a798 100644 --- a/app/Exports/ParkingPatternSpaceExport.php +++ b/app/Exports/ParkingPatternSpaceExport.php @@ -10,10 +10,10 @@ class ParkingPatternSpaceExport implements FromArray { return [ [ - 'No.', - 'Model Name', - 'Parking Space No.', - 'Parking Space Type' + __exports('global.index'), + __exports('event_calendar.export1'), + __exports('parking_pattern.parking_space_number'), + __exports('parking_pattern.parking_space_type') ], ['1','test_model', 'A0001', 'General'], ['2','test_model', 'A0002', 'General'], diff --git a/app/Imports/ParkingPatternImport.php b/app/Imports/ParkingPatternImport.php index 542d010..0fd713d 100644 --- a/app/Imports/ParkingPatternImport.php +++ b/app/Imports/ParkingPatternImport.php @@ -2,14 +2,9 @@ namespace App\Imports; -use App\Models\ParkingPattern; use App\Services\OperationLogService; use App\Services\ParkingPatternService; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Validator; -use Illuminate\Validation\ValidationException; use Maatwebsite\Excel\Concerns\ToModel; -use Maatwebsite\Excel\Concerns\WithHeadingRow; class ParkingPatternImport implements ToModel { diff --git a/app/Imports/ParkingPatternSpaceImport.php b/app/Imports/ParkingPatternSpaceImport.php index c023677..0ffbfd1 100644 --- a/app/Imports/ParkingPatternSpaceImport.php +++ b/app/Imports/ParkingPatternSpaceImport.php @@ -2,18 +2,14 @@ namespace App\Imports; -use App\Models\ParkingPattern; use App\Services\OperationLogService; use App\Services\ParkingPatternService; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Validator; -use Illuminate\Validation\ValidationException; use Maatwebsite\Excel\Concerns\ToModel; -use Maatwebsite\Excel\Concerns\WithHeadingRow; -class ParkingPatternSpaceImport implements ToModel, WithHeadingRow +class ParkingPatternSpaceImport implements ToModel { protected string $user_id; + protected int $index = 1; public function __construct(string $user_id) { @@ -25,12 +21,16 @@ class ParkingPatternSpaceImport implements ToModel, WithHeadingRow */ public function model(array $row) { - if (!empty($row['parking_space_no']) && !empty($row['parking_space_type'])) { + if ($this->index == 1) { + $this->index += 1; + return; + } + if (!empty($row[1]) && !empty($row[2]) && !empty($row[3])) { $data = [ - 'model_name' => $row['model_name'], + 'model_name' => $row[1], 'admin_user_id' => $this->user_id, - 'parking_space_number' => $row['parking_space_no'], - 'parking_space_type' => $row['parking_space_type'] + 'parking_space_number' => $row[2], + 'parking_space_type' => $row[3] ]; $service = new ParkingPatternService(new OperationLogService()); $service->saveModel($data); diff --git a/resources/lang/en/exports.php b/resources/lang/en/exports.php index 0627d10..3ede2a6 100644 --- a/resources/lang/en/exports.php +++ b/resources/lang/en/exports.php @@ -2,47 +2,47 @@ return [ 'vip_list' => [ - 'license' => 'License plate number', + 'license' => 'License Plate Number', 'import_template' => 'VIP List Import Template', 'list' => 'VIP List' ], 'global' => [ - 'index' => 'Serial number', + 'index' => 'Serial Number', 'admin' => 'Operator' ], 'license_plate' => [ 'import_template' => 'License Plate Management Import Template' ], 'parking_space' => [ - 'list' => 'parking space list', + 'list' => 'Parking Space List', 'floor' => 'Floor', 'number' => 'Parking Number', 'space_attr' => 'Parking Space Attributes', - 'license_plate' => 'License plate number', - 'berthing_time' => 'Parking time', - 'recognition' => 'License plate recognition accuracy', + 'license_plate' => 'License Plate Number', + 'berthing_time' => 'Parking Time', + 'recognition' => 'License Plate Recognition Accuracy', 'status' => 'State', - 'space_type' => 'Parking space type', + 'space_type' => 'Parking Space Type', 'operation_type' => 'Operation Type', - 'updated_at' => 'Last update time', + 'updated_at' => 'Last Update Time', 'region' => 'Region', - 'list_export' => 'Import parking spaces', + 'list_export' => 'Import Parking Spaces', ], 'parking_camera' => [ - 'list' => 'Parking camera', + 'list' => 'Parking Camera', 'number' => 'Equipment Number', - 'camera_ip' => 'IP address', - 'parking_space_count' => 'Number of equipment management parking spaces', - 'parking_space_numbers' => 'Associated parking space number', - 'is_control_lights' => 'Is there an external control light', + 'camera_ip' => 'IP Address', + 'parking_space_count' => 'Number Of Equipment Management Parking Spaces', + 'parking_space_numbers' => 'Associated Parking Space Number', + 'is_control_lights' => 'Does it have external light control?', 'type' => 'Camera type', 'status' => 'Communication status', 'updated_at' => 'Last update time', ], 'parking_pattern' => [ 'model_name' => 'Activity Mode', - 'parking_space_number' => 'Parking Number', - 'parking_space_type' => 'Parking space type', + 'parking_space_number' => 'Parking Space No.', + 'parking_space_type' => 'Parking Space Type', 'create_pattern' => 'Activity Mode Creation Template', 'spaces_pattern' => 'Activity Mode Allocation Template' ],