From a59adb2107f460d319119b258e20ef7d11499e94 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Tue, 15 Feb 2022 10:02:29 +0300 Subject: [PATCH] item for sale udated --- .../confirm-login/confirm-login.component.ts | 2 +- .../authentication/sms-page/sms-page.page.ts | 2 +- .../hmg-common/ui/smsdialog/smsdialog.page.ts | 113 +++++++++--------- .../itemforsale/items/items.component.html | 11 +- .../itemforsale/items/items.component.scss | 17 ++- .../app/itemforsale/items/items.component.ts | 2 + 6 files changed, 81 insertions(+), 66 deletions(-) diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts index 2ee80bf6..13f2a12f 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts @@ -242,7 +242,7 @@ export class ConfirmLoginComponent implements OnInit { const request = new SendActivationByType(); this.authService.setPublicFields(request); request.OTP_SendType = type; - request.MobileNumber = this.loginData.MobileNumber; + request.MobileNumber = '0543841742';//this.loginData.MobileNumber; request.smsSignature = this.signature; request.IsMobileFingerPrint = 0; diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.ts b/Mohem/src/app/authentication/sms-page/sms-page.page.ts index 699b3c79..40ebb3cc 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.ts +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.ts @@ -629,7 +629,7 @@ export class SmsPageComponent implements OnInit { - if (key === undefined && this.platform.is('ios')) { + if (key === undefined && (this.platform.is('ios') && !this.platform.is('mobileweb'))) { this.checkActivation(e.target.value, false); diff --git a/Mohem/src/app/hmg-common/ui/smsdialog/smsdialog.page.ts b/Mohem/src/app/hmg-common/ui/smsdialog/smsdialog.page.ts index 24cc3e4f..64e9872c 100644 --- a/Mohem/src/app/hmg-common/ui/smsdialog/smsdialog.page.ts +++ b/Mohem/src/app/hmg-common/ui/smsdialog/smsdialog.page.ts @@ -18,57 +18,56 @@ import { AlertController } from '@ionic/angular'; styleUrls: ['./smsdialog.page.scss'], }) export class SmsdialogPage implements OnInit { - public timeInSeconds : number ; - public time : number; - public runTimer : boolean; + public timeInSeconds: number; + public time: number; + public runTimer: boolean; public static SHARED_DATA = 'h2o-login-details'; - public hasStarted : boolean; + public hasStarted: boolean; public countryCode: CountryCode; - public hasFinished : boolean; - public remainingTime : number; - public displayTime : string = ""; + public hasFinished: boolean; + public remainingTime: number; + public displayTime: string = ""; // public userData: UserDetailsModel; - public mobile : string; - public country_code : string; - public id : string; - public MobileNumber : string; - public token : string; - public resend : boolean = false; - public smc_code : any; + public mobile: string; + public country_code: string; + public id: string; + public MobileNumber: string; + public token: string; + public resend: boolean = false; + public smc_code: any; constructor(public cs: CommonService, public ts: TranslatorService, public alertController: AlertController, public smsService: SmsReaderService, public sharedData: SharedDataService, - private modalCtrl:ModalController, + private modalCtrl: ModalController, // private navParams: NavParams, - public smsservice: SMSDialogService) { - // this.country_code = this.navParams.get("c_code"); - // this.MobileNumber = this.navParams.get('mobile'); - // this.mobile = this.navParams.get('mobile'); - // this.id = this.navParams.get('id'); - // this.smsservice.sendActivationCode(this.id, this.mobile, - // this.country_code, () => { }, - // this.ts.trPK('general', 'ok')).subscribe((result: SendValidationResponse) => { - // if (this.cs.validResponse(result)) { - // if (result.isSMSSent) { - // this.token = result.LogInTokenID; - // this.initTimer(); - // this.startTimer(); - // } else { - // this.stopSMSMonitoring(); - // } - // } else { - // this.stopSMSMonitoring(); - // } - // }); - } + public smsservice: SMSDialogService) { + // this.country_code = this.navParams.get("c_code"); + // this.MobileNumber = this.navParams.get('mobile'); + // this.mobile = this.navParams.get('mobile'); + // this.id = this.navParams.get('id'); + // this.smsservice.sendActivationCode(this.id, this.mobile, + // this.country_code, () => { }, + // this.ts.trPK('general', 'ok')).subscribe((result: SendValidationResponse) => { + // if (this.cs.validResponse(result)) { + // if (result.isSMSSent) { + // this.token = result.LogInTokenID; + // this.initTimer(); + // this.startTimer(); + // } else { + // this.stopSMSMonitoring(); + // } + // } else { + // this.stopSMSMonitoring(); + // } + // }); + } ngOnInit() { } - closeModal() - { + closeModal() { this.modalCtrl.dismiss(); } @@ -77,8 +76,8 @@ export class SmsdialogPage implements OnInit { } initTimer() { - if (!this.timeInSeconds) { - this.timeInSeconds = 60; + if (!this.timeInSeconds) { + this.timeInSeconds = 60; } this.time = this.timeInSeconds; this.runTimer = false; @@ -87,22 +86,22 @@ export class SmsdialogPage implements OnInit { this.remainingTime = this.timeInSeconds; this.displayTime = this.getSecondsAsDigitalClock(this.remainingTime); } - + startTimer() { this.runTimer = true; this.hasStarted = true; this.resend = false; this.timerTick(); } - + pauseTimer() { this.runTimer = false; } - + resumeTimer() { this.startTimer(); } - + timerTick() { setTimeout(() => { if (!this.runTimer) { return; } @@ -117,7 +116,7 @@ export class SmsdialogPage implements OnInit { } }, 1000); } - + getSecondsAsDigitalClock(inputSeconds: number) { var sec_num = parseInt(inputSeconds.toString(), 10); // don't forget the second param var hours = Math.floor(sec_num / 3600); @@ -132,13 +131,12 @@ export class SmsdialogPage implements OnInit { return minutesString + ':' + secondsString; } - validate() - { + validate() { this.checkSMSActivationCode(this.smc_code); } public presentSMSPasswordDialog() { - + } async presentAlert() { @@ -153,21 +151,20 @@ export class SmsdialogPage implements OnInit { private checkSMSActivationCode(smsCode: string) { this.smsservice.validateActivationCode(this.token, smsCode, - () => {}, this.ts.trPK('settings', 'incorrect_otp')).subscribe((result: Response) => { - if (this.cs.validResponse(result)) { - this.stopSMSMonitoring(); - this.modalCtrl.dismiss(); - SMSDialogService.modal_success = true; - } - }); + () => { }, this.ts.trPK('settings', 'incorrect_otp')).subscribe((result: Response) => { + if (this.cs.validResponse(result)) { + //this.stopSMSMonitoring(); + this.modalCtrl.dismiss(); + SMSDialogService.modal_success = true; + } + }); } public stopSMSMonitoring() { - this.smsService.stopSMSMonitoring(); + this.smsService.stopSMSMonitoring(); } - public ResendOTP() - { + public ResendOTP() { // this.smsservice.sendActivationCode(this.id, this.mobile, // this.country_code, () => { }, // this.ts.trPK('general', 'ok')).subscribe((result: SendValidationResponse) => { diff --git a/Mohem/src/app/itemforsale/items/items.component.html b/Mohem/src/app/itemforsale/items/items.component.html index 9fe58466..fcd68935 100644 --- a/Mohem/src/app/itemforsale/items/items.component.html +++ b/Mohem/src/app/itemforsale/items/items.component.html @@ -58,12 +58,15 @@
+
+ +
- - + + {{item.title}} {{item.title_Ar}} @@ -110,8 +113,8 @@ - - + + diff --git a/Mohem/src/app/itemforsale/items/items.component.scss b/Mohem/src/app/itemforsale/items/items.component.scss index 941a4b51..1433bcb5 100644 --- a/Mohem/src/app/itemforsale/items/items.component.scss +++ b/Mohem/src/app/itemforsale/items/items.component.scss @@ -101,9 +101,9 @@ ion-card-content p{ font-weight: bold; } .my-ads ion-item{ - margin: 10px; + margin:0px 10px; --border-radius: 10px; - padding: 15px 10px 0px 10px; + padding: 10px 10px 0px 10px; width: 100%; } .my-ads ion-thumbnail img{ @@ -257,4 +257,17 @@ ion-fab-button{ } .space{ height:100px; +} +.loader{ + display: block; + position: absolute; + margin: auto; + text-align: center; + width: 100%; +} +.loader img{ + display: inline-block; + margin: auto; + width: 25px; + } \ No newline at end of file diff --git a/Mohem/src/app/itemforsale/items/items.component.ts b/Mohem/src/app/itemforsale/items/items.component.ts index 43ccf0e9..5ce86db5 100644 --- a/Mohem/src/app/itemforsale/items/items.component.ts +++ b/Mohem/src/app/itemforsale/items/items.component.ts @@ -48,6 +48,7 @@ export class ItemsComponent implements OnInit { this.items = []; this.items = this.itemService.parser(result); this.tempSearch = deepCopy(this.items); + console.log(this.tempSearch); this.cs.stopLoading(); }) } @@ -64,6 +65,7 @@ export class ItemsComponent implements OnInit { selectCategory(item) { this.cs.startLoading(); this.activeClass = item.categoryID; + this.pageNo = 1; this.itemService.getItems({ pageNo: this.pageNo, ItgCategoryID: item.categoryID }, () => { }, this.ts.trPK('general', 'retry')).subscribe((result) => { this.items = []; this.items = this.itemService.parser(result);