Merge branch 'fatima' into 'master'

Fatima

See merge request Cloud_Solution/mohemm-flutter-app!29

lib/ui/attendance/monthly_attendance_screen.dart

@@ -116,6 +116,8 @@ class _MonthlyAttendanceScreenState extends State<MonthlyAttendanceScreen> {
                       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);

lib/ui/my_team/employee_details.dart

@@ -70,6 +70,7 @@ class _EmployeeDetailsState extends State<EmployeeDetails> {
         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<EmployeeDetails> {
                 decoration: new BoxDecoration(color: Colors.white.withOpacity(0.0)),
               ),
             ),
+          ) : Container(
+            decoration: BoxDecoration(color: Colors.white.withOpacity(0.0)),
           ),
           SingleChildScrollView(
             scrollDirection: Axis.vertical,

lib/ui/my_team/view_attendance.dart

@@ -169,6 +169,8 @@ class _ViewAttendanceState extends State<ViewAttendance> {
                           initialDate: formattedDate,
                           firstDate: DateTime(searchYear - 2),
                           lastDate: DateTime.now(),
+                          confirmText: Text(LocaleKeys.confirm.tr()),
+                          cancelText: Text(LocaleKeys.cancel.tr()),
                         ).then(
                           (selectedDate) {
                             if (selectedDate != null) {

lib/ui/profile/profile_screen.dart

@@ -44,7 +44,8 @@ class _ProfileScreenState extends State<ProfileScreen> {
       backgroundColor: const Color(0xffefefef),
       body: Stack(
         children: [
-          Container(
+          memberInformationList!.eMPLOYEEIMAGE != null
+              ? Container(
               height: 300,
               margin: const EdgeInsets.only(top: 50),
               decoration: BoxDecoration(
@@ -60,6 +61,8 @@ class _ProfileScreenState extends State<ProfileScreen> {
                 color: Colors.white.withOpacity(0.0),
               ),
             ),
+          ): Container(
+        decoration: BoxDecoration(color: Colors.white.withOpacity(0.0)),
     ),
           SingleChildScrollView(
             scrollDirection: Axis.vertical,