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

fixes.

Browse Source
merge-requests/11/head
Sikander Saleem 3 years ago
parent ba8e272885
commit d6315b0674
3 changed files with 84 additions and 111 deletions
Show Stats Download Patch File Download Diff File

6
lib/ui/work_list/work_list_screen.dart
Unescape Escape View File

@ -165,11 +165,7 @@ class _WorkListScreenState extends State<WorkListScreen> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Container( Container(width: double.infinity, height: 1, color: MyColors.lightGreyEFColor),
width: double.infinity,
height: 1,
color: MyColors.lightGreyEFColor,
),
SizedBox( SizedBox(
height: 40, height: 40,
child: ListView.separated( child: ListView.separated(

10
lib/ui/work_list/worklist_fragments/attachments_fragment.dart
Unescape Escape View File

@ -28,9 +28,12 @@ class AttachmentsFragment extends StatelessWidget {
(getAttachmentList[index].fILENAME?.capitalizeFirstofEach ?? "").toText16().expanded, (getAttachmentList[index].fILENAME?.capitalizeFirstofEach ?? "").toText16().expanded,
], ],
).objectContainerView().onPress(() async { ).objectContainerView().onPress(() async {
// print("calling"); try {
// String path = await _createFileFromString(getAttachmentList[index].fILEDATA ?? "", getAttachmentList[index].fILECONTENTTYPE ?? ""); String path = await _createFileFromString(getAttachmentList[index].fILEDATA ?? "", getAttachmentList[index].fILECONTENTTYPE ?? "");
// OpenFile.open(path); OpenFile.open(path);
} catch (ex) {
debugPrint("FileErorr:$ex");
}
}); });
}, },
separatorBuilder: (BuildContext context, int index) => 12.height, separatorBuilder: (BuildContext context, int index) => 12.height,
@ -67,7 +70,6 @@ class AttachmentsFragment extends StatelessWidget {
String dir = (await getApplicationDocumentsDirectory()).path; String dir = (await getApplicationDocumentsDirectory()).path;
File file = File("$dir/" + DateTime.now().millisecondsSinceEpoch.toString() + "." + ext); File file = File("$dir/" + DateTime.now().millisecondsSinceEpoch.toString() + "." + ext);
await file.writeAsBytes(bytes); await file.writeAsBytes(bytes);
// print(file.path);
return file.path; return file.path;
} }
} }

101
lib/ui/work_list/worklist_settings.dart
Unescape Escape View File

@ -1,4 +1,3 @@
import 'package:easy_localization/src/public_ext.dart'; import 'package:easy_localization/src/public_ext.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
@ -6,6 +5,7 @@ import 'package:mohem_flutter_app/api/worklist/worklist_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/utils.dart'; import 'package:mohem_flutter_app/classes/utils.dart';
import 'package:mohem_flutter_app/config/routes.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/string_extensions.dart';
import 'package:mohem_flutter_app/extensions/widget_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';
@ -26,7 +26,6 @@ class _WorklistSettingsState extends State<WorklistSettings> {
List<GetUserItemTypesList> getUserItemTypesList = []; List<GetUserItemTypesList> getUserItemTypesList = [];
UpdateUserItemTypesList? updateUserItemTypesList; UpdateUserItemTypesList? updateUserItemTypesList;
void initState() { void initState() {
super.initState(); super.initState();
userItemTypesList(); userItemTypesList();
@ -47,10 +46,9 @@ class _WorklistSettingsState extends State<WorklistSettings> {
void updateUserItem() async { void updateUserItem() async {
try { try {
Utils.showLoading(context); Utils.showLoading(context);
List<Map<String, dynamic>> itemList=[]; List<Map<String, dynamic>> itemList = [];
for (var element in getUserItemTypesList) { for (var element in getUserItemTypesList) {
itemList.add(UpdateUserTypesList(itemID: element.uSERITEMTYPEID, pITEMTYPE: element.iTEMTYPE,pFYAENABLEDFALG: element.fYAENABLEDFALG, pFYIENABLEDFALG: element.fYIENABLEDFLAG).toJson()); itemList.add(UpdateUserTypesList(itemID: element.uSERITEMTYPEID, pITEMTYPE: element.iTEMTYPE, pFYAENABLEDFALG: element.fYAENABLEDFALG, pFYIENABLEDFALG: element.fYIENABLEDFLAG).toJson());
} }
updateUserItemTypesList = await WorkListApiClient().updateUserItemTypes(itemList); updateUserItemTypesList = await WorkListApiClient().updateUserItemTypes(itemList);
Utils.hideLoading(context); Utils.hideLoading(context);
@ -64,42 +62,30 @@ class _WorklistSettingsState extends State<WorklistSettings> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold(backgroundColor: Colors.white, return Scaffold(
backgroundColor: Colors.white,
appBar: AppBarWidget( appBar: AppBarWidget(
context, context,
title: LocaleKeys.worklistSettings.tr(), title: LocaleKeys.worklistSettings.tr(),
), ),
body:ListView( body: Column(
children: [ children: [
Expanded( ListView(
child: Container( padding: const EdgeInsets.only(top: 21, left: 21, right: 21),
margin: const EdgeInsets.only(top: 21, left: 21, right: 21),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Container( LocaleKeys.TurnNotificationsFor.tr().toText22(color: MyColors.blackColor),
child: LocaleKeys.TurnNotificationsFor.tr().toText22(color: MyColors.blackColor), 16.height,
).paddingOnly(top: 10, bottom: 50),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Container( LocaleKeys.itemType.tr().toText14(color: MyColors.blackColor),
child: LocaleKeys.itemType.tr().toText14(color: MyColors.blackColor) ,
),
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceAround, mainAxisAlignment: MainAxisAlignment.spaceAround,
children: [ children: ["FYA".tr().toText14(color: MyColors.blackColor), 30.width, "FYI".tr().toText14(color: MyColors.blackColor), 30.width],
Container(
child: "FYA".tr().toText14(color: MyColors.blackColor) ,
),
Container(
child: "FYI".tr().toText14(color: MyColors.blackColor) ,
).paddingOnly(left: 30, right: 30),
],
) )
], ],
), ),
Divider(color: MyColors.greyA5Color,), const Divider(color: MyColors.greyA5Color),
SingleChildScrollView( SingleChildScrollView(
scrollDirection: Axis.vertical, scrollDirection: Axis.vertical,
child: ListView.builder( child: ListView.builder(
@ -107,72 +93,61 @@ class _WorklistSettingsState extends State<WorklistSettings> {
shrinkWrap: true, shrinkWrap: true,
physics: ScrollPhysics(), physics: ScrollPhysics(),
itemCount: getUserItemTypesList == null ? 0 : getUserItemTypesList.length, itemCount: getUserItemTypesList == null ? 0 : getUserItemTypesList.length,
itemBuilder: (BuildContext context,int index) { itemBuilder: (BuildContext context, int index) {
return Column( return Column(children: [
children:[
customSwitch(getUserItemTypesList[index]), customSwitch(getUserItemTypesList[index]),
Divider( Divider(
color: MyColors.greyC4Color, color: MyColors.greyC4Color,
thickness: 0.5,), thickness: 0.5,
]);
}
), ),
]);
}),
), ),
], ],
), ).expanded,
), DefaultButton(LocaleKeys.save.tr(), () async {
),
DefaultButton(
LocaleKeys.save.tr(), () async {
updateUserItem(); updateUserItem();
}).insideContainer, }).insideContainer,
], ],
) ));
);
} }
Widget customSwitch(GetUserItemTypesList list) {
Widget customSwitch(GetUserItemTypesList list){
return Padding( return Padding(
padding: const EdgeInsets.only(top: 21), padding: const EdgeInsets.only(top: 21),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
Text(list.iTEMTYPE.toString(), style: TextStyle( Text(
fontSize: 16, list.iTEMTYPE.toString(),
fontWeight: FontWeight.w600, style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, color: MyColors.blackColor),
color: MyColors.blackColor ),
),),
const Spacer(), const Spacer(),
Row( Row(
children: [ children: [
CupertinoSwitch( CupertinoSwitch(
trackColor: Colors.grey, trackColor: MyColors.grey57Color,
activeColor: MyColors.gradiantEndColor, activeColor: MyColors.textMixColor,
value: list?.fYAENABLEDFALG =='Y' ?true : false, value: list?.fYAENABLEDFALG == 'Y' ? true : false,
onChanged: (value){ onChanged: (value) {
setState(() { setState(() {
list?.fYAENABLEDFALG = value == true ? 'Y': 'N'; list?.fYAENABLEDFALG = value == true ? 'Y' : 'N';
}); });
} }),
),
CupertinoSwitch( CupertinoSwitch(
trackColor: Colors.grey, trackColor: MyColors.grey57Color,
activeColor: MyColors.gradiantEndColor, activeColor: MyColors.textMixColor,
value: list?.fYIENABLEDFLAG =='Y' ?true : false, value: list?.fYIENABLEDFLAG == 'Y' ? true : false,
onChanged: (value){ onChanged: (value) {
setState(() { setState(() {
// list.isFYI = value; // list.isFYI = value;
list?.fYIENABLEDFLAG = value ==true ? 'Y': 'N'; list?.fYIENABLEDFLAG = value == true ? 'Y' : 'N';
}); });
} }),
),
], ],
) )
], ],
), ),
); );
} }
} }

Write Preview
Loading…
Cancel
Save