Merge branch 'master' into development_sikander

lib/classes/date_uitl.dart

@@ -40,7 +40,7 @@ class DateUtil {
   }
 
   static DateTime convertSimpleStringDateToDate(String date) {
-    return DateFormat("MM/dd/yyyy hh:mm:ss").parse(date);
+    return DateFormat("MM/dd/yyyy hh:mm:ss a").parse(date.toUpperCase());
   }
 
   static DateTime convertSimpleStringDateToDateddMMyyyy(String date) {

lib/ui/my_team/team_members.dart

@@ -15,6 +15,7 @@ import 'package:url_launcher/url_launcher.dart';
 
 class TeamMembers extends StatefulWidget {
   final String? selectedEmp;
+
   const TeamMembers({this.selectedEmp, Key? key}) : super(key: key);
 
   @override
@@ -62,10 +63,8 @@ class _TeamMembersState extends State<TeamMembers> {
         child: Column(
           children: <Widget>[
             getEmployeeSubordinatesList.isEmpty
-              ? Container(
-                margin: const EdgeInsets.only(top: 100),
-                  child: Utils.getNoDataWidget(context)):
-              ListView.separated(
+                ? Container(margin: const EdgeInsets.only(top: 100), child: Utils.getNoDataWidget(context))
+                : ListView.separated(
                     shrinkWrap: true,
                     physics: const NeverScrollableScrollPhysics(),
                     padding: const EdgeInsets.only(top: 12),
@@ -81,7 +80,11 @@ class _TeamMembersState extends State<TeamMembers> {
                           crossAxisAlignment: CrossAxisAlignment.start,
                           children: [
                             getEmployeeSubordinatesList[index].eMPLOYEEIMAGE == null
-                    ? SvgPicture.asset("assets/images/user.svg",height: 34, width: 34, ).paddingOnly(top: 4)
+                                ? SvgPicture.asset(
+                                    "assets/images/user.svg",
+                                    height: 34,
+                                    width: 34,
+                                  ).paddingOnly(top: 4)
                                 : Container(
                                     height: 34,
                                     width: 34,
@@ -122,10 +125,11 @@ class _TeamMembersState extends State<TeamMembers> {
                             ),
                           ],
                         ).paddingOnly(top: 13, bottom: 13, right: 12, left: 14).objectContainerView(radius: 10, disablePadding: true),
-               );
+                      ).paddingOnly(left: 16.0, right: 16.0);
                     }),
           ],
-        )
-    ));
+        ),
+      ),
+    );
   }
 }