Haroon6138
/
mohemm-flutter-moe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

my team issues fixed

Browse Source
faiz_marathon_signalR_critical
Sikander Saleem 3 years ago
parent f3855c3883
commit cfe0460ea5
6 changed files with 297 additions and 329 deletions
Show Stats Download Patch File Download Diff File

4
assets/langs/ar-SA.json
Unescape Escape View File

@ -387,6 +387,10 @@
"itemPrice": "سعر السلعة",
"itemPhotos": "صور البند",
"itemInfo": "معلومات العنصر",
"uploadAttachment": "تحميل المرفق",
"selectFromGalleryOrOpenCamera": "اختر من المعرض أو فتح الكاميرا",
"openCamera": "فتح\nآلة تصوير",
"uploadFromGallery": "تحميل من\nصالة عرض",
"profile": {
"reset_password": {
"label": "Reset Password",

4
assets/langs/en-US.json
Unescape Escape View File

@ -387,6 +387,10 @@
"itemPrice": "Item Price",
"itemPhotos": "Item Photos",
"itemInfo": "Item Info",
"uploadAttachment": "Upload Attachment",
"selectFromGalleryOrOpenCamera": "Select from gallery or open camera",
"openCamera": "Open\nCamera",
"uploadFromGallery": "Upload from\nGallery",
"profile": {
"reset_password": {
"label": "Reset Password",

173
lib/ui/my_team/employee_details.dart
Unescape Escape View File

@ -1,11 +1,9 @@
import 'dart:collection';
import 'dart:ui';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:flutter_html/html_parser.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:mohem_flutter_app/api/my_team/my_team_api_client.dart';
import 'package:mohem_flutter_app/api/worklist/worklist_api_client.dart';
import 'package:mohem_flutter_app/classes/colors.dart';
import 'package:mohem_flutter_app/classes/utils.dart';
import 'package:mohem_flutter_app/config/routes.dart';
@ -19,7 +17,6 @@ import 'package:mohem_flutter_app/models/my_team/get_employee_subordinates_list.
import 'package:mohem_flutter_app/models/profile_menu.model.dart';
import 'package:mohem_flutter_app/models/worklist/get_favorite_replacements_model.dart';
import 'package:mohem_flutter_app/models/worklist/replacement_list_model.dart';
import 'package:mohem_flutter_app/provider/dashboard_provider_model.dart';
import 'package:mohem_flutter_app/widgets/circular_avatar.dart';
import 'package:url_launcher/url_launcher.dart';
@ -28,13 +25,12 @@ class EmployeeDetails extends StatefulWidget {
@override
_EmployeeDetailsState createState() => _EmployeeDetailsState();
}
class _EmployeeDetailsState extends State<EmployeeDetails> {
GetEmployeeSubordinatesList? getEmployeeSubordinates;
static List<GetMenuEntriesList> menuData = [];
List<ProfileMenu> menu =[];
List<ProfileMenu> menu = [];
String? selectedFavLetter;
List<String>? favLetters;
List<GetFavoriteReplacements>? favUsersList;
@ -62,15 +58,13 @@ class _EmployeeDetailsState extends State<EmployeeDetails> {
setState(() {});
}
@override
Widget build(BuildContext context) {
if(getEmployeeSubordinates == null) {
if (getEmployeeSubordinates == null) {
getEmployeeSubordinates = ModalRoute.of(context)?.settings.arguments as GetEmployeeSubordinatesList;
setMenu();
}
return Scaffold(
extendBody: true,
backgroundColor: MyColors.lightGreyEFColor,
@ -118,108 +112,107 @@ class _EmployeeDetailsState extends State<EmployeeDetails> {
Widget myTeamInfo() {
Uri phoneNumber = Uri.parse('tel:${getEmployeeSubordinates?.eMPLOYEEMOBILENUMBER}');
double _width = MediaQuery
.of(context)
.size
.width;
double _width = MediaQuery.of(context).size.width;
return Column(
children: [
Stack(children: [
Container(
margin: EdgeInsets.fromLTRB(21, 40, 21, 0),
child: Column(
child: Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
IconButton(
onPressed: (){
if(getEmployeeSubordinates!.isFavorite != true){
padding: EdgeInsets.zero,
constraints: const BoxConstraints(),
onPressed: () {
if (getEmployeeSubordinates!.isFavorite != true) {
showFavoriteAlertDialog(context);
setState(() {});
}else{
} else {
fetchChangeFav(
email: getEmployeeSubordinates?.eMPLOYEEEMAILADDRESS ?? "",
employeName: getEmployeeSubordinates!.eMPLOYEENAME ?? "",
image: getEmployeeSubordinates!.eMPLOYEEIMAGE ?? "",
userName: getEmployeeSubordinates!.eMPLOYEENUMBER ?? "",
isFav: false,);
isFav: false,
);
setState(() {});
} },
icon: getEmployeeSubordinates!.isFavorite != true
? Icon(
Icons.star_outline,
size: 35,
color: MyColors.green9CColor,
)
: Icon(
Icons.star_outlined,
}
},
icon: Icon(
getEmployeeSubordinates!.isFavorite != true ? Icons.star_outline : Icons.star_outlined,
size: 35,
color: MyColors.green9CColor,
),
),
getEmployeeSubordinates?.eMPLOYEEMOBILENUMBER == ""
? SvgPicture.asset("assets/images/call-disable.svg", height: 25, width: 25,).paddingOnly(left:6, right: 17)
: InkWell(
onTap:() {
launchUrl(phoneNumber);
},
child: SvgPicture.asset("assets/images/call.svg", height: 25, width: 25,).paddingOnly(left:6, right: 17),
),
? SvgPicture.asset(
"assets/images/call-disable.svg",
height: 25,
width: 25,
)
: InkWell(
onTap: () {
launchUrl(phoneNumber);
},
child: SvgPicture.asset(
"assets/images/call.svg",
height: 25,
width: 25,
),
),
],
),
getEmployeeSubordinates!.eMPLOYEENAME!.toText21(maxlines: 2),
("${getEmployeeSubordinates!.eMPLOYEENUMBER!} | ${getEmployeeSubordinates!.jOBNAME!}").toText13(color: MyColors.grey80Color),
getEmployeeSubordinates!.eMPLOYEEEMAILADDRESS!.toText13(),
getEmployeeSubordinates!.eMPLOYEENAME!.toText21(maxlines: 2),
("${getEmployeeSubordinates!.eMPLOYEENUMBER!} | ${getEmployeeSubordinates!.jOBNAME!}").toText13(color: MyColors.grey80Color),
getEmployeeSubordinates!.eMPLOYEEEMAILADDRESS!.toText13(),
],
).objectContainerView(),
),
Container(
height: 68, alignment: Alignment.center, child: ProfileImage()).paddingOnly(top: 10),
]),
12.height,
Container(
margin: EdgeInsets.fromLTRB(21, 0, 21, 0),
child: Column(
children: menu.map((ProfileMenu i) => rowItem(i, context)).toList(),
).objectContainerView(),
).paddingOnly(top: 16, bottom: 12, right: 14, left: 14).objectContainerView(radius: 10, disablePadding: true),
),
// ),
Container(height: 68, alignment: Alignment.center, child: ProfileImage()).paddingOnly(top: 10),
]),
12.height,
ListView.separated(
padding: EdgeInsets.only(bottom: 21),
shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(),
itemBuilder: (cxt, index) => Row(
children: [
SvgPicture.asset('assets/images/' + menu[index].icon, width: 20, height: 20),
16.width,
menu[index].name.toText16().expanded,
16.width,
const Icon(Icons.arrow_forward, color: MyColors.darkIconColor)
],
).onPress(() {
Navigator.pushNamed(context, menu[index].route, arguments: menu[index].arguments);
}).paddingOnly(left: 21, right: 21, top: 21),
separatorBuilder: (cxt, index) => 12.height,
itemCount: menu.length)
.objectContainerView(disablePadding: true, radius: 10)
.paddingOnly(left: 21, right: 21),
],
);
}
Widget ProfileImage() =>
getEmployeeSubordinates?.eMPLOYEEIMAGE == null
? SvgPicture.asset("assets/images/user.svg",height: 68, width: 68, )
Widget ProfileImage() => getEmployeeSubordinates?.eMPLOYEEIMAGE == null
? SvgPicture.asset(
"assets/images/user.svg",
height: 68,
width: 68,
)
: CircleAvatar(
radius: 70,
backgroundImage: MemoryImage(Utils.getPostBytes(getEmployeeSubordinates?.eMPLOYEEIMAGE)),
backgroundColor: Colors.black,
);
Widget rowItem(obj, context) {
return InkWell(
onTap: () {
Navigator.pushNamed(context, obj.route, arguments:obj.arguments);
radius: 68,
backgroundImage: MemoryImage(Utils.getPostBytes(getEmployeeSubordinates?.eMPLOYEEIMAGE)),
backgroundColor: Colors.black,
);
},
child: ListTile(
leading: SvgPicture.asset('assets/images/' + obj.icon),
title: Text(obj.name,
style: TextStyle(color: MyColors.grey3AColor,
fontSize: 16)),
trailing: Icon(Icons.arrow_forward,
color: MyColors.grey3AColor,),
),
);
}
void setMenu(){
void setMenu() {
menu = [
ProfileMenu(name: LocaleKeys.profileDetails.tr(), icon: "profile_details.svg", route: AppRoutes.profileDetails, arguments:getEmployeeSubordinates),
ProfileMenu(name: LocaleKeys.createRequest.tr(), icon: "create_request.svg", route: AppRoutes.createRequest,arguments: getEmployeeSubordinates),
ProfileMenu(name: LocaleKeys.profileDetails.tr(), icon: "profile_details.svg", route: AppRoutes.profileDetails, arguments: getEmployeeSubordinates),
ProfileMenu(name: LocaleKeys.createRequest.tr(), icon: "create_request.svg", route: AppRoutes.createRequest, arguments: getEmployeeSubordinates),
ProfileMenu(name: LocaleKeys.viewAttendance.tr(), icon: "view_attendance.svg", route: AppRoutes.viewAttendance, arguments: getEmployeeSubordinates),
ProfileMenu(name: LocaleKeys.teamMembers.tr(), icon: "team.svg", route: AppRoutes.teamMembers, arguments: getEmployeeSubordinates),
];
@ -239,15 +232,15 @@ class _EmployeeDetailsState extends State<EmployeeDetails> {
LocaleKeys.ok.tr(),
),
onPressed: () {
fetchChangeFav(
fetchChangeFav(
email: getEmployeeSubordinates?.eMPLOYEEEMAILADDRESS ?? "",
employeName: getEmployeeSubordinates!.eMPLOYEENAME ?? "",
image: getEmployeeSubordinates!.eMPLOYEEIMAGE ?? "",
userName: getEmployeeSubordinates!.eMPLOYEENUMBER ?? "",
isFav: true,
);
setState(() {});
Navigator.pop(context);
setState(() {});
Navigator.pop(context);
},
);
AlertDialog alert = AlertDialog(
@ -265,7 +258,7 @@ class _EmployeeDetailsState extends State<EmployeeDetails> {
width: 50,
isImageBase64: true,
).paddingOnly(top: 21),
// 16.width,
// 16.width,
],
),
),
@ -283,15 +276,11 @@ class _EmployeeDetailsState extends State<EmployeeDetails> {
}
}
GetMenuEntriesList getMenuEntries(String type) {
List<GetMenuEntriesList> data = _EmployeeDetailsState.menuData.where((GetMenuEntriesList test) => test.functionName == type).toList();
if (data.isNotEmpty) {
return data[0];
} else {
return GetMenuEntriesList();
}
GetMenuEntriesList getMenuEntries(String type) {
List<GetMenuEntriesList> data = _EmployeeDetailsState.menuData.where((GetMenuEntriesList test) => test.functionName == type).toList();
if (data.isNotEmpty) {
return data[0];
} else {
return GetMenuEntriesList();
}
}

287
lib/ui/my_team/my_team.dart
Unescape Escape View File

@ -29,10 +29,13 @@ class _MyTeamState extends State<MyTeam> {
TextEditingController? _textEditingController = TextEditingController();
List<GetEmployeeSubordinatesList> getEmployeeSListOnSearch = [];
String dropdownValue = 'Name';
String dropdownValue = '';
int index = 0;
void initState() {
super.initState();
dropdownValue = list[index];
getEmployeeSubordinates();
}
@ -52,155 +55,153 @@ class _MyTeamState extends State<MyTeam> {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBarWidget(
context,
title: LocaleKeys.myTeamMembers.tr(),
showMemberButton: true,
),
backgroundColor: MyColors.backgroundColor,
body: SingleChildScrollView(
child: Column(
appBar: AppBarWidget(
context,
title: LocaleKeys.myTeamMembers.tr(),
showMemberButton: true,
),
backgroundColor: MyColors.backgroundColor,
body: ListView(
padding: const EdgeInsets.all(21),
children: [
Row(
children: [
Container(
margin: EdgeInsets.only(left: 21, right: 21, top: 20, bottom: 6),
padding: EdgeInsets.only(left: 14, right: 14, top: 21, bottom: 21),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(15),
color: Color(0xffFFFFFF),
border: Border.all(
color: Color(0xffefefef),
width: 1,
),
),
child: Row(
children: [
Expanded(
child: TextField(
onChanged: dropdownValue == "Name"
? (String value) {
getEmployeeSListOnSearch =
getEmployeeSubordinatesList.where((GetEmployeeSubordinatesList element) => element.eMPLOYEENAME!.toLowerCase().contains(value.toLowerCase())).toList();
setState(() {});
}
: (String value) {
getEmployeeSListOnSearch =
getEmployeeSubordinatesList.where((GetEmployeeSubordinatesList element) => element.eMPLOYEEEMAILADDRESS!.toLowerCase().contains(value.toLowerCase())).toList();
setState(() {});
},
controller: _textEditingController,
decoration: InputDecoration(
filled: true,
fillColor: Colors.white,
border: InputBorder.none,
enabledBorder: InputBorder.none,
focusedBorder: InputBorder.none,
// contentPadding: EdgeInsets.fromLTRB(10, 15, 10, 15),
hintText: LocaleKeys.searchBy.tr() + " $dropdownValue",
hintStyle: TextStyle(fontSize: 14.0, color: MyColors.grey3AColor),
),
)),
Container(
height: 36,
width: 1,
color: Color(0xffC4C4C4),
),
10.width,
dropDown(),
],
TextField(
onChanged: dropdownValue == "Name"
? (String value) {
getEmployeeSListOnSearch =
getEmployeeSubordinatesList.where((GetEmployeeSubordinatesList element) => element.eMPLOYEENAME!.toLowerCase().contains(value.toLowerCase())).toList();
setState(() {});
}
: (String value) {
getEmployeeSListOnSearch =
getEmployeeSubordinatesList.where((GetEmployeeSubordinatesList element) => element.eMPLOYEEEMAILADDRESS!.toLowerCase().contains(value.toLowerCase())).toList();
setState(() {});
},
style: const TextStyle(
fontSize: 14.0,
color: MyColors.grey3AColor,
fontWeight: FontWeight.w600,
letterSpacing: -0.56,
),
),
Container(
margin: EdgeInsets.only(left: 21, right: 21),
width: MediaQuery.of(context).size.width,
child: SingleChildScrollView(
scrollDirection: Axis.vertical,
child: Column(
children: <Widget>[
_textEditingController!.text.isNotEmpty && getEmployeeSListOnSearch.isEmpty
? Utils.getNoDataWidget(context)
: ListView.separated(
scrollDirection: Axis.vertical,
shrinkWrap: true,
physics: ScrollPhysics(),
separatorBuilder: (cxt, index) => 12.height,
itemCount: _textEditingController!.text.isNotEmpty ? getEmployeeSListOnSearch.length : getEmployeeSubordinatesList.length,
itemBuilder: (context, index) {
var phoneNumber = Uri.parse('tel:${getEmployeeSListOnSearch[index].eMPLOYEEMOBILENUMBER}');
return InkWell(
onTap: () async {
Navigator.pushNamed(context, AppRoutes.employeeDetails, arguments: getEmployeeSListOnSearch[index]);
},
child: Row(
//mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
getEmployeeSListOnSearch[index].eMPLOYEEIMAGE == null
? SvgPicture.asset("assets/images/user.svg",height: 34, width: 34, ).paddingOnly(top: 4)
: Container(
height: 34,
width: 34,
child: CircleAvatar(
radius: 25,
backgroundImage: MemoryImage(Utils.getPostBytes(getEmployeeSListOnSearch[index].eMPLOYEEIMAGE)),
backgroundColor: Colors.black,
).paddingOnly(top: 4),
),
9.width,
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// "Present".toText13(color: MyColors.greenColor),
"${getEmployeeSListOnSearch[index].eMPLOYEENAME}".toText16(color: MyColors.grey3AColor),
"${getEmployeeSListOnSearch[index].pOSITIONNAME}".toText10(color: MyColors.grey57Color),
],
).expanded,
Column(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
getEmployeeSListOnSearch[index].eMPLOYEEMOBILENUMBER == ""
? SvgPicture.asset("assets/images/call-disable.svg", width: 22, height: 22).paddingOnly(bottom: 23)
: InkWell(
onTap: () {
launchUrl(phoneNumber);
},
child: SvgPicture.asset("assets/images/call.svg", width: 22, height: 22).paddingOnly(bottom: 23),
),
// 21.height,
Icon(Icons.arrow_forward_outlined, color: MyColors.grey3AColor),
],
).expanded,
],
).objectContainerView(),
);
})
],
controller: _textEditingController,
decoration: InputDecoration(
filled: true,
isDense: true,
fillColor: Colors.white,
border: InputBorder.none,
enabledBorder: InputBorder.none,
focusedBorder: InputBorder.none,
contentPadding: EdgeInsets.zero,
//contentPadding: EdgeInsets.fromLTRB(14, 15, 10, 15),
hintText: LocaleKeys.searchBy.tr() + " $dropdownValue",
hintStyle: const TextStyle(
fontSize: 14.0,
color: MyColors.grey3AColor,
fontWeight: FontWeight.w600,
letterSpacing: -0.56,
),
),
)
).paddingOnly(top: 21, bottom: 21).expanded,
Container(height: 15, width: 1, color: const Color(0xffC4C4C4)),
10.width,
dropDown(),
],
),
));
).paddingOnly(left: 14, right: 14).objectContainerBorderView(disablePadding: true, color: Colors.white, radius: 10),
_textEditingController!.text.isNotEmpty && getEmployeeSListOnSearch.isEmpty
? Utils.getNoDataWidget(context).paddingOnly(top: 120)
: ListView.separated(
//scrollDirection: Axis.vertical,
shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(),
padding: const EdgeInsets.only(top: 12),
separatorBuilder: (cxt, index) => 12.height,
itemCount: _textEditingController!.text.isNotEmpty ? getEmployeeSListOnSearch.length : getEmployeeSubordinatesList.length,
itemBuilder: (context, index) {
var phoneNumber = Uri.parse('tel:${getEmployeeSListOnSearch[index].eMPLOYEEMOBILENUMBER}');
return InkWell(
onTap: () async {
Navigator.pushNamed(context, AppRoutes.employeeDetails, arguments: getEmployeeSListOnSearch[index]);
},
child: Row(
//mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
getEmployeeSListOnSearch[index].eMPLOYEEIMAGE == null
? SvgPicture.asset(
"assets/images/user.svg",
height: 34,
width: 34,
).paddingOnly(top: 4)
: Container(
height: 34,
width: 34,
child: CircleAvatar(
radius: 25,
backgroundImage: MemoryImage(Utils.getPostBytes(getEmployeeSListOnSearch[index].eMPLOYEEIMAGE)),
backgroundColor: Colors.black,
).paddingOnly(top: 4),
),
9.width,
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// "Present".toText13(color: MyColors.greenColor),
"${getEmployeeSListOnSearch[index].eMPLOYEENAME}".toText16(color: MyColors.grey3AColor),
"${getEmployeeSListOnSearch[index].pOSITIONNAME}".toText10(color: MyColors.grey57Color),
],
).expanded,
Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.end,
children: [
getEmployeeSListOnSearch[index].eMPLOYEEMOBILENUMBER == ""
? SvgPicture.asset("assets/images/call-disable.svg", width: 22, height: 22)
: InkWell(
onTap: () {
launchUrl(phoneNumber);
},
child: SvgPicture.asset("assets/images/call.svg", width: 22, height: 22)),
8.height,
const Icon(
Icons.arrow_forward_outlined,
color: MyColors.grey3AColor,
size: 18,
),
],
),
],
).paddingOnly(top: 13, bottom: 13, right: 12, left: 14).objectContainerView(radius: 10, disablePadding: true),
);
})
],
),
);
}
// todo @fatima add translation for below list
List<String> list = ["Name", "Email"];
Widget dropDown() {
return
DropdownButton<String>(
value: dropdownValue,
icon: const Icon(Icons.keyboard_arrow_down,
color: MyColors.grey35Color).paddingOnly(left: 4),
elevation: 16,
onChanged: (String? newValue) {
setState(() {
dropdownValue = newValue!;
});
},
items: <String>['Name', 'Email'].map<DropdownMenuItem<String>>((String value) {
return DropdownMenuItem<String>(
value: value,
child: Text(value),
);
}).toList(),
style: TextStyle(fontSize: 14.0, color: MyColors.grey57Color),
);
return PopupMenuButton(
itemBuilder: (_) => <PopupMenuItem<int>>[
for (int i = 0; i < list.length; i++) PopupMenuItem<int>(value: i, child: Text(list[i])),
],
onSelected: (int popupIndex) {
index = popupIndex;
dropdownValue = list[popupIndex];
setState(() {});
},
child: Row(
children: [
dropdownValue.toText14(),
10.width,
const Icon(
Icons.keyboard_arrow_down_rounded,
color: Color(0xff535353),
)
],
),
);
}
}

153
lib/ui/profile/family_members.dart
Unescape Escape View File

@ -59,134 +59,105 @@ class _FamilyMembersState extends State<FamilyMembers> {
backgroundColor: MyColors.backgroundColor,
body: Column(
children: [
20.height,
Expanded(
child: getEmployeeContactsList.length != 0
? SingleChildScrollView(
padding: const EdgeInsets.all(21),
scrollDirection: Axis.vertical,
child: ListView.separated(
scrollDirection: Axis.vertical,
shrinkWrap: true,
physics: ScrollPhysics(),
separatorBuilder: (cxt, index) => 12.height,
itemCount: getEmployeeContactsList.length,
itemBuilder: (context, index) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
"${getEmployeeContactsList[index].cONTACTNAME}".toText16(isBold: true, color: MyColors.grey3AColor),
"${getEmployeeContactsList[index].rELATIONSHIP}".toText11(isBold: true, color: MyColors.textMixColor),
]),
const Divider(
color: Color(0xffEFEFEF),
thickness: 1,
indent: 0,
endIndent: 0,
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: <Widget>[
menuEntries.updateButton == 'Y'
? InkWell(
onTap: () async{
relationId = getEmployeeContactsList[index]!.cONTACTRELATIONSHIPID!.toInt();
showUpdateAlertDialog(context, relationId!.toInt(), 2, LocaleKeys.update.tr());
},
? ListView.separated(
padding: const EdgeInsets.all(21),
separatorBuilder: (cxt, index) => 12.height,
itemCount: getEmployeeContactsList.length,
itemBuilder: (context, index) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
"${getEmployeeContactsList[index].cONTACTNAME}".toText16(color: MyColors.grey3AColor),
"${getEmployeeContactsList[index].rELATIONSHIP}".toText11(color: MyColors.textMixColor),
]).paddingOnly(top: 15, left: 13, right: 13, bottom: 12),
1.divider,
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: <Widget>[
// todo @faitma clean below logic and write clean code.
menuEntries.updateButton == 'Y'
? InkWell(
onTap: () async {
relationId = getEmployeeContactsList[index]!.cONTACTRELATIONSHIPID!.toInt();
showUpdateAlertDialog(context, relationId!.toInt(), 2, LocaleKeys.update.tr());
},
child: RichText(
text: TextSpan(
children: [
WidgetSpan(
child: Icon(
Icons.edit,
size: 15,
color: MyColors.grey67Color,
),
),
TextSpan(
text: LocaleKeys.update.tr(),
style: TextStyle(
color: MyColors.grey67Color,
fontSize: 12,
),
),
],
),
),
)
: RichText(
text: TextSpan(
children: [
WidgetSpan(
const WidgetSpan(
child: Icon(
Icons.edit,
size: 15,
color: MyColors.lightGreyColor,
color: MyColors.grey67Color,
),
),
TextSpan(
text: LocaleKeys.update.tr(),
style: TextStyle(
color: MyColors.lightGreyColor,
fontSize: 12,
),
style: const TextStyle(color: MyColors.grey67Color, fontSize: 12, letterSpacing: -0.36, fontWeight: FontWeight.w600),
),
],
),
),
Container(
height: 35,
width: 1,
color: Color(0xffEFEFEF),
),
InkWell(
onTap: () {
relationId = getEmployeeContactsList[index]!.cONTACTRELATIONSHIPID!.toInt();
showRemoveAlertDialog(context, relationId!.toInt());
},
child: RichText(
)
: RichText(
text: TextSpan(
children: [
WidgetSpan(
const WidgetSpan(
child: Icon(
Icons.delete,
Icons.edit,
size: 15,
color: MyColors.redColor,
color: MyColors.lightGreyColor,
),
),
TextSpan(
text: LocaleKeys.remove.tr(),
style: TextStyle(
color: MyColors.redColor,
fontSize: 12,
),
text: LocaleKeys.update.tr(),
style: const TextStyle(color: MyColors.lightGreyColor, fontSize: 12, letterSpacing: -0.36, fontWeight: FontWeight.w600),
),
],
),
),
Container(height: 35, width: 1, color: const Color(0xffEFEFEF)),
InkWell(
onTap: () {
relationId = getEmployeeContactsList[index]!.cONTACTRELATIONSHIPID!.toInt();
showRemoveAlertDialog(context, relationId!.toInt());
},
child: RichText(
text: TextSpan(
children: [
const WidgetSpan(
child: Icon(
Icons.delete,
size: 15,
color: MyColors.redColor,
),
),
TextSpan(
text: LocaleKeys.remove.tr(),
style: const TextStyle(color: MyColors.redColor, fontSize: 12, letterSpacing: -0.36, fontWeight: FontWeight.w600),
),
],
),
],
).objectContainerView();
}),
)
),
),
],
),
],
).objectContainerView(disablePadding: true);
})
: Container(),
),
DefaultButton(
LocaleKeys.addNewFamilyMember.tr(), () async {
DefaultButton(LocaleKeys.addNewFamilyMember.tr(), () async {
Navigator.pushNamed(context, AppRoutes.addUpdateFamilyMember, arguments: {"relationID": relationId, "flag": 1, "actionType": "ADD"});
ProfileScreen();
}
).insideContainer,
}).insideContainer,
],
));
}
void showUpdateAlertDialog(BuildContext context, int relationId, int flag, String actionType) {
Widget cancelButton = TextButton(
child: Text(
@ -261,6 +232,4 @@ class _FamilyMembersState extends State<FamilyMembers> {
},
);
}
}

5
lib/widgets/bottom_sheets/attachment_options.dart
Unescape Escape View File

@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:mohem_flutter_app/classes/colors.dart';
import 'package:mohem_flutter_app/extensions/string_extensions.dart';
import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
@ -27,7 +28,7 @@ class AttachmentOptions extends StatelessWidget {
children: [
itemView("open_camera.svg", "Open\nCamera"),
itemView("gallery.svg", "Upload from\nGallery"),
itemView("files", "Upload from\nFiles"),
itemView("files.svg", "Upload from\nFiles"),
],
)
],
@ -40,7 +41,7 @@ class AttachmentOptions extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Icon(Icons.photo),
SvgPicture.asset("assets/images/$icon"),
title.toText11(isBold: true),
],
).paddingOnly(left: 13, right: 13, top: 16, bottom: 12).expanded.objectContainerBorderView(

Write Preview
Loading…
Cancel
Save