Merge
This commit is contained in:
venbaittech
commit
ff74934520
@ -62,7 +62,6 @@ class _ListAllPlansState extends State<ListAllPlans> {
|
|||||||
// });
|
// });
|
||||||
// });
|
// });
|
||||||
});
|
});
|
||||||
|
|
||||||
// futurePlans = fetchPlans();
|
// futurePlans = fetchPlans();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -764,6 +763,7 @@ class _ListAllPlansState extends State<ListAllPlans> {
|
|||||||
Icons.remove_red_eye,
|
Icons.remove_red_eye,
|
||||||
color: Color(0xFF475569),
|
color: Color(0xFF475569),
|
||||||
size: 18),
|
size: 18),
|
||||||
|
tooltip: 'View Trips',
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
Navigator.pop(
|
Navigator.pop(
|
||||||
context); // Close popup manually
|
context); // Close popup manually
|
||||||
@ -788,6 +788,7 @@ class _ListAllPlansState extends State<ListAllPlans> {
|
|||||||
icon: Icon(
|
icon: Icon(
|
||||||
Icons.cancel_rounded,
|
Icons.cancel_rounded,
|
||||||
size: 18),
|
size: 18),
|
||||||
|
tooltip: 'Cancellation Trips',
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
Navigator.pop(context);
|
Navigator.pop(context);
|
||||||
deletePlan(plan.planId);
|
deletePlan(plan.planId);
|
||||||
@ -797,6 +798,7 @@ class _ListAllPlansState extends State<ListAllPlans> {
|
|||||||
icon: Icon(Icons.download,
|
icon: Icon(Icons.download,
|
||||||
color: Color(0xFF114D8B),
|
color: Color(0xFF114D8B),
|
||||||
size: 18),
|
size: 18),
|
||||||
|
tooltip: 'Download Trips Detials',
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
Navigator.pop(context);
|
Navigator.pop(context);
|
||||||
apiService.getPdfDownload(
|
apiService.getPdfDownload(
|
||||||
@ -809,6 +811,7 @@ class _ListAllPlansState extends State<ListAllPlans> {
|
|||||||
color: Color(0xFF475569),
|
color: Color(0xFF475569),
|
||||||
size: 11,
|
size: 11,
|
||||||
),
|
),
|
||||||
|
tooltip: 'Trips Comments',
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
showDialog(
|
showDialog(
|
||||||
context: context,
|
context: context,
|
||||||
|
|||||||
529
lib/Screens/traveller/travellerDetails.dart
Normal file
529
lib/Screens/traveller/travellerDetails.dart
Normal file
@ -0,0 +1,529 @@
|
|||||||
|
import 'dart:convert';
|
||||||
|
|
||||||
|
import 'package:flutter/cupertino.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:google_fonts/google_fonts.dart';
|
||||||
|
import 'package:http/http.dart' as http;
|
||||||
|
|
||||||
|
import '../../config/apiUrl.dart';
|
||||||
|
import '../../services/apiService.dart';
|
||||||
|
import '../../utils/auth_utils.dart';
|
||||||
|
import '../../widgets/custom_text_forex.dart';
|
||||||
|
import 'travellerList.dart';
|
||||||
|
|
||||||
|
class TravellerData extends StatefulWidget {
|
||||||
|
final Future<List<dynamic>> Function() fetchGetTraveller;
|
||||||
|
final bool isDesktop;
|
||||||
|
final Color? layoutColor;
|
||||||
|
|
||||||
|
final int? travellerId; // <-- Add this
|
||||||
|
final Map<String, dynamic>? travellerData;
|
||||||
|
|
||||||
|
const TravellerData(
|
||||||
|
{super.key,
|
||||||
|
required this.isDesktop,
|
||||||
|
this.layoutColor,
|
||||||
|
required this.fetchGetTraveller,
|
||||||
|
this.travellerId,
|
||||||
|
this.travellerData});
|
||||||
|
|
||||||
|
@override
|
||||||
|
TravellerDataState createState() => TravellerDataState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class TravellerDataState extends State<TravellerData> {
|
||||||
|
final ApiService apiService = ApiService();
|
||||||
|
Map<String, dynamic>? apiData;
|
||||||
|
|
||||||
|
final Map<String, FocusNode> focusNodes = {
|
||||||
|
"name": FocusNode(),
|
||||||
|
"description": FocusNode(),
|
||||||
|
};
|
||||||
|
|
||||||
|
final Map<String, TextEditingController> controllers = {};
|
||||||
|
Map<String, String> errorMessages = {};
|
||||||
|
|
||||||
|
String? selectedName;
|
||||||
|
String? selectedDescription;
|
||||||
|
String? userId;
|
||||||
|
int? travellerDataId;
|
||||||
|
late String isActive = "1";
|
||||||
|
|
||||||
|
List<String> dataHeader = [
|
||||||
|
"first_name",
|
||||||
|
"last_name",
|
||||||
|
"email",
|
||||||
|
"mobile",
|
||||||
|
];
|
||||||
|
|
||||||
|
Map<String, dynamic> travellerDetails() {
|
||||||
|
final data = {
|
||||||
|
// "traveller_id": int.parse(travellerId),
|
||||||
|
"first_name": controllers["first_name"]?.text,
|
||||||
|
"last_name": controllers["last_name"]?.text,
|
||||||
|
"email": controllers["email"]?.text,
|
||||||
|
"mobile": controllers["mobile"]?.text,
|
||||||
|
"is_active": isActive,
|
||||||
|
};
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
|
||||||
|
|
||||||
|
apiData = null;
|
||||||
|
for (var field in dataHeader) {
|
||||||
|
controllers[field] = TextEditingController();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (widget.travellerId != null) {
|
||||||
|
print('Editing D ID: ${widget.travellerId}');
|
||||||
|
updateTravellerDetails();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void _clearError() {
|
||||||
|
setState(() {
|
||||||
|
errorMessages.clear();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
for (var controller in controllers.values) {
|
||||||
|
controller.dispose();
|
||||||
|
}
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
void updateTravellerDetails() {
|
||||||
|
print("Inside Update Function - ${widget.travellerData}");
|
||||||
|
|
||||||
|
final data = widget.travellerData;
|
||||||
|
|
||||||
|
if (data == null) return;
|
||||||
|
setState(() {
|
||||||
|
controllers['first_name']?.text = data['first_name'] ?? '';
|
||||||
|
controllers['last_name']?.text = data['last_name'] ?? '';
|
||||||
|
controllers['email']?.text = data['email'].toString();
|
||||||
|
controllers['mobile']?.text = data['mobile'].toString();
|
||||||
|
isActive = data["is_active"];
|
||||||
|
final travellerId = int.tryParse(data['traveller_id'].toString());
|
||||||
|
travellerDataId = travellerId;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void toggleStatus() {
|
||||||
|
setState(() {
|
||||||
|
isActive = isActive == "1" ? "0" : "1";
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
bool validateData() {
|
||||||
|
errorMessages.clear();
|
||||||
|
|
||||||
|
final data = {
|
||||||
|
"first_name": controllers["first_name"]?.text,
|
||||||
|
"last_name": controllers["last_name"]?.text,
|
||||||
|
"email": controllers["email"]?.text,
|
||||||
|
"mobile": controllers["mobile"]?.text,
|
||||||
|
};
|
||||||
|
|
||||||
|
final requiredFields = ["first_name","last_name","email","mobile"];
|
||||||
|
bool hasFocused = false;
|
||||||
|
|
||||||
|
// Check validation for each field
|
||||||
|
for (String field in requiredFields) {
|
||||||
|
if (data[field] == null || data[field]!.trim().isEmpty) {
|
||||||
|
errorMessages[field] = "Required";
|
||||||
|
|
||||||
|
if (!hasFocused) {
|
||||||
|
focusNodes[field]?.requestFocus();
|
||||||
|
hasFocused = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (data["mobile"] != null && data["mobile"].toString().isNotEmpty) {
|
||||||
|
if (!RegExp(r"^\d{10}$").hasMatch(data["mobile"].toString())) {
|
||||||
|
errorMessages["mobile"] =
|
||||||
|
"Enter 10 digits"; // Invalid mobile number format
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (data["email"] != null && data["email"].toString().isNotEmpty) {
|
||||||
|
if (!RegExp(r"^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$")
|
||||||
|
.hasMatch(data["email"].toString())) {
|
||||||
|
errorMessages["email"] = "Invalid email format"; // Invalid email format
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return errorMessages.isEmpty;
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> handleSubmit() async {
|
||||||
|
userId = await getUserId();
|
||||||
|
|
||||||
|
setState(() {
|
||||||
|
// This triggers UI rebuild with error messages
|
||||||
|
if (validateData()) {
|
||||||
|
postTravellerData();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
final travellerData1 = travellerDetails();
|
||||||
|
print("submit data - $travellerData1");
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> postTravellerData({int isActive = 1}) async {
|
||||||
|
// final remarksData = getData();
|
||||||
|
|
||||||
|
final travellerData = travellerDetails();
|
||||||
|
|
||||||
|
print("initially value of the Traveller - $travellerData");
|
||||||
|
// static here
|
||||||
|
final orgId = await getOrgId();
|
||||||
|
|
||||||
|
final String apiUrldata;
|
||||||
|
travellerData["org_id"] = orgId;
|
||||||
|
|
||||||
|
if (travellerDataId != null) {
|
||||||
|
print("for edit traveller id - $travellerDataId");
|
||||||
|
apiUrldata = '$apiUrl/api/travellers/update/$travellerDataId';
|
||||||
|
travellerData["traveller_id"] = travellerDataId.toString();
|
||||||
|
travellerData["updated_by"] = userId;
|
||||||
|
(travellerData.containsKey("created_by")) ? travellerData.remove("created_by") : '' ;
|
||||||
|
} else {
|
||||||
|
print("for add Traveller id - null");
|
||||||
|
apiUrldata = '$apiUrl/api/travellers/create';
|
||||||
|
print("called apiUrl - $apiUrldata");
|
||||||
|
travellerData["created_by"] = userId;
|
||||||
|
}
|
||||||
|
print("recently Traveller data - $travellerData");
|
||||||
|
final token = await getToken(); // Fetch token
|
||||||
|
|
||||||
|
if (token == null) {
|
||||||
|
throw Exception('Token not found. Please log in.');
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
final uri = Uri.parse(apiUrldata);
|
||||||
|
final headers = {
|
||||||
|
'Authorization': 'Bearer $token',
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
};
|
||||||
|
final body = jsonEncode(travellerData);
|
||||||
|
|
||||||
|
final response = travellerDataId != null
|
||||||
|
? await http.put(uri, headers: headers, body: body)
|
||||||
|
: await http.post(uri, headers: headers, body: body);
|
||||||
|
|
||||||
|
|
||||||
|
switch (response.statusCode) {
|
||||||
|
case 200:
|
||||||
|
print("Update - Response: ${response.body}");
|
||||||
|
_clearError();
|
||||||
|
widget.fetchGetTraveller();
|
||||||
|
Navigator.of(context).pop();
|
||||||
|
break;
|
||||||
|
|
||||||
|
case 201:
|
||||||
|
print("Save - Response: ${response.body}");
|
||||||
|
_clearError();
|
||||||
|
await widget.fetchGetTraveller();
|
||||||
|
Navigator.of(context).pop();
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
print("Failed to submit traveller. Status: ${response.statusCode}");
|
||||||
|
print("Error: ${response.body}");
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (e) {
|
||||||
|
print(" Error submitting plan: $e");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
|
||||||
|
return AlertDialog(
|
||||||
|
backgroundColor: Colors.white,
|
||||||
|
contentPadding: const EdgeInsets.fromLTRB(34, 30, 34, 30),
|
||||||
|
// contentPadding: const EdgeInsets.fromLTRB(24, 20, 24, 10),
|
||||||
|
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
|
||||||
|
content: SizedBox(
|
||||||
|
child: SingleChildScrollView(
|
||||||
|
child: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
// Row 1: Title + Edit + Delete buttons
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
(travellerDataId != null) ? 'Edit Traveller' : 'Create Traveller',
|
||||||
|
style: GoogleFonts.poppins(fontSize: 15, color: Colors.black),
|
||||||
|
),
|
||||||
|
const Spacer(),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
const SizedBox(height: 2),
|
||||||
|
Divider(
|
||||||
|
thickness: 0.2,
|
||||||
|
color: Colors.blueGrey.shade100,
|
||||||
|
),
|
||||||
|
const SizedBox(height: 5),
|
||||||
|
Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
"First Name",
|
||||||
|
style: GoogleFonts.poppins(
|
||||||
|
fontSize: 12,
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
color: Color(0xFF575A74)),
|
||||||
|
),
|
||||||
|
SizedBox(height: 5),
|
||||||
|
CustomTextFieldForexWrapper(
|
||||||
|
isFocused: false,
|
||||||
|
isDesktop: widget.isDesktop,
|
||||||
|
color: Colors.transparent,
|
||||||
|
child: SizedBox(
|
||||||
|
height: 40,
|
||||||
|
child: TextField(
|
||||||
|
controller: controllers["first_name"],
|
||||||
|
focusNode: focusNodes["first_name"],
|
||||||
|
style: const TextStyle(fontSize: 12),
|
||||||
|
decoration: const InputDecoration(
|
||||||
|
labelText: "First Name",
|
||||||
|
labelStyle: TextStyle(fontSize: 11, color: Colors.grey),
|
||||||
|
floatingLabelBehavior: FloatingLabelBehavior.never,
|
||||||
|
border: InputBorder.none,
|
||||||
|
contentPadding: EdgeInsets.symmetric(vertical: 16),
|
||||||
|
),
|
||||||
|
)),
|
||||||
|
),
|
||||||
|
if (errorMessages["first_name"] != null) ...[
|
||||||
|
SizedBox(height: 5), // Space before error message
|
||||||
|
Text(
|
||||||
|
errorMessages["first_name"]!,
|
||||||
|
style: TextStyle(color: Colors.red, fontSize: 12),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
],
|
||||||
|
),
|
||||||
|
SizedBox(
|
||||||
|
height: 15,
|
||||||
|
),
|
||||||
|
Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
"Last Name",
|
||||||
|
style: GoogleFonts.poppins(
|
||||||
|
fontSize: 12,
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
color: Color(0xFF575A74)),
|
||||||
|
),
|
||||||
|
SizedBox(height: 5),
|
||||||
|
CustomTextFieldForexWrapper(
|
||||||
|
isFocused: false,
|
||||||
|
isDesktop: widget.isDesktop,
|
||||||
|
color: Colors.transparent,
|
||||||
|
child: SizedBox(
|
||||||
|
height: 40,
|
||||||
|
child: TextField(
|
||||||
|
controller: controllers["last_name"],
|
||||||
|
focusNode: focusNodes["last_name"],
|
||||||
|
style: const TextStyle(fontSize: 12),
|
||||||
|
decoration: const InputDecoration(
|
||||||
|
labelText: "Last Name",
|
||||||
|
labelStyle: TextStyle(fontSize: 11, color: Colors.grey),
|
||||||
|
floatingLabelBehavior: FloatingLabelBehavior.never,
|
||||||
|
border: InputBorder.none,
|
||||||
|
contentPadding: EdgeInsets.symmetric(vertical: 16),
|
||||||
|
),
|
||||||
|
)),
|
||||||
|
),
|
||||||
|
if (errorMessages["last_name"] != null) ...[
|
||||||
|
SizedBox(height: 5), // Space before error message
|
||||||
|
Text(
|
||||||
|
errorMessages["last_name"]!,
|
||||||
|
style: TextStyle(color: Colors.red, fontSize: 12),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
],
|
||||||
|
),
|
||||||
|
SizedBox(
|
||||||
|
height: 15,
|
||||||
|
),
|
||||||
|
Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
"Email",
|
||||||
|
style: GoogleFonts.poppins(
|
||||||
|
fontSize: 12,
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
color: Color(0xFF575A74)),
|
||||||
|
),
|
||||||
|
SizedBox(height: 5),
|
||||||
|
CustomTextFieldForexWrapper(
|
||||||
|
isFocused: false,
|
||||||
|
isDesktop: widget.isDesktop,
|
||||||
|
color: Colors.transparent,
|
||||||
|
child: SizedBox(
|
||||||
|
height: 40,
|
||||||
|
child: TextField(
|
||||||
|
controller: controllers["email"],
|
||||||
|
focusNode: focusNodes["email"],
|
||||||
|
style: const TextStyle(fontSize: 12),
|
||||||
|
decoration: const InputDecoration(
|
||||||
|
labelText: "Email",
|
||||||
|
labelStyle: TextStyle(fontSize: 11, color: Colors.grey),
|
||||||
|
floatingLabelBehavior: FloatingLabelBehavior.never,
|
||||||
|
border: InputBorder.none,
|
||||||
|
contentPadding: EdgeInsets.symmetric(vertical: 16),
|
||||||
|
),
|
||||||
|
)),
|
||||||
|
),
|
||||||
|
if (errorMessages["email"] != null) ...[
|
||||||
|
SizedBox(height: 5), // Space before error message
|
||||||
|
Text(
|
||||||
|
errorMessages["email"]!,
|
||||||
|
style: TextStyle(color: Colors.red, fontSize: 12),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
],
|
||||||
|
),
|
||||||
|
SizedBox(
|
||||||
|
height: 15,
|
||||||
|
),
|
||||||
|
Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
"Mobile",
|
||||||
|
style: GoogleFonts.poppins(
|
||||||
|
fontSize: 12,
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
color: Color(0xFF575A74)),
|
||||||
|
),
|
||||||
|
SizedBox(height: 5),
|
||||||
|
CustomTextFieldForexWrapper(
|
||||||
|
isFocused: false,
|
||||||
|
isDesktop: widget.isDesktop,
|
||||||
|
color: Colors.transparent,
|
||||||
|
child: SizedBox(
|
||||||
|
height: 40,
|
||||||
|
child: TextField(
|
||||||
|
controller: controllers["mobile"],
|
||||||
|
focusNode: focusNodes["mobile"],
|
||||||
|
style: const TextStyle(fontSize: 12),
|
||||||
|
decoration: const InputDecoration(
|
||||||
|
labelText: "Mobile",
|
||||||
|
labelStyle: TextStyle(fontSize: 11, color: Colors.grey),
|
||||||
|
floatingLabelBehavior: FloatingLabelBehavior.never,
|
||||||
|
border: InputBorder.none,
|
||||||
|
contentPadding: EdgeInsets.symmetric(vertical: 16),
|
||||||
|
),
|
||||||
|
)),
|
||||||
|
),
|
||||||
|
if (errorMessages["mobile"] != null) ...[
|
||||||
|
SizedBox(height: 5), // Space before error message
|
||||||
|
Text(
|
||||||
|
errorMessages["mobile"]!,
|
||||||
|
style: TextStyle(color: Colors.red, fontSize: 12),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
],
|
||||||
|
),
|
||||||
|
SizedBox(
|
||||||
|
height: 15,
|
||||||
|
),
|
||||||
|
if (travellerDataId != null)
|
||||||
|
Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
"Change Status ",
|
||||||
|
style: GoogleFonts.poppins(
|
||||||
|
fontSize: 12,
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
color: Color(0xFF575A74)),
|
||||||
|
),
|
||||||
|
Tooltip(
|
||||||
|
message:
|
||||||
|
isActive == "1" ? "Tap to deactivate" : "Tap to activate",
|
||||||
|
child: GestureDetector(
|
||||||
|
onTap: toggleStatus,
|
||||||
|
child: Text(
|
||||||
|
isActive == "1" ? "Active" : "Inactive",
|
||||||
|
style: TextStyle(
|
||||||
|
fontSize: 13,
|
||||||
|
fontFamily: "Inter",
|
||||||
|
color: isActive == "1" ? Colors.green : Colors.red,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
],
|
||||||
|
),
|
||||||
|
if (travellerDataId != null)
|
||||||
|
SizedBox(
|
||||||
|
height: 15,
|
||||||
|
),
|
||||||
|
Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.end,
|
||||||
|
children: [
|
||||||
|
// SizedBox(
|
||||||
|
// child: ElevatedButton(
|
||||||
|
// onPressed: () {
|
||||||
|
// // You can get text from commentController.text
|
||||||
|
// Navigator.of(context).pop(); // Close the modal
|
||||||
|
// },
|
||||||
|
// style: ElevatedButton.styleFrom(
|
||||||
|
// backgroundColor: widget.layoutColor,
|
||||||
|
// shape: RoundedRectangleBorder(
|
||||||
|
// borderRadius: BorderRadius.circular(8),
|
||||||
|
// ),
|
||||||
|
// ),
|
||||||
|
// child: Text('Cancel',
|
||||||
|
// style: GoogleFonts.poppins(
|
||||||
|
// fontSize: 13, color: Colors.white)),
|
||||||
|
// ),
|
||||||
|
// ),
|
||||||
|
// SizedBox(
|
||||||
|
// width: 10,
|
||||||
|
// ),
|
||||||
|
SizedBox(
|
||||||
|
child: ElevatedButton(
|
||||||
|
onPressed: () {
|
||||||
|
handleSubmit();
|
||||||
|
// You can get text from commentController.text
|
||||||
|
// Navigator.of(context).pop(); // Close the modal
|
||||||
|
},
|
||||||
|
style: ElevatedButton.styleFrom(
|
||||||
|
backgroundColor: widget.layoutColor,
|
||||||
|
shape: RoundedRectangleBorder(
|
||||||
|
borderRadius: BorderRadius.circular(8),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
child: Text('Save',
|
||||||
|
style: GoogleFonts.poppins(
|
||||||
|
fontSize: 11, color: Colors.white)),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
// : SizedBox.shrink(),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
869
lib/Screens/traveller/travellerList.dart
Normal file
869
lib/Screens/traveller/travellerList.dart
Normal file
@ -0,0 +1,869 @@
|
|||||||
|
import 'dart:convert';
|
||||||
|
|
||||||
|
import 'package:flutter/cupertino.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:go_router/go_router.dart';
|
||||||
|
import 'package:google_fonts/google_fonts.dart';
|
||||||
|
import 'package:http/http.dart' as http;
|
||||||
|
import 'package:responsive_builder/responsive_builder.dart';
|
||||||
|
import 'package:shared_preferences/shared_preferences.dart';
|
||||||
|
|
||||||
|
import '../../config/apiUrl.dart';
|
||||||
|
import '../../routes/custom_appBar.dart';
|
||||||
|
import '../../routes/custom_drawer.dart';
|
||||||
|
import '../../services/apiService.dart';
|
||||||
|
import '../../utils/auth_utils.dart';
|
||||||
|
import '../../utils/pagination.dart';
|
||||||
|
import 'travellerDetails.dart';
|
||||||
|
|
||||||
|
class TravellerList extends StatefulWidget {
|
||||||
|
const TravellerList({super.key});
|
||||||
|
|
||||||
|
@override
|
||||||
|
TravellerListState createState() => TravellerListState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class TravellerListState extends State<TravellerList> {
|
||||||
|
final GlobalKey<TravellerListState> travellerListKey =
|
||||||
|
GlobalKey<TravellerListState>();
|
||||||
|
|
||||||
|
final ApiService apiService = ApiService();
|
||||||
|
late Future<List<dynamic>> futureTraveller;
|
||||||
|
|
||||||
|
late Map<String, dynamic> depSingleData;
|
||||||
|
String? selectedTravellerId;
|
||||||
|
String? orgId;
|
||||||
|
|
||||||
|
Color? layoutColor;
|
||||||
|
Color? bodyColor;
|
||||||
|
|
||||||
|
List allTraveller = [];
|
||||||
|
List filteredTraveller = [];
|
||||||
|
TextEditingController searchController = TextEditingController();
|
||||||
|
|
||||||
|
int currentPage = 0;
|
||||||
|
int itemsPerPage = 10;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
futureTraveller = fetchGetTraveller();
|
||||||
|
|
||||||
|
futureTraveller.then((object) {
|
||||||
|
setState(() {
|
||||||
|
allTraveller = object;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
|
loadInitialData();
|
||||||
|
});
|
||||||
|
|
||||||
|
// futurePlans = fetchPlans();
|
||||||
|
}
|
||||||
|
|
||||||
|
void loadInitialData() async {
|
||||||
|
String? layoutString = await getLayoutColor();
|
||||||
|
String? bodyStringColor = await getBodyColor();
|
||||||
|
|
||||||
|
setState(() {
|
||||||
|
layoutColor = layoutString != null
|
||||||
|
? Color(int.parse(layoutString))
|
||||||
|
: Colors.redAccent;
|
||||||
|
|
||||||
|
bodyColor = bodyStringColor != null
|
||||||
|
? Color(int.parse(bodyStringColor))
|
||||||
|
: Colors.white;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<String?> getToken() async {
|
||||||
|
final prefs = await SharedPreferences.getInstance();
|
||||||
|
return prefs.getString('auth_token');
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<List<dynamic>> refreshData() {
|
||||||
|
print("Calling Refresh Data");
|
||||||
|
|
||||||
|
futureTraveller = fetchGetTraveller();
|
||||||
|
|
||||||
|
return futureTraveller.then((object) {
|
||||||
|
print("Calling Refresh Data $object");
|
||||||
|
setState(() {
|
||||||
|
allTraveller = object;
|
||||||
|
});
|
||||||
|
return object;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<List<dynamic>> fetchGetTraveller() async {
|
||||||
|
String? ordId = await getOrgId();
|
||||||
|
final String apiUrlData = '$apiUrl/api/travellers?org_id=$ordId';
|
||||||
|
|
||||||
|
|
||||||
|
final String? token = await getToken();
|
||||||
|
|
||||||
|
print("Fetch Traveller");
|
||||||
|
print("2KN Here : $token");
|
||||||
|
|
||||||
|
if (token == null) {
|
||||||
|
throw Exception('Token not found. Please log in.');
|
||||||
|
}
|
||||||
|
|
||||||
|
final response = await http.get(
|
||||||
|
Uri.parse(apiUrlData),
|
||||||
|
headers: {
|
||||||
|
'Authorization': 'Bearer $token',
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
},
|
||||||
|
);
|
||||||
|
print("called api : $apiUrlData");
|
||||||
|
if (response.statusCode == 200) {
|
||||||
|
final data = json.decode(response.body);
|
||||||
|
return data['data']; // Returning raw JSON list
|
||||||
|
} else {
|
||||||
|
throw Exception('Failed to load users');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void filterTraveller(String query) {
|
||||||
|
// print("all before filtering: $query");
|
||||||
|
// final lowerQuery = query.toLowerCase();
|
||||||
|
// setState(() {
|
||||||
|
// filteredTraveller = allTraveller.where((object) {
|
||||||
|
// return (object['traveller_id']?.toLowerCase().contains(lowerQuery) ??
|
||||||
|
// false) ||
|
||||||
|
// (object['description']?.toLowerCase().contains(lowerQuery) ?? false) ||
|
||||||
|
// (object['user']?.toLowerCase().contains(lowerQuery) ?? false) ||
|
||||||
|
// (object['is_active']?.toLowerCase().contains(lowerQuery) ?? false);
|
||||||
|
// }).toList();
|
||||||
|
// });
|
||||||
|
// print("filteredPlans: $filteredTraveller");
|
||||||
|
|
||||||
|
print("all before filtering: $query");
|
||||||
|
final lowerQuery = query.toLowerCase();
|
||||||
|
setState(() {
|
||||||
|
filteredTraveller = allTraveller.where((object) {
|
||||||
|
final isActiveStatus =
|
||||||
|
object['is_active'] == "1" ? "active" : "inactive";
|
||||||
|
return (object['traveller_id']?.toLowerCase().contains(lowerQuery) ??
|
||||||
|
false) ||
|
||||||
|
(object['name']?.toLowerCase().contains(lowerQuery) ?? false) ||
|
||||||
|
(object['description']?.toLowerCase().contains(lowerQuery) ??
|
||||||
|
false) ||
|
||||||
|
(isActiveStatus.contains(lowerQuery));
|
||||||
|
}).toList();
|
||||||
|
});
|
||||||
|
print("filteredTraveller: $filteredTraveller");
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return ResponsiveBuilder(builder: (context, sizingInfo) {
|
||||||
|
bool isDesktop = sizingInfo.deviceScreenType == DeviceScreenType.desktop;
|
||||||
|
|
||||||
|
return Scaffold(
|
||||||
|
backgroundColor: Color(0xFFf5f5f5),
|
||||||
|
// appBar: isDesktop ? null : const CustomAppBar(title: 'User Management'),
|
||||||
|
// drawer: isDesktop ? null : CustomDrawer(isDesktop: false),
|
||||||
|
appBar: CustomAppBar(isDesktop: isDesktop),
|
||||||
|
drawer: CustomDrawer(isDesktop: false),
|
||||||
|
body: Padding(
|
||||||
|
padding: isDesktop
|
||||||
|
? EdgeInsets.symmetric(
|
||||||
|
horizontal: MediaQuery.of(context).size.width *
|
||||||
|
0.1, // 30% of screen width as horizontal padding
|
||||||
|
vertical: MediaQuery.of(context).size.height *
|
||||||
|
0, // 5% of screen height as vertical padding
|
||||||
|
)
|
||||||
|
: EdgeInsets.all(0),
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
// if (isDesktop) CustomDrawer(isDesktop: true),
|
||||||
|
// const Expanded(child: Center(child: Text("User Page Content"))),
|
||||||
|
Expanded(child: buildGroupList(isDesktop)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget buildGroupList(bool isDesktop) {
|
||||||
|
return Container(
|
||||||
|
margin: isDesktop ? const EdgeInsets.only(top: 10.0, bottom: 10.0) : null,
|
||||||
|
padding: const EdgeInsets.all(1),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: isDesktop ? Colors.white : Color(0xFFFCFCFC),
|
||||||
|
),
|
||||||
|
// decoration: BoxDecoration(
|
||||||
|
// // color: Colors.amber,
|
||||||
|
// // color: bodyColor,
|
||||||
|
// color: Color(0xFFE1F5FE),
|
||||||
|
// border: Border.all(
|
||||||
|
// color: Colors.white,
|
||||||
|
// // color: Color(0xFFF7F7FB),
|
||||||
|
// width: 3.5)),
|
||||||
|
child: buildUserTable(isDesktop),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget buildUserTable(bool isDesktop) {
|
||||||
|
return Container(
|
||||||
|
// margin: isDesktop
|
||||||
|
// ? EdgeInsets.all(10.0)
|
||||||
|
// : EdgeInsets.only(left: 20.0, bottom: 20.0, top: 10.0, right: 20.0),
|
||||||
|
// padding: const EdgeInsets.all(10),
|
||||||
|
height: isDesktop
|
||||||
|
? MediaQuery.of(context).size.height * 0.98
|
||||||
|
: MediaQuery.of(context).size.height,
|
||||||
|
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(10.0),
|
||||||
|
child: Container(
|
||||||
|
color: Colors.white,
|
||||||
|
padding: const EdgeInsets.all(10.0),
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||||
|
children: [
|
||||||
|
// Divider(
|
||||||
|
// thickness: 0.2, // how "thick" the line is
|
||||||
|
// color: Colors.grey, // optional
|
||||||
|
// ),
|
||||||
|
Row(
|
||||||
|
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
|
children: [
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
'Traveller Details',
|
||||||
|
style: GoogleFonts.poppins(
|
||||||
|
fontSize: isDesktop ? 16 : 14,
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
color: Colors.black,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
if (isDesktop)
|
||||||
|
SizedBox(
|
||||||
|
width: MediaQuery.of(context).size.width * 0.16,
|
||||||
|
),
|
||||||
|
|
||||||
|
if (isDesktop)
|
||||||
|
Container(
|
||||||
|
width: MediaQuery.of(context).size.width * 0.2,
|
||||||
|
height: 40,
|
||||||
|
child: TextField(
|
||||||
|
controller: searchController,
|
||||||
|
onChanged: filterTraveller,
|
||||||
|
decoration: InputDecoration(
|
||||||
|
hintText: "Search ...",
|
||||||
|
hintStyle: TextStyle(
|
||||||
|
fontSize: 12, color: Color(0xFF9E9DBD)),
|
||||||
|
prefixIcon: Icon(
|
||||||
|
Icons.search,
|
||||||
|
color: Color(0xFF9E9DBD),
|
||||||
|
size: 18,
|
||||||
|
),
|
||||||
|
border: OutlineInputBorder(
|
||||||
|
borderRadius: BorderRadius.circular(12),
|
||||||
|
),
|
||||||
|
enabledBorder: OutlineInputBorder(
|
||||||
|
borderRadius: BorderRadius.circular(12),
|
||||||
|
borderSide: BorderSide(
|
||||||
|
color: Colors.grey.shade200, width: 0.5),
|
||||||
|
),
|
||||||
|
focusedBorder: OutlineInputBorder(
|
||||||
|
borderRadius: BorderRadius.circular(12),
|
||||||
|
borderSide: BorderSide(
|
||||||
|
color: Colors.grey.shade300, width: 1),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
style: GoogleFonts.poppins(
|
||||||
|
fontSize: 12,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
// SizedBox(width: 16),
|
||||||
|
Spacer(),
|
||||||
|
|
||||||
|
ElevatedButton(
|
||||||
|
style: ElevatedButton.styleFrom(
|
||||||
|
backgroundColor: Color(0xFF114D8B),
|
||||||
|
foregroundColor: Colors.white,
|
||||||
|
disabledBackgroundColor: Color(0xFF114D8B),
|
||||||
|
disabledForegroundColor: Colors.white,
|
||||||
|
shape: RoundedRectangleBorder(
|
||||||
|
borderRadius: BorderRadius.circular(8),
|
||||||
|
side:
|
||||||
|
BorderSide(color: Color(0xFF114D8B), width: 2),
|
||||||
|
),
|
||||||
|
padding: EdgeInsets.symmetric(
|
||||||
|
horizontal: 20, vertical: 12),
|
||||||
|
),
|
||||||
|
onPressed: () async {
|
||||||
|
showDialog(
|
||||||
|
context: context,
|
||||||
|
builder: (context) => TravellerData(
|
||||||
|
isDesktop: isDesktop,
|
||||||
|
layoutColor: layoutColor!,
|
||||||
|
fetchGetTraveller: refreshData,
|
||||||
|
|
||||||
|
// role:
|
||||||
|
// "Travel Agent"
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
child: Row(
|
||||||
|
mainAxisSize:
|
||||||
|
MainAxisSize.min, // Ensures content fits nicely
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
"Add Traveller",
|
||||||
|
style: GoogleFonts.poppins(
|
||||||
|
fontSize: isDesktop ? 13 : 11,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
SizedBox(width: 8), // spacing between icon and text
|
||||||
|
Icon(
|
||||||
|
Icons.add_circle_outline_rounded,
|
||||||
|
size: 15,
|
||||||
|
color: Colors.white,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
|
||||||
|
if (!isDesktop)
|
||||||
|
SizedBox(
|
||||||
|
height: 5,
|
||||||
|
),
|
||||||
|
isDesktop
|
||||||
|
? SizedBox.shrink()
|
||||||
|
: Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Container(
|
||||||
|
width: MediaQuery.of(context).size.width * 0.8,
|
||||||
|
height: 35,
|
||||||
|
child: TextField(
|
||||||
|
controller: searchController,
|
||||||
|
onChanged: filterTraveller,
|
||||||
|
decoration: InputDecoration(
|
||||||
|
hintText: "Search ...",
|
||||||
|
hintStyle: TextStyle(
|
||||||
|
fontSize: 12, color: Color(0xFF9E9DBD)),
|
||||||
|
prefixIcon: Icon(
|
||||||
|
Icons.search,
|
||||||
|
color: Color(0xFF9E9DBD),
|
||||||
|
size: 18,
|
||||||
|
),
|
||||||
|
border: OutlineInputBorder(
|
||||||
|
borderRadius: BorderRadius.circular(12),
|
||||||
|
),
|
||||||
|
enabledBorder: OutlineInputBorder(
|
||||||
|
borderRadius: BorderRadius.circular(12),
|
||||||
|
borderSide: BorderSide(
|
||||||
|
color: Colors.grey.shade200,
|
||||||
|
width: 0.5),
|
||||||
|
),
|
||||||
|
focusedBorder: OutlineInputBorder(
|
||||||
|
borderRadius: BorderRadius.circular(12),
|
||||||
|
borderSide: BorderSide(
|
||||||
|
color: Colors.grey.shade300, width: 1),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
style: GoogleFonts.poppins(
|
||||||
|
fontSize: 12,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
// SizedBox(width: 16),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
const SizedBox(height: 10),
|
||||||
|
FutureBuilder<List<dynamic>>(
|
||||||
|
future: futureTraveller,
|
||||||
|
builder: (context, snapshot) {
|
||||||
|
if (snapshot.connectionState == ConnectionState.waiting) {
|
||||||
|
return const Center(child: CircularProgressIndicator());
|
||||||
|
} else if (snapshot.hasError ||
|
||||||
|
!snapshot.hasData ||
|
||||||
|
snapshot.data!.isEmpty) {
|
||||||
|
return Center(
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(16.0),
|
||||||
|
child: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
// const Icon(Icons.error_outline,
|
||||||
|
// color: Colors.redAccent, size: 60),
|
||||||
|
// const SizedBox(height: 16),
|
||||||
|
// Text(
|
||||||
|
// "Oops!",
|
||||||
|
// style: GoogleFonts.poppins(
|
||||||
|
// fontSize: 20,
|
||||||
|
// fontWeight: FontWeight.bold,
|
||||||
|
// color: Colors.redAccent),
|
||||||
|
// ),
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
Text(
|
||||||
|
"No Traveller Available ",
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
style: GoogleFonts.poppins(
|
||||||
|
fontSize: 20,
|
||||||
|
fontWeight: FontWeight.bold,
|
||||||
|
color: Colors.grey),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 20),
|
||||||
|
Text(
|
||||||
|
"Please Create Traveller Details",
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
style: GoogleFonts.poppins(
|
||||||
|
fontSize: 16, color: Colors.grey),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 20),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
/* Here collect the list to displayed the data in table or card Used */
|
||||||
|
List<dynamic> object = filteredTraveller.isNotEmpty
|
||||||
|
? filteredTraveller
|
||||||
|
: allTraveller;
|
||||||
|
|
||||||
|
/* List is Sorting here */
|
||||||
|
object.sort((a, b) {
|
||||||
|
DateTime dateA = DateTime.parse(a['created_on']);
|
||||||
|
DateTime dateB = DateTime.parse(b['created_on']);
|
||||||
|
|
||||||
|
return dateB
|
||||||
|
.compareTo(dateA); // Descending: newest first
|
||||||
|
});
|
||||||
|
|
||||||
|
/* For pagination for list ... */
|
||||||
|
List paginatedTraveller = object
|
||||||
|
.skip(currentPage * itemsPerPage)
|
||||||
|
.take(itemsPerPage)
|
||||||
|
.toList();
|
||||||
|
|
||||||
|
/* Table ... */
|
||||||
|
Widget table = LayoutBuilder(
|
||||||
|
builder: (context, constraints) {
|
||||||
|
double minWidth =
|
||||||
|
isDesktop ? constraints.maxWidth : 1300;
|
||||||
|
|
||||||
|
return ConstrainedBox(
|
||||||
|
constraints: BoxConstraints(minWidth: minWidth),
|
||||||
|
child: DataTable(
|
||||||
|
dividerThickness: 0.5,
|
||||||
|
columnSpacing: isDesktop ? 24.0 : 16.0,
|
||||||
|
border: TableBorder(
|
||||||
|
horizontalInside: BorderSide(
|
||||||
|
width: 0.5, color: Colors.grey.shade200),
|
||||||
|
),
|
||||||
|
columns: [
|
||||||
|
DataColumn(
|
||||||
|
label: Text(
|
||||||
|
'Name',
|
||||||
|
style: GoogleFonts.poppins(
|
||||||
|
fontSize: 13,
|
||||||
|
fontWeight: FontWeight.w600),
|
||||||
|
)),
|
||||||
|
DataColumn(
|
||||||
|
label: Text(
|
||||||
|
'Email',
|
||||||
|
style: GoogleFonts.poppins(
|
||||||
|
fontSize: 13,
|
||||||
|
fontWeight: FontWeight.w600),
|
||||||
|
)),
|
||||||
|
DataColumn(
|
||||||
|
label: Text(
|
||||||
|
'Mobile',
|
||||||
|
style: GoogleFonts.poppins(
|
||||||
|
fontSize: 13,
|
||||||
|
fontWeight: FontWeight.w600),
|
||||||
|
)),
|
||||||
|
DataColumn(
|
||||||
|
label: Text(
|
||||||
|
'Status',
|
||||||
|
style: GoogleFonts.poppins(
|
||||||
|
fontSize: 13,
|
||||||
|
fontWeight: FontWeight.w600),
|
||||||
|
)),
|
||||||
|
DataColumn(
|
||||||
|
label: Text(
|
||||||
|
'Actions',
|
||||||
|
style: GoogleFonts.poppins(
|
||||||
|
fontSize: 13,
|
||||||
|
fontWeight: FontWeight.w600),
|
||||||
|
)),
|
||||||
|
],
|
||||||
|
rows: paginatedTraveller.map((tableObject) {
|
||||||
|
String fullName = '${tableObject['first_name'] ?? ''} ${tableObject['last_name'] ?? ''}';
|
||||||
|
String travellerId =
|
||||||
|
tableObject['traveller_id']
|
||||||
|
.toString(); // Get user ID
|
||||||
|
bool isSelected =
|
||||||
|
selectedTravellerId == travellerId;
|
||||||
|
|
||||||
|
return DataRow(cells: [
|
||||||
|
DataCell(Text(fullName ?? 'N/A',
|
||||||
|
style: TextStyle(
|
||||||
|
fontSize: 13,
|
||||||
|
fontFamily: "Inter",
|
||||||
|
))),
|
||||||
|
DataCell(
|
||||||
|
Text(tableObject['email'] ?? 'N/A',
|
||||||
|
style: TextStyle(
|
||||||
|
fontSize: 13,
|
||||||
|
fontFamily: "Inter",
|
||||||
|
),
|
||||||
|
softWrap: true,
|
||||||
|
overflow: TextOverflow.ellipsis)),
|
||||||
|
DataCell(
|
||||||
|
Text(tableObject['mobile'] ?? 'N/A',
|
||||||
|
style: TextStyle(
|
||||||
|
fontSize: 13,
|
||||||
|
fontFamily: "Inter",
|
||||||
|
),
|
||||||
|
softWrap: true,
|
||||||
|
overflow: TextOverflow.ellipsis)),
|
||||||
|
DataCell(
|
||||||
|
Text(
|
||||||
|
tableObject['is_active'] == "1"
|
||||||
|
? 'Active'
|
||||||
|
: 'Inactive',
|
||||||
|
style: TextStyle(
|
||||||
|
fontSize: 13,
|
||||||
|
fontFamily: "Inter",
|
||||||
|
color: tableObject['is_active'] == "1"
|
||||||
|
? Colors.green
|
||||||
|
: Colors.red,
|
||||||
|
),
|
||||||
|
softWrap: true,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
DataCell(
|
||||||
|
// UserActionsMenu(
|
||||||
|
// user: forex,
|
||||||
|
// getUserDetails: (id) =>
|
||||||
|
// apiService.getSingleUser(id),
|
||||||
|
// ),
|
||||||
|
GestureDetector(
|
||||||
|
child: Image.asset(
|
||||||
|
'assets/images/IconsImg/edit.png',
|
||||||
|
width: 20,
|
||||||
|
height: 15),
|
||||||
|
onTap: () async {
|
||||||
|
// final userId = getUserId(user['user_id']);
|
||||||
|
// final usersData = await getUserDetails(userId);
|
||||||
|
//
|
||||||
|
final travellerId = int.tryParse(
|
||||||
|
tableObject['traveller_id']
|
||||||
|
.toString());
|
||||||
|
|
||||||
|
if (travellerId != null) {
|
||||||
|
print(
|
||||||
|
"Table cell - traveller Id -- $travellerId");
|
||||||
|
final data = await apiService
|
||||||
|
.getTravellerDetailsFind(
|
||||||
|
travellerId);
|
||||||
|
print("TravellerId -- $data");
|
||||||
|
|
||||||
|
showDialog(
|
||||||
|
context: context,
|
||||||
|
builder: (context) =>
|
||||||
|
TravellerData(
|
||||||
|
isDesktop: isDesktop,
|
||||||
|
travellerId:
|
||||||
|
travellerId, // Pass the ID
|
||||||
|
travellerData: data,
|
||||||
|
layoutColor: layoutColor!,
|
||||||
|
// fetchGetForex: fetchGetForex,
|
||||||
|
fetchGetTraveller: refreshData,
|
||||||
|
// role:
|
||||||
|
// "Travel Agent"
|
||||||
|
),
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
print("Invalid ID");
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
]);
|
||||||
|
}).toList(),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
/* Card ... */
|
||||||
|
Widget buildMobileCardView(List<dynamic> paginatedUser) {
|
||||||
|
return ListView.builder(
|
||||||
|
itemCount: paginatedUser.length,
|
||||||
|
itemBuilder: (context, index) {
|
||||||
|
final cardObject = paginatedUser[index];
|
||||||
|
String fullName = '${cardObject['first_name'] ?? ''} ${cardObject['last_name'] ?? ''}';
|
||||||
|
return Card(
|
||||||
|
color: Colors.white,
|
||||||
|
margin: EdgeInsets.symmetric(
|
||||||
|
horizontal: 12, vertical: 6),
|
||||||
|
shape: RoundedRectangleBorder(
|
||||||
|
borderRadius: BorderRadius.circular(12),
|
||||||
|
),
|
||||||
|
elevation: 3,
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(12.0),
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
// Status and Employee Code
|
||||||
|
Row(
|
||||||
|
mainAxisAlignment:
|
||||||
|
MainAxisAlignment.spaceBetween,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
fullName ?? 'N/A',
|
||||||
|
style: GoogleFonts.poppins(
|
||||||
|
fontSize: 10,
|
||||||
|
color: Colors.black87,
|
||||||
|
fontWeight: FontWeight.w700),
|
||||||
|
),
|
||||||
|
|
||||||
|
GestureDetector(
|
||||||
|
child: Image.asset(
|
||||||
|
'assets/images/IconsImg/edit.png',
|
||||||
|
width: 20,
|
||||||
|
height: 15),
|
||||||
|
onTap: () async {
|
||||||
|
// final userId = getUserId(user['user_id']);
|
||||||
|
// final usersData = await getUserDetails(userId);
|
||||||
|
//
|
||||||
|
final travellerId = int.tryParse(
|
||||||
|
cardObject['traveller_id']
|
||||||
|
.toString());
|
||||||
|
|
||||||
|
if (travellerId != null) {
|
||||||
|
print(
|
||||||
|
"travellerId -- $travellerId");
|
||||||
|
final data = await apiService
|
||||||
|
.getTravellerDetailsFind(
|
||||||
|
travellerId);
|
||||||
|
print("TravellerId -- $data");
|
||||||
|
|
||||||
|
showDialog(
|
||||||
|
context: context,
|
||||||
|
builder: (context) =>
|
||||||
|
TravellerData(
|
||||||
|
isDesktop: isDesktop,
|
||||||
|
travellerId:
|
||||||
|
travellerId, // Pass the ID
|
||||||
|
travellerData: data,
|
||||||
|
layoutColor: layoutColor!,
|
||||||
|
// fetchGetTraveller: fetchGetTraveller,
|
||||||
|
fetchGetTraveller:
|
||||||
|
refreshData,
|
||||||
|
// role:
|
||||||
|
// "Travel Agent"
|
||||||
|
),
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
print("Invalid ID");
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
// PopupMenuButton<int>(
|
||||||
|
// color: Colors.white,
|
||||||
|
// padding: EdgeInsets.zero,
|
||||||
|
// offset: Offset(0, 30),
|
||||||
|
// icon: Icon(
|
||||||
|
// Icons.more_vert,
|
||||||
|
// color: Color(0xFF475569),
|
||||||
|
// size: 14,
|
||||||
|
// ),
|
||||||
|
// itemBuilder: (context) => [
|
||||||
|
// CustomPopupMenuEntry(
|
||||||
|
// child: Container(
|
||||||
|
// padding: EdgeInsets.symmetric(
|
||||||
|
// horizontal: 8, vertical: 8),
|
||||||
|
// child: Row(
|
||||||
|
// mainAxisSize:
|
||||||
|
// MainAxisSize.min,
|
||||||
|
// mainAxisAlignment:
|
||||||
|
// MainAxisAlignment.center,
|
||||||
|
// children: [
|
||||||
|
// IconButton(
|
||||||
|
// icon: Icon(
|
||||||
|
// Icons
|
||||||
|
// .remove_red_eye,
|
||||||
|
// color: Color(
|
||||||
|
// 0xFF475569),
|
||||||
|
// size: 18),
|
||||||
|
// onPressed: () {
|
||||||
|
// print(
|
||||||
|
// "USerDAta - $user");
|
||||||
|
// // dynamic usersData = apiService
|
||||||
|
// // .getSingleUser(user[
|
||||||
|
// // 'user_id']
|
||||||
|
// // is String
|
||||||
|
// // ? int.parse(user[
|
||||||
|
// // 'user_id'])
|
||||||
|
// // : user[
|
||||||
|
// // 'user_id']);
|
||||||
|
// //
|
||||||
|
// // print(
|
||||||
|
// // "USerDAta - $usersData");
|
||||||
|
//
|
||||||
|
// context.go(
|
||||||
|
// "/CreateUserDetails",
|
||||||
|
// extra: {
|
||||||
|
// "selectedUser":
|
||||||
|
// user,
|
||||||
|
// "isViewMode": true
|
||||||
|
// },
|
||||||
|
// );
|
||||||
|
// }),
|
||||||
|
// IconButton(
|
||||||
|
// icon: Image.asset(
|
||||||
|
// 'assets/images/IconsImg/edit.png',
|
||||||
|
// width: 20,
|
||||||
|
// height: 15),
|
||||||
|
// onPressed: () {
|
||||||
|
// context.go(
|
||||||
|
// "/CreateUserDetails",
|
||||||
|
// extra: {
|
||||||
|
// "selectedUser":
|
||||||
|
// user,
|
||||||
|
// "isViewMode": false
|
||||||
|
// },
|
||||||
|
// );
|
||||||
|
// },
|
||||||
|
// ),
|
||||||
|
// ],
|
||||||
|
// ),
|
||||||
|
// ),
|
||||||
|
// ),
|
||||||
|
// ],
|
||||||
|
// ),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
|
||||||
|
SizedBox(height: 2),
|
||||||
|
// Trip Id and Trip Name
|
||||||
|
// Name
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Column(
|
||||||
|
crossAxisAlignment:
|
||||||
|
CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
cardObject['email'] ?? '',
|
||||||
|
style: GoogleFonts.poppins(
|
||||||
|
fontSize: 10,
|
||||||
|
color: Colors.black87),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
SizedBox(
|
||||||
|
width: 10,
|
||||||
|
),
|
||||||
|
Column(
|
||||||
|
crossAxisAlignment:
|
||||||
|
CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
cardObject['mobile'] ?? '',
|
||||||
|
style: GoogleFonts.poppins(
|
||||||
|
fontSize: 10,
|
||||||
|
color: Colors.black87),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
// Actions
|
||||||
|
// Actions
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return Expanded(
|
||||||
|
child: Column(
|
||||||
|
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
|
children: [
|
||||||
|
Expanded(
|
||||||
|
child: isDesktop
|
||||||
|
? (searchController.text.isNotEmpty &&
|
||||||
|
filteredTraveller.isEmpty
|
||||||
|
? Center(
|
||||||
|
child: Text(
|
||||||
|
"No matches found",
|
||||||
|
style: GoogleFonts.poppins(
|
||||||
|
fontSize: 14,
|
||||||
|
color: Colors.grey),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
: SingleChildScrollView(
|
||||||
|
scrollDirection: Axis.vertical,
|
||||||
|
child: table,
|
||||||
|
))
|
||||||
|
: (searchController.text.isNotEmpty &&
|
||||||
|
filteredTraveller.isEmpty
|
||||||
|
? Center(
|
||||||
|
child: Text(
|
||||||
|
"No matches found",
|
||||||
|
style: GoogleFonts.poppins(
|
||||||
|
fontSize: 14,
|
||||||
|
color: Colors.grey),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
: buildMobileCardView(
|
||||||
|
paginatedTraveller)),
|
||||||
|
),
|
||||||
|
// Expanded(
|
||||||
|
// child: isDesktop
|
||||||
|
// ? SingleChildScrollView(
|
||||||
|
// scrollDirection: Axis.vertical,
|
||||||
|
// child: table, // <-- your existing table
|
||||||
|
// )
|
||||||
|
// : buildMobileCardView(paginatedTraveller),
|
||||||
|
// ),
|
||||||
|
PaginationControls(
|
||||||
|
currentPage: currentPage,
|
||||||
|
itemsPerPage: itemsPerPage,
|
||||||
|
totalItems: object.length,
|
||||||
|
activeColor: layoutColor, // your theme color
|
||||||
|
onPageChanged: (page) {
|
||||||
|
setState(() {
|
||||||
|
currentPage = page;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
onItemsPerPageChanged: (items) {
|
||||||
|
setState(() {
|
||||||
|
itemsPerPage = items;
|
||||||
|
currentPage = 0;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
)
|
||||||
|
]),
|
||||||
|
)),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
383
lib/Screens/userManagement/create_user/change_password.dart
Normal file
383
lib/Screens/userManagement/create_user/change_password.dart
Normal file
@ -0,0 +1,383 @@
|
|||||||
|
import 'dart:convert';
|
||||||
|
|
||||||
|
import 'package:dropdown_search/dropdown_search.dart';
|
||||||
|
import 'package:flutter/cupertino.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter/services.dart';
|
||||||
|
import 'package:google_fonts/google_fonts.dart';
|
||||||
|
import 'package:http/http.dart' as http;
|
||||||
|
|
||||||
|
import '../../../config/apiUrl.dart';
|
||||||
|
import '../../../services/apiService.dart';
|
||||||
|
import '../../../utils/auth_utils.dart';
|
||||||
|
import '../../../widgets/custom_user_form.dart';
|
||||||
|
|
||||||
|
|
||||||
|
class ChangePasswordDialogData extends StatefulWidget {
|
||||||
|
|
||||||
|
final dynamic isDesktop;
|
||||||
|
final dynamic layoutColor;
|
||||||
|
final dynamic updaterUserId;
|
||||||
|
final dynamic updaterEmail;
|
||||||
|
|
||||||
|
const ChangePasswordDialogData({
|
||||||
|
super.key,
|
||||||
|
this.isDesktop,
|
||||||
|
this.layoutColor,
|
||||||
|
this.updaterUserId,
|
||||||
|
this.updaterEmail
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
@override
|
||||||
|
ChangePasswordDialogDataState createState() => ChangePasswordDialogDataState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class ChangePasswordDialogDataState extends State<ChangePasswordDialogData> {
|
||||||
|
|
||||||
|
final ApiService apiService = ApiService();
|
||||||
|
|
||||||
|
final Map<String, TextEditingController> controllers = {};
|
||||||
|
Map<String, String> errorMessages = {};
|
||||||
|
|
||||||
|
|
||||||
|
String? loggeduserId;
|
||||||
|
String? updaterUserIdForAPI;
|
||||||
|
|
||||||
|
List<String> dataHeader = [
|
||||||
|
"email",
|
||||||
|
"changePassword",
|
||||||
|
"confirmPassword"
|
||||||
|
];
|
||||||
|
|
||||||
|
// @override
|
||||||
|
// void initState() {
|
||||||
|
// super.initState();
|
||||||
|
//
|
||||||
|
// for (var field in dataHeader) {
|
||||||
|
// controllers[field] = TextEditingController();
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// setState(() {
|
||||||
|
// controllers['email']?.text = widget.updaterEmail ?? '';
|
||||||
|
// controllers['changePassword']?.text = '';
|
||||||
|
// controllers['confirmPassword']?.text = '';
|
||||||
|
// });
|
||||||
|
// }
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
print("widget.updaterEmail: ${widget.updaterEmail}");
|
||||||
|
|
||||||
|
for (var field in dataHeader) {
|
||||||
|
controllers[field] = TextEditingController();
|
||||||
|
}
|
||||||
|
|
||||||
|
setState(() {
|
||||||
|
controllers['email']?.text = widget.updaterEmail ;
|
||||||
|
controllers['changePassword']?.text = '';
|
||||||
|
controllers['confirmPassword']?.text = '';
|
||||||
|
updaterUserIdForAPI = widget.updaterUserId;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
void _clearError() {
|
||||||
|
setState(() {
|
||||||
|
errorMessages.clear();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
for (var controller in controllers.values) {
|
||||||
|
controller.dispose();
|
||||||
|
}
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
bool validateData() {
|
||||||
|
errorMessages.clear();
|
||||||
|
|
||||||
|
final String? email = controllers["email"]?.text;
|
||||||
|
final String? changePassword = controllers["changePassword"]?.text;
|
||||||
|
final String? confirmPassword = controllers["confirmPassword"]?.text;
|
||||||
|
|
||||||
|
// Required fields check
|
||||||
|
if (email == null || email.trim().isEmpty) {
|
||||||
|
errorMessages["email"] = "Required";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (changePassword == null || changePassword.trim().isEmpty) {
|
||||||
|
errorMessages["changePassword"] = "Required";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (confirmPassword == null || confirmPassword.trim().isEmpty) {
|
||||||
|
errorMessages["confirmPassword"] = "Required";
|
||||||
|
}
|
||||||
|
|
||||||
|
// Password match check
|
||||||
|
if ((changePassword?.isNotEmpty ?? false) &&
|
||||||
|
(confirmPassword?.isNotEmpty ?? false) &&
|
||||||
|
changePassword != confirmPassword) {
|
||||||
|
errorMessages["changePassword"] = "Passwords do not match";
|
||||||
|
errorMessages["confirmPassword"] = "Passwords do not match";
|
||||||
|
}
|
||||||
|
|
||||||
|
// setState(() {}); // Update UI with any error messages
|
||||||
|
return errorMessages.isEmpty;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Future<void> handleSubmit() async {
|
||||||
|
loggeduserId = await getUserId();
|
||||||
|
|
||||||
|
setState(() {
|
||||||
|
// This triggers UI rebuild with error messages
|
||||||
|
if (validateData()) {
|
||||||
|
postData();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> postData() async {
|
||||||
|
// final remarksData = getData();
|
||||||
|
print('sss$updaterUserIdForAPI');
|
||||||
|
final loggedInUserId = await getUserId();
|
||||||
|
|
||||||
|
final password = controllers["changePassword"]?.text ?? '';
|
||||||
|
final confirmPassword = controllers["confirmPassword"]?.text ?? '';
|
||||||
|
final String apiUrldata = '$apiUrl/api/user/user-password/$updaterUserIdForAPI';
|
||||||
|
|
||||||
|
final token = await getToken();
|
||||||
|
final headers = {
|
||||||
|
'Authorization': 'Bearer $token',
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
};
|
||||||
|
|
||||||
|
try {
|
||||||
|
final uri = Uri.parse(apiUrldata);
|
||||||
|
final headers = {
|
||||||
|
'Authorization': 'Bearer $token',
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
};
|
||||||
|
final body = jsonEncode({
|
||||||
|
"password": password,
|
||||||
|
"updated_by": loggedInUserId,
|
||||||
|
});
|
||||||
|
|
||||||
|
final response = await http.put(uri, headers: headers, body: body);
|
||||||
|
|
||||||
|
if (response.statusCode == 200 || response.statusCode == 201) {
|
||||||
|
print("Forex Details Created successfully!");
|
||||||
|
print("Response: ${response.body}");
|
||||||
|
_clearError();
|
||||||
|
Navigator.of(context).pop();
|
||||||
|
} else if (response.statusCode == 404) {
|
||||||
|
Navigator.of(context).pop();
|
||||||
|
final message = jsonDecode(response.body)['message'] ?? 'Unknown error';
|
||||||
|
|
||||||
|
ScaffoldMessenger.of(context).showSnackBar(
|
||||||
|
SnackBar(
|
||||||
|
content: Text(message),
|
||||||
|
backgroundColor: Colors.redAccent,
|
||||||
|
behavior: SnackBarBehavior.floating,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
print("Failed to submit plan. Status: ${response.statusCode}");
|
||||||
|
print("Error: ${response.body}");
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
print(" Error submitting plan: $e");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
|
||||||
|
return AlertDialog(
|
||||||
|
backgroundColor: Colors.white,
|
||||||
|
contentPadding: const EdgeInsets.fromLTRB(34, 30, 34, 30),
|
||||||
|
// contentPadding: const EdgeInsets.fromLTRB(24, 20, 24, 10),
|
||||||
|
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
|
||||||
|
content: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
// Row 1: Title + Edit + Delete buttons
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
'Change Password',
|
||||||
|
style: GoogleFonts.poppins(fontSize: 15, color: Colors.black),
|
||||||
|
),
|
||||||
|
const Spacer(),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
const SizedBox(height: 2),
|
||||||
|
Divider(
|
||||||
|
thickness: 0.2,
|
||||||
|
color: Colors.blueGrey.shade100,
|
||||||
|
),
|
||||||
|
const SizedBox(height: 5),
|
||||||
|
|
||||||
|
Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
"Email",
|
||||||
|
style: GoogleFonts.poppins(
|
||||||
|
fontSize: 12,
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
color: Color(0xFF575A74)),
|
||||||
|
),
|
||||||
|
SizedBox(height: 5),
|
||||||
|
CustomTextFieldUserWrapper(
|
||||||
|
isFocused: false,
|
||||||
|
isDesktop: widget.isDesktop,
|
||||||
|
color: Colors.transparent,
|
||||||
|
// width: isDesktop
|
||||||
|
// ? MediaQuery.of(context).size.width * 0.330
|
||||||
|
// : MediaQuery.of(context).size.width * 0.66,
|
||||||
|
child: SizedBox(
|
||||||
|
height: 40,
|
||||||
|
child: TextField(
|
||||||
|
controller: controllers["email"],
|
||||||
|
style: const TextStyle(fontSize: 12),
|
||||||
|
decoration: const InputDecoration(
|
||||||
|
labelText: "Email",
|
||||||
|
labelStyle: TextStyle(fontSize: 11, color: Colors.grey),
|
||||||
|
floatingLabelBehavior: FloatingLabelBehavior.never,
|
||||||
|
border: InputBorder.none,
|
||||||
|
contentPadding: EdgeInsets.symmetric(vertical: 16),
|
||||||
|
),
|
||||||
|
)),
|
||||||
|
),
|
||||||
|
if (errorMessages["email"] != null) ...[
|
||||||
|
SizedBox(height: 5), // Space before error message
|
||||||
|
Text(
|
||||||
|
errorMessages["email"]!,
|
||||||
|
style: TextStyle(color: Colors.red, fontSize: 12),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
],
|
||||||
|
),
|
||||||
|
SizedBox(
|
||||||
|
height: 10,
|
||||||
|
),
|
||||||
|
Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
"Change Password",
|
||||||
|
style: GoogleFonts.poppins(
|
||||||
|
fontSize: 12,
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
color: Color(0xFF575A74)),
|
||||||
|
),
|
||||||
|
SizedBox(height: 5),
|
||||||
|
CustomTextFieldUserWrapper(
|
||||||
|
isFocused: false,
|
||||||
|
isDesktop: widget.isDesktop,
|
||||||
|
color: Colors.transparent,
|
||||||
|
child: SizedBox(
|
||||||
|
height: 40,
|
||||||
|
child: TextField(
|
||||||
|
controller: controllers["changePassword"],
|
||||||
|
style: const TextStyle(fontSize: 12),
|
||||||
|
decoration: const InputDecoration(
|
||||||
|
labelText: "Change Password",
|
||||||
|
labelStyle: TextStyle(fontSize: 11, color: Colors.grey),
|
||||||
|
floatingLabelBehavior: FloatingLabelBehavior.never,
|
||||||
|
border: InputBorder.none,
|
||||||
|
contentPadding: EdgeInsets.symmetric(vertical: 16),
|
||||||
|
),
|
||||||
|
)),
|
||||||
|
),
|
||||||
|
if (errorMessages["changePassword"] != null) ...[
|
||||||
|
SizedBox(height: 5), // Space before error message
|
||||||
|
Text(
|
||||||
|
errorMessages["changePassword"]!,
|
||||||
|
style: TextStyle(color: Colors.red, fontSize: 12),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
],
|
||||||
|
),
|
||||||
|
SizedBox(
|
||||||
|
height: 15,
|
||||||
|
),
|
||||||
|
Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
"Confirm Password",
|
||||||
|
style: GoogleFonts.poppins(
|
||||||
|
fontSize: 12,
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
color: Color(0xFF575A74)),
|
||||||
|
),
|
||||||
|
SizedBox(height: 5),
|
||||||
|
CustomTextFieldUserWrapper(
|
||||||
|
isFocused: false,
|
||||||
|
isDesktop: widget.isDesktop,
|
||||||
|
color: Colors.transparent,
|
||||||
|
child: SizedBox(
|
||||||
|
height: 40,
|
||||||
|
child: TextField(
|
||||||
|
controller: controllers["confirmPassword"],
|
||||||
|
style: const TextStyle(fontSize: 12),
|
||||||
|
decoration: const InputDecoration(
|
||||||
|
labelText: "Confirm Password",
|
||||||
|
labelStyle: TextStyle(fontSize: 11, color: Colors.grey),
|
||||||
|
floatingLabelBehavior: FloatingLabelBehavior.never,
|
||||||
|
border: InputBorder.none,
|
||||||
|
contentPadding: EdgeInsets.symmetric(vertical: 16),
|
||||||
|
),
|
||||||
|
)),
|
||||||
|
),
|
||||||
|
if (errorMessages["confirmPassword"] != null) ...[
|
||||||
|
SizedBox(height: 5), // Space before error message
|
||||||
|
Text(
|
||||||
|
errorMessages["confirmPassword"]!,
|
||||||
|
style: TextStyle(color: Colors.red, fontSize: 12),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
],
|
||||||
|
),
|
||||||
|
SizedBox(
|
||||||
|
height: 15,
|
||||||
|
),
|
||||||
|
|
||||||
|
Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.end,
|
||||||
|
children: [
|
||||||
|
SizedBox(
|
||||||
|
child: ElevatedButton(
|
||||||
|
onPressed: () {
|
||||||
|
handleSubmit();
|
||||||
|
},
|
||||||
|
style: ElevatedButton.styleFrom(
|
||||||
|
backgroundColor: widget.layoutColor,
|
||||||
|
shape: RoundedRectangleBorder(
|
||||||
|
borderRadius: BorderRadius.circular(8),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
child: Text('Save',
|
||||||
|
style: GoogleFonts.poppins(
|
||||||
|
fontSize: 11, color: Colors.white)),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
)
|
||||||
|
// : SizedBox.shrink(),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@ -54,6 +54,7 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
|
|||||||
|
|
||||||
String? userId;
|
String? userId;
|
||||||
String? orgId;
|
String? orgId;
|
||||||
|
String? userIdApi;
|
||||||
|
|
||||||
String? token;
|
String? token;
|
||||||
|
|
||||||
@ -201,7 +202,7 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
|
|||||||
|
|
||||||
print("API Selected User Has Data - $apiselectedUser");
|
print("API Selected User Has Data - $apiselectedUser");
|
||||||
}
|
}
|
||||||
|
userIdApi = apiselectedUser?["user_id"] ?? "";
|
||||||
controllers["Fname"]?.text = apiselectedUser?["first_name"] ?? "";
|
controllers["Fname"]?.text = apiselectedUser?["first_name"] ?? "";
|
||||||
controllers["Lname"]?.text = apiselectedUser?["last_name"] ?? "";
|
controllers["Lname"]?.text = apiselectedUser?["last_name"] ?? "";
|
||||||
controllers["email"]?.text = apiselectedUser?["email"] ?? "";
|
controllers["email"]?.text = apiselectedUser?["email"] ?? "";
|
||||||
@ -976,6 +977,7 @@ class _CreateUserFormDetialsState extends State<CreateUserFormDetials> {
|
|||||||
personalDetailsKey: personalDetailsKey,
|
personalDetailsKey: personalDetailsKey,
|
||||||
isDesktop: isDesktop, // pass isDesktop as a named argument
|
isDesktop: isDesktop, // pass isDesktop as a named argument
|
||||||
isViewMode: isViewMode,
|
isViewMode: isViewMode,
|
||||||
|
userIdApi:userIdApi,
|
||||||
controllers: controllers,
|
controllers: controllers,
|
||||||
errorMessages: errorMessages,
|
errorMessages: errorMessages,
|
||||||
selectedGender: selectedGender,
|
selectedGender: selectedGender,
|
||||||
|
|||||||
@ -1108,6 +1108,12 @@ class _OfficeDetailsState extends State<OfficeDetails> {
|
|||||||
_selectedCheckOutDate = pickedDate;
|
_selectedCheckOutDate = pickedDate;
|
||||||
widget.controllers["delegationStartDate"]?.text =
|
widget.controllers["delegationStartDate"]?.text =
|
||||||
DateFormat('dd-MM-yyyy').format(pickedDate);
|
DateFormat('dd-MM-yyyy').format(pickedDate);
|
||||||
|
|
||||||
|
if (_selectedEndDate != null &&
|
||||||
|
_selectedEndDate!.isBefore(_selectedCheckOutDate!)) {
|
||||||
|
_selectedEndDate = null;
|
||||||
|
widget.controllers["delegationEndDate"]?.text = '';
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1173,6 +1179,10 @@ class _OfficeDetailsState extends State<OfficeDetails> {
|
|||||||
DateTime now = DateTime.now();
|
DateTime now = DateTime.now();
|
||||||
DateTime today = DateTime(now.year, now.month, now.day);
|
DateTime today = DateTime(now.year, now.month, now.day);
|
||||||
|
|
||||||
|
DateTime minDate = _selectedCheckOutDate != null
|
||||||
|
? _selectedCheckOutDate!
|
||||||
|
: today;
|
||||||
|
|
||||||
// Parse date from notifier if available, else use today
|
// Parse date from notifier if available, else use today
|
||||||
DateTime initialDate;
|
DateTime initialDate;
|
||||||
|
|
||||||
@ -1188,11 +1198,11 @@ class _OfficeDetailsState extends State<OfficeDetails> {
|
|||||||
|
|
||||||
DateTime? pickedDate = await showDatePicker(
|
DateTime? pickedDate = await showDatePicker(
|
||||||
context: context,
|
context: context,
|
||||||
initialDate:
|
initialDate: _selectedEndDate != null &&
|
||||||
_selectedEndDate != null && _selectedEndDate!.isAfter(today)
|
_selectedEndDate!.isAfter(minDate)
|
||||||
? _selectedEndDate!
|
? _selectedEndDate!
|
||||||
: today,
|
: minDate,
|
||||||
firstDate: today,
|
firstDate: minDate,
|
||||||
lastDate: DateTime(2100),
|
lastDate: DateTime(2100),
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -1201,8 +1211,6 @@ class _OfficeDetailsState extends State<OfficeDetails> {
|
|||||||
_selectedEndDate = pickedDate;
|
_selectedEndDate = pickedDate;
|
||||||
widget.controllers["delegationEndDate"]?.text =
|
widget.controllers["delegationEndDate"]?.text =
|
||||||
DateFormat('dd-MM-yyyy').format(pickedDate);
|
DateFormat('dd-MM-yyyy').format(pickedDate);
|
||||||
// textControllers["_forexEndDate"]?.text =
|
|
||||||
// DateFormat('dd-MM-yyyy').format(initialDate);
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -6,11 +6,14 @@ import 'package:flutter/cupertino.dart';
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
import 'package:google_fonts/google_fonts.dart';
|
import 'package:google_fonts/google_fonts.dart';
|
||||||
|
import 'package:http/http.dart' as http;
|
||||||
import 'package:intl/intl.dart';
|
import 'package:intl/intl.dart';
|
||||||
|
|
||||||
import '../../../services/apiService.dart';
|
import '../../../services/apiService.dart';
|
||||||
import '../../../utils/auth_utils.dart';
|
import '../../../utils/auth_utils.dart';
|
||||||
import '../../../widgets/custom_user_form.dart';
|
import '../../../widgets/custom_user_form.dart';
|
||||||
|
import '../../../config/apiUrl.dart';
|
||||||
|
import 'change_password.dart';
|
||||||
|
|
||||||
class PersonalDetails extends StatefulWidget {
|
class PersonalDetails extends StatefulWidget {
|
||||||
final GlobalKey<PersonalDetailsState> personalDetailsKey;
|
final GlobalKey<PersonalDetailsState> personalDetailsKey;
|
||||||
@ -31,10 +34,11 @@ class PersonalDetails extends StatefulWidget {
|
|||||||
final String? selectedGender;
|
final String? selectedGender;
|
||||||
final String? selectedCountry;
|
final String? selectedCountry;
|
||||||
final String? selectedRole;
|
final String? selectedRole;
|
||||||
|
final String? userIdApi;
|
||||||
|
|
||||||
// const PersonalDetails(this.isDesktop, this.isViewMode, {super.key},);
|
// const PersonalDetails(this.isDesktop, this.isViewMode, {super.key},);
|
||||||
const PersonalDetails(
|
const PersonalDetails({
|
||||||
{Key? key,
|
Key? key,
|
||||||
this.selectedGender,
|
this.selectedGender,
|
||||||
this.selectedCountry,
|
this.selectedCountry,
|
||||||
this.selectedRole,
|
this.selectedRole,
|
||||||
@ -49,8 +53,9 @@ class PersonalDetails extends StatefulWidget {
|
|||||||
this.onGenderChanged,
|
this.onGenderChanged,
|
||||||
this.onCountryChanged,
|
this.onCountryChanged,
|
||||||
this.onRoleChanged,
|
this.onRoleChanged,
|
||||||
this.onUserTypeChanged})
|
this.onUserTypeChanged,
|
||||||
: super(key: key);
|
this.userIdApi,
|
||||||
|
}) : super(key: key);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
PersonalDetailsState createState() => PersonalDetailsState();
|
PersonalDetailsState createState() => PersonalDetailsState();
|
||||||
@ -118,12 +123,15 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
"employeeCode",
|
"employeeCode",
|
||||||
"dateOfIssue",
|
"dateOfIssue",
|
||||||
"dateOfExpiry",
|
"dateOfExpiry",
|
||||||
"changePassword"
|
"changePassword",
|
||||||
];
|
];
|
||||||
|
|
||||||
Color? layoutColor;
|
Color? layoutColor;
|
||||||
Color? bodyColor;
|
Color? bodyColor;
|
||||||
|
|
||||||
|
final Map<String, TextEditingController> controllers = {};
|
||||||
|
Map<String, String> errorMessages2 = {};
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
@ -136,14 +144,16 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
selectedRole = widget.selectedRole;
|
selectedRole = widget.selectedRole;
|
||||||
fetchRoles();
|
fetchRoles();
|
||||||
fetchCountries();
|
fetchCountries();
|
||||||
selectedServiceIds =
|
selectedServiceIds = List<Map<String, dynamic>>.from(
|
||||||
List<Map<String, dynamic>>.from(widget.initialSelectedServices ?? []);
|
widget.initialSelectedServices ?? [],
|
||||||
|
);
|
||||||
|
|
||||||
print("selectedServiceIdsAPI - $selectedServiceIds");
|
print("selectedServiceIdsAPI - $selectedServiceIds");
|
||||||
|
|
||||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
loadAllServices();
|
loadAllServices();
|
||||||
getOrganizationData();
|
getOrganizationData();
|
||||||
|
loadInitialData();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -153,6 +163,23 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void loadInitialData() async {
|
||||||
|
String? layoutString = await getLayoutColor();
|
||||||
|
String? bodyStringColor = await getBodyColor();
|
||||||
|
|
||||||
|
setState(() {
|
||||||
|
layoutColor =
|
||||||
|
layoutString != null
|
||||||
|
? Color(int.parse(layoutString))
|
||||||
|
: Colors.redAccent;
|
||||||
|
|
||||||
|
bodyColor =
|
||||||
|
bodyStringColor != null
|
||||||
|
? Color(int.parse(bodyStringColor))
|
||||||
|
: Colors.white;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
Future<void> fetchRoles() async {
|
Future<void> fetchRoles() async {
|
||||||
try {
|
try {
|
||||||
final response = await apiService.fetchMasterDropdown();
|
final response = await apiService.fetchMasterDropdown();
|
||||||
@ -209,11 +236,10 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (selectedServiceIds.isEmpty && services.isNotEmpty) {
|
if (selectedServiceIds.isEmpty && services.isNotEmpty) {
|
||||||
selectedServiceIds = services.map<Map<String, dynamic>>((item) {
|
selectedServiceIds =
|
||||||
|
services.map<Map<String, dynamic>>((item) {
|
||||||
final map = Map<String, dynamic>.from(item);
|
final map = Map<String, dynamic>.from(item);
|
||||||
return {
|
return {"service_id": map['service_id'].toString()};
|
||||||
"service_id": map['service_id'].toString(),
|
|
||||||
};
|
|
||||||
}).toList();
|
}).toList();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -251,26 +277,16 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
child: Column(
|
child: Column(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
SizedBox(
|
SizedBox(height: 10),
|
||||||
height: 10,
|
|
||||||
),
|
|
||||||
_buildFirstRow(widget.isDesktop),
|
_buildFirstRow(widget.isDesktop),
|
||||||
SizedBox(
|
SizedBox(height: 10),
|
||||||
height: 10,
|
|
||||||
),
|
|
||||||
_buildSecondRow(widget.isDesktop),
|
_buildSecondRow(widget.isDesktop),
|
||||||
SizedBox(
|
SizedBox(height: 10),
|
||||||
height: 10,
|
|
||||||
),
|
|
||||||
_buildThirdRow(widget.isDesktop),
|
_buildThirdRow(widget.isDesktop),
|
||||||
SizedBox(
|
SizedBox(height: 10),
|
||||||
height: 10,
|
|
||||||
),
|
|
||||||
_buildForthRow(widget.isDesktop),
|
_buildForthRow(widget.isDesktop),
|
||||||
SizedBox(
|
SizedBox(height: 10),
|
||||||
height: 10,
|
if (selectedRole == "5") _buildServices(widget.isDesktop),
|
||||||
),
|
|
||||||
if (selectedRole == "5") _buildServices(widget.isDesktop)
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@ -283,7 +299,8 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
setState(() {
|
setState(() {
|
||||||
// apiAllServices = result;
|
// apiAllServices = result;
|
||||||
setState(() {
|
setState(() {
|
||||||
apiAllServices = result
|
apiAllServices =
|
||||||
|
result
|
||||||
..sort((a, b) => (a['order'] ?? 0).compareTo(b['order'] ?? 0));
|
..sort((a, b) => (a['order'] ?? 0).compareTo(b['order'] ?? 0));
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@ -301,25 +318,28 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
"Services",
|
"Services",
|
||||||
|
|
||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 14, fontWeight: FontWeight.w400, color: Colors.black),
|
fontSize: 14,
|
||||||
|
fontWeight: FontWeight.w400,
|
||||||
|
color: Colors.black,
|
||||||
|
),
|
||||||
// style: TextStyle(
|
// style: TextStyle(
|
||||||
// fontFamily: "Archivo",
|
// fontFamily: "Archivo",
|
||||||
// fontSize: 14,
|
// fontSize: 14,
|
||||||
// fontWeight: FontWeight.w600,
|
// fontWeight: FontWeight.w600,
|
||||||
// color: Color(0xFF212121)),
|
// color: Color(0xFF212121)),
|
||||||
),
|
),
|
||||||
SizedBox(
|
SizedBox(height: 10),
|
||||||
height: 10,
|
|
||||||
),
|
|
||||||
Container(
|
Container(
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
border: Border.all(color: Color(0xFFF4F4FB)),
|
border: Border.all(color: Color(0xFFF4F4FB)),
|
||||||
borderRadius: BorderRadius.circular(1),
|
borderRadius: BorderRadius.circular(1),
|
||||||
// color: bodyColor,
|
// color: bodyColor,
|
||||||
// color: Color(0xFFF5F5F5),
|
// color: Color(0xFFF5F5F5),
|
||||||
color: Colors.white),
|
color: Colors.white,
|
||||||
|
),
|
||||||
padding: EdgeInsets.only(left: 5, right: 5, top: 15, bottom: 5),
|
padding: EdgeInsets.only(left: 5, right: 5, top: 15, bottom: 5),
|
||||||
child: isDesktop
|
child:
|
||||||
|
isDesktop
|
||||||
? Row(
|
? Row(
|
||||||
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
|
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
|
||||||
// mainAxisSize: MainAxisSize.min,
|
// mainAxisSize: MainAxisSize.min,
|
||||||
@ -328,9 +348,7 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
: Expanded(
|
: Expanded(
|
||||||
child: SingleChildScrollView(
|
child: SingleChildScrollView(
|
||||||
scrollDirection: Axis.horizontal,
|
scrollDirection: Axis.horizontal,
|
||||||
child: Row(
|
child: Row(children: _buildOptions()),
|
||||||
children: _buildOptions(),
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@ -357,8 +375,9 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
|
|
||||||
String serviceId = service['service_id'].toString();
|
String serviceId = service['service_id'].toString();
|
||||||
// bool isSelected = selectedServiceIds.contains(serviceId);
|
// bool isSelected = selectedServiceIds.contains(serviceId);
|
||||||
bool isSelected =
|
bool isSelected = selectedServiceIds.any(
|
||||||
selectedServiceIds.any((item) => item["service_id"] == serviceId);
|
(item) => item["service_id"] == serviceId,
|
||||||
|
);
|
||||||
|
|
||||||
return GestureDetector(
|
return GestureDetector(
|
||||||
onTap: () {
|
onTap: () {
|
||||||
@ -366,8 +385,9 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
String serviceId = service['service_id'].toString();
|
String serviceId = service['service_id'].toString();
|
||||||
|
|
||||||
// Check if already selected
|
// Check if already selected
|
||||||
int existingIndex = selectedServiceIds
|
int existingIndex = selectedServiceIds.indexWhere(
|
||||||
.indexWhere((item) => item["service_id"] == serviceId);
|
(item) => item["service_id"] == serviceId,
|
||||||
|
);
|
||||||
|
|
||||||
if (existingIndex != -1) {
|
if (existingIndex != -1) {
|
||||||
selectedServiceIds.removeAt(existingIndex);
|
selectedServiceIds.removeAt(existingIndex);
|
||||||
@ -379,24 +399,30 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
widget.onServiceIdsChanged!(selectedServiceIds);
|
widget.onServiceIdsChanged!(selectedServiceIds);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
child: Row(children: [
|
child: Row(
|
||||||
|
children: [
|
||||||
iconUrl.isNotEmpty
|
iconUrl.isNotEmpty
|
||||||
? Image.network(
|
? Image.network(
|
||||||
iconUrl,
|
iconUrl,
|
||||||
width: 18,
|
width: 18,
|
||||||
height: 18,
|
height: 18,
|
||||||
errorBuilder: (context, error, stackTrace) {
|
errorBuilder: (context, error, stackTrace) {
|
||||||
return Icon(fallbackIcon,
|
return Icon(
|
||||||
size: 18,
|
fallbackIcon,
|
||||||
color: isSelected == name
|
|
||||||
? Color(0xFF114D8B)
|
|
||||||
: Color(0xFF475569));
|
|
||||||
},
|
|
||||||
)
|
|
||||||
: Icon(fallbackIcon,
|
|
||||||
size: 18,
|
size: 18,
|
||||||
color:
|
color:
|
||||||
isSelected == name ? Color(0xFF114D8B) : Color(0xFF475569)),
|
isSelected == name
|
||||||
|
? Color(0xFF114D8B)
|
||||||
|
: Color(0xFF475569),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
)
|
||||||
|
: Icon(
|
||||||
|
fallbackIcon,
|
||||||
|
size: 18,
|
||||||
|
color:
|
||||||
|
isSelected == name ? Color(0xFF114D8B) : Color(0xFF475569),
|
||||||
|
),
|
||||||
|
|
||||||
SizedBox(width: 5),
|
SizedBox(width: 5),
|
||||||
|
|
||||||
@ -407,7 +433,8 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
color: isSelected == name ? Color(0xFF114D8B) : Color(0xFF475569),
|
color: isSelected == name ? Color(0xFF114D8B) : Color(0xFF475569),
|
||||||
fontWeight:
|
fontWeight:
|
||||||
isSelected == name ? FontWeight.bold : FontWeight.w500),
|
isSelected == name ? FontWeight.bold : FontWeight.w500,
|
||||||
|
),
|
||||||
// style: TextStyle(
|
// style: TextStyle(
|
||||||
// fontSize: 13,
|
// fontSize: 13,
|
||||||
// color: isSelected == name ? Color(0xFF114D8B) : Color(0xFF475569),
|
// color: isSelected == name ? Color(0xFF114D8B) : Color(0xFF475569),
|
||||||
@ -435,8 +462,10 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
|
|
||||||
color: isSelected ? Colors.green : Colors.white10,
|
color: isSelected ? Colors.green : Colors.white10,
|
||||||
// color: Colors.grey,
|
// color: Colors.grey,
|
||||||
)),
|
),
|
||||||
]),
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -468,7 +497,8 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
Widget _buildFirstRow(bool isDesktop) {
|
Widget _buildFirstRow(bool isDesktop) {
|
||||||
return Container(
|
return Container(
|
||||||
color: Colors.white,
|
color: Colors.white,
|
||||||
child: widget.isDesktop
|
child:
|
||||||
|
widget.isDesktop
|
||||||
? Row(
|
? Row(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
@ -477,9 +507,7 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
buildLastNameField(),
|
buildLastNameField(),
|
||||||
Spacer(), // Space after Last Name
|
Spacer(), // Space after Last Name
|
||||||
buildGenderField(),
|
buildGenderField(),
|
||||||
SizedBox(
|
SizedBox(width: 15),
|
||||||
width: 15,
|
|
||||||
),
|
|
||||||
buildDobField(),
|
buildDobField(),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
@ -501,7 +529,8 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
Widget _buildSecondRow(bool isDesktop) {
|
Widget _buildSecondRow(bool isDesktop) {
|
||||||
return Container(
|
return Container(
|
||||||
color: Colors.white,
|
color: Colors.white,
|
||||||
child: widget.isDesktop
|
child:
|
||||||
|
widget.isDesktop
|
||||||
? Row(
|
? Row(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
@ -526,17 +555,81 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Widget _buildThirdRow(bool isDesktop) {
|
Widget _buildThirdRow(bool isDesktop) {
|
||||||
|
void _openPopup() {
|
||||||
|
final emailValue = widget.controllers["email"]?.text ?? "";
|
||||||
|
final updaterUserId = widget.userIdApi ?? "";
|
||||||
|
|
||||||
|
showDialog(
|
||||||
|
context: context,
|
||||||
|
builder: (context) {
|
||||||
|
return ChangePasswordDialogData(
|
||||||
|
updaterEmail: emailValue,
|
||||||
|
updaterUserId: updaterUserId,
|
||||||
|
layoutColor: layoutColor,
|
||||||
|
isDesktop: widget.isDesktop,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
return Container(
|
return Container(
|
||||||
color: Colors.white,
|
color: Colors.white,
|
||||||
child: isDesktop
|
child:
|
||||||
|
isDesktop
|
||||||
|
? !widget.apiselectedUser
|
||||||
? Row(
|
? Row(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
if (!widget.apiselectedUser) ...[
|
if (!widget.apiselectedUser) ...[
|
||||||
buildPassword(),
|
buildPassword(),
|
||||||
SizedBox(width: 15),
|
SizedBox(width: 15),
|
||||||
|
buildRole(),
|
||||||
|
] else ...[
|
||||||
|
// TextButton(
|
||||||
|
// onPressed: () => _openPopup(),
|
||||||
|
// style: TextButton.styleFrom(
|
||||||
|
// foregroundColor: Colors.black,
|
||||||
|
// textStyle: GoogleFonts.poppins(
|
||||||
|
// fontSize: 12,
|
||||||
|
// fontWeight: FontWeight.w400,
|
||||||
|
// ),
|
||||||
|
// ),
|
||||||
|
// child: Text("Change Password"),
|
||||||
|
// ),
|
||||||
|
//
|
||||||
|
// SizedBox(height: 8, width: 15),
|
||||||
|
// buildRole(),
|
||||||
],
|
],
|
||||||
buildRole()
|
],
|
||||||
|
)
|
||||||
|
: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Container(
|
||||||
|
width:
|
||||||
|
isDesktop
|
||||||
|
? MediaQuery.of(context).size.width * 0.25
|
||||||
|
: MediaQuery.of(context).size.width * 0.8,
|
||||||
|
child: Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.end,
|
||||||
|
children: [
|
||||||
|
TextButton(
|
||||||
|
onPressed: () => _openPopup(),
|
||||||
|
style: TextButton.styleFrom(
|
||||||
|
foregroundColor: Color(0xFF114D8B),
|
||||||
|
textStyle: GoogleFonts.poppins(
|
||||||
|
fontSize: 12,
|
||||||
|
fontWeight: FontWeight.w400,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
child: Text("Change Password"),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
|
||||||
|
SizedBox(height: 1),
|
||||||
|
buildRole(),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
: Column(
|
: Column(
|
||||||
@ -544,9 +637,34 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
children: [
|
children: [
|
||||||
if (!widget.apiselectedUser) ...[
|
if (!widget.apiselectedUser) ...[
|
||||||
buildPassword(),
|
buildPassword(),
|
||||||
SizedBox(height: 8)], //
|
SizedBox(height: 8),
|
||||||
buildRole()
|
buildRole(),
|
||||||
|
] else ...[
|
||||||
|
Container(
|
||||||
|
width:
|
||||||
|
isDesktop
|
||||||
|
? MediaQuery.of(context).size.width * 0.25
|
||||||
|
: MediaQuery.of(context).size.width * 0.8,
|
||||||
|
child: Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.end,
|
||||||
|
children: [
|
||||||
|
TextButton(
|
||||||
|
onPressed: () => _openPopup(),
|
||||||
|
style: TextButton.styleFrom(
|
||||||
|
foregroundColor: Color(0xFF114D8B),
|
||||||
|
textStyle: GoogleFonts.poppins(
|
||||||
|
fontSize: 12,
|
||||||
|
fontWeight: FontWeight.w400,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
child: Text("Change Password"),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
SizedBox(height: 1),
|
||||||
|
buildRole(),
|
||||||
|
],
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
@ -555,18 +673,15 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
Widget _buildForthRow(bool isDesktop) {
|
Widget _buildForthRow(bool isDesktop) {
|
||||||
return Container(
|
return Container(
|
||||||
color: Colors.white,
|
color: Colors.white,
|
||||||
child: isDesktop
|
child:
|
||||||
|
isDesktop
|
||||||
? Row(
|
? Row(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
buildAddress(),
|
buildAddress(),
|
||||||
SizedBox(
|
SizedBox(width: 15),
|
||||||
width: 15,
|
|
||||||
),
|
|
||||||
buildCountryField(),
|
buildCountryField(),
|
||||||
SizedBox(
|
SizedBox(width: 15),
|
||||||
width: 15,
|
|
||||||
),
|
|
||||||
buildPostalCodeField(),
|
buildPostalCodeField(),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
@ -592,7 +707,8 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w600,
|
fontWeight: FontWeight.w600,
|
||||||
color: Color(0xFF575A74))
|
color: Color(0xFF575A74),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
CustomTextFieldUserWrapper(
|
CustomTextFieldUserWrapper(
|
||||||
@ -612,7 +728,8 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
labelStyle: GoogleFonts.poppins(
|
labelStyle: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w400,
|
||||||
color: Colors.grey),
|
color: Colors.grey,
|
||||||
|
),
|
||||||
floatingLabelBehavior: FloatingLabelBehavior.never,
|
floatingLabelBehavior: FloatingLabelBehavior.never,
|
||||||
border: InputBorder.none,
|
border: InputBorder.none,
|
||||||
contentPadding: EdgeInsets.symmetric(vertical: 16),
|
contentPadding: EdgeInsets.symmetric(vertical: 16),
|
||||||
@ -635,11 +752,14 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
return Column(
|
return Column(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
Text("Last Name",
|
Text(
|
||||||
|
"Last Name",
|
||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w600,
|
fontWeight: FontWeight.w600,
|
||||||
color: Color(0xFF575A74))),
|
color: Color(0xFF575A74),
|
||||||
|
),
|
||||||
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
CustomTextFieldUserWrapper(
|
CustomTextFieldUserWrapper(
|
||||||
isFocused: false,
|
isFocused: false,
|
||||||
@ -683,11 +803,13 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w600,
|
fontWeight: FontWeight.w600,
|
||||||
color: Color(0xFF575A74)),
|
color: Color(0xFF575A74),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
CustomTextFieldUserWrapper(
|
CustomTextFieldUserWrapper(
|
||||||
width: widget.isDesktop
|
width:
|
||||||
|
widget.isDesktop
|
||||||
? MediaQuery.of(context).size.width * 0.12
|
? MediaQuery.of(context).size.width * 0.12
|
||||||
: null,
|
: null,
|
||||||
isFocused: false,
|
isFocused: false,
|
||||||
@ -697,7 +819,8 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
child: DropdownButtonFormField<String>(
|
child: DropdownButtonFormField<String>(
|
||||||
// value: selectedGender,
|
// value: selectedGender,
|
||||||
value: widget.isViewMode ? null : selectedGender,
|
value: widget.isViewMode ? null : selectedGender,
|
||||||
onChanged: widget.isViewMode
|
onChanged:
|
||||||
|
widget.isViewMode
|
||||||
? null
|
? null
|
||||||
: (String? newValue) {
|
: (String? newValue) {
|
||||||
setState(() {
|
setState(() {
|
||||||
@ -789,8 +912,9 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
if (pickedDate != null && pickedDate != _selectedDateOfBirth) {
|
if (pickedDate != null && pickedDate != _selectedDateOfBirth) {
|
||||||
setState(() {
|
setState(() {
|
||||||
_selectedDateOfBirth = pickedDate;
|
_selectedDateOfBirth = pickedDate;
|
||||||
widget.controllers["dob"]?.text =
|
widget.controllers["dob"]?.text = DateFormat(
|
||||||
DateFormat('dd-MM-yyyy').format(pickedDate);
|
'dd-MM-yyyy',
|
||||||
|
).format(pickedDate);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -803,11 +927,13 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w600,
|
fontWeight: FontWeight.w600,
|
||||||
color: Color(0xFF575A74))
|
color: Color(0xFF575A74),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
CustomTextFieldUserWrapper(
|
CustomTextFieldUserWrapper(
|
||||||
width: widget.isDesktop
|
width:
|
||||||
|
widget.isDesktop
|
||||||
? MediaQuery.of(context).size.width * 0.12
|
? MediaQuery.of(context).size.width * 0.12
|
||||||
: null,
|
: null,
|
||||||
isFocused: false,
|
isFocused: false,
|
||||||
@ -815,7 +941,8 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
child: SizedBox(
|
child: SizedBox(
|
||||||
height: 40,
|
height: 40,
|
||||||
child: GestureDetector(
|
child: GestureDetector(
|
||||||
onTap: widget.isViewMode
|
onTap:
|
||||||
|
widget.isViewMode
|
||||||
? null
|
? null
|
||||||
: () async {
|
: () async {
|
||||||
await _selectCheckDateOfBirth(context);
|
await _selectCheckDateOfBirth(context);
|
||||||
@ -834,12 +961,16 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
labelStyle: GoogleFonts.poppins(
|
labelStyle: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w400,
|
||||||
color: Colors.grey),
|
color: Colors.grey,
|
||||||
|
),
|
||||||
floatingLabelBehavior: FloatingLabelBehavior.never,
|
floatingLabelBehavior: FloatingLabelBehavior.never,
|
||||||
border: InputBorder.none,
|
border: InputBorder.none,
|
||||||
contentPadding: EdgeInsets.symmetric(vertical: 16),
|
contentPadding: EdgeInsets.symmetric(vertical: 16),
|
||||||
suffixIcon: Icon(Icons.calendar_today,
|
suffixIcon: Icon(
|
||||||
size: 16, color: Color(0xFF8B8FB2)),
|
Icons.calendar_today,
|
||||||
|
size: 16,
|
||||||
|
color: Color(0xFF8B8FB2),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@ -859,7 +990,8 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w600,
|
fontWeight: FontWeight.w600,
|
||||||
color: Color(0xFF575A74))
|
color: Color(0xFF575A74),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
CustomTextFieldUserWrapper(
|
CustomTextFieldUserWrapper(
|
||||||
@ -876,8 +1008,10 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
enabled: !widget.isViewMode,
|
enabled: !widget.isViewMode,
|
||||||
decoration: InputDecoration(
|
decoration: InputDecoration(
|
||||||
labelText: "Email",
|
labelText: "Email",
|
||||||
labelStyle:
|
labelStyle: GoogleFonts.poppins(
|
||||||
GoogleFonts.poppins(fontSize: 12, color: Colors.grey),
|
fontSize: 12,
|
||||||
|
color: Colors.grey,
|
||||||
|
),
|
||||||
floatingLabelBehavior: FloatingLabelBehavior.never,
|
floatingLabelBehavior: FloatingLabelBehavior.never,
|
||||||
border: InputBorder.none,
|
border: InputBorder.none,
|
||||||
contentPadding: EdgeInsets.symmetric(vertical: 16),
|
contentPadding: EdgeInsets.symmetric(vertical: 16),
|
||||||
@ -905,7 +1039,8 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w600,
|
fontWeight: FontWeight.w600,
|
||||||
color: Color(0xFF575A74))
|
color: Color(0xFF575A74),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
CustomTextFieldUserWrapper(
|
CustomTextFieldUserWrapper(
|
||||||
@ -922,13 +1057,16 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
},
|
},
|
||||||
keyboardType: TextInputType.numberWithOptions(decimal: true),
|
keyboardType: TextInputType.numberWithOptions(decimal: true),
|
||||||
inputFormatters: [
|
inputFormatters: [
|
||||||
FilteringTextInputFormatter.allow(RegExp(
|
FilteringTextInputFormatter.allow(
|
||||||
r'^\d*\.?\d*$')), // Allow only positive numbers with optional decimal
|
RegExp(r'^\d*\.?\d*$'),
|
||||||
|
), // Allow only positive numbers with optional decimal
|
||||||
],
|
],
|
||||||
decoration: InputDecoration(
|
decoration: InputDecoration(
|
||||||
labelText: "Mobile Number",
|
labelText: "Mobile Number",
|
||||||
labelStyle:
|
labelStyle: GoogleFonts.poppins(
|
||||||
GoogleFonts.poppins(fontSize: 12, color: Colors.grey),
|
fontSize: 12,
|
||||||
|
color: Colors.grey,
|
||||||
|
),
|
||||||
floatingLabelBehavior: FloatingLabelBehavior.never,
|
floatingLabelBehavior: FloatingLabelBehavior.never,
|
||||||
border: InputBorder.none,
|
border: InputBorder.none,
|
||||||
contentPadding: EdgeInsets.symmetric(vertical: 16),
|
contentPadding: EdgeInsets.symmetric(vertical: 16),
|
||||||
@ -951,11 +1089,14 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
return Column(
|
return Column(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
Text("Alternate Mobile Number",
|
Text(
|
||||||
|
"Alternate Mobile Number",
|
||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w600,
|
fontWeight: FontWeight.w600,
|
||||||
color: Color(0xFF575A74))),
|
color: Color(0xFF575A74),
|
||||||
|
),
|
||||||
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
CustomTextFieldUserWrapper(
|
CustomTextFieldUserWrapper(
|
||||||
isFocused: false,
|
isFocused: false,
|
||||||
@ -968,13 +1109,16 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
enabled: !widget.isViewMode,
|
enabled: !widget.isViewMode,
|
||||||
keyboardType: TextInputType.numberWithOptions(decimal: true),
|
keyboardType: TextInputType.numberWithOptions(decimal: true),
|
||||||
inputFormatters: [
|
inputFormatters: [
|
||||||
FilteringTextInputFormatter.allow(RegExp(
|
FilteringTextInputFormatter.allow(
|
||||||
r'^\d*\.?\d*$')), // Allow only positive numbers with optional decimal
|
RegExp(r'^\d*\.?\d*$'),
|
||||||
|
), // Allow only positive numbers with optional decimal
|
||||||
],
|
],
|
||||||
decoration: InputDecoration(
|
decoration: InputDecoration(
|
||||||
labelText: "Alternate Number",
|
labelText: "Alternate Number",
|
||||||
labelStyle:
|
labelStyle: GoogleFonts.poppins(
|
||||||
GoogleFonts.poppins(fontSize: 12, color: Colors.grey),
|
fontSize: 12,
|
||||||
|
color: Colors.grey,
|
||||||
|
),
|
||||||
floatingLabelBehavior: FloatingLabelBehavior.never,
|
floatingLabelBehavior: FloatingLabelBehavior.never,
|
||||||
border: InputBorder.none,
|
border: InputBorder.none,
|
||||||
contentPadding: EdgeInsets.symmetric(vertical: 16),
|
contentPadding: EdgeInsets.symmetric(vertical: 16),
|
||||||
@ -1003,7 +1147,7 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
// Map country codes to country names
|
// Map country codes to country names
|
||||||
countryMap = {
|
countryMap = {
|
||||||
for (var item in countryList)
|
for (var item in countryList)
|
||||||
item['country_code'] as String: item['country_name'] as String
|
item['country_code'] as String: item['country_name'] as String,
|
||||||
};
|
};
|
||||||
|
|
||||||
// Extract only country codes for processing
|
// Extract only country codes for processing
|
||||||
@ -1019,7 +1163,8 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w600,
|
fontWeight: FontWeight.w600,
|
||||||
color: Color(0xFF575A74))
|
color: Color(0xFF575A74),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
CustomTextFieldUserWrapper(
|
CustomTextFieldUserWrapper(
|
||||||
@ -1045,19 +1190,22 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
dropdownDecoratorProps: DropDownDecoratorProps(
|
dropdownDecoratorProps: DropDownDecoratorProps(
|
||||||
dropdownSearchDecoration: InputDecoration(
|
dropdownSearchDecoration: InputDecoration(
|
||||||
border: InputBorder.none,
|
border: InputBorder.none,
|
||||||
contentPadding: EdgeInsets.symmetric(
|
contentPadding: EdgeInsets.symmetric(horizontal: 1),
|
||||||
horizontal: 1,
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
dropdownBuilder:
|
||||||
dropdownBuilder: (context, selectedItem) => Align(
|
(context, selectedItem) => Align(
|
||||||
// Center-align selected item
|
// Center-align selected item
|
||||||
alignment: Alignment.centerLeft,
|
alignment: Alignment.centerLeft,
|
||||||
child: Text(
|
child: Text(
|
||||||
selectedItem ?? "Select Country",
|
selectedItem ?? "Select Country",
|
||||||
style: GoogleFonts.poppins(fontSize: 12, color: Colors.black),
|
style: GoogleFonts.poppins(
|
||||||
|
fontSize: 12,
|
||||||
|
color: Colors.black,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
),
|
||||||
|
|
||||||
// onChanged: widget.isViewMode
|
// onChanged: widget.isViewMode
|
||||||
// ? null
|
// ? null
|
||||||
// : (String? newValue) {
|
// : (String? newValue) {
|
||||||
@ -1073,13 +1221,14 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
// });
|
// });
|
||||||
// widget.onCountryChanged?.call(newValue);
|
// widget.onCountryChanged?.call(newValue);
|
||||||
// },
|
// },
|
||||||
|
onChanged:
|
||||||
onChanged: widget.isViewMode
|
widget.isViewMode
|
||||||
? null
|
? null
|
||||||
: (String? newValue) {
|
: (String? newValue) {
|
||||||
if (newValue == null) return;
|
if (newValue == null) return;
|
||||||
|
|
||||||
final countryCode = countryMap.entries
|
final countryCode =
|
||||||
|
countryMap.entries
|
||||||
.firstWhere((entry) => entry.value == newValue)
|
.firstWhere((entry) => entry.value == newValue)
|
||||||
.key;
|
.key;
|
||||||
|
|
||||||
@ -1087,8 +1236,9 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
selectedCountry = countryCode;
|
selectedCountry = countryCode;
|
||||||
});
|
});
|
||||||
|
|
||||||
widget.onCountryChanged
|
widget.onCountryChanged?.call(
|
||||||
?.call(countryCode); // ✅ send code not name
|
countryCode,
|
||||||
|
); // ✅ send code not name
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@ -1106,7 +1256,8 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w600,
|
fontWeight: FontWeight.w600,
|
||||||
color: Color(0xFF575A74))
|
color: Color(0xFF575A74),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
CustomTextFieldUserWrapper(
|
CustomTextFieldUserWrapper(
|
||||||
@ -1120,15 +1271,17 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
enabled: !widget.isViewMode,
|
enabled: !widget.isViewMode,
|
||||||
keyboardType: TextInputType.numberWithOptions(decimal: true),
|
keyboardType: TextInputType.numberWithOptions(decimal: true),
|
||||||
inputFormatters: [
|
inputFormatters: [
|
||||||
FilteringTextInputFormatter.allow(RegExp(
|
FilteringTextInputFormatter.allow(
|
||||||
r'^\d*\.?\d*$')), // Allow only positive numbers with optional decimal
|
RegExp(r'^\d*\.?\d*$'),
|
||||||
|
), // Allow only positive numbers with optional decimal
|
||||||
],
|
],
|
||||||
decoration: InputDecoration(
|
decoration: InputDecoration(
|
||||||
labelText: "Postal Code",
|
labelText: "Postal Code",
|
||||||
labelStyle: GoogleFonts.poppins(
|
labelStyle: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w400,
|
||||||
color: Colors.grey),
|
color: Colors.grey,
|
||||||
|
),
|
||||||
floatingLabelBehavior: FloatingLabelBehavior.never,
|
floatingLabelBehavior: FloatingLabelBehavior.never,
|
||||||
border: InputBorder.none,
|
border: InputBorder.none,
|
||||||
contentPadding: EdgeInsets.symmetric(vertical: 16),
|
contentPadding: EdgeInsets.symmetric(vertical: 16),
|
||||||
@ -1149,7 +1302,8 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w600,
|
fontWeight: FontWeight.w600,
|
||||||
color: Color(0xFF575A74))
|
color: Color(0xFF575A74),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
CustomTextFieldUserWrapper(
|
CustomTextFieldUserWrapper(
|
||||||
@ -1163,10 +1317,12 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
style: GoogleFonts.poppins(fontSize: 12, color: Colors.black),
|
style: GoogleFonts.poppins(fontSize: 12, color: Colors.black),
|
||||||
decoration: InputDecoration(
|
decoration: InputDecoration(
|
||||||
border: InputBorder.none,
|
border: InputBorder.none,
|
||||||
contentPadding:
|
contentPadding: EdgeInsets.symmetric(
|
||||||
EdgeInsets.symmetric(horizontal: 10), // Proper padding
|
horizontal: 10,
|
||||||
|
), // Proper padding
|
||||||
),
|
),
|
||||||
onChanged: widget.isViewMode
|
onChanged:
|
||||||
|
widget.isViewMode
|
||||||
? null
|
? null
|
||||||
: (newValue) {
|
: (newValue) {
|
||||||
setState(() {
|
setState(() {
|
||||||
@ -1177,10 +1333,12 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
});
|
});
|
||||||
widget.onRoleChanged?.call(newValue);
|
widget.onRoleChanged?.call(newValue);
|
||||||
},
|
},
|
||||||
items: apiRoleData?.map<DropdownMenuItem<String>>((item) {
|
items:
|
||||||
|
apiRoleData?.map<DropdownMenuItem<String>>((item) {
|
||||||
return DropdownMenuItem(
|
return DropdownMenuItem(
|
||||||
value: item['dropdown_key'], // ID as value
|
value: item['dropdown_key'], // ID as value
|
||||||
child: Text(item['dropdown_value'] ?? "Select Role"));
|
child: Text(item['dropdown_value'] ?? "Select Role"),
|
||||||
|
);
|
||||||
}).toList(),
|
}).toList(),
|
||||||
hint: Text("Select Role"),
|
hint: Text("Select Role"),
|
||||||
disabledHint: Text(
|
disabledHint: Text(
|
||||||
@ -1203,7 +1361,8 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w600,
|
fontWeight: FontWeight.w600,
|
||||||
color: Color(0xFF575A74))
|
color: Color(0xFF575A74),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
CustomTextFieldUserWrapper(
|
CustomTextFieldUserWrapper(
|
||||||
@ -1219,8 +1378,10 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
keyboardType: TextInputType.multiline,
|
keyboardType: TextInputType.multiline,
|
||||||
decoration: InputDecoration(
|
decoration: InputDecoration(
|
||||||
labelText: "Address",
|
labelText: "Address",
|
||||||
labelStyle:
|
labelStyle: GoogleFonts.poppins(
|
||||||
GoogleFonts.poppins(fontSize: 12, color: Colors.grey),
|
fontSize: 12,
|
||||||
|
color: Colors.grey,
|
||||||
|
),
|
||||||
floatingLabelBehavior: FloatingLabelBehavior.never,
|
floatingLabelBehavior: FloatingLabelBehavior.never,
|
||||||
border: InputBorder.none,
|
border: InputBorder.none,
|
||||||
// contentPadding: EdgeInsets.symmetric(vertical: 16),
|
// contentPadding: EdgeInsets.symmetric(vertical: 16),
|
||||||
@ -1242,7 +1403,8 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w600,
|
fontWeight: FontWeight.w600,
|
||||||
color: Color(0xFF575A74))
|
color: Color(0xFF575A74),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
CustomTextFieldUserWrapper(
|
CustomTextFieldUserWrapper(
|
||||||
@ -1259,8 +1421,10 @@ class PersonalDetailsState extends State<PersonalDetails> {
|
|||||||
},
|
},
|
||||||
decoration: InputDecoration(
|
decoration: InputDecoration(
|
||||||
labelText: "Password",
|
labelText: "Password",
|
||||||
labelStyle:
|
labelStyle: GoogleFonts.poppins(
|
||||||
GoogleFonts.poppins(fontSize: 12, color: Colors.grey),
|
fontSize: 12,
|
||||||
|
color: Colors.grey,
|
||||||
|
),
|
||||||
floatingLabelBehavior: FloatingLabelBehavior.never,
|
floatingLabelBehavior: FloatingLabelBehavior.never,
|
||||||
border: InputBorder.none,
|
border: InputBorder.none,
|
||||||
contentPadding: EdgeInsets.symmetric(vertical: 16),
|
contentPadding: EdgeInsets.symmetric(vertical: 16),
|
||||||
|
|||||||
@ -1069,8 +1069,8 @@ class TravellerDetailsState extends State<TravellerDetails> {
|
|||||||
"Passport Number",
|
"Passport Number",
|
||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w600,
|
||||||
color: Colors.black,
|
color: Color(0xFF575A74),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
@ -1111,8 +1111,8 @@ class TravellerDetailsState extends State<TravellerDetails> {
|
|||||||
"Place of Issue",
|
"Place of Issue",
|
||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w600,
|
||||||
color: Colors.black,
|
color: Color(0xFF575A74),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
@ -1179,8 +1179,8 @@ class TravellerDetailsState extends State<TravellerDetails> {
|
|||||||
"Date of Issue",
|
"Date of Issue",
|
||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w600,
|
||||||
color: Colors.black,
|
color: Color(0xFF575A74),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
@ -1272,8 +1272,8 @@ class TravellerDetailsState extends State<TravellerDetails> {
|
|||||||
"Date of Expiry",
|
"Date of Expiry",
|
||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w600,
|
||||||
color: Colors.black,
|
color: Color(0xFF575A74),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
@ -1365,8 +1365,8 @@ class TravellerDetailsState extends State<TravellerDetails> {
|
|||||||
"Passport Document",
|
"Passport Document",
|
||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w600,
|
||||||
color: Colors.black,
|
color: Color(0xFF575A74),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
@ -1558,8 +1558,8 @@ class TravellerDetailsState extends State<TravellerDetails> {
|
|||||||
"Id Number",
|
"Id Number",
|
||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w600,
|
||||||
color: Colors.black,
|
color: Color(0xFF575A74),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
@ -1607,8 +1607,8 @@ class TravellerDetailsState extends State<TravellerDetails> {
|
|||||||
"Id Type",
|
"Id Type",
|
||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w600,
|
||||||
color: Colors.black,
|
color: Color(0xFF575A74),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
@ -1696,8 +1696,8 @@ class TravellerDetailsState extends State<TravellerDetails> {
|
|||||||
"Full Name As ID",
|
"Full Name As ID",
|
||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w600,
|
||||||
color: Colors.black,
|
color: Color(0xFF575A74),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
@ -1785,8 +1785,8 @@ class TravellerDetailsState extends State<TravellerDetails> {
|
|||||||
"Seat Preference",
|
"Seat Preference",
|
||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w600,
|
||||||
color: Colors.black,
|
color: Color(0xFF575A74),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
@ -1878,8 +1878,8 @@ class TravellerDetailsState extends State<TravellerDetails> {
|
|||||||
"Meal Preference",
|
"Meal Preference",
|
||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w600,
|
||||||
color: Colors.black,
|
color: Color(0xFF575A74),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
@ -1924,8 +1924,8 @@ class TravellerDetailsState extends State<TravellerDetails> {
|
|||||||
"Additional Information",
|
"Additional Information",
|
||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w600,
|
||||||
color: Colors.black,
|
color: Color(0xFF575A74),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
@ -2015,8 +2015,8 @@ class TravellerDetailsState extends State<TravellerDetails> {
|
|||||||
"Seat Preference",
|
"Seat Preference",
|
||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w600,
|
||||||
color: Colors.black,
|
color: Color(0xFF575A74),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
@ -2114,8 +2114,8 @@ class TravellerDetailsState extends State<TravellerDetails> {
|
|||||||
"Meal Preference",
|
"Meal Preference",
|
||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w600,
|
||||||
color: Colors.black,
|
color: Color(0xFF575A74),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
@ -2160,8 +2160,8 @@ class TravellerDetailsState extends State<TravellerDetails> {
|
|||||||
"Additional Information",
|
"Additional Information",
|
||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w600,
|
||||||
color: Colors.black,
|
color: Color(0xFF575A74),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
@ -2213,8 +2213,8 @@ class TravellerDetailsState extends State<TravellerDetails> {
|
|||||||
"Emergency Contact Number",
|
"Emergency Contact Number",
|
||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w600,
|
||||||
color: Colors.black,
|
color: Color(0xFF575A74),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
@ -2292,8 +2292,8 @@ class TravellerDetailsState extends State<TravellerDetails> {
|
|||||||
"Forex Pre-Paid Card Number",
|
"Forex Pre-Paid Card Number",
|
||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w600,
|
||||||
color: Colors.black,
|
color: Color(0xFF575A74),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
@ -2362,8 +2362,8 @@ class TravellerDetailsState extends State<TravellerDetails> {
|
|||||||
"Forex Expiry Date",
|
"Forex Expiry Date",
|
||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w600,
|
||||||
color: Colors.black,
|
color: Color(0xFF575A74),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
@ -2522,8 +2522,8 @@ class TravellerDetailsState extends State<TravellerDetails> {
|
|||||||
"Airline",
|
"Airline",
|
||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w600,
|
||||||
color: Colors.black,
|
color: Color(0xFF575A74),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
@ -2538,12 +2538,7 @@ class TravellerDetailsState extends State<TravellerDetails> {
|
|||||||
height: 40,
|
height: 40,
|
||||||
child:
|
child:
|
||||||
hasAirlineCountryData
|
hasAirlineCountryData
|
||||||
? Center(
|
? CircularProgressIndicator()
|
||||||
child: Transform.scale(
|
|
||||||
scale: 0.5,
|
|
||||||
child: CircularProgressIndicator(),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
: DropdownSearch<String>(
|
: DropdownSearch<String>(
|
||||||
// selectedItem: countryMap[selectedCountry],
|
// selectedItem: countryMap[selectedCountry],
|
||||||
// selectedItem: entry['airline'] != null
|
// selectedItem: entry['airline'] != null
|
||||||
@ -2668,8 +2663,8 @@ class TravellerDetailsState extends State<TravellerDetails> {
|
|||||||
"Frequent Flyer Information",
|
"Frequent Flyer Information",
|
||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w600,
|
||||||
color: Colors.black,
|
color: Color(0xFF575A74),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
@ -2807,8 +2802,8 @@ class TravellerDetailsState extends State<TravellerDetails> {
|
|||||||
"Hotel",
|
"Hotel",
|
||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w600,
|
||||||
color: Colors.black,
|
color: Color(0xFF575A74),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
@ -2822,12 +2817,7 @@ class TravellerDetailsState extends State<TravellerDetails> {
|
|||||||
height: 40,
|
height: 40,
|
||||||
child:
|
child:
|
||||||
hasAirlineCountryData
|
hasAirlineCountryData
|
||||||
? Center(
|
? CircularProgressIndicator()
|
||||||
child: Transform.scale(
|
|
||||||
scale: 0.5,
|
|
||||||
child: CircularProgressIndicator(),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
: DropdownSearch<String>(
|
: DropdownSearch<String>(
|
||||||
selectedItem:
|
selectedItem:
|
||||||
(entry["hotel_id"] != null &&
|
(entry["hotel_id"] != null &&
|
||||||
@ -2917,8 +2907,8 @@ class TravellerDetailsState extends State<TravellerDetails> {
|
|||||||
"Hotel Membership Number",
|
"Hotel Membership Number",
|
||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w600,
|
||||||
color: Colors.black,
|
color: Color(0xFF575A74),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
@ -3060,8 +3050,8 @@ class TravellerDetailsState extends State<TravellerDetails> {
|
|||||||
"Country",
|
"Country",
|
||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w600,
|
||||||
color: Colors.black,
|
color: Color(0xFF575A74),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
@ -3189,8 +3179,8 @@ class TravellerDetailsState extends State<TravellerDetails> {
|
|||||||
"Visa Type",
|
"Visa Type",
|
||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w600,
|
||||||
color: Colors.black,
|
color: Color(0xFF575A74),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
@ -3233,6 +3223,112 @@ class TravellerDetailsState extends State<TravellerDetails> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Widget buildVisaType2(entry) {
|
||||||
|
late Map<String, String>
|
||||||
|
visaTypeMap; // Mapping country_code -> country_name
|
||||||
|
late List<String> visaTypeCodes; // List of country codes
|
||||||
|
|
||||||
|
// List<dynamic> purposeList = apiData?['visa_type_of_visa'];
|
||||||
|
|
||||||
|
List<dynamic> purposeList = apiData?['visa_type_of_visa'];
|
||||||
|
|
||||||
|
print("purposeList - $purposeList");
|
||||||
|
|
||||||
|
visaTypeMap = {
|
||||||
|
for (var item in purposeList)
|
||||||
|
item['visa_type_id'] as String: item['visa_type_of_visa'] as String,
|
||||||
|
};
|
||||||
|
|
||||||
|
// Extract only country codes for processing
|
||||||
|
visaTypeCodes = visaTypeMap.keys.toList();
|
||||||
|
|
||||||
|
// selectedPurpose ??= null;
|
||||||
|
|
||||||
|
String? selectedPurpose = entry['visa_type_of_visa'];
|
||||||
|
|
||||||
|
return Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
"Visa Type",
|
||||||
|
style: GoogleFonts.poppins(
|
||||||
|
fontSize: 12,
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
color: Color(0xFF575A74),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
SizedBox(height: 5),
|
||||||
|
CustomTextFieldUserTravellerWrapper(
|
||||||
|
width:
|
||||||
|
widget.isDesktop
|
||||||
|
? MediaQuery.of(context).size.width * 0.17
|
||||||
|
: null,
|
||||||
|
isFocused: false,
|
||||||
|
isDesktop: widget.isDesktop,
|
||||||
|
child: SizedBox(
|
||||||
|
height: 40,
|
||||||
|
child: DropdownSearch<String>(
|
||||||
|
selectedItem: visaTypeMap[selectedPurpose],
|
||||||
|
popupProps: PopupProps.menu(
|
||||||
|
showSearchBox: true, // Enables search functionality
|
||||||
|
menuProps: const MenuProps(backgroundColor: Colors.white),
|
||||||
|
// constraints: BoxConstraints(maxHeight: 250),
|
||||||
|
itemBuilder:
|
||||||
|
(context, item, isSelected) => Padding(
|
||||||
|
padding: const EdgeInsets.symmetric(
|
||||||
|
horizontal: 8.0,
|
||||||
|
vertical: 6.0,
|
||||||
|
),
|
||||||
|
child: Text(
|
||||||
|
item,
|
||||||
|
style: GoogleFonts.poppins(fontSize: 11.5),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
searchFieldProps: TextFieldProps(
|
||||||
|
decoration: InputDecoration(
|
||||||
|
hintText: "Search Visa Type...",
|
||||||
|
hintStyle: GoogleFonts.poppins(fontSize: 11.5),
|
||||||
|
contentPadding: EdgeInsets.symmetric(horizontal: 10),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
items: visaTypeMap.values.toList(),
|
||||||
|
dropdownDecoratorProps: DropDownDecoratorProps(
|
||||||
|
dropdownSearchDecoration: InputDecoration(
|
||||||
|
border: InputBorder.none,
|
||||||
|
contentPadding: EdgeInsets.symmetric(horizontal: 1),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
dropdownBuilder:
|
||||||
|
(context, selectedItem) => Align(
|
||||||
|
// Center-align selected item
|
||||||
|
alignment: Alignment.centerLeft,
|
||||||
|
child: Text(
|
||||||
|
selectedItem ?? "Select Visa Type",
|
||||||
|
style: TextStyle(fontSize: 12),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
onChanged: (String? newValue) {
|
||||||
|
setState(() {
|
||||||
|
// Find the country_code based on selected country_name
|
||||||
|
// selectedCountry = countryMap.entries
|
||||||
|
// .firstWhere((entry) => entry.value == newValue)
|
||||||
|
// .key;
|
||||||
|
|
||||||
|
final selectedPurpose =
|
||||||
|
visaTypeMap.entries
|
||||||
|
.firstWhere((entry) => entry.value == newValue)
|
||||||
|
.key;
|
||||||
|
entry['visa_type_of_visa'] = selectedPurpose;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
Widget buildVisaValidFrom(Map<String, dynamic> entry) {
|
Widget buildVisaValidFrom(Map<String, dynamic> entry) {
|
||||||
DateTime? _selectedCheckOutDate;
|
DateTime? _selectedCheckOutDate;
|
||||||
TimeOfDay? _selectedCheckOutTime;
|
TimeOfDay? _selectedCheckOutTime;
|
||||||
@ -3273,11 +3369,11 @@ class TravellerDetailsState extends State<TravellerDetails> {
|
|||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
Text(
|
Text(
|
||||||
"ValidFrom",
|
"Valid From",
|
||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w600,
|
||||||
color: Colors.black,
|
color: Color(0xFF575A74),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
@ -3361,11 +3457,11 @@ class TravellerDetailsState extends State<TravellerDetails> {
|
|||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
Text(
|
Text(
|
||||||
"Valid UpTo",
|
"Valid To",
|
||||||
style: GoogleFonts.poppins(
|
style: GoogleFonts.poppins(
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
fontWeight: FontWeight.w400,
|
fontWeight: FontWeight.w600,
|
||||||
color: Colors.black,
|
color: Color(0xFF575A74),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SizedBox(height: 5),
|
SizedBox(height: 5),
|
||||||
|
|||||||
@ -29,6 +29,7 @@ import '../Screens/department/department_list.dart';
|
|||||||
import '../Screens/costCenter/costCenter_list.dart';
|
import '../Screens/costCenter/costCenter_list.dart';
|
||||||
import '../Screens/dashboard/status_dashboard.dart';
|
import '../Screens/dashboard/status_dashboard.dart';
|
||||||
import '../Screens/hotels/hotels_list.dart';
|
import '../Screens/hotels/hotels_list.dart';
|
||||||
|
import '../Screens/traveller/travellerList.dart';
|
||||||
|
|
||||||
final GoRouter router = GoRouter(
|
final GoRouter router = GoRouter(
|
||||||
routes: [
|
routes: [
|
||||||
@ -111,6 +112,10 @@ final GoRouter router = GoRouter(
|
|||||||
path: '/statusdashboard',
|
path: '/statusdashboard',
|
||||||
builder: (context, state) => StatusDashboard(),
|
builder: (context, state) => StatusDashboard(),
|
||||||
),
|
),
|
||||||
|
GoRoute(
|
||||||
|
path: '/traveller',
|
||||||
|
builder: (context, state) => TravellerList(),
|
||||||
|
),
|
||||||
GoRoute(
|
GoRoute(
|
||||||
path: '/CreateGroup',
|
path: '/CreateGroup',
|
||||||
pageBuilder:
|
pageBuilder:
|
||||||
|
|||||||
@ -100,6 +100,13 @@ class OrganizationSettingState extends State<OrganizationSetting> {
|
|||||||
'label': 'Hotels',
|
'label': 'Hotels',
|
||||||
'description': 'Create and Edit Hotels'
|
'description': 'Create and Edit Hotels'
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
'value': '/traveller',
|
||||||
|
'icon': Icons.travel_explore,
|
||||||
|
'label': 'Traveller',
|
||||||
|
'description': 'Create and Edit Traveller'
|
||||||
|
},
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
// List<Widget> rows = [];
|
// List<Widget> rows = [];
|
||||||
|
|||||||
@ -1190,4 +1190,48 @@ class ApiService {
|
|||||||
throw Exception('Failed to load plans');
|
throw Exception('Failed to load plans');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Future<Map<String, dynamic>> getTravellerDetailsFind(int id) async {
|
||||||
|
final String apiUrldata = '$apiUrl/api/travellers/find?traveller_id=$id';
|
||||||
|
|
||||||
|
|
||||||
|
//c
|
||||||
|
final token = await getToken();
|
||||||
|
|
||||||
|
if (token == null) {
|
||||||
|
throw Exception('Token not found. Please log in.');
|
||||||
|
}
|
||||||
|
|
||||||
|
final response = await http.get(
|
||||||
|
Uri.parse(apiUrldata),
|
||||||
|
headers: {
|
||||||
|
'Authorization': 'Bearer $token',
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
if (response.statusCode == 200) {
|
||||||
|
try {
|
||||||
|
final data = json.decode(response.body);
|
||||||
|
|
||||||
|
if (!data.containsKey('data') || data['data'] is! List) {
|
||||||
|
throw Exception("Invalid response format: 'data' field is missing or not a List");
|
||||||
|
}
|
||||||
|
|
||||||
|
final List<Map<String, dynamic>> listData =
|
||||||
|
List<Map<String, dynamic>>.from(data['data']);
|
||||||
|
|
||||||
|
if (listData.isEmpty) {
|
||||||
|
throw Exception("No Traveller data found with ID $id");
|
||||||
|
}
|
||||||
|
|
||||||
|
return listData[0];
|
||||||
|
} catch (e) {
|
||||||
|
throw Exception('Error parsing response: $e');
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
throw Exception('Failed to load Hotel details');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user