stop working hide for nurse.

design_3.0_latest
Sikander Saleem 12 months ago
parent 8fe01adcb0
commit edd22bf4af

@ -3,7 +3,8 @@ class URLs {
static const String appReleaseBuildNumber = "14"; static const String appReleaseBuildNumber = "14";
// static const host1 = "https://atomsm.hmg.com"; // production url // static const host1 = "https://atomsm.hmg.com"; // production url
static const host1 = "https://atomsmdev.hmg.com"; // local UAT url static const host1 = "https://atomsmdev.hmg.com"; // local DEV url
// static const host1 = "https://atomsmuat.hmg.com"; // local UAT url
// static String _baseUrl = "$_host/mobile"; // static String _baseUrl = "$_host/mobile";
static final String _baseUrl = "$_host/v2/mobile"; // new V2 apis static final String _baseUrl = "$_host/v2/mobile"; // new V2 apis

@ -79,7 +79,6 @@ class FirebaseNotificationManger {
} }
static void handleMessage(context, Map<String, dynamic> messageData) { static void handleMessage(context, Map<String, dynamic> messageData) {
print('message data i got is ${messageData}');
if (messageData["requestType"] != null && messageData["requestNumber"] != null) { if (messageData["requestType"] != null && messageData["requestNumber"] != null) {
Widget? serviceClass; Widget? serviceClass;

@ -154,7 +154,6 @@ class PpmProvider extends ChangeNotifier {
Response response = await ApiManager.instance.get(URLs.getPlanPreventiveVisitById + "?planPreventiveVisitId=$id"); Response response = await ApiManager.instance.get(URLs.getPlanPreventiveVisitById + "?planPreventiveVisitId=$id");
if (response.statusCode >= 200 && response.statusCode < 300) { if (response.statusCode >= 200 && response.statusCode < 300) {
planPreventiveVisit = PlanPreventiveVisit.fromJson(json.decode(response.body)["data"]); planPreventiveVisit = PlanPreventiveVisit.fromJson(json.decode(response.body)["data"]);
print('data i got is ${planPreventiveVisit?.toJson(status: 0)}');
isLoading = false; isLoading = false;
notifyListeners(); notifyListeners();
return planPreventiveVisit; return planPreventiveVisit;

@ -1,11 +1,13 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:test_sa/controllers/api_routes/urls.dart'; import 'package:test_sa/controllers/api_routes/urls.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/enums/user_types.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/service_request_latest/service_request_detail_provider.dart'; import 'package:test_sa/service_request_latest/service_request_detail_provider.dart';
@ -41,6 +43,10 @@ class HistoryLogView extends StatelessWidget {
String lastStatus = ""; String lastStatus = "";
DateTime? nextDate; DateTime? nextDate;
var workOrderHistory = requestProvider.currentWorkOrder!.data!.workOrderHistory; var workOrderHistory = requestProvider.currentWorkOrder!.data!.workOrderHistory;
bool isNurse = (Provider.of<UserProvider>(context, listen: false).user?.type) == UsersTypes.normal_user;
if(isNurse) {
workOrderHistory.removeWhere((element)=>element.step?.id==5617);
}
for (int i = 0; i < workOrderHistory.length; i++) { for (int i = 0; i < workOrderHistory.length; i++) {
var object = workOrderHistory[i]; var object = workOrderHistory[i];
String currentStatus = object.workorderStatus!.name!; String currentStatus = object.workorderStatus!.name!;

@ -49,7 +49,7 @@ class _MaintenanceRequestFormState extends State<MaintenanceRequestForm> with Si
bool isUpdate = requestDetailProvider.activityMaintenanceHelperModel?.id != 0; bool isUpdate = requestDetailProvider.activityMaintenanceHelperModel?.id != 0;
return Scaffold( return Scaffold(
backgroundColor: AppColor.neutral110, backgroundColor: AppColor.neutral110,
appBar: DefaultAppBar(title: isUpdate ? "Update Activity" : "New Activity"), appBar: const DefaultAppBar(title: "CM Activity"),
body: Stack( body: Stack(
children: [ children: [
DefaultTabController( DefaultTabController(
@ -98,7 +98,7 @@ class _MaintenanceRequestFormState extends State<MaintenanceRequestForm> with Si
buttonColor: AppColor.primary10, buttonColor: AppColor.primary10,
onPressed: () async { onPressed: () async {
//TODO add this as dropdown not added in design yet Bhaa need to confirm with hussain then. //TODO add this as dropdown not added in design yet Bhaa need to confirm with hussain then.
requestDetailProvider.activityMaintenanceHelperModel?.lastSituationId = 282; // requestDetailProvider.activityMaintenanceHelperModel?.lastSituationId = 282;
if (validate(model: requestDetailProvider.activityMaintenanceHelperModel!)) { if (validate(model: requestDetailProvider.activityMaintenanceHelperModel!)) {
requestDetailProvider.activityMaintenanceHelperModel?.activityMaintenanceTimers = requestDetailProvider.activityMaintenanceHelperModel?.activityMaintenanceTimers ?? []; requestDetailProvider.activityMaintenanceHelperModel?.activityMaintenanceTimers = requestDetailProvider.activityMaintenanceHelperModel?.activityMaintenanceTimers ?? [];

@ -53,7 +53,6 @@ class _UpdatePpmState extends State<UpdatePpm> with TickerProviderStateMixin {
ppmProvider.planPreventiveVisit?.preventiveVisitAttachments ppmProvider.planPreventiveVisit?.preventiveVisitAttachments
?.add(PreventiveVisitAttachments(id: 0, attachmentName: ServiceRequestUtils.isLocalUrl(item.path) ? "${item.path.split("/").last}|${base64Encode(item.readAsBytesSync())}" : item.path)); ?.add(PreventiveVisitAttachments(id: 0, attachmentName: ServiceRequestUtils.isLocalUrl(item.path) ? "${item.path.split("/").last}|${base64Encode(item.readAsBytesSync())}" : item.path));
} }
log('data i got is ${ppmProvider.planPreventiveVisit?.toJson(status: status)}');
ppmProvider.planPreventiveVisit?.preventiveVisitTimers = ppmProvider.planPreventiveVisit?.preventiveVisitTimers ?? []; ppmProvider.planPreventiveVisit?.preventiveVisitTimers = ppmProvider.planPreventiveVisit?.preventiveVisitTimers ?? [];
ppmProvider.planPreventiveVisit?.timerModelList?.forEach((timer) { ppmProvider.planPreventiveVisit?.timerModelList?.forEach((timer) {

@ -46,7 +46,6 @@ class _RequestApprovalBottomState extends State<RequestApprovalBottomSheet> {
// }); // });
} else { } else {
FirebaseMessaging.onMessage.listen((RemoteMessage message) { FirebaseMessaging.onMessage.listen((RemoteMessage message) {
print('message data i got is ${message.toMap()}');
ConfirmArrivalNotificationModel notificationModel = ConfirmArrivalNotificationModel.fromJson(message.data); ConfirmArrivalNotificationModel notificationModel = ConfirmArrivalNotificationModel.fromJson(message.data);
if(notificationModel.requestId!=null&&notificationModel.accept!=null){ if(notificationModel.requestId!=null&&notificationModel.accept!=null){
if(notificationModel.accept=='True'){ if(notificationModel.accept=='True'){

Loading…
Cancel
Save