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

Merge remote-tracking branch 'origin/design_3.0_task_module_new_merge' into design_3.0_task_module_new_merge

Browse Source
design_3.0_TM_Module_snagsFix
WaseemAbbasi22 2 months ago
parent bbc4974458 df66cf5c77
commit b45035a35f
3 changed files with 254 additions and 255 deletions
Show Stats Download Patch File Download Diff File

14
lib/modules/cm_module/views/components/action_button/footer_action_button.dart
Unescape Escape View File

@ -23,10 +23,10 @@ import 'package:test_sa/new_views/swipe_module/dialoge/acknowledge_work_dialog.d
import 'package:test_sa/providers/service_request_providers/reject_reason_provider.dart';
class FooterActionButton {
static Widget footerContainer({required Widget child,required BuildContext context}) {
static Widget footerContainer({required Widget child, required BuildContext context}) {
return Container(
alignment: Alignment.bottomCenter,
padding: const EdgeInsets.only(left: 16, right: 16, top: 12,bottom: 8),
padding: const EdgeInsets.only(left: 16, right: 16, top: 12, bottom: 8),
color: AppColor.background(context),
child: SafeArea(child: child),
);
@ -92,7 +92,7 @@ class FooterActionButton {
context: context,
child: AppFilledButton(
label: context.translation.activities,
buttonColor: context.isDark? AppColor.primary10:AppColor.neutral50,
buttonColor: context.isDark ? AppColor.primary10 : AppColor.neutral50,
textColor: context.isDark ? AppColor.black10 : Colors.white,
onPressed: () async {
Navigator.push(context, MaterialPageRoute(builder: (context) => const ActivitiesListView()));
@ -120,7 +120,7 @@ class FooterActionButton {
AppFilledButton(
label: context.translation.reject,
maxWidth: true,
buttonColor:AppColor.background(context),
buttonColor: AppColor.background(context),
// textColor: context.isDark ? AppColor.neutral30 : Colors.white,
textColor: AppColor.red30,
showBorder: true,
@ -208,7 +208,7 @@ class FooterActionButton {
AppFilledButton(
label: context.translation.activities,
textColor: context.isDark ? AppColor.black10 : Colors.white,
buttonColor: context.isDark? AppColor.primary10:AppColor.neutral50,
buttonColor: context.isDark ? AppColor.primary10 : AppColor.neutral50,
onPressed: () async {
// ServiceRequestBottomSheet.activityTypeBottomSheet(context: context);
Navigator.push(context, MaterialPageRoute(builder: (context) => const ActivitiesListView()));
@ -254,7 +254,7 @@ class FooterActionButton {
child: AppFilledButton(
label: context.translation.assetRetiredPendingOpManagementApproval,
buttonColor: AppColor.background(context),
textColor: context.isDark ? Colors.white: AppColor.neutral150,
textColor: context.isDark ? Colors.white : AppColor.neutral150,
fontSize: 12.toScreenWidth,
));
case WorkOrderNextStepEnum.waitingForRequesterToConfirm:
@ -267,7 +267,7 @@ class FooterActionButton {
AppFilledButton(
label: 'Waiting for requester to verify',
buttonColor: AppColor.background(context),
textColor: context.isDark ? Colors.white: AppColor.neutral150,
textColor: context.isDark ? Colors.white : AppColor.neutral150,
// buttonColor: AppColor.neutral140,
// textColor: AppColor.neutral150,
fontSize: 12.toScreenWidth,

15
lib/modules/cm_module/views/components/history_log_view.dart
Unescape Escape View File

@ -14,7 +14,6 @@ import 'package:test_sa/modules/cm_module/service_request_detail_provider.dart';
import 'package:test_sa/modules/cm_module/utilities/service_request_utils.dart';
import 'package:test_sa/new_views/app_style/app_color.dart';
import 'package:test_sa/views/widgets/buttons/app_back_button.dart';
import 'package:test_sa/views/widgets/loaders/no_data_found.dart';
import 'package:test_sa/views/widgets/requests/request_status.dart';
@ -41,14 +40,15 @@ class HistoryLogView extends StatelessWidget {
endIndent: 10,
),
),
Builder(builder: (cxt) {
SafeArea(
child: Builder(builder: (cxt) {
List<Widget> items = [];
String lastStatus = "";
DateTime? nextDate;
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);
if (isNurse) {
workOrderHistory.removeWhere((element) => element.step?.id == 5617);
}
for (int i = 0; i < workOrderHistory.length; i++) {
var object = workOrderHistory[i];
@ -84,15 +84,16 @@ class HistoryLogView extends StatelessWidget {
child: Column(children: items),
);
}),
),
],
));
});
}
Widget historyLogCard(BuildContext context, WorkOrderHistory object) {
String title =object.step!.name!;
String title = object.step!.name!;
if(object.step!.value == 18 || object.step!.value == 27 || object.step!.value == 28) {
if (object.step!.value == 18 || object.step!.value == 27 || object.step!.value == 28) {
title = object.activityStatus?.name ?? "";
}
@ -117,7 +118,6 @@ class HistoryLogView extends StatelessWidget {
if (object.assetVerificationType?.value == 4 && object.photoVerfication != null) ...[
Padding(
padding: EdgeInsets.symmetric(vertical: 12.toScreenWidth),
child: InteractiveViewer(child: Image.network(URLs.getFileUrl(object.photoVerfication ?? '')!, height: 143.toScreenHeight)),
).onPress(() async {
Navigator.of(context).push(
@ -138,7 +138,6 @@ class HistoryLogView extends StatelessWidget {
],
title.bodyText(context).custom(color: AppColor.textColor(context)),
object.timeDifference.isNotEmpty ? object.timeDifference.tinyFont(context).custom(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120) : const SizedBox(),
],
),
),

2
lib/views/widgets/fullscreen_dialogs/selection_fullscreen_dialog.dart
Unescape Escape View File

@ -167,7 +167,7 @@ class _SelectionBottomSheetState<T extends Base> extends State<SelectionFullScre
}),
),
8.height,
if (_selectedValue != null) 16.height,
if (_selectedValue != null)
FooterActionButton.footerContainer(
context: context,
child: AppFilledButton(

Write Preview
Loading…
Cancel
Save