Compare commits

..

No commits in common. 'c4f4af7e63e884429cab75340bc0a347c6324419' and '92e704a1b42caedc8e9820e30c47b710e78ec9ed' have entirely different histories.

@ -51,7 +51,7 @@ class _ResourcesDriverScreenState extends State<ResourcesDriverScreen> {
String search = '';
bool isLoading = false;
List<DriversModel> driversList = [];
String selectedStatus = "all";
// ---------- form (bottom sheet) ----------
final GlobalKey<FormState> _formKey = GlobalKey<FormState>();
@ -1319,27 +1319,6 @@ class _ResourcesDriverScreenState extends State<ResourcesDriverScreen> {
bool matchesFilter = true;
// Top metric click filter
if(selectedStatus != "all"){
if(selectedStatus == "delivery"){
matchesFilter =
it.status.toLowerCase().trim() == "on delivery";
}
if(selectedStatus == "available"){
matchesFilter =
it.status.toLowerCase().trim() == "available";
}
if(selectedStatus == "offline"){
matchesFilter =
it.status.toLowerCase().trim() == "offline";
}
}
// Menu filter
if(selectedFilter!=null){
matchesFilter =
@ -1429,58 +1408,29 @@ class _ResourcesDriverScreenState extends State<ResourcesDriverScreen> {
child: IntrinsicHeight(
child: Row(
children: [
Expanded(
child: GestureDetector(
onTap: (){
setState(() {
selectedStatus = "delivery";
selectedFilter = null;
});
},
child: SmallMetricBox(
title: 'On delivery',
value: onDeliveryCount.toString(),
),
),
),
const SizedBox(width: 8),
Expanded(
child: GestureDetector(
onTap: (){
setState(() {
selectedStatus = "available";
selectedFilter = null;
});
},
child: SmallMetricBox(
title: 'Available',
value: availableCount.toString(),
),
),
),
const SizedBox(width: 8),
Expanded(
child: GestureDetector(
onTap: (){
setState(() {
selectedStatus = "offline";
selectedFilter = null;
});
},
child: SmallMetricBox(
title: 'Offline',
value: offlineCount.toString(),
),
),
),
],
),
),
),

@ -1553,7 +1553,6 @@ class _ResourcesFleetScreenState extends State<ResourcesFleetScreen> {
onTap: (){
setState(() {
selectedFilter = "Maintenance";
});
},
child: SmallMetricBox(

@ -88,7 +88,6 @@ class _ResourcesSourceScreenState extends State<ResourcesSourceScreen> {
int selectedTab = 2;
String search = '';
bool isLoading = false;
String selectedWaterFilter = "all";
List<SourceLocationsModel> sourceLocationsList = [];
// ---------- Form state (bottom sheet) ----------
@ -717,16 +716,6 @@ class _ResourcesSourceScreenState extends State<ResourcesSourceScreen> {
bool matchesFilter = true;
// Top metric filter
if(selectedWaterFilter != "all"){
matchesFilter =
it.water_type.toLowerCase().trim() ==
selectedWaterFilter;
}
// Menu filter
if(selectedFilter!=null){
matchesFilter =
@ -824,58 +813,29 @@ class _ResourcesSourceScreenState extends State<ResourcesSourceScreen> {
child: Row(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Expanded(
child: GestureDetector(
onTap: (){
setState(() {
selectedWaterFilter = "drinking water";
selectedFilter = null;
});
},
child: SmallMetricBox(
title: 'Drinking water',
value: drinkingCount.toString(),
),
),
),
const SizedBox(width: 8),
Expanded(
child: GestureDetector(
onTap: (){
setState(() {
selectedWaterFilter = "bore water";
selectedFilter = null;
});
},
child: SmallMetricBox(
title: 'Bore water',
value: boreCount.toString(),
),
),
),
const SizedBox(width: 8),
Expanded(
child: GestureDetector(
onTap: (){
setState(() {
selectedWaterFilter = "both";
selectedFilter = null;
});
},
child: SmallMetricBox(
title: 'Both',
value: bothCount.toString(),
),
),
),
],
),
),
],
),

Loading…
Cancel
Save