From e2519b5df2335f3424344e0a4fe9e81862198de1 Mon Sep 17 00:00:00 2001 From: Fatimah Alshammari Date: Wed, 26 Oct 2022 10:30:08 +0300 Subject: [PATCH 1/4] fix issues --- lib/ui/my_team/employee_details.dart | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/ui/my_team/employee_details.dart b/lib/ui/my_team/employee_details.dart index e33dad8..82d289d 100644 --- a/lib/ui/my_team/employee_details.dart +++ b/lib/ui/my_team/employee_details.dart @@ -70,6 +70,7 @@ class _EmployeeDetailsState extends State { extendBody: true, backgroundColor: MyColors.lightGreyEFColor, body: Stack(children: [ + getEmployeeSubordinates!.eMPLOYEEIMAGE != null ? Container( height: 200, margin: EdgeInsets.only(top: 30), @@ -80,6 +81,8 @@ class _EmployeeDetailsState extends State { decoration: new BoxDecoration(color: Colors.white.withOpacity(0.0)), ), ), + ) : Container( + decoration: new BoxDecoration(color: Colors.white.withOpacity(0.0)), ), SingleChildScrollView( scrollDirection: Axis.vertical, From e4db7e0cc284495dabb6b38a96bba102b15fcfe9 Mon Sep 17 00:00:00 2001 From: Fatimah Alshammari Date: Wed, 26 Oct 2022 11:17:45 +0300 Subject: [PATCH 2/4] fix issues --- lib/ui/attendance/monthly_attendance_screen.dart | 2 ++ lib/ui/my_team/view_attendance.dart | 2 ++ 2 files changed, 4 insertions(+) diff --git a/lib/ui/attendance/monthly_attendance_screen.dart b/lib/ui/attendance/monthly_attendance_screen.dart index 39f33a4..439a5f4 100644 --- a/lib/ui/attendance/monthly_attendance_screen.dart +++ b/lib/ui/attendance/monthly_attendance_screen.dart @@ -116,6 +116,8 @@ class _MonthlyAttendanceScreenState extends State { initialDate: formattedDate, firstDate: DateTime(searchYear - 2), lastDate: DateTime.now(), + confirmText: Text(LocaleKeys.confirm.tr()), + cancelText: Text(LocaleKeys.cancel.tr()), ).then((selectedDate) { if (selectedDate != null) { searchMonth = getMonth(selectedDate.month); diff --git a/lib/ui/my_team/view_attendance.dart b/lib/ui/my_team/view_attendance.dart index 5d55ee8..c77b1b4 100644 --- a/lib/ui/my_team/view_attendance.dart +++ b/lib/ui/my_team/view_attendance.dart @@ -169,6 +169,8 @@ class _ViewAttendanceState extends State { initialDate: formattedDate, firstDate: DateTime(searchYear - 2), lastDate: DateTime.now(), + confirmText: Text(LocaleKeys.confirm.tr()), + cancelText: Text(LocaleKeys.cancel.tr()), ).then( (selectedDate) { if (selectedDate != null) { From 2002359ff1daeb96e5b395104ea01984a75e69c2 Mon Sep 17 00:00:00 2001 From: Fatimah Alshammari Date: Wed, 26 Oct 2022 14:58:22 +0300 Subject: [PATCH 3/4] fix issues --- lib/ui/profile/profile_screen.dart | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/ui/profile/profile_screen.dart b/lib/ui/profile/profile_screen.dart index 690633b..533834f 100644 --- a/lib/ui/profile/profile_screen.dart +++ b/lib/ui/profile/profile_screen.dart @@ -44,23 +44,26 @@ class _ProfileScreenState extends State { backgroundColor: const Color(0xffefefef), body: Stack( children: [ - Container( - height: 300, - margin: const EdgeInsets.only(top: 50), - decoration: BoxDecoration( + memberInformationList!.eMPLOYEEIMAGE != null + ? Container( + height: 300, + margin: const EdgeInsets.only(top: 50), + decoration: BoxDecoration( image: DecorationImage( image: MemoryImage( Utils.dataFromBase64String(memberInformationList.eMPLOYEEIMAGE!), ), fit: BoxFit.cover), ), - child: BackdropFilter( + child: BackdropFilter( filter: ImageFilter.blur(sigmaX: 10.0, sigmaY: 10.0), child: Container( color: Colors.white.withOpacity(0.0), ), ), - ), + ): Container( + decoration: new BoxDecoration(color: Colors.white.withOpacity(0.0)), + ), SingleChildScrollView( scrollDirection: Axis.vertical, child: Column( From 2d40ede37f74cdb16be7da9640356fbfb7bb8169 Mon Sep 17 00:00:00 2001 From: Fatimah Alshammari Date: Wed, 26 Oct 2022 14:59:18 +0300 Subject: [PATCH 4/4] fix issues --- lib/ui/my_team/employee_details.dart | 2 +- lib/ui/profile/profile_screen.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ui/my_team/employee_details.dart b/lib/ui/my_team/employee_details.dart index 82d289d..d0e167d 100644 --- a/lib/ui/my_team/employee_details.dart +++ b/lib/ui/my_team/employee_details.dart @@ -82,7 +82,7 @@ class _EmployeeDetailsState extends State { ), ), ) : Container( - decoration: new BoxDecoration(color: Colors.white.withOpacity(0.0)), + decoration: BoxDecoration(color: Colors.white.withOpacity(0.0)), ), SingleChildScrollView( scrollDirection: Axis.vertical, diff --git a/lib/ui/profile/profile_screen.dart b/lib/ui/profile/profile_screen.dart index 533834f..c071d3f 100644 --- a/lib/ui/profile/profile_screen.dart +++ b/lib/ui/profile/profile_screen.dart @@ -62,7 +62,7 @@ class _ProfileScreenState extends State { ), ), ): Container( - decoration: new BoxDecoration(color: Colors.white.withOpacity(0.0)), + decoration: BoxDecoration(color: Colors.white.withOpacity(0.0)), ), SingleChildScrollView( scrollDirection: Axis.vertical,