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 40ebb3cc..350dcbdd 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.ts +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.ts @@ -653,30 +653,15 @@ export class SmsPageComponent implements OnInit { } } - - if (key === 9) { - return true; - } - - - if (sib) { - if (e.target.value === '') { - sibPre.setFocus(); - } else { - sib.setFocus(); - } - } - } - } diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts index 72cf9af1..57c32741 100644 --- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts +++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts @@ -14,6 +14,7 @@ import { EitService } from '../services/eit.service'; import { AddEitResponse } from '../models/add.eit.response'; import { FileUploader } from 'ng2-file-upload'; import { SubmitEitModalComponent } from '../submit-eit-modal/submit-eit-modal.component'; +import { HomeComponent } from 'src/app/notification/home/home.component'; @Component({ selector: 'app-confirm-add-eit', @@ -62,7 +63,7 @@ export class ConfirmAddEitComponent implements OnInit { filterAllowedType: any = ['application/pdf', 'image/jpeg', 'image/png', 'text/plain', 'image/jpg', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']; direction: string; - + constructor(public modalController: ModalController, public cs: CommonService, private ts: TranslatorService, private eitService: EitService) { this.direction = TranslatorService.getCurrentLanguageName() this.isSubmitBtnClicked = false; @@ -81,8 +82,8 @@ export class ConfirmAddEitComponent implements OnInit { this.getPassNotificationDetails = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false); //WARINING ** // console.log("this.getPassNotificationDetails: " + this.getPassNotificationDetails); this.P_TransactionID = this.cs.sharedService.getSharedData("TransactionIDResubmit", true); - // let notification = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, true); - + // let notification = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, true); + this.itemKey = this.getPassNotificationDetails.ITEM_KEY; this.pActionMode = "RESUBMIT"; this.menuType = "E"; @@ -234,6 +235,7 @@ export class ConfirmAddEitComponent implements OnInit { // this.navCtrl.popToRoot(); // this.cs.openHome(); + this.cs.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED); this.cs.openNotificationPage(); } } @@ -249,7 +251,7 @@ export class ConfirmAddEitComponent implements OnInit { //open the modal with return data let attachDocID = attachItems.ATTACHED_DOCUMENT_ID; - this.cs.sharedService.setSharedData( this.P_TransactionID, 'TransactionID'); + this.cs.sharedService.setSharedData(this.P_TransactionID, 'TransactionID'); this.cs.sharedService.setSharedData(this.attachListOver.length, 'indexLastObj'); const modal = await this.modalController.create({ @@ -298,7 +300,7 @@ export class ConfirmAddEitComponent implements OnInit { /*****submit modal********/ async openSubmitModal() { - this.cs.sharedService.setSharedData( this.attachListOver, 'submitAttachmentList'); + this.cs.sharedService.setSharedData(this.attachListOver, 'submitAttachmentList'); this.cs.sharedService.setSharedData(this.eitComments, 'eitComments'); const modal = await this.modalController.create({ component: SubmitEitModalComponent, @@ -314,7 +316,7 @@ export class ConfirmAddEitComponent implements OnInit { if (data.data == "cancel" || data.data == undefined) { return; } else { - this.startEitApproval(); + this.startEitApproval(); } }); @@ -482,7 +484,7 @@ export class ConfirmAddEitComponent implements OnInit { }); - onFileSelectedclick(event){ + onFileSelectedclick(event) { event.target.value = ''; } @@ -529,7 +531,7 @@ export class ConfirmAddEitComponent implements OnInit { pushObject(fileData, name, type) { - console.log("before push: "+ this.index); + console.log("before push: " + this.index); //this.attachListOver.length++; try { let array = name.split('.'); @@ -537,11 +539,11 @@ export class ConfirmAddEitComponent implements OnInit { this.attachListOver.push( { - AttachmentID: this.attachListOver.length, + AttachmentID: this.attachListOver.length, P_FILE_CONTENT_TYPE: attachType,//type.split('/')[1], P_FILE_DATA: fileData.split(',')[1], P_FILE_NAME: name,//.split('.')[0], - P_TRANSACTION_ID: this.P_TransactionID + P_TRANSACTION_ID: this.P_TransactionID }) } catch (e) { diff --git a/Mohem/src/app/hmg-common/hmg-common.module.ts b/Mohem/src/app/hmg-common/hmg-common.module.ts index a8948b72..2b8da3ac 100644 --- a/Mohem/src/app/hmg-common/hmg-common.module.ts +++ b/Mohem/src/app/hmg-common/hmg-common.module.ts @@ -277,7 +277,7 @@ import { SanitizeHtmlPipe } from '../itemforsale/services/domsafe'; AttendanceOptionsComponent, CardCalendarComponent, SubmitAddressModalComponent, - SanitizeHtmlPipe + SanitizeHtmlPipe, ], providers: [ AttendScanService, diff --git a/Mohem/src/app/offersdiscount/offer-details/offer-details.component.html b/Mohem/src/app/offersdiscount/offer-details/offer-details.component.html index e089da6a..1d9c3d44 100644 --- a/Mohem/src/app/offersdiscount/offer-details/offer-details.component.html +++ b/Mohem/src/app/offersdiscount/offer-details/offer-details.component.html @@ -11,9 +11,11 @@
-
- - + + + {{details.Title}} {{details.Title_AR}} diff --git a/Mohem/src/app/offersdiscount/offersdiscount.module.ts b/Mohem/src/app/offersdiscount/offersdiscount.module.ts index b4062b63..fa0495d4 100644 --- a/Mohem/src/app/offersdiscount/offersdiscount.module.ts +++ b/Mohem/src/app/offersdiscount/offersdiscount.module.ts @@ -12,6 +12,7 @@ import { HmgCommonModule } from '../hmg-common/hmg-common.module'; import { OfferDiscountService } from './services/service'; import { FilterComponent } from './filter/filter.component'; import { LocationComponent } from './location/location.component'; +import { ImageModalModule } from '../hmg-common/ui/image-modal/image-modal.module'; @@ -48,6 +49,7 @@ const routes: Routes = [ FormsModule, IonicModule, HmgCommonModule, + ImageModalModule, RouterModule.forChild(routes) ], declarations: [OffersdiscountPage, HomeComponent, OfferDetailsComponent, FilterComponent, LocationComponent], diff --git a/Mohem/src/app/profile/confirm-address/confirm-address.component.ts b/Mohem/src/app/profile/confirm-address/confirm-address.component.ts index f84248f9..d0e317fb 100644 --- a/Mohem/src/app/profile/confirm-address/confirm-address.component.ts +++ b/Mohem/src/app/profile/confirm-address/confirm-address.component.ts @@ -10,6 +10,7 @@ import { SubmitEitModalComponent } from 'src/app/eit/submit-eit-modal/submit-eit import { CommonService } from 'src/app/hmg-common/services/common/common.service'; import { MenuResponse } from 'src/app/hmg-common/services/menu/models/menu-response'; import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; +import { HomeComponent } from 'src/app/notification/home/home.component'; import { EITNotificatonBodyResponse } from 'src/app/notification/models/EITNotificationBodyRes'; import { WorkListButtonRequest } from 'src/app/notification/models/NotificationButtonReq'; import { WorkListAttachViewComponent } from 'src/app/notification/work-list-attach-view/work-list-attach-view.component'; @@ -103,6 +104,7 @@ export class ConfirmAddressComponent implements OnInit { if (this.isContact) { this.itemKey = this.addrespList.SubmitPhonesTransactionList.P_ITEM_KEY; this.P_TransactionID = this.addrespList.SubmitPhonesTransactionList.P_TRANSACTION_ID; + this.headerTitle = this.ts.trPK('general', 'contact'); } else { this.itemKey = this.addrespList.SubmitAddressTransactionList.P_ITEM_KEY; this.P_TransactionID = this.addrespList.SubmitAddressTransactionList.P_TRANSACTION_ID; @@ -267,7 +269,7 @@ export class ConfirmAddressComponent implements OnInit { this.cs.presentAlert(msg); // } // this.navCtrl.popToRoot(); - + this.cs.sharedService.setSharedData(true, HomeComponent.COUNT_CHANGED); // this.cs.openHome(); this.cs.openNotificationPage(); } diff --git a/Mohem/src/app/profile/home/home.component.html b/Mohem/src/app/profile/home/home.component.html index 682c8590..cd3bbece 100644 --- a/Mohem/src/app/profile/home/home.component.html +++ b/Mohem/src/app/profile/home/home.component.html @@ -230,13 +230,15 @@
- +
+

{{phone.PHONE_TYPE_MEANING}}

{{phone.PHONE_NUMBER}}

-

+
+
diff --git a/Mohem/src/app/profile/home/home.component.ts b/Mohem/src/app/profile/home/home.component.ts index 8aba0e1c..e423d395 100644 --- a/Mohem/src/app/profile/home/home.component.ts +++ b/Mohem/src/app/profile/home/home.component.ts @@ -406,6 +406,7 @@ export class HomeComponent implements OnInit { if (this.cs.validResponse(response)) { this.cs.stopLoading(); this.phoneNumbers = response['GetEmployeePhonesList']; + console.log(this.phoneNumbers); this.cs.sharedService.setSharedData(this.phoneNumbers, ProfileService.EMP_PHONE); } }) diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index 9c564382..e5217a79 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1639,4 +1639,14 @@ ion-segment-button { .select-alert .alert-radio-label{ font-size: 12px !important; - } \ No newline at end of file + } + .modal-image-viewer-landscape { + --height: 35% !important; + --width: 90% !important; + --border-radius: 0.4cm; + } + .modal-image-viewer-portrait { + --height: 45% !important; + --width: 60% !important; + --border-radius: 0.4cm; + } \ No newline at end of file