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

Merge branch 'master' into development_aamir

Browse Source 
# Conflicts:
#	lib/generated_plugin_registrant.dart
merge-requests/116/head
Aamir Muhammad 3 years ago
parent 4021eccd9f 9c867c3041
commit ddba673970
14 changed files with 315 additions and 311 deletions
Show Stats Download Patch File Download Diff File

2
lib/classes/date_uitl.dart
Unescape Escape View File

@ -40,7 +40,7 @@ class DateUtil {
}
static DateTime convertSimpleStringDateToDate(String date) {
return DateFormat("MM/dd/yyyy hh:mm:ss").parse(date);
return DateFormat("MM/dd/yyyy hh:mm:ss a").parse(date.toUpperCase());
}
static DateTime convertSimpleStringDateToDateddMMyyyy(String date) {

2
lib/extensions/widget_extensions.dart
Unescape Escape View File

@ -58,7 +58,7 @@ extension WidgetExtensions on Widget {
),
],
),
alignment: center == true ? Alignment.center : null,
alignment: center ? Alignment.center : null,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min,

2
lib/generated_plugin_registrant.dart
Unescape Escape View File

@ -16,7 +16,6 @@ import 'package:image_picker_for_web/image_picker_for_web.dart';
import 'package:shared_preferences_web/shared_preferences_web.dart';
import 'package:url_launcher_web/url_launcher_web.dart';
import 'package:video_player_web/video_player_web.dart';
//import 'package:wakelock_web/wakelock_web.dart';
import 'package:flutter_web_plugins/flutter_web_plugins.dart';
@ -32,6 +31,5 @@ void registerPlugins(Registrar registrar) {
SharedPreferencesPlugin.registerWith(registrar);
UrlLauncherPlugin.registerWith(registrar);
VideoPlayerPlugin.registerWith(registrar);
// WakelockWeb.registerWith(registrar);
registrar.registerMessageHandler();
}

2
lib/models/get_po_Item_history_list_model.dart
Unescape Escape View File

@ -4,7 +4,7 @@ class GetPoItemHistoryList {
String? bUYER;
String? cLOSEDCODE;
String? cREATIONDATE;
int? dISCOUNTPERCENTAGE;
num? dISCOUNTPERCENTAGE;
int? fROMROWNUM;
int? iTEMID;
num? nETPRICE;

2
lib/models/get_quotation_analysis_list_model.dart
Unescape Escape View File

@ -5,7 +5,7 @@ class GetQuotationAnalysisList {
int? nOOFROWS;
String? qUOTBONUSQTY;
String? qUOTDELIVERYDATE;
int? qUOTLINETOTAL;
num? qUOTLINETOTAL;
String? qUOTMFGPARTNUM;
String? qUOTNUM;
num? qUOTQTY;

4
lib/ui/leave_balance/leave_balance_screen.dart
Unescape Escape View File

@ -43,9 +43,9 @@ class _LeaveBalanceState extends State<LeaveBalance> {
void getAbsenceTransactions() async {
try {
// Utils.showLoading(context);
Utils.showLoading(context);
absenceTransList = await LeaveBalanceApiClient().getAbsenceTransactions(-999, empID: selectedEmp);
//Utils.hideLoading(context);
Utils.hideLoading(context);
setState(() {});
} catch (ex) {
Utils.hideLoading(context);

6
lib/ui/login/login_screen.dart
Unescape Escape View File

@ -58,9 +58,9 @@ class _LoginScreenState extends State<LoginScreen> {
void initState() {
super.initState();
// checkFirebaseToken();
if (kReleaseMode) {
checkDeviceSafety();
}
// if (kReleaseMode) {
// checkDeviceSafety();
// }
}
void checkDeviceSafety() async {

1
lib/ui/marathon/marathon_provider.dart
Unescape Escape View File

@ -390,6 +390,7 @@ class MarathonProvider extends ChangeNotifier {
}
bool checkIfPrivilegedForMarathon() {
return true;
for (PrivilegeListModel element in AppState().privilegeListModel!) {
if (element.serviceName == "Marathon") {
if (element.previlege != null) {

16
lib/ui/marathon/widgets/marathon_banner.dart
Unescape Escape View File

@ -184,10 +184,12 @@ class MarathonBanner extends StatelessWidget {
Widget build(BuildContext context) {
MarathonProvider provider = context.read<MarathonProvider>();
return !provider.isPrivilegedWithMarathon
? getUnPrivilegedMarathon(context)
: provider.marathonDetailModel.startTime != null
? Container(
return
// !provider.isPrivilegedWithMarathon
// ? getUnPrivilegedMarathon(context)
// : provider.marathonDetailModel.startTime != null
// ?
Container(
decoration: MyDecorations.shadowDecoration,
height: isTablet ? MediaQuery.of(context).size.height * 0.17 : MediaQuery.of(context).size.height * 0.11,
clipBehavior: Clip.antiAlias,
@ -353,7 +355,6 @@ class MarathonBanner extends StatelessWidget {
child: SvgPicture.asset("assets/images/arrow_next.svg", color: MyColors.whiteColor),
).paddingAll(isTablet ? 20 : 15),
),
],
).onPress(() async {
int remainingTimeInMinutes = DateTime.parse(provider.marathonDetailModel.startTime!).difference(DateTime.now()).inMinutes;
@ -377,7 +378,8 @@ class MarathonBanner extends StatelessWidget {
Navigator.pushNamed(context, AppRoutes.marathonIntroScreen);
}
}),
)
: const SizedBox();
);
// )
// : const SizedBox();
}
}

20
lib/ui/my_team/team_members.dart
Unescape Escape View File

@ -15,6 +15,7 @@ import 'package:url_launcher/url_launcher.dart';
class TeamMembers extends StatefulWidget {
final String? selectedEmp;
const TeamMembers({this.selectedEmp, Key? key}) : super(key: key);
@override
@ -62,10 +63,8 @@ class _TeamMembersState extends State<TeamMembers> {
child: Column(
children: <Widget>[
getEmployeeSubordinatesList.isEmpty
? Container(
margin: const EdgeInsets.only(top: 100),
child: Utils.getNoDataWidget(context)):
ListView.separated(
? Container(margin: const EdgeInsets.only(top: 100), child: Utils.getNoDataWidget(context))
: ListView.separated(
shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(),
padding: const EdgeInsets.only(top: 12),
@ -81,7 +80,11 @@ class _TeamMembersState extends State<TeamMembers> {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
getEmployeeSubordinatesList[index].eMPLOYEEIMAGE == null
? SvgPicture.asset("assets/images/user.svg",height: 34, width: 34, ).paddingOnly(top: 4)
? SvgPicture.asset(
"assets/images/user.svg",
height: 34,
width: 34,
).paddingOnly(top: 4)
: Container(
height: 34,
width: 34,
@ -122,10 +125,11 @@ class _TeamMembersState extends State<TeamMembers> {
),
],
).paddingOnly(top: 13, bottom: 13, right: 12, left: 14).objectContainerView(radius: 10, disablePadding: true),
);
).paddingOnly(left: 16.0, right: 16.0);
}),
],
)
));
),
),
);
}
}

19
lib/ui/profile/personal_info.dart
Unescape Escape View File

@ -21,29 +21,30 @@ class PersonalInfo extends StatelessWidget {
title: LocaleKeys.profile_personalInformation.tr(),
),
backgroundColor: MyColors.backgroundColor,
body: SizedBox(
width: MediaQuery.of(context).size.width,
child: Column(
body: ListView(
children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
// mainAxisSize: MainAxisSize.min,
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.start,
children: [
LocaleKeys.category.tr().toText13(color: MyColors.lightGrayColor),
(memberInformationList.eMPLOYMENTCATEGORYMEANING ?? "").toText16(),
20.height,
12.height,
LocaleKeys.address.tr().toText13(color: MyColors.lightGrayColor),
(memberInformationList.lOCATIONNAME ?? "").toText16(),
20.height,
12.height,
LocaleKeys.phoneNumber.tr().toText13(color: MyColors.lightGrayColor),
(memberInformationList.eMPLOYEEMOBILENUMBER ?? "").toText16(),
20.height,
12.height,
LocaleKeys.businessGroup.tr().toText13(color: MyColors.lightGrayColor),
(memberInformationList.bUSINESSGROUPNAME ?? "").toText16(),
20.height,
12.height,
LocaleKeys.Payroll.tr().toText13(color: MyColors.lightGrayColor),
(memberInformationList.pAYROLLNAME ?? "").toText16(),
],
).objectContainerView().paddingAll(21),
).objectContainerView(center: false).paddingAll(21),
],
),
);
}

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

@ -1,4 +1,3 @@
import 'dart:convert';
import 'dart:io';
import 'dart:ui';
@ -76,15 +75,13 @@ class _ProfileScreenState extends State<ProfileScreen> {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
IconButton(
onPressed: () {
CircleAvatar(
radius: 18,
backgroundColor: Colors.black.withOpacity(.21),
child: const Icon(Icons.arrow_back_ios_rounded, color: Colors.white, size: 18).paddingOnly(right: 4),
).onPress(() {
Navigator.pop(context);
},
icon: const Icon(
Icons.arrow_back_ios,
color: Colors.white,
),
),
}),
InkWell(
onTap: () {
// startImageSheet();

4
lib/ui/profile/widgets/profile_panel.dart
Unescape Escape View File

@ -51,8 +51,8 @@ class ProfilePanel extends StatelessWidget {
: ClipOval(
child: Image.memory(
Utils.dataFromBase64String(memberInformationList.eMPLOYEEIMAGE!),
width: 75,
height: 75,
width: 68,
height: 68,
fit: BoxFit.fill,
),
);

3
lib/ui/work_list/item_history_screen.dart
Unescape Escape View File

@ -88,7 +88,8 @@ class _ItemHistoryScreenState extends State<ItemHistoryScreen> {
children: [
if (moItemHistoryList.isNotEmpty) loadMoItemHistoryData(),
if (poItemHistoryList.isNotEmpty) loadPoItemHistoryData(),
if (quotationAnalysisList.isNotEmpty) loadQuotationAnalysisData()
if (quotationAnalysisList.isNotEmpty) loadQuotationAnalysisData(),
if (moItemHistoryList.isEmpty && poItemHistoryList.isEmpty && quotationAnalysisList.isEmpty) Utils.getNoDataWidget(context),
],
),
);

Write Preview
Loading…
Cancel
Save