Haroon6138
/
cloudsolutions-atoms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

ready for testing

Browse Source
design_3.0_sdk_upgrade
muhammad.abbasi 3 days ago
parent 3c03ef2e34
commit 388761a8aa
2 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File

48
lib/dashboard_latest/widgets/request_category_fragment.dart
Unescape Escape View File

@ -22,29 +22,31 @@ class RequestCategoryFragment extends StatelessWidget {
return Consumer<DashBoardProvider>(builder: (context, dashboardProvider, child) {
bool isNurse = (Provider.of<UserProvider>(context, listen: false).user?.type) == UsersTypes.normal_user;
return Column(mainAxisSize: MainAxisSize.min, crossAxisAlignment: CrossAxisAlignment.start, children: <Widget>[
!isNurse
? Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
context.translation.allWorkOrder.heading4(context),
GestureDetector(
onTap: () {
dashboardProvider.isShowDashBoardCalendar = !dashboardProvider.isShowDashBoardCalendar;
},
child: dashboardProvider.isShowDashBoardCalendar ? AppAsset.listIcon.toSvgAsset() : AppAsset.calendarIcon.toSvgAsset())
],
),
dashboardProvider.isShowDashBoardCalendar
? Padding(
padding: EdgeInsets.only(top: 12.toScreenHeight),
child: const WeeklyCalendarFragment(),
)
: const SizedBox(),
],
).paddingOnly(start: 16, end: 16)
: context.translation.allWorkOrder.heading4(context).paddingOnly(start: 16, end: 16),
//TODO uncommit this to get the calendar card..
// !isNurse
// ? Column(
// children: [
// Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
// children: [
// context.translation.allWorkOrder.heading4(context),
// GestureDetector(
// onTap: () {
// dashboardProvider.isShowDashBoardCalendar = !dashboardProvider.isShowDashBoardCalendar;
// },
// child: dashboardProvider.isShowDashBoardCalendar ? AppAsset.listIcon.toSvgAsset() : AppAsset.calendarIcon.toSvgAsset())
// ],
// ),
// dashboardProvider.isShowDashBoardCalendar
// ? Padding(
// padding: EdgeInsets.only(top: 12.toScreenHeight),
// child: const WeeklyCalendarFragment(),
// )
// : const SizedBox(),
// ],
// ).paddingOnly(start: 16, end: 16)
// :
context.translation.allWorkOrder.heading4(context).paddingOnly(start: 16, end: 16),
getTabs(
requestsProvider: dashboardProvider,
context: context,

28
lib/service_request_latest/views/components/bottom_sheets/service_request_bottomsheet.dart
Unescape Escape View File

@ -282,20 +282,20 @@ class ServiceRequestBottomSheet {
buttonColor: AppColor.primary10,
loading: false,
onPressed: () async {
// if (requestDetailProvider.currentWorkOrder?.data?.nextStep!.workOrderNextStepEnum == WorkOrderNextStepEnum.eArrived) {
// requestDetailProvider.updateNeedVisitHelperModel(NeedVisitHelperModel(
// workOrderId: requestDetailProvider.needVisitHelperModel?.workOrderId,
// visitDate: requestDetailProvider.needVisitHelperModel?.visitDate,
// comment: requestDetailProvider.needVisitHelperModel?.comment,
// ));
// requestDetailProvider.engineerUpdateNeedVisit();
// } else {
// requestDetailProvider.needVisitHelperModel?.workOrderId = requestDetailProvider.currentWorkOrder!.data!.requestId;
// requestDetailProvider.engineerNeedVisit();
// requestDetailProvider.needVisitHelperModel = NeedVisitHelperModel();
// }
Navigator.pop(context);
initialVisitReminderBottomSheet(context: context);
if (requestDetailProvider.currentWorkOrder?.data?.nextStep!.workOrderNextStepEnum == WorkOrderNextStepEnum.eArrived) {
requestDetailProvider.updateNeedVisitHelperModel(NeedVisitHelperModel(
workOrderId: requestDetailProvider.needVisitHelperModel?.workOrderId,
visitDate: requestDetailProvider.needVisitHelperModel?.visitDate,
comment: requestDetailProvider.needVisitHelperModel?.comment,
));
requestDetailProvider.engineerUpdateNeedVisit();
} else {
requestDetailProvider.needVisitHelperModel?.workOrderId = requestDetailProvider.currentWorkOrder!.data!.requestId;
requestDetailProvider.engineerNeedVisit();
requestDetailProvider.needVisitHelperModel = NeedVisitHelperModel();
}
Navigator.pop(context);
// initialVisitReminderBottomSheet(context: context);
//
},
),

Write Preview
Loading…
Cancel
Save