Merge branch 'enad-Q1' of https://gitlab.com/haroon6138/mohemmionic5 into enad-Q1

MOHEMM-SFH-COLORS
enadhilal 4 years ago
commit 6a07e1d7b7

@ -737,7 +737,7 @@ export class HomePage implements OnInit {
this.accrualBalancesList = result.GetAccrualBalancesList;
for (const accrualBalance of result.GetAccrualBalancesList) {
if (accrualBalance.ACCURAL_PLAN_NAME === 'HMG Annual Vacation Accrual Plan') {
this.statsButtons[3].statsValue = Number(accrualBalance.ACCRUAL_NET_ENTITLEMENT.toFixed(2));
this.statsButtons[3].statsValue = accrualBalance.ACCRUAL_NET_ENTITLEMENT === null ? 0 : Number(accrualBalance.ACCRUAL_NET_ENTITLEMENT.toFixed(2));
this.common.sharedService.setSharedData(accrualBalance, 'leaveAccrualBalance');
this.common.sharedService.setSharedData(request, 'leaveAccrualBalanceDate');
this.common.sharedService.setSharedData(this.accrualBalancesList, 'tickitsbalance');

@ -239,7 +239,7 @@ export class HomeComponent implements OnInit {
this.filters[2].value = this.totalPO;
this.filters[3].value = this.totalPR;
this.filters[4].value = this.totalMR;
this.filters[5].value = this.totalIC;
this.filters[6].value = this.totalIC;
});
@ -518,6 +518,10 @@ export class HomeComponent implements OnInit {
}
} else {
this.newWorkListResponse = [];
// this.assignDataToFilters();
if (this.showFormattedData.length === 0) {
this.resetFiltersUI();
}
this.data.datasets[0].data[4] = this.ITGCount;
this.showChart = true;
// this.common.stopLoading();
@ -525,6 +529,23 @@ export class HomeComponent implements OnInit {
}
}
public resetFiltersUI () {
this.ngZone.run(() => {
this.filters[0].value = 0;
this.filters[1].value = 0;
this.filters[2].value = 0;
this.filters[3].value = 0;
this.filters[4].value = 0;
this.filters[6].value = 0;
this.data.datasets[0].data[0] = 0;
this.data.datasets[0].data[1] = 0;
this.data.datasets[0].data[2] = 0;
this.data.datasets[0].data[3] = 0;
this.data.datasets[0].data[5] = 0;
});
}
openNotificationDetail(obj) {
this.common.sharedService.setSharedData(this.selectedFilter, 'selectedFilter');
this.common.sharedService.setSharedData(false, 'loadWorkList');

@ -18,7 +18,7 @@
{{key.categoryName_ar}}
</ion-label>
<ion-thumbnail slot="start">
<img [src]="key.content">
<div class="top-filter" [innerHTML]="key.content"></div>
</ion-thumbnail>
</ion-item>

@ -52,11 +52,12 @@ export class HomeComponent implements AfterViewInit {
console.log(this.direction);
let activeClass = this.cs.sharedService.getSharedData(OfferDiscountService.selected_filters);
// if (activeClass) {
// this.filterOffers(activeClass);
// }
this.getCategories();
this.tempSearch = JSON.parse(JSON.stringify(this.offersData));
if (activeClass) {
this.filterOffers(activeClass);
} else {
this.getCategories();
this.tempSearch = JSON.parse(JSON.stringify(this.offersData));
}
}
getCategories() {
this.offersService.getCategories({}).subscribe((result) => {

@ -38,8 +38,8 @@ export class OfferDetailsComponent implements OnInit {
console.log(this.details);
const options = {
message: this.stripHtml(this.details.Description),
// subject: this.stripHtml(this.details.Title),
files: ['https://www.geo.tv/assets/uploads/updates/2021-09-05/368882_8709303_updates.jpg']
subject: this.stripHtml(this.details.Title),
files: [this.details.Banner_Image]
}
this.socialSharing.shareWithOptions(options).then((result) => {
console.log(result);

@ -1609,3 +1609,8 @@ ion-segment-button {
.top svg {
height: 30px !important;
}
.top-filter svg {
margin-top: 15px !important;
}

Loading…
Cancel
Save