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

Merge branch 'master' into development_faiz

Browse Source 
# Conflicts:
#	lib/generated/codegen_loader.g.dart
merge-requests/27/head
FaizHashmiCS22 3 years ago
parent 199a65a994 c1666b7140
commit f3623e29dc
11 changed files with 86 additions and 61 deletions
Show Stats Download Patch File Download Diff File

2
assets/langs/en-US.json
Unescape Escape View File

@ -420,7 +420,7 @@
"updateMember": "Are You Sure You Want to Update this Member?", "updateMember": "Are You Sure You Want to Update this Member?",
"fieldIsEmpty": "'{data}' Field is empty. Please select", "fieldIsEmpty": "'{data}' Field is empty. Please select",
"pleaseEnterComments": "Please enter comments", "pleaseEnterComments": "Please enter comments",
"skip": "skip", "skip": "Skip",
"typeCurrentPasswordBelow": "Type Your Current password below", "typeCurrentPasswordBelow": "Type Your Current password below",
"currentPassword": "Current password", "currentPassword": "Current password",
"profile": { "profile": {

4
lib/api/api_client.dart
Unescape Escape View File

@ -81,8 +81,8 @@ class ApiClient {
} }
if (!kReleaseMode) { if (!kReleaseMode) {
print("Url:$url"); print("Url:$url");
// var bodyJson = json.encode(jsonObject); var bodyJson = json.encode(jsonObject);
// print("body:$bodyJson"); print("body:$bodyJson");
} }
var response = await postJsonForResponse(url, jsonObject, var response = await postJsonForResponse(url, jsonObject,
token: token, token: token,

2
lib/ui/attendance/monthly_attendance_screen.dart
Unescape Escape View File

@ -116,6 +116,8 @@ class _MonthlyAttendanceScreenState extends State<MonthlyAttendanceScreen> {
initialDate: formattedDate, initialDate: formattedDate,
firstDate: DateTime(searchYear - 2), firstDate: DateTime(searchYear - 2),
lastDate: DateTime.now(), lastDate: DateTime.now(),
confirmText: Text(LocaleKeys.confirm.tr()),
cancelText: Text(LocaleKeys.cancel.tr()),
).then((selectedDate) { ).then((selectedDate) {
if (selectedDate != null) { if (selectedDate != null) {
searchMonth = getMonth(selectedDate.month); searchMonth = getMonth(selectedDate.month);

3
lib/ui/my_team/employee_details.dart
Unescape Escape View File

@ -70,6 +70,7 @@ class _EmployeeDetailsState extends State<EmployeeDetails> {
extendBody: true, extendBody: true,
backgroundColor: MyColors.lightGreyEFColor, backgroundColor: MyColors.lightGreyEFColor,
body: Stack(children: [ body: Stack(children: [
getEmployeeSubordinates!.eMPLOYEEIMAGE != null ?
Container( Container(
height: 200, height: 200,
margin: EdgeInsets.only(top: 30), margin: EdgeInsets.only(top: 30),
@ -80,6 +81,8 @@ class _EmployeeDetailsState extends State<EmployeeDetails> {
decoration: new BoxDecoration(color: Colors.white.withOpacity(0.0)), decoration: new BoxDecoration(color: Colors.white.withOpacity(0.0)),
), ),
), ),
) : Container(
decoration: BoxDecoration(color: Colors.white.withOpacity(0.0)),
), ),
SingleChildScrollView( SingleChildScrollView(
scrollDirection: Axis.vertical, scrollDirection: Axis.vertical,

2
lib/ui/my_team/view_attendance.dart
Unescape Escape View File

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

15
lib/ui/profile/profile_screen.dart
Unescape Escape View File

@ -44,23 +44,26 @@ class _ProfileScreenState extends State<ProfileScreen> {
backgroundColor: const Color(0xffefefef), backgroundColor: const Color(0xffefefef),
body: Stack( body: Stack(
children: [ children: [
Container( memberInformationList!.eMPLOYEEIMAGE != null
height: 300, ? Container(
margin: const EdgeInsets.only(top: 50), height: 300,
decoration: BoxDecoration( margin: const EdgeInsets.only(top: 50),
decoration: BoxDecoration(
image: DecorationImage( image: DecorationImage(
image: MemoryImage( image: MemoryImage(
Utils.dataFromBase64String(memberInformationList.eMPLOYEEIMAGE!), Utils.dataFromBase64String(memberInformationList.eMPLOYEEIMAGE!),
), ),
fit: BoxFit.cover), fit: BoxFit.cover),
), ),
child: BackdropFilter( child: BackdropFilter(
filter: ImageFilter.blur(sigmaX: 10.0, sigmaY: 10.0), filter: ImageFilter.blur(sigmaX: 10.0, sigmaY: 10.0),
child: Container( child: Container(
color: Colors.white.withOpacity(0.0), color: Colors.white.withOpacity(0.0),
), ),
), ),
), ): Container(
decoration: BoxDecoration(color: Colors.white.withOpacity(0.0)),
),
SingleChildScrollView( SingleChildScrollView(
scrollDirection: Axis.vertical, scrollDirection: Axis.vertical,
child: Column( child: Column(

8
lib/ui/work_list/sheets/delegate_sheet.dart
Unescape Escape View File

@ -407,10 +407,10 @@ class _DelegateSheetState extends State<DelegateSheet> {
child: Row( child: Row(
children: [ children: [
CircularAvatar( CircularAvatar(
url: actionHistory.employeeImage ?? "", url: actionHistory.employeeImage,
height: 30, height: 30,
width: 30, width: 30,
isImageBase64: true, isImageBase64: (actionHistory.employeeImage != null || actionHistory.employeeImage!.isNotEmpty) ? true : false,
), ),
16.width, 16.width,
Expanded( Expanded(
@ -452,10 +452,10 @@ class _DelegateSheetState extends State<DelegateSheet> {
child: Row( child: Row(
children: [ children: [
CircularAvatar( CircularAvatar(
url: actionHistory.employeeImage ?? "", url: actionHistory.employeeImage,
height: 30, height: 30,
width: 30, width: 30,
isImageBase64: true, isImageBase64: actionHistory.employeeImage != null ? true : false,
), ),
16.width, 16.width,
Expanded( Expanded(

15
lib/ui/work_list/sheets/selected_item_sheet.dart
Unescape Escape View File

@ -142,10 +142,17 @@ class SelectedItemSheet extends StatelessWidget {
padding: EdgeInsets.only(top: 16, bottom: 16, left: 21, right: 21), padding: EdgeInsets.only(top: 16, bottom: 16, left: 21, right: 21),
child: Row( child: Row(
children: [ children: [
CircularAvatar( actionHistoryList != null
height: 30, ? CircularAvatar(
width: 30, height: 30,
), width: 30,
url: actionHistoryList!.eMPLOYEEIMAGE,
isImageBase64: true,
)
: CircularAvatar(
height: 30,
width: 30,
),
16.width, 16.width,
Expanded( Expanded(
child: (name ?? "").toText12(), child: (name ?? "").toText12(),

7
lib/ui/work_list/worklist_detail_screen.dart
Unescape Escape View File

@ -307,7 +307,7 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
myFab(LocaleKeys.pleaseEnterComments.tr(), "assets/images/skip.svg").onPress(() { myFab(LocaleKeys.skip.tr(), "assets/images/skip.svg").onPress(() {
if (AppState().workList!.length - 1 > AppState().workListIndex!) { if (AppState().workList!.length - 1 > AppState().workListIndex!) {
AppState().setWorkListIndex = AppState().workListIndex! + 1; AppState().setWorkListIndex = AppState().workListIndex! + 1;
workListData = null; workListData = null;
@ -354,7 +354,8 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
if (notificationButtonsList[i].bUTTONACTION! == "REJECTED" || notificationButtonsList[i].bUTTONACTION! == "APPROVED" || notificationButtonsList[i].bUTTONACTION! == "CLOSE") { if (notificationButtonsList[i].bUTTONACTION! == "REJECTED" || notificationButtonsList[i].bUTTONACTION! == "APPROVED" || notificationButtonsList[i].bUTTONACTION! == "CLOSE") {
continue; continue;
} }
fabs.add(myFab(notificationButtonsList[i].bUTTONLABEL!, notificationButtonsList[i].bUTTONICON ?? "", isIconAsset: false) fabs.add(myFab(notificationButtonsList[i].bUTTONLABEL!, notificationButtonsList[i].bUTTONACTION == "DELEGATE" ? "assets/images/delegate.svg" : notificationButtonsList[i].bUTTONICON ?? "",
isIconAsset: notificationButtonsList[i].bUTTONACTION == "DELEGATE" ? true : false,)
.paddingOnly(bottom: 12) .paddingOnly(bottom: 12)
.onPress(() => handleFabAction(notificationButtonsList[i]))); .onPress(() => handleFabAction(notificationButtonsList[i])));
} }
@ -778,7 +779,7 @@ class _WorkListDetailScreenState extends State<WorkListDetailScreen> {
// apiCallCount--; // apiCallCount--;
// if (apiCallCount == 0) { // if (apiCallCount == 0) {
// Utils.hideLoading(context); // Utils.hideLoading(context);
setState(() {}); setState(() {});
// } // }
} catch (ex) { } catch (ex) {
// apiCallCount--; // apiCallCount--;

22
lib/ui/work_list/worklist_fragments/info_fragments.dart
Unescape Escape View File

@ -440,7 +440,7 @@ class InfoFragment extends StatelessWidget {
Widget getPRNotificationBodyListWidget(GetPrNotificationBodyList getPrNotificationBodyList) { Widget getPRNotificationBodyListWidget(GetPrNotificationBodyList getPrNotificationBodyList) {
return Column( return Column(
children: [ children: [
getPrNotificationBodyList.pINFORMATION.toString().toText14(color: MyColors.textMixColor).objectContainerView(), getPrNotificationBodyList.pINFORMATION != null ? getPrNotificationBodyList.pINFORMATION.toString().toText14(color: MyColors.textMixColor).objectContainerView() : Container(),
12.height, 12.height,
Column( Column(
children: [ children: [
@ -456,21 +456,23 @@ class InfoFragment extends StatelessWidget {
ItemDetailViewCol(LocaleKeys.id.tr(), workListData!.nOTIFICATIONID?.toString() ?? ""), ItemDetailViewCol(LocaleKeys.id.tr(), workListData!.nOTIFICATIONID?.toString() ?? ""),
ItemDetailViewCol(LocaleKeys.responder.tr(), workListData!.rESPONDER ?? ""), ItemDetailViewCol(LocaleKeys.responder.tr(), workListData!.rESPONDER ?? ""),
), ),
ItemDetailGrid( Column(
ItemDetailViewCol(getPrNotificationBodyList.pRHeader![2].hDRATTRIBUTENAME!, getPrNotificationBodyList.pRHeader![2].hDRATTRIBUTEVALUE ?? ""), children: getPRHeaderValues(),
ItemDetailViewCol(getPrNotificationBodyList.pRHeader![0].hDRATTRIBUTENAME!, getPrNotificationBodyList.pRHeader![0].hDRATTRIBUTEVALUE ?? ""), )
),
ItemDetailGrid(
ItemDetailViewCol(getPrNotificationBodyList.pRHeader![1].hDRATTRIBUTENAME!, getPrNotificationBodyList.pRHeader![1].hDRATTRIBUTEVALUE ?? ""),
Container(),
isItLast: true,
),
], ],
).objectContainerView(), ).objectContainerView(),
], ],
); );
} }
List<Widget> getPRHeaderValues() {
List<Widget> pRHeaders = [];
getPrNotificationBodyList!.pRHeader!.forEach((element) {
pRHeaders.add(ItemDetailGrid(ItemDetailViewCol(element.hDRATTRIBUTENAME!, element.hDRATTRIBUTEVALUE!), Container()));
});
return pRHeaders;
}
Widget getContactNotificationBodyListWidget(GetContactNotificationBodyList data) { Widget getContactNotificationBodyListWidget(GetContactNotificationBodyList data) {
bool isOdd = false; bool isOdd = false;
try { try {

67
lib/ui/work_list/worklist_fragments/request_fragment.dart
Unescape Escape View File

@ -115,37 +115,42 @@ class RequestFragment extends StatelessWidget {
} }
Widget prLinesDataView() { Widget prLinesDataView() {
return Column( return ExpandableNotifier(
children: [ child: ListView.separated(
prLinesList[0].dESCRIPTION.toString().toText14(color: MyColors.textMixColor).objectContainerView(), shrinkWrap: true,
12.height, physics: const NeverScrollableScrollPhysics(),
Column( itemBuilder: (cxt, index) => ExpandablePanel(
children: [ header: prLinesList[index].dESCRIPTION.toString().toText14(color: MyColors.textMixColor),
ItemDetailGrid( collapsed: Column(
ItemDetailViewCol("Cost Center", prLinesList[0].cOSTCENTER ?? ""), children: [
ItemDetailViewCol("Code", prLinesList[0].iTEMCODE ?? ""), ItemDetailGrid(
), ItemDetailViewCol("Cost Center", prLinesList[index].cOSTCENTER ?? ""),
ItemDetailGrid( ItemDetailViewCol("Code", prLinesList[index].iTEMCODE ?? ""),
ItemDetailViewCol("Unit", prLinesList[0].uOM ?? ""), ),
ItemDetailViewCol("Price (SAR)", prLinesList[0].uNITPRICE.toString() ?? ""), ItemDetailGrid(
), ItemDetailViewCol("Unit", prLinesList[index].uOM ?? ""),
ItemDetailGrid( ItemDetailViewCol("Price (SAR)", prLinesList[index].uNITPRICE.toString() ?? ""),
ItemDetailViewCol("Amount (SAR)", prLinesList[0].lINEAMOUNT.toString() ?? ""), ),
ItemDetailViewCol("Quantity", prLinesList[0].qUANTITY.toString() ?? ""), ItemDetailGrid(
), ItemDetailViewCol("Amount (SAR)", prLinesList[index].lINEAMOUNT.toString() ?? ""),
ItemDetailGrid( ItemDetailViewCol("Quantity", prLinesList[index].qUANTITY.toString() ?? ""),
ItemDetailViewCol("AMU (Last 3 months)", prLinesList[0].iTEMAMU.toString() ?? ""), ),
Container(), ItemDetailGrid(
isItLast: true, ItemDetailViewCol("AMU (Last 3 months)", prLinesList[index].iTEMAMU.toString() ?? ""),
), Container(),
// ItemDetailGrid( isItLast: true,
// ItemDetailViewCol(getPrNotificationBodyList.pRHeader![1].hDRATTRIBUTENAME!, getPrNotificationBodyList.pRHeader![1].hDRATTRIBUTEVALUE ?? ""), ),
// Container(), // ItemDetailGrid(
// isItLast: true, // ItemDetailViewCol(getPrNotificationBodyList.pRHeader![1].hDRATTRIBUTENAME!, getPrNotificationBodyList.pRHeader![1].hDRATTRIBUTEVALUE ?? ""),
// ), // Container(),
], // isItLast: true,
).objectContainerView(), // ),
], ],
),
expanded: const SizedBox(),
).objectContainerView(),
separatorBuilder: (cxt, index) => 12.height,
itemCount: prLinesList.length),
); );
} }

Write Preview
Loading…
Cancel
Save