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

Merge branch 'development_haroon' into 'master'

Browse Source 
Development haroon

See merge request mirza.shafique/mohem_flutter_app!35
merge-requests/1/merge
Sikander Saleem 2 years ago
parent e01bb920a7 e045374703
commit 2adb1e34bf
8 changed files with 446 additions and 2 deletions
Show Stats Download Patch File Download Diff File

8
assets/images/not_found.svg
Unescape Escape View File

@ -0,0 +1,8 @@
<svg id="user_21_" data-name="user (21)" xmlns="http://www.w3.org/2000/svg" width="110.999" height="110.999" viewBox="0 0 110.999 110.999">
<path id="Path_4696" data-name="Path 4696" d="M272.482,267.883a25.756,25.756,0,0,0,5.549-15.868,26.015,26.015,0,1,0-26.015,26.015,25.756,25.756,0,0,0,15.868-5.549l14.569,14.569a3.252,3.252,0,1,0,4.6-4.6ZM260.818,256.22a3.252,3.252,0,1,1-4.6,4.6l-4.2-4.2-4.2,4.2a3.252,3.252,0,0,1-4.6-4.6l4.2-4.2-4.2-4.2a3.252,3.252,0,0,1,4.6-4.6l4.2,4.2,4.2-4.2a3.252,3.252,0,1,1,4.6,4.6l-4.2,4.2Z" transform="translate(-177.004 -177.004)" fill="#ddd"/>
<circle id="Ellipse_165" data-name="Ellipse 165" cx="3.5" cy="3.5" r="3.5" transform="translate(35.5 19.499)" fill="#ddd"/>
<path id="Path_4697" data-name="Path 4697" d="M197.516,362h0Z" transform="translate(-154.695 -283.52)" fill="#ddd"/>
<path id="Path_4698" data-name="Path 4698" d="M197.516,332h0Z" transform="translate(-154.695 -260.021)" fill="#ddd"/>
<path id="Path_4699" data-name="Path 4699" d="M3.252,111H75.011a3.25,3.25,0,0,0,3.252-3.252v-.329a31.763,31.763,0,0,1-3.252.329,32.393,32.393,0,0,1-23.165-9.756H16.476a3.252,3.252,0,0,1,0-6.5H47.016v0a32.2,32.2,0,0,1-2.865-6.507H16.476a3.252,3.252,0,0,1,0-6.5H42.821c-.454-4.484-.454-2.022,0-6.5H16.476a3.252,3.252,0,1,1,0-6.5H44.152a32.468,32.468,0,0,1,7.694-13.009H26.232a3.25,3.25,0,0,1-3.252-3.252V45.96A13.021,13.021,0,0,1,35.988,32.953H39.24A9.756,9.756,0,1,1,49,23.2a9.767,9.767,0,0,1-9.756,9.756h3.252A13.021,13.021,0,0,1,55.5,45.96v3.252c0,.071-.036.13-.04.2a32.2,32.2,0,0,1,19.552-6.7,31.762,31.762,0,0,1,3.252.329V3.252A3.25,3.25,0,0,0,75.011,0H3.252A3.25,3.25,0,0,0,0,3.252v104.5A3.25,3.25,0,0,0,3.252,111Z" fill="#ddd"/>
<path id="Path_4700" data-name="Path 4700" d="M142.5,182a6.512,6.512,0,0,0-6.5,6.5h19.512a6.512,6.512,0,0,0-6.5-6.5Z" transform="translate(-106.516 -142.543)" fill="#ddd"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

11
lib/api/pending_transactions_api_client.dart
Unescape Escape View File

@ -33,4 +33,15 @@ class PendingTransactionsApiClient {
return responseData.getPendingTransactionsDetails ?? [];
}, url, postParams);
}
Future<String> getAnnouncements(int itgAwarenessID, int itgPageNo, int itgRowID) async {
String url = "${ApiConsts.cocRest}GetAnnouncementDiscountsConfigData";
Map<String, dynamic> postParams = {"EmployeeNumber": AppState().memberInformationList?.eMPLOYEENUMBER.toString(), "ItgAwarenessID": itgAwarenessID, "ItgPageNo": itgPageNo, "ItgPageSize": 5, "ItgRowID": itgRowID};
postParams.addAll(AppState().postParamsJson);
return await ApiClient().postJsonForObject((json) {
GenericResponseModel? responseData = GenericResponseModel.fromJson(json);
return responseData.mohemmITGResponseItem ?? "";
}, url, postParams);
}
}

8
lib/classes/utils.dart
Unescape Escape View File

@ -141,6 +141,14 @@ class Utils {
return null;
}
static getBase64FromJpeg(img) {
try {
var b64 = img.replaceFirst('data:image/jpeg;base64,', '');
return b64;
} catch (e) {}
return null;
}
static bool isBase64(String str) {
RegExp _base64 = RegExp(r'^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=|[A-Za-z0-9+\/]{4})$');
return _base64.hasMatch(str);

72
lib/models/get_announcement_details.dart
Unescape Escape View File

@ -0,0 +1,72 @@
class GetAnnouncementDetails {
String? titleEN;
String? titleAR;
String? emailBodyEN;
String? emailBodyAR;
String? bodyEN;
String? bodyAR;
String? bannerImage;
String? rowID;
String? awarenessName;
String? created;
String? publishedDesc;
String? published;
String? twoLanguageTemplateDesc;
String? wFStatus;
String? totalItems;
GetAnnouncementDetails(
{this.titleEN,
this.titleAR,
this.emailBodyEN,
this.emailBodyAR,
this.bodyEN,
this.bodyAR,
this.bannerImage,
this.rowID,
this.awarenessName,
this.created,
this.publishedDesc,
this.published,
this.twoLanguageTemplateDesc,
this.wFStatus,
this.totalItems});
GetAnnouncementDetails.fromJson(Map<String, dynamic> json) {
titleEN = json['Title_EN'];
titleAR = json['Title_AR'];
emailBodyEN = json['EmailBody_EN'];
emailBodyAR = json['EmailBody_AR'];
bodyEN = json['Body_EN'];
bodyAR = json['Body_AR'];
bannerImage = json['Banner_Image'];
rowID = json['rowID'];
awarenessName = json['awarenessName'];
created = json['created'];
publishedDesc = json['PublishedDesc'];
published = json['Published'];
twoLanguageTemplateDesc = json['TwoLanguageTemplateDesc'];
wFStatus = json['WFStatus'];
totalItems = json['TotalItems'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['Title_EN'] = this.titleEN;
data['Title_AR'] = this.titleAR;
data['EmailBody_EN'] = this.emailBodyEN;
data['EmailBody_AR'] = this.emailBodyAR;
data['Body_EN'] = this.bodyEN;
data['Body_AR'] = this.bodyAR;
data['Banner_Image'] = this.bannerImage;
data['rowID'] = this.rowID;
data['awarenessName'] = this.awarenessName;
data['created'] = this.created;
data['PublishedDesc'] = this.publishedDesc;
data['Published'] = this.published;
data['TwoLanguageTemplateDesc'] = this.twoLanguageTemplateDesc;
data['WFStatus'] = this.wFStatus;
data['TotalItems'] = this.totalItems;
return data;
}
}

72
lib/models/get_announcements.dart
Unescape Escape View File

@ -0,0 +1,72 @@
class GetAnnouncementsObject {
String? titleEN;
String? titleAR;
String? bannerImage;
String? rowID;
String? awarenessName;
String? created;
String? publishedDesc;
String? published;
String? twoLanguageTemplateDesc;
String? wFStatus;
String? totalItems;
String? emailBodyEN;
String? emailBodyAR;
String? bodyEN;
String? bodyAR;
GetAnnouncementsObject(
{this.titleEN,
this.titleAR,
this.bannerImage,
this.rowID,
this.awarenessName,
this.created,
this.publishedDesc,
this.published,
this.twoLanguageTemplateDesc,
this.wFStatus,
this.totalItems,
this.emailBodyEN,
this.emailBodyAR,
this.bodyEN,
this.bodyAR});
GetAnnouncementsObject.fromJson(Map<String, dynamic> json) {
titleEN = json['Title_EN'];
titleAR = json['Title_AR'];
bannerImage = json['Banner_Image'];
rowID = json['rowID'];
awarenessName = json['awarenessName'];
created = json['created'];
publishedDesc = json['PublishedDesc'];
published = json['Published'];
twoLanguageTemplateDesc = json['TwoLanguageTemplateDesc'];
wFStatus = json['WFStatus'];
totalItems = json['TotalItems'];
emailBodyEN = json['EmailBody_EN'];
emailBodyAR = json['EmailBody_AR'];
bodyEN = json['Body_EN'];
bodyAR = json['Body_AR'];
}
Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>();
data['Title_EN'] = this.titleEN;
data['Title_AR'] = this.titleAR;
data['Banner_Image'] = this.bannerImage;
data['rowID'] = this.rowID;
data['awarenessName'] = this.awarenessName;
data['created'] = this.created;
data['PublishedDesc'] = this.publishedDesc;
data['Published'] = this.published;
data['TwoLanguageTemplateDesc'] = this.twoLanguageTemplateDesc;
data['WFStatus'] = this.wFStatus;
data['TotalItems'] = this.totalItems;
data['EmailBody_EN'] = this.emailBodyEN;
data['EmailBody_AR'] = this.emailBodyAR;
data['Body_EN'] = this.bodyEN;
data['Body_AR'] = this.bodyAR;
return data;
}
}

5
lib/ui/landing/dashboard_screen.dart
Unescape Escape View File

@ -101,8 +101,9 @@ class _DashboardScreenState extends State<DashboardScreen> {
)
],
),
).onPress(() {
data.update(context);
).onPress(() async {
// data.update(context);
await Navigator.pushNamed(context, AppRoutes.announcements);
})
],
).paddingOnly(left: 21, right: 21, top: 48, bottom: 7),

104
lib/ui/screens/announcements/announcement_details.dart
Unescape Escape View File

@ -0,0 +1,104 @@
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:flutter_html/flutter_html.dart';
import 'package:mohem_flutter_app/api/pending_transactions_api_client.dart';
import 'package:mohem_flutter_app/classes/utils.dart';
import 'package:mohem_flutter_app/models/get_announcement_details.dart';
import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
class AnnouncementDetails extends StatefulWidget {
const AnnouncementDetails({Key? key}) : super(key: key);
@override
_AnnouncementDetailsState createState() => _AnnouncementDetailsState();
}
class _AnnouncementDetailsState extends State<AnnouncementDetails> {
String jsonResponse = "";
int currentPageNo = 0;
int rowID = 0;
GetAnnouncementDetails? getAnnouncementDetailsObj;
@override
void initState() {
super.initState();
}
@override
Widget build(BuildContext context) {
getRequestID();
return Scaffold(
backgroundColor: Colors.white,
appBar: AppBarWidget(
context,
title: "Announcements",
),
body: SingleChildScrollView(
child: Container(
width: double.infinity,
padding: const EdgeInsets.all(10.0),
margin: const EdgeInsets.all(12.0),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(10),
boxShadow: [
BoxShadow(
color: const Color(0xff000000).withOpacity(.05),
blurRadius: 26,
offset: const Offset(0, -3),
),
],
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
SizedBox(
width: double.infinity,
height: 150.0,
child: ClipRRect(
borderRadius: BorderRadius.circular(10),
child: Image.memory(
base64Decode(Utils.getBase64FromJpeg(getAnnouncementDetailsObj?.bannerImage)),
fit: BoxFit.cover,
),
),
),
Container(
margin: const EdgeInsets.only(top: 12.0),
child: Html(
data: getAnnouncementDetailsObj?.bodyEN,
),
),
],
),
),
),
);
}
getRequestID() {
if (currentPageNo == 0) {
final arguments = (ModalRoute.of(context)?.settings.arguments ?? <String, dynamic>{}) as Map;
currentPageNo = arguments["currentPageNo"];
rowID = arguments["rowID"];
getAnnouncementDetails(0, rowID);
}
}
void getAnnouncementDetails(int itgAwarenessID, int itgRowID) async {
try {
Utils.showLoading(context);
jsonResponse = await PendingTransactionsApiClient().getAnnouncements(itgAwarenessID, currentPageNo, itgRowID);
var jsonDecodedData = jsonDecode(jsonDecode(jsonResponse)['result']['data']);
getAnnouncementDetailsObj = GetAnnouncementDetails.fromJson(jsonDecodedData[0]);
Utils.hideLoading(context);
setState(() {});
} catch (ex) {
Utils.hideLoading(context);
Utils.handleException(ex, context, null);
}
}
}

168
lib/ui/screens/announcements/announcements.dart
Unescape Escape View File

@ -0,0 +1,168 @@
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:mohem_flutter_app/api/pending_transactions_api_client.dart';
import 'package:mohem_flutter_app/app_state/app_state.dart';
import 'package:mohem_flutter_app/classes/colors.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/models/get_announcements.dart';
import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
import 'package:mohem_flutter_app/widgets/dynamic_forms/dynamic_textfield_widget.dart';
class Announcements extends StatefulWidget {
const Announcements({Key? key}) : super(key: key);
@override
_AnnouncementsState createState() => _AnnouncementsState();
}
class _AnnouncementsState extends State<Announcements> {
String jsonResponse = "";
int currentPageNo = 1;
int currentOpenIndex = -1;
List<GetAnnouncementsObject> getAnnouncementsObject = [];
List<GetAnnouncementsObject> _foundAnnouncements = [];
TextEditingController searchController = TextEditingController();
@override
void initState() {
getAnnouncements(0, 0);
super.initState();
}
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: Colors.white,
appBar: AppBarWidget(
context,
title: "Announcements",
),
body: getAnnouncementsObject.isNotEmpty
? Container(
margin: const EdgeInsets.only(top: 10.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
12.height,
Container(
margin: const EdgeInsets.fromLTRB(12.0, 0.0, 12.0, 0.0),
child: DynamicTextFieldWidget(
"Search",
"Search Announcements",
isEnable: true,
suffixIconData: Icons.search,
isPopup: false,
lines: 1,
isInputTypeNum: false,
isReadOnly: false,
onChange: (String value) {
_runFilter(value);
},
),
),
12.height,
Expanded(
child: ListView.separated(
physics: const BouncingScrollPhysics(),
shrinkWrap: true,
itemBuilder: (BuildContext context, int index) {
return InkWell(
onTap: () {
openAnnouncementsDetails(int.parse(_foundAnnouncements[index].rowID!));
},
child: Container(
width: double.infinity,
padding: const EdgeInsets.all(10.0),
margin: const EdgeInsets.only(left: 12, right: 12, top: 10),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(10),
boxShadow: [
BoxShadow(
color: const Color(0xff000000).withOpacity(.05),
blurRadius: 26,
offset: const Offset(0, -3),
),
],
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
SizedBox(
width: 80.0,
height: 80.0,
child: ClipRRect(
borderRadius: BorderRadius.circular(10),
child: Image.memory(
base64Decode(Utils.getBase64FromJpeg(_foundAnnouncements[index].bannerImage)),
fit: BoxFit.cover,
),
),
),
12.width,
SizedBox(
height: 80.0,
width: 200.0,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
AppState().isArabic(context) ? _foundAnnouncements[index].titleAR!.toText13() : getAnnouncementsObject[index].titleEN!.toText13(),
8.height,
_foundAnnouncements[index].created!.toText10(color: MyColors.grey98Color)
],
),
),
],
),
),
);
},
separatorBuilder: (BuildContext context, int index) => 1.height,
itemCount: _foundAnnouncements.length ?? 0))
],
),
)
: Utils.getNoDataWidget(context),
);
}
void _runFilter(String enteredKeyword) {
List<GetAnnouncementsObject> results = [];
if (enteredKeyword.isEmpty) {
results = getAnnouncementsObject;
} else {
results = getAnnouncementsObject.where((user) => user.titleEN!.toLowerCase().contains(enteredKeyword.toLowerCase())).toList();
}
setState(() {
_foundAnnouncements = results;
});
}
void getAnnouncements(int itgAwarenessID, int itgRowID) async {
try {
Utils.showLoading(context);
jsonResponse = await PendingTransactionsApiClient().getAnnouncements(itgAwarenessID, currentPageNo, itgRowID);
var jsonDecodedData = jsonDecode(jsonDecode(jsonResponse)['result']['data']);
for (int i = 0; i < jsonDecodedData.length; i++) {
getAnnouncementsObject.add(GetAnnouncementsObject.fromJson(jsonDecodedData[i]));
}
_foundAnnouncements = getAnnouncementsObject;
Utils.hideLoading(context);
setState(() {});
} catch (ex) {
Utils.hideLoading(context);
Utils.handleException(ex, context, null);
}
}
void openAnnouncementsDetails(int rowID) async {
await Navigator.pushNamed(context, AppRoutes.announcementsDetails, arguments: {"currentPageNo": currentPageNo, "rowID": rowID});
}
}
Write Preview
Loading…
Cancel
Save