Update: 2026-06-25 18:05:26

This commit is contained in:
Hamza-Ayed
2026-06-25 18:05:26 +03:00
parent 1e24c3d0c8
commit a4d9d8e74c
3 changed files with 141 additions and 536 deletions

View File

@@ -105,9 +105,9 @@ class ReviewDriverPage extends StatelessWidget {
Icon(Icons.public, size: 16, color: AppColor.primaryColor),
const SizedBox(width: 6),
Text(
c.country.value.isNotEmpty
? 'Country: ${c.country.value}'
: 'Detecting country...',
c.country.isNotEmpty
? 'Country: ${c.country}'
: 'Detecting country...',
style: TextStyle(
fontSize: 13,
fontWeight: FontWeight.w600,
@@ -193,7 +193,7 @@ class ReviewDriverPage extends StatelessWidget {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text('${c.country.value} - Criminal Record',
Text('${c.country} - Criminal Record',
style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
const Divider(),
Card(
@@ -206,7 +206,7 @@ class ReviewDriverPage extends StatelessWidget {
const SizedBox(width: 12),
Expanded(
child: Text(
_getCriminalRecordHint(c.country.value),
_getCriminalRecordHint(c.country),
style: TextStyle(color: Colors.green[800]),
),
),
@@ -256,7 +256,7 @@ class ReviewDriverPage extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
'${c.country.value} - ${c.tabLabels[tabKey] ?? tabKey}',
'${c.country} - ${c.tabLabels[tabKey] ?? tabKey}',
style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
),
const Divider(),
@@ -320,19 +320,14 @@ class ReviewDriverPage extends StatelessWidget {
if (l.contains('email')) return Icons.email;
if (l.contains('address')) return Icons.location_on;
if (l.contains('birth')) return Icons.cake;
if (l.contains('father') || l.contains('mother')) return Icons.people;
if (l.contains('license') || l.contains('category')) return Icons.card_membership;
if (l.contains('plate')) return Icons.confirmation_number;
if (l.contains('owner')) return Icons.person_search;
if (l.contains('make') || l.contains('model')) return Icons.directions_car;
if (l.contains('year')) return Icons.calendar_today;
if (l.contains('vin')) return Icons.confirmation_number;
if (l.contains('governorate') || l.contains('place')) return Icons.location_city;
if (l.contains('blood')) return Icons.water_drop;
if (l.contains('spouse') || l.contains('marital')) return Icons.people;
if (l.contains('occupation')) return Icons.work;
if (l.contains('restriction')) return Icons.block;
if (l.contains('engine') || l.contains('capacity')) return Icons.settings;
if (l.contains('place')) return Icons.location_city;
if (l.contains('marital')) return Icons.people;
if (l.contains('first name') || l.contains('last name')) return Icons.person;
return null;
}
@@ -358,22 +353,7 @@ class ReviewDriverPage extends StatelessWidget {
case 'makeController': return c.makeController;
case 'modelController': return c.modelController;
case 'yearController': return c.yearController;
case 'fatherNameController': return c.fatherNameController;
case 'motherNameController': return c.motherNameController;
case 'birthPlaceController': return c.birthPlaceController;
case 'bloodTypeController': return c.bloodTypeController;
case 'maritalStatusController': return c.maritalStatusController;
case 'spouseNameController': return c.spouseNameController;
case 'idIssueDateController': return c.idIssueDateController;
case 'idExpiryDateController': return c.idExpiryDateController;
case 'licenseNumberController': return c.licenseNumberController;
case 'licenseCategoryController': return c.licenseCategoryController;
case 'restrictionsController': return c.restrictionsController;
case 'governorateController': return c.governorateController;
case 'occupationController': return c.occupationController;
case 'religionController': return c.religionController;
case 'engineCapacityController': return c.engineCapacityController;
case 'passengerCapacityController': return c.passengerCapacityController;
default: return null;
}
}
@@ -416,7 +396,7 @@ class ReviewDriverPage extends StatelessWidget {
padding: const EdgeInsets.symmetric(vertical: 6),
child: Obx(
() => DropdownButtonFormField<String>(
value: c.selectedGender.value.isEmpty
initialValue: c.selectedGender.value.isEmpty
? null
: c.selectedGender.value,
isExpanded: true,
@@ -444,7 +424,7 @@ class ReviewDriverPage extends StatelessWidget {
padding: const EdgeInsets.symmetric(vertical: 6),
child: Obx(
() => DropdownButtonFormField<String>(
value: c.colorHex.value.isEmpty ? null : c.colorHex.value,
initialValue: c.colorHex.value.isEmpty ? null : c.colorHex.value,
isExpanded: true,
decoration: InputDecoration(
labelText: label.tr,
@@ -487,7 +467,7 @@ class ReviewDriverPage extends StatelessWidget {
padding: const EdgeInsets.symmetric(vertical: 6),
child: Obx(
() => DropdownButtonFormField<String>(
value: ReviewDriverController.kFuelOptions
initialValue: ReviewDriverController.kFuelOptions
.contains(c.selectedFuel.value)
? c.selectedFuel.value
: null,

View File

@@ -2,7 +2,6 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:intl/intl.dart';
import 'package:siro_service/constant/box_name.dart';
import 'package:siro_service/constant/links.dart';
import 'package:siro_service/controller/functions/crud.dart';
import 'package:siro_service/main.dart';
@@ -49,187 +48,50 @@ class ReviewDriverController extends GetxController {
'profile_picture': Icons.person,
};
var country = ''.obs;
var countryDetected = false;
String get country => box.read('countryCode')?.toString() ?? 'Syria';
/// Get current country code from box or server data
String get currentCountry {
if (country.value.isNotEmpty) return country.value;
final boxCountry = box.read('countryCode')?.toString() ?? '';
if (boxCountry.isNotEmpty) {
country.value = boxCountry;
return boxCountry;
}
final site = serverData['site'] ?? '';
if (site.contains('سوريا') || site.contains('دمشق') || site.contains('حلب')) {
country.value = 'Syria';
return 'Syria';
}
if (site.contains('أردن') || site.contains('عمان') || site.contains('اربد')) {
country.value = 'Jordan';
return 'Jordan';
}
country.value = 'Syria';
return 'Syria';
}
/// Field configuration: which fields appear on which tab, per country
/// Each entry: [key, label, isDate, isGender, isColor, isFuel]
static final Map<String, Map<String, List<List<dynamic>>>> countryFieldConfig = {
'Syria': {
'id_front': [
['firstNameController', 'First Name', false, false, false, false],
['lastNameController', 'Last Name', false, false, false, false],
['fatherNameController', 'Father Name', false, false, false, false],
['motherNameController', 'Mother Name', false, false, false, false],
['nationalNumberController', 'National Number', false, false, false, false],
['gender', 'Gender', false, true, false, false],
['birthdateController', 'Birthdate', true, false, false, false],
['birthPlaceController', 'Birth Place', false, false, false, false],
['bloodTypeController', 'Blood Type', false, false, false, false],
],
'id_back': [
['addressController', 'Address', false, false, false, false],
['governorateController', 'Governorate', false, false, false, false],
['siteController', 'Place of Registration', false, false, false, false],
['maritalStatusController', 'Marital Status', false, false, false, false],
['spouseNameController', 'Spouse Name', false, false, false, false],
['idIssueDateController', 'ID Issue Date', true, false, false, false],
['idExpiryDateController', 'ID Expiry Date', true, false, false, false],
],
'driver_license': [
['licenseNumberController', 'License Number', false, false, false, false],
['licenseCategoryController', 'License Category', false, false, false, false],
['licenseTypeController', 'License Type', false, false, false, false],
['licenseIssueDateController', 'Issue Date', true, false, false, false],
['expiryDateController', 'Expiry Date', true, false, false, false],
],
'driver_license_back': [
['restrictionsController', 'Restrictions', false, false, false, false],
],
'car_license_front': [
['ownerController', 'Owner Name', false, false, false, false],
['carPlateController', 'Car Plate', false, false, false, false],
['makeController', 'Make', false, false, false, false],
['modelController', 'Model', false, false, false, false],
['yearController', 'Year', false, false, false, false],
['color', 'Car Color', false, false, true, false],
],
'car_license_back': [
['vinController', 'VIN / Chassis', false, false, false, false],
['fuel', 'Fuel Type', false, false, false, true],
['engineCapacityController', 'Engine Capacity', false, false, false, false],
['carLicenseExpiryDateController', 'License Expiry', true, false, false, false],
],
'criminal_record': [],
'profile_picture': [
['phoneController', 'Phone Number', false, false, false, false],
['emailController', 'Email', false, false, false, false],
],
},
'Jordan': {
'id_front': [
['firstNameController', 'First Name', false, false, false, false],
['lastNameController', 'Last Name', false, false, false, false],
['nationalNumberController', 'National Number', false, false, false, false],
['gender', 'Gender', false, true, false, false],
['birthdateController', 'Birthdate', true, false, false, false],
['siteController', 'Place of Registration', false, false, false, false],
['governorateController', 'Governorate', false, false, false, false],
],
'id_back': [
['addressController', 'Address', false, false, false, false],
['idIssueDateController', 'ID Issue Date', true, false, false, false],
['idExpiryDateController', 'ID Expiry Date', true, false, false, false],
['bloodTypeController', 'Blood Type', false, false, false, false],
['maritalStatusController', 'Marital Status', false, false, false, false],
['spouseNameController', 'Spouse Name', false, false, false, false],
['occupationController', 'Occupation', false, false, false, false],
],
'driver_license': [
['licenseNumberController', 'License Number', false, false, false, false],
['licenseCategoryController', 'License Category', false, false, false, false],
['licenseIssueDateController', 'Issue Date', true, false, false, false],
['expiryDateController', 'Expiry Date', true, false, false, false],
],
'driver_license_back': [
['restrictionsController', 'Restrictions', false, false, false, false],
],
'car_license_front': [
['ownerController', 'Owner Name', false, false, false, false],
['carPlateController', 'Car Plate', false, false, false, false],
['makeController', 'Make', false, false, false, false],
['modelController', 'Model', false, false, false, false],
['yearController', 'Year', false, false, false, false],
['color', 'Car Color', false, false, true, false],
],
'car_license_back': [
['vinController', 'VIN / Chassis', false, false, false, false],
['fuel', 'Fuel Type', false, false, false, true],
['engineCapacityController', 'Engine Capacity', false, false, false, false],
['passengerCapacityController', 'Passenger Capacity', false, false, false, false],
['carLicenseExpiryDateController', 'License Expiry', true, false, false, false],
],
'criminal_record': [],
'profile_picture': [
['phoneController', 'Phone Number', false, false, false, false],
['emailController', 'Email', false, false, false, false],
],
},
'Egypt': {
'id_front': [
['firstNameController', 'First Name', false, false, false, false],
['lastNameController', 'Last Name', false, false, false, false],
['nationalNumberController', 'National Number', false, false, false, false],
['gender', 'Gender', false, true, false, false],
['birthdateController', 'Birthdate', true, false, false, false],
['governorateController', 'Governorate', false, false, false, false],
],
'id_back': [
['addressController', 'Address', false, false, false, false],
['idIssueDateController', 'ID Issue Date', true, false, false, false],
['idExpiryDateController', 'ID Expiry Date', true, false, false, false],
['occupationController', 'Occupation', false, false, false, false],
['maritalStatusController', 'Marital Status', false, false, false, false],
['religionController', 'Religion', false, false, false, false],
['bloodTypeController', 'Blood Type', false, false, false, false],
['spouseNameController', 'Spouse Name', false, false, false, false],
],
'driver_license': [
['licenseNumberController', 'License Number', false, false, false, false],
['licenseCategoryController', 'License Category', false, false, false, false],
['licenseIssueDateController', 'Issue Date', true, false, false, false],
['expiryDateController', 'Expiry Date', true, false, false, false],
],
'driver_license_back': [
['restrictionsController', 'Restrictions', false, false, false, false],
],
'car_license_front': [
['ownerController', 'Owner Name', false, false, false, false],
['carPlateController', 'Car Plate', false, false, false, false],
['makeController', 'Make', false, false, false, false],
['modelController', 'Model', false, false, false, false],
['yearController', 'Year', false, false, false, false],
['color', 'Car Color', false, false, true, false],
],
'car_license_back': [
['vinController', 'VIN / Chassis', false, false, false, false],
['fuel', 'Fuel Type', false, false, false, true],
['engineCapacityController', 'Engine Capacity', false, false, false, false],
['carLicenseExpiryDateController', 'License Expiry', true, false, false, false],
],
'criminal_record': [],
'profile_picture': [
['phoneController', 'Phone Number', false, false, false, false],
['emailController', 'Email', false, false, false, false],
],
},
static const Map<String, List<List<dynamic>>> fieldConfig = {
'id_front': [
['firstNameController', 'First Name', false, false, false, false],
['lastNameController', 'Last Name', false, false, false, false],
['nationalNumberController', 'National Number', false, false, false, false],
['gender', 'Gender', false, true, false, false],
['birthdateController', 'Birthdate', true, false, false, false],
['siteController', 'Place of Registration', false, false, false, false],
],
'id_back': [
['addressController', 'Address', false, false, false, false],
['maritalStatusController', 'Marital Status', false, false, false, false],
],
'driver_license': [
['licenseTypeController', 'License Type', false, false, false, false],
['licenseCategoriesController', 'License Categories', false, false, false, false],
['licenseIssueDateController', 'License Issue Date', true, false, false, false],
['expiryDateController', 'License Expiry Date', true, false, false, false],
],
'driver_license_back': [],
'car_license_front': [
['ownerController', 'Owner Name', false, false, false, false],
['carPlateController', 'Car Plate', false, false, false, false],
['color', 'Car Color', false, false, true, false],
],
'car_license_back': [
['makeController', 'Make', false, false, false, false],
['modelController', 'Model', false, false, false, false],
['yearController', 'Year', false, false, false, false],
['fuel', 'Fuel Type', false, false, false, true],
['vinController', 'VIN / Chassis', false, false, false, false],
['carLicenseExpiryDateController', 'License Expiry', true, false, false, false],
],
'criminal_record': [],
'profile_picture': [
['phoneController', 'Phone Number', false, false, false, false],
['emailController', 'Email', false, false, false, false],
],
};
List<List<dynamic>> getFieldsForTab(String tabKey) {
final c = currentCountry;
final config = countryFieldConfig[c] ?? countryFieldConfig['Syria']!;
return config[tabKey] ?? [];
return fieldConfig[tabKey] ?? [];
}
late TextEditingController firstNameController;
@@ -244,6 +106,7 @@ class ReviewDriverController extends GetxController {
late TextEditingController licenseTypeController;
late TextEditingController expiryDateController;
late TextEditingController licenseIssueDateController;
late TextEditingController maritalStatusController;
late TextEditingController ownerController;
late TextEditingController carPlateController;
late TextEditingController vinController;
@@ -251,22 +114,6 @@ class ReviewDriverController extends GetxController {
late TextEditingController makeController;
late TextEditingController modelController;
late TextEditingController yearController;
late TextEditingController fatherNameController;
late TextEditingController motherNameController;
late TextEditingController birthPlaceController;
late TextEditingController bloodTypeController;
late TextEditingController maritalStatusController;
late TextEditingController spouseNameController;
late TextEditingController idIssueDateController;
late TextEditingController idExpiryDateController;
late TextEditingController licenseNumberController;
late TextEditingController licenseCategoryController;
late TextEditingController restrictionsController;
late TextEditingController governorateController;
late TextEditingController occupationController;
late TextEditingController religionController;
late TextEditingController engineCapacityController;
late TextEditingController passengerCapacityController;
var selectedGender = ''.obs;
var colorHex = ''.obs;
@@ -298,6 +145,7 @@ class ReviewDriverController extends GetxController {
licenseTypeController = TextEditingController();
expiryDateController = TextEditingController();
licenseIssueDateController = TextEditingController();
maritalStatusController = TextEditingController();
ownerController = TextEditingController();
carPlateController = TextEditingController();
vinController = TextEditingController();
@@ -305,22 +153,6 @@ class ReviewDriverController extends GetxController {
makeController = TextEditingController();
modelController = TextEditingController();
yearController = TextEditingController();
fatherNameController = TextEditingController();
motherNameController = TextEditingController();
birthPlaceController = TextEditingController();
bloodTypeController = TextEditingController();
maritalStatusController = TextEditingController();
spouseNameController = TextEditingController();
idIssueDateController = TextEditingController();
idExpiryDateController = TextEditingController();
licenseNumberController = TextEditingController();
licenseCategoryController = TextEditingController();
restrictionsController = TextEditingController();
governorateController = TextEditingController();
occupationController = TextEditingController();
religionController = TextEditingController();
engineCapacityController = TextEditingController();
passengerCapacityController = TextEditingController();
}
Future<void> fetchData() async {
@@ -373,6 +205,7 @@ class ReviewDriverController extends GetxController {
expiryDateController.text = serverData['expiry_date'] ?? '';
licenseIssueDateController.text =
serverData['licenseIssueDate'] ?? serverData['issue_date'] ?? '';
maritalStatusController.text = serverData['maritalStatus'] ?? '';
selectedGender.value = serverData['gender'] ?? '';
ownerController.text = serverData['owner'] ?? '';
@@ -384,39 +217,6 @@ class ReviewDriverController extends GetxController {
modelController.text = serverData['model'] ?? '';
yearController.text = serverData['year'] ?? '';
selectedFuel.value = serverData['fuel'] ?? '';
fatherNameController.text = serverData['father_name'] ?? '';
motherNameController.text = serverData['mother_name'] ?? '';
birthPlaceController.text = serverData['birth_place'] ?? '';
bloodTypeController.text = serverData['blood_type'] ?? '';
maritalStatusController.text = serverData['marital_status'] ?? '';
spouseNameController.text = serverData['spouse_name'] ?? '';
idIssueDateController.text = serverData['id_issue_date'] ?? '';
idExpiryDateController.text = serverData['id_expiry_date'] ?? '';
licenseNumberController.text = serverData['license_number'] ?? '';
licenseCategoryController.text = serverData['license_category'] ?? '';
restrictionsController.text = serverData['restrictions'] ?? '';
governorateController.text = serverData['governorate'] ?? '';
occupationController.text = serverData['occupation'] ?? '';
religionController.text = serverData['religion'] ?? '';
engineCapacityController.text = serverData['engine_capacity'] ?? '';
passengerCapacityController.text = serverData['passenger_capacity'] ?? '';
// Detect country from server data if available
if (!countryDetected) {
countryDetected = true;
if (serverData['country']?.isNotEmpty == true) {
country.value = serverData['country']!;
} else if (serverData['site']?.isNotEmpty == true) {
final s = serverData['site']!;
if (s.contains('سوريا') || s.contains('دمشق')) {
country.value = 'Syria';
} else if (s.contains('أردن') || s.contains('عمان')) {
country.value = 'Jordan';
} else if (s.contains('مصر') || s.contains('القاهرة')) {
country.value = 'Egypt';
}
}
}
final serverColorName = serverData['color'] ?? '';
final colorOption = kCarColorOptions.firstWhere(
@@ -489,7 +289,7 @@ class ReviewDriverController extends GetxController {
'license_categories': licenseCategoriesController.text,
'expiry_date': expiryDateController.text,
'license_issue_date': licenseIssueDateController.text,
'maritalStatus': box.read(BoxName.employeename) ?? 'unknown',
'maritalStatus': maritalStatusController.text,
'owner': ownerController.text,
'color': colorName.value,
'color_hex': colorHex.value,
@@ -642,6 +442,15 @@ class ReviewDriverController extends GetxController {
kCarColorOptions.firstWhere((o) => o['hex'] == hex)['key']!;
}
void updateColorSelectionByName(String name) {
final opt = kCarColorOptions.firstWhere(
(o) => o['key'] == name,
orElse: () => {'key': name, 'hex': '#000000'},
);
colorName.value = opt['key']!;
colorHex.value = opt['hex']!;
}
@override
void onClose() {
firstNameController.dispose();
@@ -656,6 +465,7 @@ class ReviewDriverController extends GetxController {
licenseTypeController.dispose();
expiryDateController.dispose();
licenseIssueDateController.dispose();
maritalStatusController.dispose();
ownerController.dispose();
carPlateController.dispose();
vinController.dispose();
@@ -663,22 +473,6 @@ class ReviewDriverController extends GetxController {
makeController.dispose();
modelController.dispose();
yearController.dispose();
fatherNameController.dispose();
motherNameController.dispose();
birthPlaceController.dispose();
bloodTypeController.dispose();
maritalStatusController.dispose();
spouseNameController.dispose();
idIssueDateController.dispose();
idExpiryDateController.dispose();
licenseNumberController.dispose();
licenseCategoryController.dispose();
restrictionsController.dispose();
governorateController.dispose();
occupationController.dispose();
religionController.dispose();
engineCapacityController.dispose();
passengerCapacityController.dispose();
super.onClose();
}
}