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

improvement.

Browse Source
merge-requests/1/merge
Sikander Saleem 3 years ago
parent 2ce3c535d2
commit 55cafb5466
2 changed files with 94 additions and 145 deletions
Show Stats Download Patch File Download Diff File

61
lib/ui/my_team/profile_details.dart
Unescape Escape View File

@ -3,11 +3,11 @@ import 'package:flutter/material.dart';
import 'package:mohem_flutter_app/classes/colors.dart'; import 'package:mohem_flutter_app/classes/colors.dart';
import 'package:mohem_flutter_app/extensions/int_extensions.dart'; import 'package:mohem_flutter_app/extensions/int_extensions.dart';
import 'package:mohem_flutter_app/extensions/string_extensions.dart'; import 'package:mohem_flutter_app/extensions/string_extensions.dart';
import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
import 'package:mohem_flutter_app/generated/locale_keys.g.dart'; import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
import 'package:mohem_flutter_app/models/my_team/get_employee_subordinates_list.dart'; import 'package:mohem_flutter_app/models/my_team/get_employee_subordinates_list.dart';
import 'package:mohem_flutter_app/widgets/app_bar_widget.dart'; import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
class ProfileDetails extends StatefulWidget { class ProfileDetails extends StatefulWidget {
const ProfileDetails({Key? key}) : super(key: key); const ProfileDetails({Key? key}) : super(key: key);
@ -18,8 +18,6 @@ class ProfileDetails extends StatefulWidget {
class _ProfileDetailsState extends State<ProfileDetails> { class _ProfileDetailsState extends State<ProfileDetails> {
GetEmployeeSubordinatesList? getEmployeeSubordinates; GetEmployeeSubordinatesList? getEmployeeSubordinates;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
@ -33,47 +31,26 @@ class _ProfileDetailsState extends State<ProfileDetails> {
title: LocaleKeys.profileDetails.tr(), title: LocaleKeys.profileDetails.tr(),
), ),
backgroundColor: MyColors.backgroundColor, backgroundColor: MyColors.backgroundColor,
body: Column( body: ListView(
padding: EdgeInsets.all(21),
children: [ children: [
Container( Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
width: double.infinity, LocaleKeys.category.tr().toText13(color: MyColors.lightGrayColor),
margin: EdgeInsets.only( "${getEmployeeSubordinates?.eMPLOYMENTCATEGORYMEANING}".toText16(isBold: true, color: MyColors.darkTextColor),
top: 20, 23.height,
left: 21, LocaleKeys.address.tr().toText13(color: MyColors.lightGrayColor),
right: 21, "${getEmployeeSubordinates?.lOCATIONNAME}".toText16(isBold: true, color: MyColors.darkTextColor),
), 23.height,
padding: EdgeInsets.only(left: 14, right: 14, top: 13, bottom: 20), LocaleKeys.phoneNumber.tr().toText13(color: MyColors.lightGrayColor),
decoration: BoxDecoration( "${getEmployeeSubordinates?.eMPLOYEEMOBILENUMBER}".toText16(isBold: true, color: MyColors.darkTextColor),
boxShadow: [ 23.height,
BoxShadow( LocaleKeys.businessGroup.tr().toText13(color: MyColors.lightGrayColor),
color: Colors.grey.withOpacity(0.5), "${getEmployeeSubordinates?.bUSINESSGROUPNAME}".toText16(isBold: true, color: MyColors.darkTextColor),
spreadRadius: 5, 23.height,
blurRadius: 26, LocaleKeys.Payroll.tr().toText13(color: MyColors.lightGrayColor),
offset: Offset(0, 3), "${getEmployeeSubordinates?.pAYROLLNAME}".toText16(isBold: true, color: MyColors.darkTextColor),
), ]).objectContainerView(),
],
color: Colors.white,
borderRadius: BorderRadius.circular(10.0),
),
child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
LocaleKeys.category.tr().toText13(color: MyColors.lightGrayColor),
"${getEmployeeSubordinates?.eMPLOYMENTCATEGORYMEANING}".toText16(isBold: true, color: MyColors.darkTextColor),
23.height,
LocaleKeys.address.tr().toText13(color: MyColors.lightGrayColor),
"${getEmployeeSubordinates?.lOCATIONNAME}".toText16(isBold: true, color: MyColors.darkTextColor),
23.height,
LocaleKeys.phoneNumber.tr().toText13(color: MyColors.lightGrayColor),
"${getEmployeeSubordinates?.eMPLOYEEMOBILENUMBER}".toText16(isBold: true, color: MyColors.darkTextColor),
23.height,
LocaleKeys.businessGroup.tr().toText13(color: MyColors.lightGrayColor),
"${getEmployeeSubordinates?.bUSINESSGROUPNAME}".toText16(isBold: true, color: MyColors.darkTextColor),
23.height,
LocaleKeys.Payroll.tr().toText13(color: MyColors.lightGrayColor),
"${getEmployeeSubordinates?.pAYROLLNAME}".toText16(isBold: true, color: MyColors.darkTextColor),
]),
),
], ],
)); ));
} }
} }

178
lib/ui/my_team/subordinate_leave.dart
Unescape Escape View File

@ -1,4 +1,3 @@
import 'dart:io'; import 'dart:io';
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
@ -9,7 +8,6 @@ import 'package:mohem_flutter_app/api/my_team/my_team_api_client.dart';
import 'package:mohem_flutter_app/classes/colors.dart'; import 'package:mohem_flutter_app/classes/colors.dart';
import 'package:mohem_flutter_app/classes/date_uitl.dart'; import 'package:mohem_flutter_app/classes/date_uitl.dart';
import 'package:mohem_flutter_app/classes/utils.dart'; import 'package:mohem_flutter_app/classes/utils.dart';
import 'package:mohem_flutter_app/config/routes.dart';
import 'package:mohem_flutter_app/extensions/int_extensions.dart'; import 'package:mohem_flutter_app/extensions/int_extensions.dart';
import 'package:mohem_flutter_app/extensions/string_extensions.dart'; import 'package:mohem_flutter_app/extensions/string_extensions.dart';
import 'package:mohem_flutter_app/extensions/widget_extensions.dart'; import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
@ -18,7 +16,7 @@ import 'package:mohem_flutter_app/models/my_team/get_subordinates_leaves_total_v
import 'package:mohem_flutter_app/widgets/app_bar_widget.dart'; import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
import 'package:mohem_flutter_app/widgets/button/default_button.dart'; import 'package:mohem_flutter_app/widgets/button/default_button.dart';
import 'package:mohem_flutter_app/widgets/dynamic_forms/dynamic_textfield_widget.dart'; import 'package:mohem_flutter_app/widgets/dynamic_forms/dynamic_textfield_widget.dart';
import 'package:mohem_flutter_app/widgets/item_detail_view_widget.dart';
class SubordinateLeave extends StatefulWidget { class SubordinateLeave extends StatefulWidget {
const SubordinateLeave({Key? key}) : super(key: key); const SubordinateLeave({Key? key}) : super(key: key);
@ -33,19 +31,16 @@ class _SubordinateLeaveState extends State<SubordinateLeave> {
DateTime selectedDateTo = DateTime.now(); DateTime selectedDateTo = DateTime.now();
bool showList = false; bool showList = false;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
} }
void getSubordinatesLeaves()async { void getSubordinatesLeaves() async {
try { try {
Utils.showLoading(context); Utils.showLoading(context);
getSubordinatesLeavesTotalList = await MyTeamApiClient().getSubordinatesLeavesList(DateUtil.convertDateToStringLocation(selectedDateFrom), DateUtil.convertDateToStringLocation(selectedDateTo)); getSubordinatesLeavesTotalList = await MyTeamApiClient().getSubordinatesLeavesList(DateUtil.convertDateToStringLocation(selectedDateFrom), DateUtil.convertDateToStringLocation(selectedDateTo));
showList= true; showList = true;
Utils.hideLoading(context); Utils.hideLoading(context);
setState(() {}); setState(() {});
} catch (ex) { } catch (ex) {
@ -54,108 +49,85 @@ class _SubordinateLeaveState extends State<SubordinateLeave> {
} }
} }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBarWidget( appBar: AppBarWidget(
context, context,
title: LocaleKeys.subordinateLeave.tr(), title: LocaleKeys.subordinateLeave.tr(),
), ),
backgroundColor: MyColors.backgroundColor, backgroundColor: MyColors.backgroundColor,
body: Column( body: Column(
children: [ children: [
Expanded( Expanded(
child: SingleChildScrollView( child: Column(
scrollDirection: Axis.vertical, children: [
child: Column( Column(
children: [ children: [
Column( DynamicTextFieldWidget(
children: [ LocaleKeys.dateFrom.tr(),
DynamicTextFieldWidget( selectedDateFrom.toString().split(" ")[0],
LocaleKeys.dateFrom.tr(), suffixIconData: Icons.calendar_today,
selectedDateFrom.toString().split(" ")[0], isEnable: false,
suffixIconData: Icons.calendar_today, onTap: () async {
isEnable: false, selectedDateFrom = await _selectDate(context, DateTime.now());
onTap: () async { setState(() {});
selectedDateFrom = await _selectDate(context, DateTime.now()); },
setState(() {}); ),
}, 12.height,
), DynamicTextFieldWidget(
12.height, LocaleKeys.dateTo.tr(),
DynamicTextFieldWidget( selectedDateTo.toString().split(" ")[0],
LocaleKeys.dateTo.tr(), suffixIconData: Icons.calendar_today,
selectedDateTo.toString().split(" ")[0], isEnable: false,
suffixIconData: Icons.calendar_today, onTap: () async {
isEnable: false, selectedDateTo = await _selectDate(context, DateTime.now());
onTap: () async { setState(() {});
selectedDateTo = await _selectDate(context, DateTime.now()); },
setState(() {}); )
}, ],
) ).objectContainerView(),
], if (showList)
).objectContainerView(), ListView.separated(
Container( scrollDirection: Axis.vertical,
margin: EdgeInsets.only(left: 21, right: 21), physics: ScrollPhysics(),
width: MediaQuery.of(context).size.width, padding: const EdgeInsets.all(21),
child: SingleChildScrollView( separatorBuilder: (BuildContext cxt, int index) => 12.height,
scrollDirection: Axis.vertical, itemCount: getSubordinatesLeavesTotalList.length,
child: Column( itemBuilder: (BuildContext context, int index) {
children: [ var diffDays = DateUtil.convertStringToDate(getSubordinatesLeavesTotalList[index].dATEEND!)
showList? ListView.separated( .difference(DateUtil.convertStringToDate(getSubordinatesLeavesTotalList[index].dATESTART!))
scrollDirection: Axis.vertical, .inDays;
shrinkWrap: true, return getSubordinatesLeavesTotalList.isEmpty
physics: ScrollPhysics(), ? Utils.getNoDataWidget(context)
separatorBuilder: (BuildContext cxt,int index) => 12.height, : Row(
itemCount: getSubordinatesLeavesTotalList.length, crossAxisAlignment: CrossAxisAlignment.start,
itemBuilder: (BuildContext context,int index) { children: [
var diffDays = DateUtil.convertStringToDate(getSubordinatesLeavesTotalList[index].dATEEND!).difference(DateUtil.convertStringToDate(getSubordinatesLeavesTotalList[index].dATESTART!)).inDays; SvgPicture.asset("assets/images/user.svg", width: 34, height: 34).paddingOnly(top: 4),
return getSubordinatesLeavesTotalList.isEmpty 9.width,
? Utils.getNoDataWidget(context) Column(
: Row( crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
children: [ getSubordinatesLeavesTotalList[index].eMPLOYEENAME!.toText16(),
SvgPicture.asset("assets/images/user.svg"), ItemDetailView(LocaleKeys.from.tr(), DateUtil.getFormattedDate(DateUtil.convertStringToDate(getSubordinatesLeavesTotalList[index].dATESTART!), "MMM dd yyyy")),
14.width, ItemDetailView(LocaleKeys.to.tr(), DateUtil.getFormattedDate(DateUtil.convertStringToDate(getSubordinatesLeavesTotalList[index].dATEEND!), "MMM dd yyyy")),
Column( ItemDetailView(LocaleKeys.numberDays.tr(), diffDays.toString()),
crossAxisAlignment: CrossAxisAlignment.start, ],
children: [ ).expanded
"${getSubordinatesLeavesTotalList[index].eMPLOYEENAME}".toText16(isBold: true, color: MyColors.grey3AColor), ],
10.height, ).objectContainerView();
Row( }).expanded
children: [ ],
(LocaleKeys.from.tr() + ': ${DateUtil.getFormattedDate(DateUtil.convertStringToDate(getSubordinatesLeavesTotalList[index].dATESTART!), "MMM dd yyyy")}').toText10(isBold: true, color: MyColors.grey57Color),
14.width,
(LocaleKeys.to.tr() + ': ${DateUtil.getFormattedDate(DateUtil.convertStringToDate(getSubordinatesLeavesTotalList[index].dATEEND!), "MMM dd yyyy")}').toText10(isBold: true, color: MyColors.grey57Color),
],
),
(LocaleKeys.numberDays.tr()+ ": $diffDays").toText10(color: MyColors.grey3AColor),
],
).expanded
],
).objectContainerView();
}
)
:Container(),
],
),
),
),
],
),
),
), ),
DefaultButton(
LocaleKeys.submit.tr(), () async {
getSubordinatesLeaves();
}).insideContainer
],
), ),
); DefaultButton(LocaleKeys.submit.tr(), () async {
getSubordinatesLeaves();
}).insideContainer
],
),
);
} }
Future<DateTime> _selectDate(BuildContext context, DateTime selectedDate) async { Future<DateTime> _selectDate(BuildContext context, DateTime selectedDate) async {
DateTime time = selectedDate; DateTime time = selectedDate;
if (!Platform.isIOS) { if (!Platform.isIOS) {

Write Preview
Loading…
Cancel
Save