assistant employee improvements

design_3.0_latest
Sikander Saleem 1 year ago
parent f20929b1dc
commit f3695b90fb

@ -34,7 +34,7 @@ class FirebaseNotificationManger {
h_push.Push.getTokenStream.listen((hToken) { h_push.Push.getTokenStream.listen((hToken) {
// onToken(token); // onToken(token);
print("Huawei Token: ${hToken}"); // print("Huawei Token: ${hToken}");
token = hToken; token = hToken;
}, onError: (e) { }, onError: (e) {
print( "Huawei TokenError"+e.toString()); print( "Huawei TokenError"+e.toString());
@ -57,7 +57,7 @@ class FirebaseNotificationManger {
} catch (ex) {} } catch (ex) {}
} }
} }
print("pushToken:$token"); //print("pushToken:$token");
} }
static void _onMessageReceived(h_push.RemoteMessage remoteMessage) { static void _onMessageReceived(h_push.RemoteMessage remoteMessage) {

@ -6,7 +6,6 @@ import 'package:test_sa/extensions/int_extensions.dart';
import 'package:test_sa/extensions/string_extensions.dart'; import 'package:test_sa/extensions/string_extensions.dart';
import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/text_extensions.dart';
import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/models/helper_data_models/maintenance_request/activity_maintenance_model.dart';
import 'package:test_sa/models/new_models/work_order_detail_model.dart'; import 'package:test_sa/models/new_models/work_order_detail_model.dart';
import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/new_views/app_style/app_color.dart';
import 'package:test_sa/new_views/common_widgets/app_text_form_field.dart'; import 'package:test_sa/new_views/common_widgets/app_text_form_field.dart';
@ -22,7 +21,6 @@ class AssistantEmployeeCard extends StatefulWidget {
} }
class _AssistantEmployeeCardState extends State<AssistantEmployeeCard> { class _AssistantEmployeeCardState extends State<AssistantEmployeeCard> {
bool status = false; bool status = false;
final TextEditingController _workingHoursController = TextEditingController(text: ''); final TextEditingController _workingHoursController = TextEditingController(text: '');
bool isCurrentUserIsAssistantEmp = false; bool isCurrentUserIsAssistantEmp = false;
@ -65,14 +63,16 @@ class _AssistantEmployeeCardState extends State<AssistantEmployeeCard> {
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
context.translation.assistantEmployee.bodyText(context).custom(color: AppColor.black20), context.translation.assistantEmployee.bodyText(context).custom(color: AppColor.black20),
IconButton(onPressed: (){ Icon(isExpanded ? Icons.arrow_drop_up_outlined : Icons.arrow_drop_down),
],
),
).onPress(() {
setState(() { setState(() {
isExpanded=!isExpanded; isExpanded = !isExpanded;
}); });
}, icon: Icon(isExpanded?Icons.arrow_drop_up_outlined:Icons.arrow_drop_down)), }),
],), isExpanded
), ? Column(
isExpanded? Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
ServiceReportAssistantEmployeeMenu( ServiceReportAssistantEmployeeMenu(
@ -90,8 +90,7 @@ class _AssistantEmployeeCardState extends State<AssistantEmployeeCard> {
requestDetailProvider.activityMaintenanceHelperModel?.assistantEmployees = []; requestDetailProvider.activityMaintenanceHelperModel?.assistantEmployees = [];
} else { } else {
requestDetailProvider.activityMaintenanceHelperModel?.assistantEmployees = [employee.copyWith(id: 0)]; requestDetailProvider.activityMaintenanceHelperModel?.assistantEmployees = [employee.copyWith(id: 0)];
requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.user= AssignedEmployee(userId: employee.user?.id,userName:employee.user?.name ); requestDetailProvider.activityMaintenanceHelperModel?.modelAssistantEmployees?.user = AssignedEmployee(userId: employee.user?.id, userName: employee.user?.name);
} }
}, },
), ),
@ -194,10 +193,10 @@ class _AssistantEmployeeCardState extends State<AssistantEmployeeCard> {
), ),
8.height, 8.height,
], ],
):const SizedBox(), )
: const SizedBox(),
], ],
); );
}); });
} }
@ -205,7 +204,7 @@ class _AssistantEmployeeCardState extends State<AssistantEmployeeCard> {
double calculateWorkingHours(DateTime? startTime, DateTime? endTime) { double calculateWorkingHours(DateTime? startTime, DateTime? endTime) {
if (startTime != null && endTime != null) { if (startTime != null && endTime != null) {
Duration difference = endTime.difference(startTime); Duration difference = endTime.difference(startTime);
int hours = difference.inHours ; int hours = difference.inHours;
int minutes = difference.inMinutes % 60; int minutes = difference.inMinutes % 60;
return hours.toDouble(); return hours.toDouble();
} else { } else {

@ -1,26 +1,20 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:fluttertoast/fluttertoast.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:test_sa/controllers/providers/api/service_requests_provider.dart'; import 'package:test_sa/controllers/providers/api/service_requests_provider.dart';
import 'package:test_sa/controllers/providers/api/status_drop_down/report/service_report_repair_location_provider.dart'; import 'package:test_sa/controllers/providers/api/status_drop_down/report/service_report_repair_location_provider.dart';
import 'package:test_sa/controllers/providers/api/user_provider.dart';
import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/context_extension.dart';
import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/int_extensions.dart';
import 'package:test_sa/extensions/string_extensions.dart'; import 'package:test_sa/extensions/string_extensions.dart';
import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/text_extensions.dart';
import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/models/helper_data_models/maintenance_request/activity_maintenance_model.dart';
import 'package:test_sa/models/service_request/service_report.dart'; import 'package:test_sa/models/service_request/service_report.dart';
import 'package:test_sa/models/service_request/service_request.dart'; import 'package:test_sa/models/service_request/service_request.dart';
import 'package:test_sa/new_views/app_style/app_color.dart'; import 'package:test_sa/new_views/app_style/app_color.dart';
import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
import 'package:test_sa/providers/service_request_providers/last_situation_provider.dart'; import 'package:test_sa/providers/service_request_providers/last_situation_provider.dart';
import 'package:test_sa/providers/work_order/activity_status_provider.dart'; import 'package:test_sa/providers/work_order/activity_status_provider.dart';
import 'package:test_sa/service_request_latest/request_detail_provider.dart'; import 'package:test_sa/service_request_latest/request_detail_provider.dart';
import 'package:test_sa/service_request_latest/views/components/action_button/footer_action_button.dart';
import 'package:test_sa/service_request_latest/views/forms/maintenance_request/components/assistant_employee_card.dart'; import 'package:test_sa/service_request_latest/views/forms/maintenance_request/components/assistant_employee_card.dart';
import 'package:test_sa/views/widgets/date_and_time/date_picker.dart'; import 'package:test_sa/views/widgets/date_and_time/date_picker.dart';
import 'package:test_sa/views/widgets/loaders/loading_manager.dart';
import '../../../../../controllers/providers/api/status_drop_down/report/service_types_provider.dart'; import '../../../../../controllers/providers/api/status_drop_down/report/service_types_provider.dart';
import '../../../../../models/lookup.dart'; import '../../../../../models/lookup.dart';
@ -101,8 +95,10 @@ class _InternalMaintenanceRequestState extends State<InternalMaintenanceRequest>
showAsBottomSheet: true, showAsBottomSheet: true,
initialValue: requestDetailProvider.activityMaintenanceHelperModel?.lastSituation, initialValue: requestDetailProvider.activityMaintenanceHelperModel?.lastSituation,
onSelect: (status) { onSelect: (status) {
if (status != null) {
requestDetailProvider.activityMaintenanceHelperModel?.lastSituation = status; requestDetailProvider.activityMaintenanceHelperModel?.lastSituation = status;
setState(() {}); setState(() {});
}
}, },
), ),
8.height, 8.height,

@ -1,7 +1,11 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/context_extension.dart';
import'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/int_extensions.dart';
import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/text_extensions.dart';
import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/models/base.dart';
import 'package:test_sa/providers/loading_list_notifier.dart';
import 'package:test_sa/views/widgets/bottom_sheets/selection_bottom_sheet.dart';
import '../../../models/new_models/assistant_employee.dart'; import '../../../models/new_models/assistant_employee.dart';
import '../../../new_views/app_style/app_color.dart'; import '../../../new_views/app_style/app_color.dart';
@ -13,22 +17,25 @@ class AssistantEmployeeMenu extends StatefulWidget {
final Function(AssistantEmployees?) onSelect; // Now accepts nullable values final Function(AssistantEmployees?) onSelect; // Now accepts nullable values
final String? title; // Now nullable final String? title; // Now nullable
final bool enable; final bool enable;
final bool showAsBottomSheet;
AssistantEmployeeMenu({Key? key, required this.statuses, this.title, required this.onSelect, this.initialStatus,this.backgroundColor, this.enable = true}) : super(key: key); AssistantEmployeeMenu({Key? key, required this.statuses, this.title, this.showAsBottomSheet = false, required this.onSelect, this.initialStatus, this.backgroundColor, this.enable = true})
: super(key: key);
@override @override
_SingleAssistantEmployeeMenuState createState() => _SingleAssistantEmployeeMenuState(); _SingleAssistantEmployeeMenuState createState() => _SingleAssistantEmployeeMenuState();
} }
class _SingleAssistantEmployeeMenuState extends State<AssistantEmployeeMenu> {AssistantEmployees? _selectedStatus; // Now nullable class _SingleAssistantEmployeeMenuState extends State<AssistantEmployeeMenu> {
AssistantEmployees? _selectedStatus; // Now nullable
@override @override
void setState(VoidCallback fn) { void setState(VoidCallback fn) {
if (mounted) super.setState(fn); if (mounted) super.setState(fn);
} }
@override @override
void didUpdateWidget(covariant AssistantEmployeeMenu oldWidget) { void didUpdateWidget(covariant AssistantEmployeeMenu oldWidget) {
if (widget.initialStatus != null) { if (widget.initialStatus != null) {
final result = widget.statuses.where((element) => element.user?.id == widget.initialStatus?.user?.id); final result = widget.statuses.where((element) => element.user?.id == widget.initialStatus?.user?.id);
if (result.isNotEmpty) { if (result.isNotEmpty) {
@ -43,10 +50,10 @@ void didUpdateWidget(covariant AssistantEmployeeMenu oldWidget) {
_selectedStatus = null; _selectedStatus = null;
} }
super.didUpdateWidget(oldWidget); super.didUpdateWidget(oldWidget);
} }
@override @override
void initState() { void initState() {
if (widget.initialStatus != null) { if (widget.initialStatus != null) {
final result = widget.statuses.where((element) => element.user?.id == widget.initialStatus?.user?.id); final result = widget.statuses.where((element) => element.user?.id == widget.initialStatus?.user?.id);
if (result.isNotEmpty) { if (result.isNotEmpty) {
@ -57,15 +64,15 @@ void initState() {
} }
} }
super.initState(); super.initState();
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
height: 60.toScreenHeight, height: 60.toScreenHeight,
padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth), padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth),
decoration: BoxDecoration( decoration: BoxDecoration(
color:widget.backgroundColor ?? (context.isDark ? AppColor.neutral50 : AppColor.neutral120), color: widget.backgroundColor ?? (context.isDark ? AppColor.neutral50 : AppColor.neutral120),
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(10),
boxShadow: [BoxShadow(color: Colors.black.withOpacity(0.05), blurRadius: 10)], boxShadow: [BoxShadow(color: Colors.black.withOpacity(0.05), blurRadius: 10)],
), ),
@ -102,14 +109,15 @@ Widget build(BuildContext context) {
), ),
style: AppTextStyles.bodyText2.copyWith(color: AppColor.black20), style: AppTextStyles.bodyText2.copyWith(color: AppColor.black20),
underline: const SizedBox.shrink(), underline: const SizedBox.shrink(),
onChanged: widget.enable onChanged: (widget.enable == false || widget.showAsBottomSheet)
? (AssistantEmployees? newValue) { // Now accepts nullable values ? null
: (AssistantEmployees? newValue) {
// Now accepts nullable values
setState(() { setState(() {
_selectedStatus = newValue; _selectedStatus = newValue;
}); });
widget.onSelect(newValue); widget.onSelect(newValue);
} },
:null,
items: widget.statuses.map<DropdownMenuItem<AssistantEmployees>>( items: widget.statuses.map<DropdownMenuItem<AssistantEmployees>>(
(AssistantEmployees value) { (AssistantEmployees value) {
return DropdownMenuItem<AssistantEmployees>( return DropdownMenuItem<AssistantEmployees>(
@ -121,11 +129,37 @@ Widget build(BuildContext context) {
); );
}, },
).toList(), ).toList(),
).onPress(widget.showAsBottomSheet
? () async {
final selectedT = await showModalBottomSheet<AssistantEmployees?>(
// Specify return type
context: context,
isScrollControlled: true,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(
top: Radius.circular(20),
),
),
clipBehavior: Clip.antiAliasWithSaveLayer,
builder: (BuildContext context) => SelectionBottomSheet<AssistantEmployees>(
items: widget.statuses,
selectedItem: _selectedStatus,
title: "Select",
builderString: (emp) => emp?.name ?? "", // Null-aware operator for emp.name
), ),
);
if (selectedT != null) {
setState(() {
_selectedStatus = selectedT;
});
widget.onSelect(selectedT); // Non-null assertion after null check
}
}
: null),
], ],
), ),
], ],
), ),
); );
} }
} }

@ -30,6 +30,7 @@ class ServiceReportAssistantEmployeeMenu extends StatelessWidget {
child: AssistantEmployeeMenu( child: AssistantEmployeeMenu(
initialStatus: initialValue, initialStatus: initialValue,
title: title, title: title,
showAsBottomSheet: true,
statuses: menuProvider.assistantEmployees ?? [], statuses: menuProvider.assistantEmployees ?? [],
backgroundColor: backgroundColor, backgroundColor: backgroundColor,
// Provide an empty list if null // Provide an empty list if null

Loading…
Cancel
Save