merge-requests/111/head
haroon amjad 3 years ago
parent 966533c793
commit ece6a68a95

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

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

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

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

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

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

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

Loading…
Cancel
Save