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_TM_Module_bug_fixes' into design_3.0_TM_Module_bug_fixes

Browse Source
design_3.0_task_module_new
Sikander Saleem 4 months ago
parent 4d13105b91 9561b29822
commit afe0d45d86
3 changed files with 181 additions and 1 deletions
Show Stats Download Patch File Download Diff File

1
lib/modules/cm_module/views/forms/maintenance_request/components/external_request.dart
Unescape Escape View File

@ -138,6 +138,7 @@ class _ExternalMaintenanceRequestState extends State<ExternalMaintenanceRequest>
hideShadow: true,
backgroundColor: AppColor.neutral100,
date: requestDetailProvider.activityMaintenanceHelperModel?.supplierStartTime,
from:requestDetailProvider.currentWorkOrder?.data?.requestedDate,
formatDateWithTime: true,
onDatePicker: (selectedDate) {
showTimePicker(

88
lib/views/pages/user/profile_page.dart
Unescape Escape View File

@ -13,6 +13,7 @@ import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/models/user.dart';
import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
import 'package:test_sa/new_views/common_widgets/default_app_bar.dart';
import 'package:test_sa/views/pages/user/update_profile_info_bottmsheet.dart';
import '../../../new_views/app_style/app_color.dart';
@ -175,7 +176,73 @@ class _ProfilePageState extends State<ProfilePage> {
AppFilledButton(
label: "Update Information",
buttonColor: AppColor.neutral50,
onPressed: () {},
onPressed: () {
showModalBottomSheet(
context: context,
isScrollControlled: true,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
),
clipBehavior: Clip.antiAliasWithSaveLayer,
builder: (BuildContext context) {
return Padding(
padding: EdgeInsets.only(
bottom: MediaQuery.of(context).viewInsets.bottom,
),
child: ConstrainedBox(
constraints: BoxConstraints(
maxHeight: MediaQuery.of(context).size.height * 0.9,
),
child: SingleChildScrollView(
child: UpdateProfileInfoBottmsheet(
userInfoModel: UpdateUserInfoModel(
email: _user.email,
phoneNo: _user.phoneNumber,
extensionNo: _user.extensionNo,
),
),
),
),
);
},
);
// showModalBottomSheet(
// context: context,
// isScrollControlled: true,
// shape: const RoundedRectangleBorder(
// borderRadius: BorderRadius.vertical(
// top: Radius.circular(20),
// ),
// ),
// clipBehavior: Clip.antiAliasWithSaveLayer,
// builder: (BuildContext context) {
// return Padding(
// padding: EdgeInsets.only(
// bottom: MediaQuery.of(context).viewInsets.bottom,
// ),
// child: DraggableScrollableSheet(
// // initialChildSize: 0.6, // You can adjust this as needed
// minChildSize: 0.3,
// maxChildSize: 0.9,
// expand: false,
// builder: (context, scrollController) {
// return SingleChildScrollView(
// controller: scrollController,
// child: UpdateProfileInfoBottmsheet(
// userInfoModel: UpdateUserInfoModel(
// email: _user.email,
// phoneNo: _user.phoneNumber,
// extensionNo: _user.extensionNo,
// ),
// ),
// );
// },
// ),
// );
// },
// );
},
)
],
),
@ -337,3 +404,22 @@ class _ProfilePageState extends State<ProfilePage> {
);
}
}
class UpdateUserInfoModel {
dynamic userId;
String? email;
String? phoneNo;
String? extensionNo;
UpdateUserInfoModel({this.email, this.phoneNo, this.extensionNo, this.userId});
Map<String, dynamic> toJson() {
return {
//need this to update user info..
'userId': userId,
'email': email,
'phoneNo': phoneNo,
'extensionNo': extensionNo,
};
}
}

93
lib/views/pages/user/update_profile_info_bottmsheet.dart
Unescape Escape View File

@ -0,0 +1,93 @@
import 'package:flutter/material.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/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_text_form_field.dart';
import 'package:test_sa/views/pages/user/profile_page.dart';
class UpdateProfileInfoBottmsheet extends StatelessWidget {
UpdateUserInfoModel userInfoModel;
UpdateProfileInfoBottmsheet({super.key, required this.userInfoModel});
@override
Widget build(BuildContext context) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
"Email".bodyText(context).custom(color: AppColor.black20),
8.height,
AppTextFormField(
labelText: "Email",
backgroundColor: AppColor.neutral100,
initialValue: userInfoModel.email,
textAlign: TextAlign.center,
labelStyle: AppTextStyles.textFieldLabelStyle,
textInputType: TextInputType.number,
showShadow: false,
onChange: (value) {
userInfoModel.email = value;
},
style: Theme.of(context).textTheme.titleMedium,
),
8.height,
"Phone Number".bodyText(context).custom(color: AppColor.black20),
8.height,
AppTextFormField(
labelText: "Phone Number",
backgroundColor: AppColor.neutral100,
initialValue: userInfoModel.phoneNo,
textAlign: TextAlign.center,
labelStyle: AppTextStyles.textFieldLabelStyle,
textInputType: TextInputType.number,
showShadow: false,
onChange: (value) {
userInfoModel.phoneNo = value;
},
style: Theme.of(context).textTheme.titleMedium,
),
8.height,
"Extension No".bodyText(context).custom(color: AppColor.black20),
8.height,
AppTextFormField(
labelText: "Extension No",
backgroundColor: AppColor.neutral100,
initialValue: userInfoModel.extensionNo,
textAlign: TextAlign.center,
labelStyle: AppTextStyles.textFieldLabelStyle,
textInputType: TextInputType.number,
showShadow: false,
onChange: (value) {
userInfoModel.extensionNo = value;
},
style: Theme.of(context).textTheme.titleMedium,
),
],
).toShadowContainer(context).paddingAll(16),
),
Container(
padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 16.toScreenHeight),
color: AppColor.white10,
child: AppFilledButton(
label: "Update",
buttonColor: AppColor.neutral50,
onPressed: () async {
//TODO call update api here...
// showDialog(context: context, barrierDismissible: false, builder: (context) => const AppLazyLoading());
Navigator.pop(context);
},
),
),
],
);
}
}
Write Preview
Loading…
Cancel
Save