diff --git a/Mohem/config.xml b/Mohem/config.xml index 5ad4f1b7..f907a637 100644 --- a/Mohem/config.xml +++ b/Mohem/config.xml @@ -4,8 +4,8 @@ an app created by cloud Solutions Cloud Solutions - + diff --git a/Mohem/resources/android/xml/network_security_config.xml b/Mohem/resources/android/xml/network_security_config.xml index f9fecaf7..14144c66 100644 --- a/Mohem/resources/android/xml/network_security_config.xml +++ b/Mohem/resources/android/xml/network_security_config.xml @@ -2,5 +2,6 @@ localhost + hmg.com \ No newline at end of file diff --git a/Mohem/src/app/authentication/app-update/app-update.component.html b/Mohem/src/app/authentication/app-update/app-update.component.html index b23ed2f3..2c9482cf 100644 --- a/Mohem/src/app/authentication/app-update/app-update.component.html +++ b/Mohem/src/app/authentication/app-update/app-update.component.html @@ -1,5 +1,5 @@ - -
+ +
diff --git a/Mohem/src/app/authentication/app-update/app-update.component.scss b/Mohem/src/app/authentication/app-update/app-update.component.scss index e69de29b..889cc1ba 100644 --- a/Mohem/src/app/authentication/app-update/app-update.component.scss +++ b/Mohem/src/app/authentication/app-update/app-update.component.scss @@ -0,0 +1,10 @@ + +@media only screen and (min-width: 540px) and (max-width: 767px) { + .biggerPhone { + .rocket-image { + img { + height: 350px; + } + } + } + } \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/services/connector/connector.service.ts b/Mohem/src/app/hmg-common/services/connector/connector.service.ts index 2ae7a1a4..642ef3a8 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -29,7 +29,6 @@ export class ConnectorService { // public static host = 'https://uat.hmgwebservices.com/'; public static host = 'https://hmgwebservices.com/'; - // public static host = 'http://riyt-mohemm1:1010/' //MOE constructor(public httpClient: HttpClient, public cs: CommonService, private events: Events, diff --git a/Mohem/src/app/notification/home/home.component.html b/Mohem/src/app/notification/home/home.component.html index d363a9f7..497bb412 100644 --- a/Mohem/src/app/notification/home/home.component.html +++ b/Mohem/src/app/notification/home/home.component.html @@ -99,8 +99,8 @@
- - + +
diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index 0954aea8..e2b585a3 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -80,6 +80,7 @@ export class HomeComponent implements OnInit { public totalMR = 0; public totalIC = 0; public totalStamp = 0; + public worklistLength = 0; public showChart = false; @@ -423,6 +424,7 @@ export class HomeComponent implements OnInit { } this.WorklistService.getWorkList(this.WorkListObj, '', '', this.isPostNoLoad).subscribe((result) => { if (this.common.validResponse(result)) { + this.worklistLength = result.GetWorkList.length; this.handleWorkListResult(result.GetWorkList); } } @@ -589,6 +591,7 @@ export class HomeComponent implements OnInit { if (!this.isReachEnd && this.selectedFilter !== 'ITG') { this.WorklistService.getWorkList(this.WorkListObj, '', '', this.isPostNoLoad).subscribe((result) => { if (this.common.validResponse(result)) { + this.worklistLength = result.GetWorkList.length; this.handleWorkListResult(result.GetWorkList); } }); diff --git a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.html b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.html index c2161ae3..0206f5a4 100644 --- a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.html +++ b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.html @@ -414,7 +414,7 @@ - + {{approve_label}} @@ -426,7 +426,7 @@ - + {{reject_label}} diff --git a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts index 1d08ec1f..d4d94682 100644 --- a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts +++ b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts @@ -497,16 +497,16 @@ export class WorklistMainIcComponent implements OnInit { checkRequestType(index) { if (this.notificationArray[index].REQUEST_TYPE === 'PO') { - this.intializeNotificationDetail(); - } else - if (this.notificationArray[index].REQUEST_TYPE === 'PR') { + this.common.openWorklistMainPOPage(); + } else if (this.notificationArray[index].REQUEST_TYPE === 'PR') { this.common.openWorklistMainPRPage(); - } else - if (this.notificationArray[index].REQUEST_TYPE === 'MO') { + } else if (this.notificationArray[index].REQUEST_TYPE === 'MO') { this.common.openWorklistMainMRPage(); - } else { + } else if (this.notificationArray[index].REQUEST_TYPE === 'ITEM_CREATION') { + this.intializeNotificationDetail(); + } else { this.common.openWorklistMainPage(); - } + } } actionButton(action) { @@ -544,8 +544,8 @@ export class WorklistMainIcComponent implements OnInit { // } if ( - ButtonAction == "APPROVE" || - ButtonAction == "REJECT" || + ButtonAction == "APPROVED" || + ButtonAction == "REJECTED" || ButtonAction == "DEL" || ButtonAction == "CLOSE" ) { @@ -560,10 +560,10 @@ export class WorklistMainIcComponent implements OnInit { // this.WorkListActionObj, // WorklistMainPRComponent.PASS_NOTIFICATION_INFO // ); - if (ButtonAction == "APPROVE") { + if (ButtonAction == "APPROVED") { this.confirmMsg = this.ts.trPK('worklistMain', 'approveMsg') } - else if (ButtonAction == "REJECT") { + else if (ButtonAction == "REJECTED") { this.confirmMsg = this.ts.trPK('worklistMain', 'rejectMsg') } @@ -653,7 +653,8 @@ export class WorklistMainIcComponent implements OnInit { ButtonAction == "TRANSFER" || ButtonAction == "TRANSFER_INFO" || ButtonAction == "APPROVE_AND_FORWARD" || - ButtonAction == "FORWARD" + ButtonAction == "FORWARD" || + ButtonAction == "RETURNED" ) { diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.html b/Mohem/src/app/notification/worklist-main/worklist-main.component.html index 0bc23f9c..6400b618 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html @@ -317,12 +317,12 @@ -

Current

+

{{ 'general, current' | translate}}

-

Proposed

+

{{ 'general, proposed' | translate}}

diff --git a/Mohem/src/app/offersdiscount/home/home.component.html b/Mohem/src/app/offersdiscount/home/home.component.html index b84354f8..678dc3e8 100644 --- a/Mohem/src/app/offersdiscount/home/home.component.html +++ b/Mohem/src/app/offersdiscount/home/home.component.html @@ -54,7 +54,8 @@ -
+ + {{item.Title}} {{item.Title_AR}}
diff --git a/Mohem/src/app/offersdiscount/home/home.component.ts b/Mohem/src/app/offersdiscount/home/home.component.ts index 8ee773ac..354daa36 100644 --- a/Mohem/src/app/offersdiscount/home/home.component.ts +++ b/Mohem/src/app/offersdiscount/home/home.component.ts @@ -39,6 +39,7 @@ export class HomeComponent implements AfterViewInit { public cs: CommonService, public offersService: OfferDiscountService, public route: ActivatedRoute, + private sanitizer: DomSanitizer ) { this.route @@ -218,4 +219,9 @@ export class HomeComponent implements AfterViewInit { }, 1000); } } + + sanitize(img) { + return this.sanitizer.bypassSecurityTrustUrl(img); + } + } 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 1d9c3d44..dfb21ae9 100644 --- a/Mohem/src/app/offersdiscount/offer-details/offer-details.component.html +++ b/Mohem/src/app/offersdiscount/offer-details/offer-details.component.html @@ -14,7 +14,7 @@ + [src]="sanitize(details.Banner_Image)"> {{details.Title}} @@ -69,8 +69,8 @@ -
- + + {{item.Title}}
diff --git a/Mohem/src/app/offersdiscount/offer-details/offer-details.component.ts b/Mohem/src/app/offersdiscount/offer-details/offer-details.component.ts index ee364abe..8a4df9c1 100644 --- a/Mohem/src/app/offersdiscount/offer-details/offer-details.component.ts +++ b/Mohem/src/app/offersdiscount/offer-details/offer-details.component.ts @@ -3,6 +3,7 @@ import { CommonService } from 'src/app/hmg-common/services/common/common.service import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; import { OfferDiscountService } from '../services/service'; import { SocialSharing } from '@ionic-native/social-sharing/ngx'; +import { DomSanitizer } from '@angular/platform-browser'; @Component({ selector: 'app-offer-details', templateUrl: './offer-details.component.html', @@ -12,7 +13,7 @@ export class OfferDetailsComponent implements OnInit { public details: any; public direction: String; public related: any; - constructor(public ts: TranslatorService, private socialSharing: SocialSharing, public cs: CommonService, public offersService: OfferDiscountService) { } + constructor(public ts: TranslatorService, private socialSharing: SocialSharing, public cs: CommonService, public offersService: OfferDiscountService, private sanitizer: DomSanitizer) { } ngOnInit() { this.direction = TranslatorService.getCurrentDirection(); @@ -68,4 +69,8 @@ export class OfferDetailsComponent implements OnInit { this.openLocation(); }) } + sanitize(img) { + return this.sanitizer.bypassSecurityTrustUrl(img); + } + } diff --git a/Mohem/src/app/reports/transactions/transactions.component.html b/Mohem/src/app/reports/transactions/transactions.component.html index dd843220..fce2455c 100644 --- a/Mohem/src/app/reports/transactions/transactions.component.html +++ b/Mohem/src/app/reports/transactions/transactions.component.html @@ -44,7 +44,7 @@

{{'transaction,output' | translate}}

-

+

diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 1b044530..de8301ac 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -249,6 +249,14 @@ } }, "general": { + "current": { + "en": "Current", + "ar": "تيار" + }, + "proposed": { + "en": "Proposed", + "ar": "مقترح" + }, "fav-showData": { "en": "Please select an alphabet to see your favourites", "ar": "الرجاء تحديد الأبجدية لرؤية المفضلة لديك"