Merge branch 'Fatima' into 'master'
Fatima See merge request mirza.shafique/mohem_flutter_app!67merge-requests/1/merge
commit
8bb13cfb3a
@ -0,0 +1,6 @@
|
|||||||
|
<svg id="user_5_" data-name="user (5)" xmlns="http://www.w3.org/2000/svg" width="52.998" height="53" viewBox="0 0 52.998 53">
|
||||||
|
<path id="Path_5018" data-name="Path 5018" d="M18.613,41.552l-7.907,4.313a7.106,7.106,0,0,0-1.269.9,26.483,26.483,0,0,0,34.027.088,7.015,7.015,0,0,0-1.394-.934L33.6,41.689A3.229,3.229,0,0,1,31.818,38.8V35.479a12.788,12.788,0,0,0,.8-1.03,19.483,19.483,0,0,0,2.632-5.3,2.659,2.659,0,0,0,1.886-2.53V23.069a2.647,2.647,0,0,0-.886-1.965V15.978S37.3,8,26.5,8s-9.75,7.977-9.75,7.977V21.1a2.644,2.644,0,0,0-.886,1.965v3.546a2.658,2.658,0,0,0,1.226,2.231A17.6,17.6,0,0,0,20.3,35.479v3.24A3.232,3.232,0,0,1,18.613,41.552Z" fill="#bcbcbc"/>
|
||||||
|
<g id="Group_8632" data-name="Group 8632">
|
||||||
|
<path id="Path_5019" data-name="Path 5019" d="M26.953,0A26.483,26.483,0,0,0,9.448,46.76a7.041,7.041,0,0,1,1.257-.894l7.907-4.313A3.23,3.23,0,0,0,20.3,38.718v-3.24a17.58,17.58,0,0,1-3.206-6.633,2.66,2.66,0,0,1-1.226-2.231V23.068a2.647,2.647,0,0,1,.886-1.965V15.977S15.7,8,26.5,8s9.75,7.977,9.75,7.977V21.1a2.644,2.644,0,0,1,.886,1.965v3.546a2.659,2.659,0,0,1-1.886,2.53,19.482,19.482,0,0,1-2.632,5.3,12.788,12.788,0,0,1-.8,1.03V38.8A3.228,3.228,0,0,0,33.6,41.688l8.467,4.233a7.05,7.05,0,0,1,1.39.932A26.494,26.494,0,0,0,26.953,0Z" fill="#e0e0e0"/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1.2 KiB |
@ -0,0 +1,62 @@
|
|||||||
|
|
||||||
|
|
||||||
|
class GetSubordinatesLeavesTotalVacationsList {
|
||||||
|
String? aBSENCEATTENDANCETYPENAME;
|
||||||
|
String? cALENDARENTRYDESC;
|
||||||
|
String? dATEEND;
|
||||||
|
String? dATESTART;
|
||||||
|
String? eMPLOYEENAME;
|
||||||
|
String? eMPLOYEENUMBER;
|
||||||
|
String? lEAVETYPE;
|
||||||
|
int? oRGANIZATIONID;
|
||||||
|
String? oRGANIZATIONNAME;
|
||||||
|
String? pOSITIONTITLE;
|
||||||
|
String? rEPLACEMENTNAME;
|
||||||
|
String? sTATUS;
|
||||||
|
|
||||||
|
GetSubordinatesLeavesTotalVacationsList(
|
||||||
|
{this.aBSENCEATTENDANCETYPENAME,
|
||||||
|
this.cALENDARENTRYDESC,
|
||||||
|
this.dATEEND,
|
||||||
|
this.dATESTART,
|
||||||
|
this.eMPLOYEENAME,
|
||||||
|
this.eMPLOYEENUMBER,
|
||||||
|
this.lEAVETYPE,
|
||||||
|
this.oRGANIZATIONID,
|
||||||
|
this.oRGANIZATIONNAME,
|
||||||
|
this.pOSITIONTITLE,
|
||||||
|
this.rEPLACEMENTNAME,
|
||||||
|
this.sTATUS});
|
||||||
|
|
||||||
|
GetSubordinatesLeavesTotalVacationsList.fromJson(Map<String, dynamic> json) {
|
||||||
|
aBSENCEATTENDANCETYPENAME = json['ABSENCE_ATTENDANCE_TYPE_NAME'];
|
||||||
|
cALENDARENTRYDESC = json['CALENDAR_ENTRY_DESC'];
|
||||||
|
dATEEND = json['DATE_END'];
|
||||||
|
dATESTART = json['DATE_START'];
|
||||||
|
eMPLOYEENAME = json['EMPLOYEE_NAME'];
|
||||||
|
eMPLOYEENUMBER = json['EMPLOYEE_NUMBER'];
|
||||||
|
lEAVETYPE = json['LEAVE_TYPE'];
|
||||||
|
oRGANIZATIONID = json['ORGANIZATION_ID'];
|
||||||
|
oRGANIZATIONNAME = json['ORGANIZATION_NAME'];
|
||||||
|
pOSITIONTITLE = json['POSITION_TITLE'];
|
||||||
|
rEPLACEMENTNAME = json['REPLACEMENT_NAME'];
|
||||||
|
sTATUS = json['STATUS'];
|
||||||
|
}
|
||||||
|
|
||||||
|
Map<String, dynamic> toJson() {
|
||||||
|
Map<String, dynamic> data = new Map<String, dynamic>();
|
||||||
|
data['ABSENCE_ATTENDANCE_TYPE_NAME'] = this.aBSENCEATTENDANCETYPENAME;
|
||||||
|
data['CALENDAR_ENTRY_DESC'] = this.cALENDARENTRYDESC;
|
||||||
|
data['DATE_END'] = this.dATEEND;
|
||||||
|
data['DATE_START'] = this.dATESTART;
|
||||||
|
data['EMPLOYEE_NAME'] = this.eMPLOYEENAME;
|
||||||
|
data['EMPLOYEE_NUMBER'] = this.eMPLOYEENUMBER;
|
||||||
|
data['LEAVE_TYPE'] = this.lEAVETYPE;
|
||||||
|
data['ORGANIZATION_ID'] = this.oRGANIZATIONID;
|
||||||
|
data['ORGANIZATION_NAME'] = this.oRGANIZATIONNAME;
|
||||||
|
data['POSITION_TITLE'] = this.pOSITIONTITLE;
|
||||||
|
data['REPLACEMENT_NAME'] = this.rEPLACEMENTNAME;
|
||||||
|
data['STATUS'] = this.sTATUS;
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,187 @@
|
|||||||
|
|
||||||
|
import 'dart:io';
|
||||||
|
|
||||||
|
import 'package:easy_localization/easy_localization.dart';
|
||||||
|
import 'package:flutter/cupertino.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter_svg/flutter_svg.dart';
|
||||||
|
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/date_uitl.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/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/models/my_team/get_subordinates_leaves_total_vacations_list_model.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/dynamic_forms/dynamic_textfield_widget.dart';
|
||||||
|
|
||||||
|
|
||||||
|
class SubordinateLeave extends StatefulWidget {
|
||||||
|
const SubordinateLeave({Key? key}) : super(key: key);
|
||||||
|
|
||||||
|
@override
|
||||||
|
_SubordinateLeaveState createState() => _SubordinateLeaveState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _SubordinateLeaveState extends State<SubordinateLeave> {
|
||||||
|
List<GetSubordinatesLeavesTotalVacationsList> getSubordinatesLeavesTotalList = [];
|
||||||
|
DateTime selectedDateFrom = DateTime.now();
|
||||||
|
DateTime selectedDateTo = DateTime.now();
|
||||||
|
bool showList = false;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
}
|
||||||
|
|
||||||
|
void getSubordinatesLeaves()async {
|
||||||
|
try {
|
||||||
|
Utils.showLoading(context);
|
||||||
|
getSubordinatesLeavesTotalList = await MyTeamApiClient().getSubordinatesLeavesList(DateUtil.convertDateToStringLocation(selectedDateFrom), DateUtil.convertDateToStringLocation(selectedDateTo));
|
||||||
|
showList= true;
|
||||||
|
Utils.hideLoading(context);
|
||||||
|
setState(() {});
|
||||||
|
} catch (ex) {
|
||||||
|
Utils.hideLoading(context);
|
||||||
|
Utils.handleException(ex, context, null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return Scaffold(
|
||||||
|
appBar: AppBarWidget(
|
||||||
|
context,
|
||||||
|
title: LocaleKeys.subordinateLeave.tr(),
|
||||||
|
),
|
||||||
|
backgroundColor: MyColors.backgroundColor,
|
||||||
|
body: Column(
|
||||||
|
children: [
|
||||||
|
Expanded(
|
||||||
|
child: SingleChildScrollView(
|
||||||
|
scrollDirection: Axis.vertical,
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
Column(
|
||||||
|
children: [
|
||||||
|
DynamicTextFieldWidget(
|
||||||
|
LocaleKeys.dateFrom.tr(),
|
||||||
|
selectedDateFrom.toString().split(" ")[0],
|
||||||
|
suffixIconData: Icons.calendar_today,
|
||||||
|
isEnable: false,
|
||||||
|
onTap: () async {
|
||||||
|
selectedDateFrom = await _selectDate(context, DateTime.now());
|
||||||
|
setState(() {});
|
||||||
|
},
|
||||||
|
),
|
||||||
|
12.height,
|
||||||
|
DynamicTextFieldWidget(
|
||||||
|
LocaleKeys.dateTo.tr(),
|
||||||
|
selectedDateTo.toString().split(" ")[0],
|
||||||
|
suffixIconData: Icons.calendar_today,
|
||||||
|
isEnable: false,
|
||||||
|
onTap: () async {
|
||||||
|
selectedDateTo = await _selectDate(context, DateTime.now());
|
||||||
|
setState(() {});
|
||||||
|
},
|
||||||
|
)
|
||||||
|
],
|
||||||
|
).objectContainerView(),
|
||||||
|
Container(
|
||||||
|
margin: EdgeInsets.only(left: 21, right: 21),
|
||||||
|
width: MediaQuery.of(context).size.width,
|
||||||
|
child: SingleChildScrollView(
|
||||||
|
scrollDirection: Axis.vertical,
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
showList? ListView.separated(
|
||||||
|
scrollDirection: Axis.vertical,
|
||||||
|
shrinkWrap: true,
|
||||||
|
physics: ScrollPhysics(),
|
||||||
|
separatorBuilder: (BuildContext cxt,int index) => 12.height,
|
||||||
|
itemCount: getSubordinatesLeavesTotalList.length,
|
||||||
|
itemBuilder: (BuildContext context,int index) {
|
||||||
|
var diffDays = DateUtil.convertStringToDate(getSubordinatesLeavesTotalList[index].dATEEND!).difference(DateUtil.convertStringToDate(getSubordinatesLeavesTotalList[index].dATESTART!)).inDays;
|
||||||
|
return getSubordinatesLeavesTotalList.isEmpty
|
||||||
|
? Utils.getNoDataWidget(context)
|
||||||
|
: Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
|
children: [
|
||||||
|
SvgPicture.asset("assets/images/user.svg"),
|
||||||
|
14.width,
|
||||||
|
Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
"${getSubordinatesLeavesTotalList[index].eMPLOYEENAME}".toText16(isBold: true, color: MyColors.grey3AColor),
|
||||||
|
10.height,
|
||||||
|
Row(
|
||||||
|
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
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Future<DateTime> _selectDate(BuildContext context, DateTime selectedDate) async {
|
||||||
|
DateTime time = selectedDate;
|
||||||
|
if (!Platform.isIOS) {
|
||||||
|
await showCupertinoModalPopup(
|
||||||
|
context: context,
|
||||||
|
builder: (cxt) => Container(
|
||||||
|
height: 250,
|
||||||
|
color: Colors.white,
|
||||||
|
child: CupertinoDatePicker(
|
||||||
|
backgroundColor: Colors.white,
|
||||||
|
mode: CupertinoDatePickerMode.date,
|
||||||
|
onDateTimeChanged: (value) {
|
||||||
|
if (value != null && value != selectedDate) {
|
||||||
|
time = value;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
initialDateTime: selectedDate,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
DateTime? picked = await showDatePicker(context: context, initialDate: selectedDate, initialEntryMode: DatePickerEntryMode.calendarOnly, firstDate: DateTime(2015, 8), lastDate: DateTime(2101));
|
||||||
|
if (picked != null && picked != selectedDate) {
|
||||||
|
time = picked;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return time;
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue