Arminta
/
watermanagement-suppliernew
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

source and service location changes

Browse Source
master
gitadmin 1 month ago
parent 033df91288
commit ac734007af
4 changed files with 346 additions and 292 deletions
Show Stats Download Patch File Download Diff File

6
lib/profile/employees.dart
Unescape View File

@ -498,8 +498,10 @@ class _FleetEmployeesState extends State<FleetEmployees> {
ElevatedButton( ElevatedButton(
onPressed: _addDriver, onPressed: _addDriver,
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
backgroundColor: const Color(0xFF0D3771), backgroundColor: const Color(0xFF8270DB),
foregroundColor: Colors.white), foregroundColor: Colors.white,
minimumSize: const Size(343, 41), // Width & Height
padding: const EdgeInsets.fromLTRB(24, 12, 24, 12),),
child: const Text("Add Driver"), child: const Text("Add Driver"),
), ),
], ],

22
lib/profile/fleet.dart
Unescape View File

@ -487,14 +487,26 @@ class _AddTankerFormState extends State<AddTankerForm> {
onTap: _pickInsuranceDate, onTap: _pickInsuranceDate,
), ),
), ),
const SizedBox(height: 16), SizedBox(
ElevatedButton( child: ElevatedButton.icon(
onPressed: _addTanker, onPressed: _addTanker,
label: Text(
"Add Tanker",
style: fontTextStyle(14, Colors.white, FontWeight.w600),
),
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
backgroundColor: const Color(0xFF0D3771), backgroundColor: const Color(0xFF8270DB),
foregroundColor: Colors.white), foregroundColor: Colors.white,
child: const Text("Add Tanker"), minimumSize: const Size(343, 41), // Width & Height
padding: const EdgeInsets.fromLTRB(24, 12, 24, 12),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(24),
), ),
elevation: 0, // Optional: flat style per modern UI
),
),
)
], ],
), ),
), ),

329
lib/profile/service_location.dart
Unescape View File

@ -1,5 +1,7 @@
import 'dart:convert';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:supplier_new/common/settings.dart'; import 'package:supplier_new/common/settings.dart';
import '../resources/source_loctaions_model.dart';
void main() => runApp(const MaterialApp(home: ServiceLocation())); void main() => runApp(const MaterialApp(home: ServiceLocation()));
@ -16,6 +18,49 @@ class _ServiceLocationState extends State<ServiceLocation> {
final TextEditingController _radiusController = final TextEditingController _radiusController =
TextEditingController(text: "10"); TextEditingController(text: "10");
bool _customizeEachSource = false; bool _customizeEachSource = false;
bool isLoading = false;
int currentStep = 3;
List<SourceLocationsModel> sourceLocationsList = [];
final List<String> _services = [
"24/7 Emergency services",
"Scheduled water deliveries",
"Bulk water deliveries",
"Long-term water delivery plans",
"Industrial/Commercial water deliveries"
];
final Set<String> _selectedServices = {};
final Map<int, bool> _expandedMap = {};
@override
void initState() {
super.initState();
_fetchSources();
}
Future<void> _fetchSources() async {
setState(() => isLoading = true);
try {
final response = await AppSettings.getSourceLoctaions();
final data = (jsonDecode(response)['data'] as List)
.map((e) => SourceLocationsModel.fromJson(e))
.toList();
if (!mounted) return;
setState(() {
sourceLocationsList = data;
isLoading = false;
for (var i = 0; i < data.length; i++) {
_expandedMap[i] = false;
}
});
} catch (e) {
debugPrint("⚠️ Error fetching source locations: $e");
setState(() => isLoading = false);
}
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -25,40 +70,22 @@ class _ServiceLocationState extends State<ServiceLocation> {
backgroundColor: Colors.white, backgroundColor: Colors.white,
surfaceTintColor: Colors.transparent, surfaceTintColor: Colors.transparent,
elevation: 0, elevation: 0,
scrolledUnderElevation: 0,
title: const Text("Complete Profile"), title: const Text("Complete Profile"),
actions: [
IconButton(
splashRadius: 20,
icon: const Image(
image: AssetImage('images/calendar_appbar.png'),
width: 22,
height: 22,
),
onPressed: () {},
),
IconButton(
splashRadius: 20,
icon: Image.asset('images/notification_appbar.png',
width: 22, height: 22),
onPressed: () {},
),
],
), ),
body: SafeArea( body: SafeArea(
child: Form( child: isLoading
? const Center(child: CircularProgressIndicator())
: Form(
key: _formKey, key: _formKey,
child: ListView( child: ListView(
padding: const EdgeInsets.fromLTRB(20, 10, 20, 24), padding: const EdgeInsets.fromLTRB(20, 10, 20, 24),
children: [ children: [
// Step indicator Text("Step $currentStep/5",
Text("Step 3/5", style: fontTextStyle(16, Color(0xFFC3C4C4), FontWeight.w500)),
style:
fontTextStyle(16, const Color(0xFFC3C4C4), FontWeight.w500)),
const SizedBox(height: 16), const SizedBox(height: 16),
Row( Row(
children: List.generate(5, (index) { children: List.generate(5, (index) {
final isFilled = index < 3; final isFilled = index < currentStep;
return Expanded( return Expanded(
child: Container( child: Container(
margin: const EdgeInsets.symmetric(horizontal: 2), margin: const EdgeInsets.symmetric(horizontal: 2),
@ -75,31 +102,29 @@ class _ServiceLocationState extends State<ServiceLocation> {
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
Text("SOURCE LOCATION",
style: Text("SERVICE LOCATIONS",
fontTextStyle(20, const Color(0xFF515253), FontWeight.w600)), style: fontTextStyle(20, Color(0xFF515253), FontWeight.w600)),
const SizedBox(height: 8), const SizedBox(height: 16),
Align( Align(
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
child: Image.asset('images/marker-pin.png', width: 24, height: 24), child: Image.asset('images/marker-pin.png',
width: 24, height: 24),
), ),
const SizedBox(height: 12), const SizedBox(height: 16),
Text( Text(
"Define where you want to provide delivery services", "Define where you want to provide delivery services",
style: style: fontTextStyle(14, Color(0xFF939495), FontWeight.w500),
fontTextStyle(14, const Color(0xFF939495), FontWeight.w500),
), ),
const SizedBox(height: 6), const SizedBox(height: 16),
// Radio Buttons
RadioListTile<String>( RadioListTile<String>(
value: 'business', value: 'business',
groupValue: _deliveryFrom, groupValue: _deliveryFrom,
onChanged: (value) => onChanged: (value) =>
setState(() => _deliveryFrom = value ?? 'business'), setState(() => _deliveryFrom = value ?? 'business'),
title: Text("From Business Location", title: Text("From Business Location",
style: fontTextStyle( style: fontTextStyle(12, Color(0xFF2D2E30), FontWeight.w400)),
14, const Color(0xFF2D2E30), FontWeight.w500)),
dense: true, dense: true,
contentPadding: EdgeInsets.zero, contentPadding: EdgeInsets.zero,
visualDensity: visualDensity:
@ -111,31 +136,30 @@ class _ServiceLocationState extends State<ServiceLocation> {
onChanged: (value) => onChanged: (value) =>
setState(() => _deliveryFrom = value ?? 'source'), setState(() => _deliveryFrom = value ?? 'source'),
title: Text("From Source Locations", title: Text("From Source Locations",
style: fontTextStyle( style: fontTextStyle(12, Color(0xFF2D2E30), FontWeight.w400)),
14, const Color(0xFF2D2E30), FontWeight.w500)),
dense: true, dense: true,
contentPadding: EdgeInsets.zero, contentPadding: EdgeInsets.zero,
visualDensity: visualDensity:
const VisualDensity(horizontal: 0, vertical: -3), const VisualDensity(horizontal: 0, vertical: -3),
), ),
const SizedBox(height: 12), const SizedBox(height: 16),
// ✅ Business Location Section
Visibility( Visibility(
visible: _deliveryFrom == 'business', visible: _deliveryFrom == 'business',
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text("Delivery Radius (in Kms) *", Text("Delivery Radius (in Kms) *",
style: fontTextStyle( style: fontTextStyle(12, Color(0xFF2F3036), FontWeight.w600)),
14, const Color(0xFF2D2E30), FontWeight.w500)), const SizedBox(height: 16),
const SizedBox(height: 6),
TextFormField( TextFormField(
controller: _radiusController, controller: _radiusController,
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
decoration: InputDecoration( decoration: InputDecoration(
hintText: "Enter radius in kms", hintText: "Enter radius in kms",
hintStyle: fontTextStyle(14, Color(0xFF939495), FontWeight.w400),
border: OutlineInputBorder( border: OutlineInputBorder(
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
), ),
@ -143,8 +167,7 @@ class _ServiceLocationState extends State<ServiceLocation> {
horizontal: 12, vertical: 12), horizontal: 12, vertical: 12),
), ),
), ),
const SizedBox(height: 16),
const SizedBox(height: 12),
Container( Container(
width: double.infinity, width: double.infinity,
height: 160, height: 160,
@ -163,84 +186,120 @@ class _ServiceLocationState extends State<ServiceLocation> {
Visibility( Visibility(
visible: _deliveryFrom == 'source', visible: _deliveryFrom == 'source',
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
const SizedBox(height: 12), Text("Delivery Radius (in Kms) *",
style: fontTextStyle(12, Color(0xFF2F3036), FontWeight.w600)),
// 🔹 Checkbox toggle const SizedBox(height: 16),
TextFormField(
controller: _radiusController,
keyboardType: TextInputType.number,
decoration: InputDecoration(
hintText: "Enter radius in kms",
hintStyle: fontTextStyle(14, const Color(0xFF939495), FontWeight.w400),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(8),
),
contentPadding: const EdgeInsets.symmetric(
horizontal: 12, vertical: 12),
),
),
const SizedBox(height: 16),
Row( Row(
children: [ children: [
Checkbox( Checkbox(
value: _customizeEachSource, value: _customizeEachSource,
onChanged: (val) => onChanged: (val) => setState(
setState(() => _customizeEachSource = val ?? false), () => _customizeEachSource = val ?? false),
materialTapTargetSize:
MaterialTapTargetSize.shrinkWrap,
visualDensity: const VisualDensity(
horizontal: -4, vertical: -4),
), ),
const SizedBox(width: 6), const SizedBox(width: 6),
Expanded( Expanded(
child: Text( child: Text(
"Customize for each source location", "Customize for each source location",
style: fontTextStyle( style: fontTextStyle(12, Color(0xFF2D2E30), FontWeight.w400),
14, const Color(0xFF2D2E30), FontWeight.w500),
), ),
), ),
], ],
), ),
const SizedBox(height: 12), const SizedBox(height: 12),
// 🔹 Only the list hides/shows // 🔹 Show all source locations when checkbox checked
Visibility( if (_customizeEachSource)
visible: _customizeEachSource, Column(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: sourceLocationsList.isEmpty
_SectionHeaderBar(title: "SOURCE LOCATION #1"), ? [
const SizedBox(height: 12), const Text("No source locations available"),
Text( ]
"Delivery Radius (in Kms) *", : List.generate(sourceLocationsList.length, (index) {
style: fontTextStyle( final d = sourceLocationsList[index];
14, const Color(0xFF2D2E30), FontWeight.w500), return StatefulBuilder(
), builder: (context, setInner) {
const SizedBox(height: 6), // ✅ Always read from map dynamically (not fixed final variable)
TextFormField( final isExpanded = _expandedMap[index] ?? false;
controller: TextEditingController(text: "10"),
keyboardType: TextInputType.number, return Container(
decoration: InputDecoration( margin: const EdgeInsets.only(bottom: 8),
hintText: "Enter radius in kms", decoration: BoxDecoration(
border: OutlineInputBorder( color: const Color(0xFFF7F7F7),
borderRadius: BorderRadius.circular(8), border: Border.all(color: const Color(0xFFE5E5E5)),
borderRadius: BorderRadius.circular(12),
), ),
contentPadding: child: Column(
const EdgeInsets.symmetric(horizontal: 12, vertical: 12), children: [
ListTile(
dense: true,
contentPadding: EdgeInsets.zero,
minVerticalPadding: 0,
visualDensity: const VisualDensity(vertical: -4, horizontal: 0),
title: Text(
d.source_name ?? 'Unnamed location',
style: fontTextStyle(14, const Color(0xFF2D2E30), FontWeight.w600),
),
trailing: IconButton(
icon: Image.asset(
isExpanded
? 'images/arrow-up.png'
: 'images/downarrow.png',
width: 18,
height: 18,
), ),
onPressed: () {
setInner(() {
_expandedMap[index] = !isExpanded;
});
},
), ),
const SizedBox(height: 12),
_SectionHeaderBar(title: "SOURCE LOCATION #2"),
const SizedBox(height: 12),
Text(
"Delivery Radius (in Kms) *",
style: fontTextStyle(
14, const Color(0xFF2D2E30), FontWeight.w500),
), ),
const SizedBox(height: 6), if (isExpanded)
TextFormField( Container(
controller: TextEditingController(text: "8"), margin: const EdgeInsets.only(left: 10, right: 10, bottom: 6),
keyboardType: TextInputType.number, padding: const EdgeInsets.all(10),
decoration: InputDecoration( decoration: BoxDecoration(
hintText: "Enter radius in kms", color: Colors.white,
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(8),
border: Border.all(color: const Color(0xFFE5E5E5)),
), ),
contentPadding: child: Text(
const EdgeInsets.symmetric(horizontal: 12, vertical: 12), "Address: ${d.address ?? 'N/A'}",
style: fontTextStyle(12, const Color(0xFF646566), FontWeight.w400),
), ),
), ),
const SizedBox(height: 12),
], ],
), ),
);
},
);
}),
), ),
// 🔹 Map always visible const SizedBox(height: 16),
Container( Container(
width: double.infinity, width: double.infinity,
height: 160, height: 160,
@ -255,24 +314,18 @@ class _ServiceLocationState extends State<ServiceLocation> {
), ),
), ),
const SizedBox(height: 24), const SizedBox(height: 24),
Text("Types of Services", Text("Types of Services",
style: fontTextStyle( style: fontTextStyle(16, Color(0xFF2D2E30), FontWeight.w600)),
16, const Color(0xFF2D2E30), FontWeight.w600)),
const SizedBox(height: 12), const SizedBox(height: 12),
Text("Define what type of services you would wish to provide", Text(
style: "Define what type of services you would wish to provide",
fontTextStyle(14, const Color(0xFF939495), FontWeight.w500)), style: fontTextStyle(14, Color(0xFF939495), FontWeight.w500)),
const SizedBox(height: 20),
_serviceItem("24/7 Emergency services"),
_serviceItem("Scheduled water deliveries"),
_serviceItem("Bulk water deliveries"),
_serviceItem("Long-term water delivery plans"),
_serviceItem("Industrial/Commercial water deliveries"),
const SizedBox(height: 16),
..._services
.map((service) => _serviceItem(service))
.toList(),
const SizedBox(height: 24), const SizedBox(height: 24),
SizedBox( SizedBox(
width: double.infinity, width: double.infinity,
@ -285,15 +338,18 @@ class _ServiceLocationState extends State<ServiceLocation> {
borderRadius: BorderRadius.circular(24)), borderRadius: BorderRadius.circular(24)),
), ),
onPressed: () { onPressed: () {
final selected = _selectedServices.isEmpty
? "No services selected"
: _selectedServices.join(", ");
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
SnackBar( SnackBar(
content: Text( content: Text(
"Saved successfully for ${_deliveryFrom == 'business' ? 'Business Location' : 'Source Locations'}"), "Saved successfully for ${_deliveryFrom == 'business' ? 'Business Location' : 'Source Locations'}\nSelected: $selected"),
), ),
); );
}, },
child: Text("Save & Continue", child: Text("Save & Continue",
style: fontTextStyle(14, Colors.white, FontWeight.w400)), style: fontTextStyle(14, Color(0xFFFFFFFF), FontWeight.w400)),
), ),
), ),
], ],
@ -303,45 +359,36 @@ class _ServiceLocationState extends State<ServiceLocation> {
); );
} }
Widget _serviceItem(String label) => Padding( // ✅ Service item
padding: const EdgeInsets.only(bottom: 12), Widget _serviceItem(String label) {
final bool selected = _selectedServices.contains(label);
return GestureDetector(
onTap: () {
setState(() {
if (selected) {
_selectedServices.remove(label);
} else {
_selectedServices.add(label);
}
});
},
child: Container(
margin: const EdgeInsets.only(bottom: 8),
child: Row( child: Row(
children: [ children: [
const Icon(Icons.check_box_outline_blank, Icon(
size: 20, color: Color(0xFF939495)), selected ? Icons.check_box : Icons.check_box_outline_blank,
color: selected ? Color(0xFF8270DB) : Color(0xFF939495),
size: 20,
),
const SizedBox(width: 8), const SizedBox(width: 8),
Text(label, Expanded(
style: child: Text(label, style: fontTextStyle(12, Color(0xFF2D2E30), FontWeight.w400),
fontTextStyle(12, const Color(0xFF2D2E30), FontWeight.w400)),
],
), ),
);
}
class _SectionHeaderBar extends StatelessWidget {
final String title;
const _SectionHeaderBar({required this.title, super.key});
@override
Widget build(BuildContext context) {
return Container(
decoration: BoxDecoration(
color: const Color(0xFFEEEEEE),
border: Border.all(color: const Color(0xFFE5E7EB), width: 1),
borderRadius: BorderRadius.circular(12),
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.04),
blurRadius: 6,
offset: const Offset(0, 2),
), ),
], ],
), ),
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 10), ),
child: Text(title,
style:
fontTextStyle(10, const Color(0xFF2D2E30), FontWeight.w600)),
); );
} }
} }

27
lib/profile/source_location.dart
Unescape View File

@ -162,8 +162,7 @@ class _SourceLocationState extends State<SourceLocation> {
Center( Center(
child: Text( child: Text(
"Add Source Location", "Add Source Location",
style: fontTextStyle( style: fontTextStyle(16, Color(0xFF2D2E30), FontWeight.w600),
16, const Color(0xFF2D2E30), FontWeight.w600),
), ),
), ),
const SizedBox(height: 20), const SizedBox(height: 20),
@ -304,7 +303,7 @@ class _SourceLocationState extends State<SourceLocation> {
), ),
), ),
), ),
const SizedBox(height: 12), const SizedBox(height: 16),
], ],
), ),
), ),
@ -401,8 +400,7 @@ class _SourceLocationState extends State<SourceLocation> {
padding: const EdgeInsets.fromLTRB(20, 10, 20, 24), padding: const EdgeInsets.fromLTRB(20, 10, 20, 24),
children: [ children: [
Text("Step $currentStep/5", Text("Step $currentStep/5",
style: fontTextStyle( style: fontTextStyle(16, Color(0xFFC3C4C4), FontWeight.w500)),
16, const Color(0xFFC3C4C4), FontWeight.w500)),
const SizedBox(height: 16), const SizedBox(height: 16),
Row( Row(
children: List.generate(5, (index) { children: List.generate(5, (index) {
@ -420,18 +418,16 @@ class _SourceLocationState extends State<SourceLocation> {
}), }),
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
Text("SOURCE LOCATION", Text("SOURCE LOCATIONS",
style: fontTextStyle( style: fontTextStyle(20, Color(0xFF515253), FontWeight.w600)),
20, const Color(0xFF515253), FontWeight.w600)), const SizedBox(height: 6),
const SizedBox(height: 16),
Align( Align(
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
child: Image.asset('images/truck.png', width: 24, height: 24), child: Image.asset('images/truck.png', width: 24, height: 24),
), ),
const SizedBox(height: 16), const SizedBox(height: 16),
Text("Add your source location", Text("Add your source location",
style: fontTextStyle( style: fontTextStyle(14, Color(0xFF939495), FontWeight.w500)),
14, const Color(0xFF939495), FontWeight.w500)),
const SizedBox(height: 16), const SizedBox(height: 16),
// List of saved locations // List of saved locations
@ -496,10 +492,7 @@ class _SourceLocationState extends State<SourceLocation> {
), ),
child: Text( child: Text(
"Address: ${d.address ?? 'N/A'}", "Address: ${d.address ?? 'N/A'}",
style: fontTextStyle( style: fontTextStyle(12, Color(0xFF646566), FontWeight.w400),
12,
const Color(0xFF646566),
FontWeight.w400),
), ),
), ),
], ],
@ -518,7 +511,7 @@ class _SourceLocationState extends State<SourceLocation> {
14, const Color(0xFF646566), FontWeight.w600), 14, const Color(0xFF646566), FontWeight.w600),
), ),
), ),
const SizedBox(height: 12), const SizedBox(height: 16),
ElevatedButton( ElevatedButton(
style: ElevatedButton.styleFrom( style: ElevatedButton.styleFrom(
backgroundColor: const Color(0xFF8270DB), backgroundColor: const Color(0xFF8270DB),
@ -532,7 +525,7 @@ class _SourceLocationState extends State<SourceLocation> {
}, },
child: Text("Continue", child: Text("Continue",
style: fontTextStyle( style: fontTextStyle(
14, Colors.white, FontWeight.w400)), 14, Color(0xFFFFFFFF), FontWeight.w600)),
), ),
], ],
), ),

Write Preview
Loading…
Cancel
Save