merge conflict resolve.

design_3.0_internal_audit_module
Sikander Saleem 1 year ago
parent 69ae0147bb
commit c6d8c299f7

@ -353,7 +353,6 @@ class RequestDetailProvider extends ChangeNotifier {
}; };
isLoading = true; isLoading = true;
final response = await ApiManager.instance.post(URLs.assignEngineerToWorkOrderUrl, body: body); final response = await ApiManager.instance.post(URLs.assignEngineerToWorkOrderUrl, body: body);
final response = await ApiManager.instance.post(URLs.assignEngineerToWorkOrderUrl, body: body);
stateCode = response.statusCode; stateCode = response.statusCode;
if (response.statusCode >= 200 && response.statusCode < 300) { if (response.statusCode >= 200 && response.statusCode < 300) {
CommonResponseModel commonResponseModel = CommonResponseModel.fromJson(json.decode(response.body)); CommonResponseModel commonResponseModel = CommonResponseModel.fromJson(json.decode(response.body));

@ -1,32 +1,29 @@
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/widget_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.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/new_views/common_widgets/app_filled_button.dart';
import 'package:test_sa/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart'; import 'package:test_sa/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart';
class FooterActionButton { class FooterActionButton {
static Widget footerContainer({required Widget child}) {
static Widget footerContainer({required Widget child}){
return Align( return Align(
alignment: Alignment.bottomCenter, alignment: Alignment.bottomCenter,
child: Container( child: Container(
padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth,vertical: 16.toScreenHeight), padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 16.toScreenHeight),
color: AppColor.white10, color: AppColor.white10,
child: child, child: child,
), ),
); );
} }
static Widget requestDetailsFooterWidget({required int status,required BuildContext context}){ static Widget requestDetailsFooterWidget({required int status, required BuildContext context}) {
switch(status){ switch (status) {
//accept reject... //accept reject...
case 1: case 1:
return footerContainer( return footerContainer(
child: child: Row(
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
@ -47,18 +44,15 @@ class FooterActionButton {
label: context.translation.accept, label: context.translation.accept,
maxWidth: true, maxWidth: true,
buttonColor: AppColor.green70, buttonColor: AppColor.green70,
onPressed: () async { onPressed: () async {},
},
).expanded, ).expanded,
], ],
) ));
);
break; break;
//need visit fixed remotely //need visit fixed remotely
case 2: case 2:
return footerContainer( return footerContainer(
child: child: Row(
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
@ -82,84 +76,66 @@ class FooterActionButton {
}, },
).expanded, ).expanded,
], ],
) ));
);
break; break;
//verify Asset Details //verify Asset Details
case 3: case 3:
return footerContainer( return footerContainer(
child: child: AppFilledButton(
AppFilledButton(
label: context.translation.verify_asset_details, label: context.translation.verify_asset_details,
// maxWidth: true, // maxWidth: true,
buttonColor: AppColor.primary10, buttonColor: AppColor.primary10,
onPressed: () async { onPressed: () async {},
));
},
)
);
break; break;
//Activities //Activities
case 4: case 4:
return footerContainer( return footerContainer(
child: child: AppFilledButton(
AppFilledButton(
label: context.translation.activities, label: context.translation.activities,
// maxWidth: true, // maxWidth: true,
buttonColor: AppColor.neutral50, buttonColor: AppColor.neutral50,
onPressed: () async { onPressed: () async {
ServiceRequestBottomSheet.activityTypeBottomSheet(context: context); ServiceRequestBottomSheet.activityTypeBottomSheet(context: context);
}, },
) ));
);
break; break;
//I have arrived... //I have arrived...
case 5: case 5:
return footerContainer( return footerContainer(
child: child: AppFilledButton(
AppFilledButton(
label: context.translation.iHaveArrived, label: context.translation.iHaveArrived,
//showIcon: true, //showIcon: true,
// icon: 'arrived_icon'.toSvgAsset(), // icon: 'arrived_icon'.toSvgAsset(),
buttonColor: AppColor.green70, buttonColor: AppColor.green70,
onPressed: () async { onPressed: () async {},
));
},
)
);
break; break;
//Close.. //Close..
case 6: case 6:
return footerContainer( return footerContainer(
child: child: AppFilledButton(
AppFilledButton(
label: context.translation.close, label: context.translation.close,
// maxWidth: true, // maxWidth: true,
buttonColor: AppColor.primary10, buttonColor: AppColor.primary10,
onPressed: () async { onPressed: () async {},
));
},
)
);
break; break;
//for nurse to take action... //for nurse to take action...
case 7: case 7:
return footerContainer( return footerContainer(
child: child: AppFilledButton(
AppFilledButton(
label: context.translation.takeAction, label: context.translation.takeAction,
// maxWidth: true, // maxWidth: true,
buttonColor: AppColor.primary10, buttonColor: AppColor.primary10,
onPressed: () async { onPressed: () async {
ServiceRequestBottomSheet.nurseTakeActionBottomSheet(context: context); ServiceRequestBottomSheet.nurseTakeActionBottomSheet(context: context);
}, },
) ));
);
break; break;
default: default:
return const SizedBox(); return const SizedBox();
} }
} }
} }

@ -19,9 +19,6 @@ 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/components/action_button/footer_action_button.dart';
import 'package:test_sa/service_request_latest/views/components/initial_visit_card.dart'; import 'package:test_sa/service_request_latest/views/components/initial_visit_card.dart';
import 'package:test_sa/service_request_latest/views/components/timer_widget.dart'; import 'package:test_sa/service_request_latest/views/components/timer_widget.dart';
import 'package:test_sa/service_request_latest/views/forms/asset_retired/asset_retired.dart';
import 'package:test_sa/service_request_latest/views/forms/asset_retired/verify_asset_detail.dart';
import 'package:test_sa/service_request_latest/views/forms/maintenance_request/maintenance_request_main.dart';
import 'package:test_sa/service_request_latest/views/nurse/create_new_request_view.dart'; import 'package:test_sa/service_request_latest/views/nurse/create_new_request_view.dart';
import 'package:test_sa/views/pages/user/requests/comments_bottom_sheet.dart'; import 'package:test_sa/views/pages/user/requests/comments_bottom_sheet.dart';
import 'package:test_sa/views/pages/user/requests/update_service_request_page.dart'; import 'package:test_sa/views/pages/user/requests/update_service_request_page.dart';
@ -30,7 +27,7 @@ import 'package:test_sa/views/widgets/loaders/app_loading.dart';
import 'package:test_sa/views/widgets/loaders/no_data_found.dart'; import 'package:test_sa/views/widgets/loaders/no_data_found.dart';
import 'package:test_sa/views/widgets/requests/request_status.dart'; import 'package:test_sa/views/widgets/requests/request_status.dart';
import 'package:test_sa/views/widgets/sound/sound_player.dart'; import 'package:test_sa/views/widgets/sound/sound_player.dart';
import '../forms/spare_part/spare_part_request.dart';
class WorkOrderDetailView extends StatelessWidget { class WorkOrderDetailView extends StatelessWidget {
WorkOrderDetailView({Key? key}) : super(key: key); WorkOrderDetailView({Key? key}) : super(key: key);
@ -63,7 +60,7 @@ class WorkOrderDetailView extends StatelessWidget {
], ],
), ),
).expanded, ).expanded,
FooterActionButton.footerWidget(status: 1, context: context), FooterActionButton.requestDetailsFooterWidget(status: 1, context: context),
], ],
), ),
const TimerWidget(), const TimerWidget(),
@ -312,8 +309,6 @@ class _RequestDetailViewState extends State<RequestDetailView> {
}); });
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
UserProvider _userProvider = Provider.of<UserProvider>(context, listen: false); UserProvider _userProvider = Provider.of<UserProvider>(context, listen: false);
@ -334,7 +329,6 @@ class _RequestDetailViewState extends State<RequestDetailView> {
} }
Widget requestDetailCard({required ServiceRequestsProvider serviceRequestsProvider, required UserProvider userProvider}) { Widget requestDetailCard({required ServiceRequestsProvider serviceRequestsProvider, required UserProvider userProvider}) {
return SafeArea( return SafeArea(
child: serviceRequestsProvider.isDetialLoading child: serviceRequestsProvider.isDetialLoading
? const ALoading().center ? const ALoading().center
@ -584,7 +578,7 @@ class _RequestDetailViewState extends State<RequestDetailView> {
showBorder: true, showBorder: true,
onPressed: () async { onPressed: () async {
// Navigator.push(context, MaterialPageRoute(builder: (context) => AssetRetired())); // Navigator.push(context, MaterialPageRoute(builder: (context) => AssetRetired()));
Navigator.push(context, MaterialPageRoute(builder: (context) => const CreateNewRequest())); Navigator.push(context, MaterialPageRoute(builder: (context) => CreateNewRequest()));
}), }),
); );
} }

@ -1,22 +1,18 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:test_sa/dashboard_latest/dashboard_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/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/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/default_app_bar.dart'; import 'package:test_sa/new_views/common_widgets/default_app_bar.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/history_log_view.dart'; import 'package:test_sa/service_request_latest/views/components/history_log_view.dart';
import 'package:test_sa/service_request_latest/views/components/initial_visit_card.dart';
import 'components/request_detail_view.dart'; import 'components/request_detail_view.dart';
class RequestDetailMain extends StatefulWidget { class RequestDetailMain extends StatefulWidget {
final int requestId; final int requestId;
const RequestDetailMain({Key? key, required this.requestId}) : super(key: key);
RequestDetailMain({Key? key, required this.requestId}) : super(key: key); RequestDetailMain({Key? key, required this.requestId}) : super(key: key);

Loading…
Cancel
Save