fix issues

merge-requests/1/merge
Fatimah Alshammari 4 years ago
parent b7685295d9
commit ffba702cf9

@ -115,16 +115,15 @@ class _MyTeamState extends State<MyTeam> {
shrinkWrap: true, shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(), physics: const NeverScrollableScrollPhysics(),
padding: const EdgeInsets.only(top: 12), padding: const EdgeInsets.only(top: 12),
separatorBuilder: (cxt, index) => 12.height, separatorBuilder: (BuildContext cxt,int index) => 12.height,
itemCount: _textEditingController!.text.isNotEmpty ? getEmployeeSListOnSearch.length : getEmployeeSubordinatesList.length, itemCount: _textEditingController!.text.isNotEmpty ? getEmployeeSListOnSearch.length : getEmployeeSubordinatesList.length,
itemBuilder: (context, index) { itemBuilder: (BuildContext cxt,int index) {
var phoneNumber = Uri.parse('tel:${getEmployeeSListOnSearch[index].eMPLOYEEMOBILENUMBER}'); var phoneNumber = Uri.parse('tel:${getEmployeeSListOnSearch[index].eMPLOYEEMOBILENUMBER}');
return InkWell( return InkWell(
onTap: () async { onTap: () async {
Navigator.pushNamed(context, AppRoutes.employeeDetails, arguments: getEmployeeSListOnSearch[index]); Navigator.pushNamed(context, AppRoutes.employeeDetails, arguments: getEmployeeSListOnSearch[index]);
}, },
child: Row( child: Row(
//mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
getEmployeeSListOnSearch[index].eMPLOYEEIMAGE == null getEmployeeSListOnSearch[index].eMPLOYEEIMAGE == null

@ -64,11 +64,10 @@ class _TeamMembersState extends State<TeamMembers> {
margin: const EdgeInsets.only(top: 100), margin: const EdgeInsets.only(top: 100),
child: Utils.getNoDataWidget(context)): child: Utils.getNoDataWidget(context)):
ListView.separated( ListView.separated(
scrollDirection: Axis.vertical,
shrinkWrap: true, shrinkWrap: true,
padding: EdgeInsets.all(21), physics: const NeverScrollableScrollPhysics(),
physics: ScrollPhysics(), padding: const EdgeInsets.only(top: 12),
separatorBuilder: (cxt, index) => 12.height, separatorBuilder: (BuildContext cxt,int index) => 12.height,
itemCount: getEmployeeSubordinatesList.length, itemCount: getEmployeeSubordinatesList.length,
itemBuilder: (BuildContext context, int index) { itemBuilder: (BuildContext context, int index) {
var phoneNumber = Uri.parse('tel:${getEmployeeSubordinatesList[index].eMPLOYEEMOBILENUMBER}'); var phoneNumber = Uri.parse('tel:${getEmployeeSubordinatesList[index].eMPLOYEEMOBILENUMBER}');
@ -100,23 +99,28 @@ class _TeamMembersState extends State<TeamMembers> {
], ],
).expanded, ).expanded,
Column( Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
getEmployeeSubordinatesList[index].eMPLOYEEMOBILENUMBER == "" getEmployeeSubordinatesList[index].eMPLOYEEMOBILENUMBER == ""
? SvgPicture.asset("assets/images/call-disable.svg", width: 22, height: 22).paddingOnly(bottom: 23) ? SvgPicture.asset("assets/images/call-disable.svg", width: 22, height: 22)
:InkWell( :InkWell(
onTap: () { onTap: () {
launchUrl(phoneNumber); launchUrl(phoneNumber);
}, },
child: SvgPicture.asset("assets/images/call.svg", width: 22, height: 22).paddingOnly(bottom: 23), child: SvgPicture.asset("assets/images/call.svg", width: 22, height: 22),
),
8.height,
const Icon(
Icons.arrow_forward_outlined,
color: MyColors.grey3AColor,
size: 18,
), ),
// 21.height,
Icon(Icons.arrow_forward_outlined, color: MyColors.grey3AColor),
],
).expanded,
], ],
), ),
).objectContainerView(); ],
).paddingOnly(top: 13, bottom: 13, right: 12, left: 14).objectContainerView(radius: 10, disablePadding: true),
);
}), }),
], ],
) )

@ -83,14 +83,11 @@ class _FamilyMembersState extends State<FamilyMembers> {
children: [ children: [
WidgetSpan( WidgetSpan(
child: menuEntries.updateButton == 'Y' child: menuEntries.updateButton == 'Y'
?InkWell( ? Icon(Icons.edit, size: 14, color: MyColors.grey67Color,
onTap: () async { ).onPress(() async {
relationId = getEmployeeContactsList[index]!.cONTACTRELATIONSHIPID!.toInt(); relationId = getEmployeeContactsList[index]!.cONTACTRELATIONSHIPID!.toInt();
showUpdateAlertDialog(context, relationId!.toInt(), 2, LocaleKeys.update.tr()); showUpdateAlertDialog(context, relationId!.toInt(), 2, LocaleKeys.update.tr());
}, })
child: Icon(Icons.edit, size: 14, color: MyColors.grey67Color,
),
)
:Icon(Icons.edit, size: 14, color: MyColors.lightGreyColor, :Icon(Icons.edit, size: 14, color: MyColors.lightGreyColor,
), ),
), ),
@ -103,12 +100,7 @@ class _FamilyMembersState extends State<FamilyMembers> {
), ),
), ),
Container(height: 35, width: 1, color: const Color(0xffEFEFEF)), Container(height: 35, width: 1, color: const Color(0xffEFEFEF)),
InkWell( RichText(
onTap: () {
relationId = getEmployeeContactsList[index]!.cONTACTRELATIONSHIPID!.toInt();
showRemoveAlertDialog(context, relationId!.toInt());
},
child: RichText(
text: TextSpan( text: TextSpan(
children: [ children: [
const WidgetSpan( const WidgetSpan(
@ -121,8 +113,8 @@ class _FamilyMembersState extends State<FamilyMembers> {
), ),
], ],
), ),
), ).onPress(() { relationId = getEmployeeContactsList[index]!.cONTACTRELATIONSHIPID!.toInt();
), showRemoveAlertDialog(context, relationId!.toInt());}),
], ],
), ),
], ],

Loading…
Cancel
Save