completed work list ui part

itg-new-design
umasoodch 6 years ago
parent 5b7e435a31
commit 2e6dd95004

@ -42,7 +42,7 @@
"input": "src/app/app.scss" "input": "src/app/app.scss"
} }
], ],
"scripts": [], "scripts": ["node_modules/chart.js/dist/Chart.js"],
"es5BrowserSupport": true "es5BrowserSupport": true
}, },
"configurations": { "configurations": {

@ -12,9 +12,9 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { ZBar } from '@ionic-native/zbar/ngx'; import { ZBar } from '@ionic-native/zbar/ngx';
import { Geolocation } from '@ionic-native/geolocation/ngx'; import { Geolocation } from '@ionic-native/geolocation/ngx';
import {Camera, CameraOptions, PictureSourceType} from '@ionic-native/Camera/ngx'; import {Camera, CameraOptions, PictureSourceType} from '@ionic-native/Camera/ngx';
import { FilePath } from "@ionic-native/file-path/ngx"; import { FilePath } from '@ionic-native/file-path/ngx';
import { File } from "@ionic-native/file/ngx"; import { File } from '@ionic-native/file/ngx';
import { Base64 } from "@ionic-native/base64/ngx"; import { Base64 } from '@ionic-native/base64/ngx';
import { FirebaseX } from '@ionic-native/firebase-x/ngx'; import { FirebaseX } from '@ionic-native/firebase-x/ngx';
@NgModule({ @NgModule({

@ -96,13 +96,16 @@ import { FileSelectDirective } from 'ng2-file-upload';
import { WorkListAttachViewComponent } from '../notification/work-list-attach-view/work-list-attach-view.component'; import { WorkListAttachViewComponent } from '../notification/work-list-attach-view/work-list-attach-view.component';
import {Camera, CameraOptions, PictureSourceType} from '@ionic-native/Camera/ngx'; import {Camera, CameraOptions, PictureSourceType} from '@ionic-native/Camera/ngx';
import {File} from '@ionic-native/file/ngx'; import {File} from '@ionic-native/file/ngx';
import {FileUploderProfileComponent} from './ui/file-uploder-profile/file-uploder-profile.component' import {FileUploderProfileComponent} from './ui/file-uploder-profile/file-uploder-profile.component';
import { OpenNativeSettings } from '@ionic-native/open-native-settings/ngx'; import { OpenNativeSettings } from '@ionic-native/open-native-settings/ngx';
import { AccordinCustomComponent } from './ui/accordin-custom/accordin-custom.component'; import { AccordinCustomComponent } from './ui/accordin-custom/accordin-custom.component';
import { AccordinTabCustomComponent} from './ui/accordin-custom/accordin-tab-custom/accordin-tab-custom.component'; import { AccordinTabCustomComponent} from './ui/accordin-custom/accordin-tab-custom/accordin-tab-custom.component';
import{ConfirmLoginComponent} from '../authentication/confirm-login/confirm-login.component' import {ConfirmLoginComponent} from '../authentication/confirm-login/confirm-login.component';
import{WelcomeComponent} from './ui/welcome-login/welcome.component' import {WelcomeComponent} from './ui/welcome-login/welcome.component';
import {DashboredService} from './services/dashbored/dashbored.service' import {DashboredService} from './services/dashbored/dashbored.service';
import {ChartModule} from 'primeng/chart';
import { CardFilterComponent} from './ui/card-filter/card-filter.component';
@NgModule({ @NgModule({
imports: [ imports: [
CommonModule, CommonModule,
@ -112,7 +115,8 @@ import {DashboredService} from './services/dashbored/dashbored.service'
HttpClientModule, HttpClientModule,
NgxChartsModule, NgxChartsModule,
ListboxModule, ListboxModule,
PdfViewerModule PdfViewerModule,
ChartModule
], ],
declarations: [ declarations: [
WelcomeComponent, WelcomeComponent,
@ -163,15 +167,14 @@ import {DashboredService} from './services/dashbored/dashbored.service'
EmptyDataComponent, EmptyDataComponent,
DetailButtonComponent, DetailButtonComponent,
HeaderButtonComponent, HeaderButtonComponent,
//PaymentComponent,
ReplacementListComponent, ReplacementListComponent,
FileSelectDirective, FileSelectDirective,
WorkListAttachViewComponent, WorkListAttachViewComponent,
FileUploderProfileComponent, FileUploderProfileComponent,
AccordinTabCustomComponent, AccordinTabCustomComponent,
AccordinCustomComponent, AccordinCustomComponent,
ConfirmLoginComponent ConfirmLoginComponent,
CardFilterComponent
], ],
exports: [ exports: [
WelcomeComponent, WelcomeComponent,
@ -219,15 +222,15 @@ import {DashboredService} from './services/dashbored/dashbored.service'
EmptyDataComponent, EmptyDataComponent,
DetailButtonComponent, DetailButtonComponent,
HeaderButtonComponent, HeaderButtonComponent,
//PaymentComponent,
ReplacementListComponent, ReplacementListComponent,
FileSelectDirective, FileSelectDirective,
WorkListAttachViewComponent, WorkListAttachViewComponent,
FileUploderProfileComponent, FileUploderProfileComponent,
AccordinTabCustomComponent, AccordinTabCustomComponent,
AccordinCustomComponent, AccordinCustomComponent,
ConfirmLoginComponent ConfirmLoginComponent,
ChartModule,
CardFilterComponent
], ],
providers: [ providers: [
DashboredService, DashboredService,

@ -1,4 +1,4 @@
import { Injectable } from "@angular/core"; import { Injectable } from '@angular/core';
import { import {
NavController, NavController,
ToastController, ToastController,
@ -6,74 +6,74 @@ import {
AlertController, AlertController,
Platform, Platform,
MenuController MenuController
} from "@ionic/angular"; } from '@ionic/angular';
import { Router } from "@angular/router"; import { Router } from '@angular/router';
import { TranslatorService } from "../translator/translator.service"; import { TranslatorService } from '../translator/translator.service';
import { AlertControllerService } from "../../ui/alert/alert-controller.service"; import { AlertControllerService } from '../../ui/alert/alert-controller.service';
//import { Response } from "../models/response"; //import { Response } from "../models/response";
import { Response } from 'src/app/hmg-common/services/models/response'; import { Response } from 'src/app/hmg-common/services/models/response';
import { Location, DatePipe } from "@angular/common"; import { Location, DatePipe } from '@angular/common';
import { ThemeableBrowser } from "@ionic-native/themeable-browser/ngx"; import { ThemeableBrowser } from '@ionic-native/themeable-browser/ngx';
import { BrowserConfig } from "./models/browser-config"; import { BrowserConfig } from './models/browser-config';
import { import {
LaunchNavigator, LaunchNavigator,
LaunchNavigatorOptions LaunchNavigatorOptions
} from "@ionic-native/launch-navigator/ngx"; } from '@ionic-native/launch-navigator/ngx';
import { Device } from "@ionic-native/device/ngx"; import { Device } from '@ionic-native/device/ngx';
import { ProgressLoadingService } from "../../ui/progressLoading/progress-loading.service"; import { ProgressLoadingService } from '../../ui/progressLoading/progress-loading.service';
import { Observable, throwError } from "rxjs"; import { Observable, throwError } from 'rxjs';
import { SharedDataService } from "../shared-data-service/shared-data.service"; import { SharedDataService } from '../shared-data-service/shared-data.service';
import { Badge } from "@ionic-native/badge/ngx"; import { Badge } from '@ionic-native/badge/ngx';
import { LifeCycleService } from "../life-cycle/life-cycle.service"; import { LifeCycleService } from '../life-cycle/life-cycle.service';
import { Diagnostic } from "@ionic-native/diagnostic/ngx"; import { Diagnostic } from '@ionic-native/diagnostic/ngx';
//import { CallNumber } from "@ionic-native/call-number/ngx"; //import { CallNumber } from "@ionic-native/call-number/ngx";
import { InAppBrowser } from "@ionic-native/in-app-browser/ngx"; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
@Injectable({ @Injectable({
providedIn: "root" providedIn: 'root'
}) })
export class CommonService { export class CommonService {
public static months_en_long = [ public static months_en_long = [
"January", 'January',
"February", 'February',
"March", 'March',
"April", 'April',
"May", 'May',
"June", 'June',
"July", 'July',
"August", 'August',
"September", 'September',
"October", 'October',
"November", 'November',
"December" 'December'
]; ];
public static months_en = [ public static months_en = [
"Jan", 'Jan',
"Feb", 'Feb',
"Mar", 'Mar',
"Apr", 'Apr',
"May", 'May',
"Jun", 'Jun',
"Jul", 'Jul',
"Aug", 'Aug',
"Sep", 'Sep',
"Oct", 'Oct',
"Nov", 'Nov',
"Dec" 'Dec'
]; ];
public static months_ar = [ public static months_ar = [
"يناير", 'يناير',
"فبراير", 'فبراير',
"مارس", 'مارس',
"أبريل", 'أبريل',
"مايو", 'مايو',
"يونيو", 'يونيو',
"يوليو", 'يوليو',
"أغسطس", 'أغسطس',
"سبتمبر", 'سبتمبر',
"أكتوبر", 'أكتوبر',
"نوفمبر", 'نوفمبر',
"ديسمبر" 'ديسمبر'
]; ];
private progressLoaders: any[] = []; private progressLoaders: any[] = [];
@ -114,7 +114,7 @@ export class CommonService {
public round(value: number, decimal: number): string { public round(value: number, decimal: number): string {
const valueStr = value.toString(); const valueStr = value.toString();
const dotIndex = valueStr.indexOf("."); const dotIndex = valueStr.indexOf('.');
if (dotIndex >= 0) { if (dotIndex >= 0) {
return valueStr.toString().substr(0, dotIndex + decimal); return valueStr.toString().substr(0, dotIndex + decimal);
@ -128,13 +128,13 @@ export class CommonService {
var hours = Math.floor(sec_num / 3600); var hours = Math.floor(sec_num / 3600);
var minutes = Math.floor((sec_num - hours * 3600) / 60); var minutes = Math.floor((sec_num - hours * 3600) / 60);
var seconds = sec_num - hours * 3600 - minutes * 60; var seconds = sec_num - hours * 3600 - minutes * 60;
var hoursString = ""; var hoursString = '';
var minutesString = ""; var minutesString = '';
var secondsString = ""; var secondsString = '';
hoursString = hours < 10 ? "0" + hours : hours.toString(); hoursString = hours < 10 ? '0' + hours : hours.toString();
minutesString = minutes < 10 ? "0" + minutes : minutes.toString(); minutesString = minutes < 10 ? '0' + minutes : minutes.toString();
secondsString = seconds < 10 ? "0" + seconds : seconds.toString(); secondsString = seconds < 10 ? '0' + seconds : seconds.toString();
return minutesString + ":" + secondsString; return minutesString + ':' + secondsString;
} }
public toastPK(page: string, key: string) { public toastPK(page: string, key: string) {
@ -144,9 +144,9 @@ export class CommonService {
const toast = await this.toastController.create({ const toast = await this.toastController.create({
message: message, message: message,
showCloseButton: true, showCloseButton: true,
position: "middle", position: 'middle',
duration: 2000, duration: 2000,
closeButtonText: this.ts.trPK("general", "close") closeButtonText: this.ts.trPK('general', 'close')
}); });
toast.present(); toast.present();
} }
@ -155,9 +155,9 @@ export class CommonService {
async startLoadingOld() { async startLoadingOld() {
this.stopLoading(); this.stopLoading();
const loader = await this.loadingController.create({ const loader = await this.loadingController.create({
spinner: "bubbles", spinner: 'bubbles',
duration: 30000, duration: 30000,
message: this.ts.trPK("error", "wait"), message: this.ts.trPK('error', 'wait'),
translucent: true translucent: true
}); });
this.progressLoaders.push(loader); this.progressLoaders.push(loader);
@ -170,7 +170,7 @@ export class CommonService {
*/ */
this.stopLoading(); this.stopLoading();
this.progressLoadingService.presentLoading( this.progressLoadingService.presentLoading(
this.ts.trPK("general", "loading") this.ts.trPK('general', 'loading')
); );
} }
@ -190,8 +190,8 @@ export class CommonService {
onAccept(); onAccept();
} }
}, },
this.ts.trPK("general", "ok"), this.ts.trPK('general', 'ok'),
this.ts.trPK("general", "alert"), this.ts.trPK('general', 'alert'),
message message
); );
} }
@ -199,10 +199,10 @@ export class CommonService {
public presentConfirmDialog(message: string, onAccept: any, onCancel?: any) { public presentConfirmDialog(message: string, onAccept: any, onCancel?: any) {
this.confirmAlertDialog( this.confirmAlertDialog(
onAccept, onAccept,
this.ts.trPK("general", "ok"), this.ts.trPK('general', 'ok'),
onCancel, onCancel,
this.ts.trPK("general", "cancel"), this.ts.trPK('general', 'cancel'),
this.ts.trPK("general", "confirm"), this.ts.trPK('general', 'confirm'),
message message
); );
} }
@ -210,8 +210,8 @@ export class CommonService {
public presentAcceptDialog(message: string, onAccept: any) { public presentAcceptDialog(message: string, onAccept: any) {
this.alertDialog( this.alertDialog(
onAccept, onAccept,
this.ts.trPK("general", "ok"), this.ts.trPK('general', 'ok'),
this.ts.trPK("general", "confirm"), this.ts.trPK('general', 'confirm'),
message message
); );
} }
@ -221,8 +221,8 @@ export class CommonService {
() => { () => {
this.back(); this.back();
}, },
this.ts.trPK("general", "ok"), this.ts.trPK('general', 'ok'),
this.ts.trPK("general", "info"), this.ts.trPK('general', 'info'),
message message
); );
} }
@ -230,9 +230,9 @@ export class CommonService {
this.openHome(); this.openHome();
this.alertDialog( this.alertDialog(
() => {}, () => {},
this.ts.trPK("general", "ok"), this.ts.trPK('general', 'ok'),
this.ts.trPK("general", "info"), this.ts.trPK('general', 'info'),
this.ts.trPK("general", "not-allowed") this.ts.trPK('general', 'not-allowed')
); );
} }
@ -243,14 +243,14 @@ export class CommonService {
) { ) {
this.alertDialog( this.alertDialog(
onClick, onClick,
this.ts.trPK("general", "ok"), this.ts.trPK('general', 'ok'),
this.ts.trPK("general", "alert"), this.ts.trPK('general', 'alert'),
message message
); );
} }
public userNeedToReLogin() { public userNeedToReLogin() {
this.presentAcceptDialog(this.ts.trPK("general", "relogin"), () => { this.presentAcceptDialog(this.ts.trPK('general', 'relogin'), () => {
this.sharedService.clearAll(); this.sharedService.clearAll();
this.openLogin(); this.openLogin();
}); });
@ -259,9 +259,9 @@ export class CommonService {
public showConnectionErrorDialog(onClick: any, okLabel: string) { public showConnectionErrorDialog(onClick: any, okLabel: string) {
this.alertDialog( this.alertDialog(
onClick, onClick,
this.ts.trPK("general", "ok"), this.ts.trPK('general', 'ok'),
this.ts.trPK("general", "alert"), this.ts.trPK('general', 'alert'),
this.ts.trPK("general", "connError") this.ts.trPK('general', 'connError')
); );
} }
@ -269,15 +269,15 @@ export class CommonService {
this.alertDialog( this.alertDialog(
onClick, onClick,
okLabel, okLabel,
this.ts.trPK("general", "alert"), this.ts.trPK('general', 'alert'),
this.ts.trPK("general", "timeout") this.ts.trPK('general', 'timeout')
); );
} }
async JustAlertDialog(acceptLabel: string, message: string) { async JustAlertDialog(acceptLabel: string, message: string) {
this.clearAllAlerts(); this.clearAllAlerts();
const alert = await this.alertControllerIonic.create({ const alert = await this.alertControllerIonic.create({
header: this.ts.trPK("general", "info"), header: this.ts.trPK('general', 'info'),
message: message, message: message,
buttons: [ buttons: [
{ {
@ -302,13 +302,13 @@ export class CommonService {
) { ) {
this.clearAllAlerts(); this.clearAllAlerts();
const alert = await this.alertControllerIonic.create({ const alert = await this.alertControllerIonic.create({
header: this.ts.trPK("general", "confirm"), header: this.ts.trPK('general', 'confirm'),
message: message, message: message,
buttons: [ buttons: [
{ {
text: cancelLabel, text: cancelLabel,
role: "cancel", role: 'cancel',
cssClass: "cancel-button", cssClass: 'cancel-button',
handler: () => { handler: () => {
if (onCancel) { if (onCancel) {
onCancel(); onCancel();
@ -341,7 +341,7 @@ export class CommonService {
) { ) {
this.clearAllAlerts(); this.clearAllAlerts();
const alert = await this.alertControllerIonic.create({ const alert = await this.alertControllerIonic.create({
header: this.ts.trPK("general", "confirm"), header: this.ts.trPK('general', 'confirm'),
message: message, message: message,
buttons: [ buttons: [
{ {
@ -375,7 +375,7 @@ export class CommonService {
message: message, message: message,
buttons: [ buttons: [
{ {
text:this.ts.trPK("general", "ok"), text:this.ts.trPK('general', 'ok'),
handler: () => { handler: () => {
if (onAccept) { if (onAccept) {
onAccept(); onAccept();
@ -418,13 +418,13 @@ export class CommonService {
) { ) {
this.clearAllAlerts(); this.clearAllAlerts();
const alert = await this.alertControllerIonic.create({ const alert = await this.alertControllerIonic.create({
header: this.ts.trPK("general", "confirm"), header: this.ts.trPK('general', 'confirm'),
message: message, message: message,
buttons: [ buttons: [
{ {
text: cancelLabel, text: cancelLabel,
role: "cancel", role: 'cancel',
cssClass: "cancelBtn", cssClass: 'cancelBtn',
handler: () => { handler: () => {
if (onCancel) { if (onCancel) {
onCancel(); onCancel();
@ -434,9 +434,9 @@ export class CommonService {
}, },
{ {
text: acceptLabel, text: acceptLabel,
role: "Confirm", role: 'Confirm',
cssClass: "confirmBtn", cssClass: 'confirmBtn',
handler: () => { handler: () => {
@ -455,7 +455,7 @@ export class CommonService {
public clearAllAlerts() { public clearAllAlerts() {
// custom solutions because of async issue // custom solutions because of async issue
const alerts = document.getElementsByTagName("ion-alert"); const alerts = document.getElementsByTagName('ion-alert');
for (let i = 0; i < alerts.length; i++) { for (let i = 0; i < alerts.length; i++) {
const alert = alerts[i]; const alert = alerts[i];
alert.parentNode.removeChild(alert); alert.parentNode.removeChild(alert);
@ -463,15 +463,15 @@ export class CommonService {
} }
public getDeviceInfo(): string { public getDeviceInfo(): string {
if (this.platform.is("mobile")) { if (this.platform.is('mobile')) {
const os = this.platform.is("ios") ? "Iphone" : "android"; const os = this.platform.is('ios') ? 'Iphone' : 'android';
return ( return (
os + os +
" - " + ' - ' +
this.device.platform + this.device.platform +
" - " + ' - ' +
this.device.version + this.device.version +
" , " + ' , ' +
this.device.manufacturer this.device.manufacturer
); );
} else { } else {
@ -480,19 +480,19 @@ export class CommonService {
} }
public getDeviceType(): string { public getDeviceType(): string {
if (this.platform.is("mobile")) { if (this.platform.is('mobile')) {
// return "Mobile " + (this.platform.is("ios") ? "Iphone" : "android"); // return "Mobile " + (this.platform.is("ios") ? "Iphone" : "android");
return (this.platform.is("ios") ? "Iphone" : "android"); return (this.platform.is('ios') ? 'Iphone' : 'android');
} else { } else {
return "Desktop"; return 'Desktop';
} }
} }
public validResponse(result: Response): boolean { public validResponse(result: Response): boolean {
if (result.MessageStatus === 1) { if (result.MessageStatus === 1) {
return true; return true;
} else if (result.MessageStatus === 2) { } else if (result.MessageStatus === 2) {
return this.hasData(result["SameClinicApptList"]); return this.hasData(result['SameClinicApptList']);
} }
return false; return false;
} }
@ -513,15 +513,15 @@ export class CommonService {
} }
private openBrowserHtml(url, onExit?, onFaild?, onSuccess?) { private openBrowserHtml(url, onExit?, onFaild?, onSuccess?) {
const browser = window.open(url, "_blank", "location=no"); const browser = window.open(url, '_blank', 'location=no');
browser.addEventListener("loadstart", () => {}); browser.addEventListener('loadstart', () => {});
browser.addEventListener("loaderror", () => { browser.addEventListener('loaderror', () => {
if (onFaild) { if (onFaild) {
onFaild(); onFaild();
} }
}); });
browser.addEventListener("loadstop", () => { browser.addEventListener('loadstop', () => {
if (onSuccess) { if (onSuccess) {
onSuccess(); onSuccess();
} }
@ -538,14 +538,14 @@ export class CommonService {
this.platform.ready().then(() => { this.platform.ready().then(() => {
const browser = this.iab.create( const browser = this.iab.create(
url, url,
"_blank", '_blank',
"closebuttoncolor=#60686b,hidenavigationbuttons=yes,hideurlbar=yes,zoom=no" 'closebuttoncolor=#60686b,hidenavigationbuttons=yes,hideurlbar=yes,zoom=no'
); );
// browser.executeScript(...); // browser.executeScript(...);
// browser.insertCSS(...); // browser.insertCSS(...);
browser.on("loaderror").subscribe(event => { browser.on('loaderror').subscribe(event => {
if (onFaild) { if (onFaild) {
onFaild(); onFaild();
} }
@ -561,13 +561,13 @@ export class CommonService {
}); });
*/ */
browser.on("exit").subscribe(event => { browser.on('exit').subscribe(event => {
if (onExit) { if (onExit) {
onExit(); onExit();
} }
}); });
browser.on("loadstart").subscribe(event => { browser.on('loadstart').subscribe(event => {
if (successURLS) { if (successURLS) {
successURLS.forEach((successURL, index) => { successURLS.forEach((successURL, index) => {
if (event.url && event.url.indexOf(successURL) >= 0) { if (event.url && event.url.indexOf(successURL) >= 0) {
@ -584,7 +584,7 @@ export class CommonService {
} }
public imageFromBase64(base64: string) { public imageFromBase64(base64: string) {
return "data:image/jpeg;base64," + base64; return 'data:image/jpeg;base64,' + base64;
} }
public openLocation(lat: number, lng: number) { public openLocation(lat: number, lng: number) {
@ -593,24 +593,24 @@ export class CommonService {
() => {}, () => {},
err => { err => {
// this.failedToOpenMap(); // this.failedToOpenMap();
window.open("https://maps.google.com/?q=" + lat + "," + lng); window.open('https://maps.google.com/?q=' + lat + ',' + lng);
} }
); );
}); });
} }
private failedToOpenMap() { private failedToOpenMap() {
this.presentAlert(this.ts.trPK("error", "map")); this.presentAlert(this.ts.trPK('error', 'map'));
} }
public localizeTime(date: Date) { public localizeTime(date: Date) {
if (!(date.getHours() == 0 && date.getMinutes() == 0)) { if (!(date.getHours() == 0 && date.getMinutes() == 0)) {
let h = date.getHours() % 12 || 12; let h = date.getHours() % 12 || 12;
let hStr = h < 10 ? "0" + h : h; // leading 0 at the left for 1 digit hours let hStr = h < 10 ? '0' + h : h; // leading 0 at the left for 1 digit hours
const m = date.getMinutes(); const m = date.getMinutes();
let mStr = m < 10 ? "0" + m : m; let mStr = m < 10 ? '0' + m : m;
return hStr + ":" + mStr + (date.getHours() < 12 ? " AM" : " PM"); return hStr + ':' + mStr + (date.getHours() < 12 ? ' AM' : ' PM');
} }
return ""; return '';
} }
public localizeDate(date: Date, time = false) { public localizeDate(date: Date, time = false) {
@ -619,20 +619,20 @@ export class CommonService {
if (lng === TranslatorService.AR) { if (lng === TranslatorService.AR) {
dateStr = dateStr =
CommonService.months_ar[date.getMonth()] + CommonService.months_ar[date.getMonth()] +
" " + ' ' +
date.getDate() + date.getDate() +
" " + ' ' +
date.getFullYear(); date.getFullYear();
} else { } else {
dateStr = dateStr =
CommonService.months_en[date.getMonth()] + CommonService.months_en[date.getMonth()] +
" " + ' ' +
date.getDate() + date.getDate() +
"," + ',' +
date.getFullYear(); date.getFullYear();
} }
return time ? dateStr + " " + this.localizeTime(date) : dateStr; return time ? dateStr + ' ' + this.localizeTime(date) : dateStr;
} }
public localizeMonth(monthIndex) { public localizeMonth(monthIndex) {
@ -664,21 +664,21 @@ export class CommonService {
return ( return (
date.getMonth() + date.getMonth() +
1 + 1 +
"/" + '/' +
date date
.getFullYear() .getFullYear()
.toString() .toString()
.substr(2) .substr(2)
); );
} else { } else {
return "--"; return '--';
} }
} }
public convertISODateToJsonDate(isoDate: string): string { public convertISODateToJsonDate(isoDate: string): string {
return "/Date(" + Date.parse(isoDate) + ")/"; return '/Date(' + Date.parse(isoDate) + ')/';
} }
public convertDateToJsonDate(date: Date): string { public convertDateToJsonDate(date: Date): string {
return "/Date(" + date.getTime() + ")/"; return '/Date(' + date.getTime() + ')/';
} }
/* /*
@ -687,13 +687,13 @@ export class CommonService {
*/ */
public convertIsoDateToObject(isoDate: string, isoTime: string): Date { public convertIsoDateToObject(isoDate: string, isoTime: string): Date {
const date = new Date(isoDate); const date = new Date(isoDate);
const parts = isoTime.split(":"); const parts = isoTime.split(':');
if (this.hasData(parts)) { if (this.hasData(parts)) {
// remove if numbers start with 0 // remove if numbers start with 0
let hrsStr = parts[0]; let hrsStr = parts[0];
let msStr = parts[1]; let msStr = parts[1];
hrsStr = hrsStr[0] == "0" ? hrsStr.substr(1) : hrsStr; hrsStr = hrsStr[0] == '0' ? hrsStr.substr(1) : hrsStr;
msStr = msStr[0] == "0" ? msStr.substr(1) : msStr; msStr = msStr[0] == '0' ? msStr.substr(1) : msStr;
date.setHours(Number(hrsStr)); date.setHours(Number(hrsStr));
date.setMinutes(Number(msStr)); date.setMinutes(Number(msStr));
} }
@ -721,9 +721,9 @@ export class CommonService {
public getDateISO(date: Date): string { public getDateISO(date: Date): string {
return ( return (
date.getFullYear().toString() + date.getFullYear().toString() +
"-" + '-' +
this.trailerZero(date.getMonth() + 1) + this.trailerZero(date.getMonth() + 1) +
"-" + '-' +
this.trailerZero(date.getDate()) this.trailerZero(date.getDate())
); );
} }
@ -735,19 +735,19 @@ export class CommonService {
public getTimeISO(date: Date): string { public getTimeISO(date: Date): string {
return ( return (
this.trailerZero(date.getHours()) + this.trailerZero(date.getHours()) +
":" + ':' +
this.trailerZero(date.getMinutes()) + this.trailerZero(date.getMinutes()) +
":00" ':00'
); );
} }
public getDateTimeISO(date: Date): string { public getDateTimeISO(date: Date): string {
return this.getDateISO(date) + " " + this.getTimeISO(date); return this.getDateISO(date) + ' ' + this.getTimeISO(date);
} }
public getDateTimeISOFromString(dateStr: string): string { public getDateTimeISOFromString(dateStr: string): string {
const date = this.evaluteDateAsObject(dateStr); const date = this.evaluteDateAsObject(dateStr);
return this.getDateTimeISO(date) + " " + this.getTimeISO(date); return this.getDateTimeISO(date) + ' ' + this.getTimeISO(date);
} }
public getCurrentTimeISO(): string { public getCurrentTimeISO(): string {
@ -756,7 +756,7 @@ export class CommonService {
private trailerZero(value: number): string { private trailerZero(value: number): string {
const str = value.toString(); const str = value.toString();
return str.length > 1 ? str : "0" + str; return str.length > 1 ? str : '0' + str;
} }
public hasData(array: any[]): boolean { public hasData(array: any[]): boolean {
@ -780,13 +780,13 @@ export class CommonService {
} }
} }
} }
return startIndex ? message.substring(startIndex, endIndex) : ""; return startIndex ? message.substring(startIndex, endIndex) : '';
} }
return null; return null;
} }
public inNumberRange(targetCode: number): boolean { public inNumberRange(targetCode: number): boolean {
const minDigit = "0".charCodeAt(0); const minDigit = '0'.charCodeAt(0);
const maxDigit = "9".charCodeAt(0); const maxDigit = '9'.charCodeAt(0);
return targetCode >= minDigit && targetCode <= maxDigit; return targetCode >= minDigit && targetCode <= maxDigit;
} }
@ -808,24 +808,24 @@ export class CommonService {
title?: string title?: string
) { ) {
this.smsAlertDialog = await this.alertControllerIonic.create({ this.smsAlertDialog = await this.alertControllerIonic.create({
header: title || this.ts.trPK("general", "enter-sms-code"), header: title || this.ts.trPK('general', 'enter-sms-code'),
inputs: [ inputs: [
{ {
name: "sms", name: 'sms',
type: "number", type: 'number',
value: smsCode, value: smsCode,
placeholder: this.ts.trPK("general", "enter-sms") placeholder: this.ts.trPK('general', 'enter-sms')
} }
], ],
buttons: [ buttons: [
{ {
text: this.ts.trPK("general", "cancel"), text: this.ts.trPK('general', 'cancel'),
role: "cancel", role: 'cancel',
cssClass: "cancel-button", cssClass: 'cancel-button',
handler: () => {} handler: () => {}
}, },
{ {
text: this.ts.trPK("general", "ok"), text: this.ts.trPK('general', 'ok'),
handler: data => { handler: data => {
onAccept(data.sms); onAccept(data.sms);
} }
@ -928,8 +928,8 @@ export class CommonService {
} }
const dataSets = [ const dataSets = [
this.getGraphDataSet(this.ts.trInline(title1), series1, "#d12026"), this.getGraphDataSet(this.ts.trInline(title1), series1, '#d12026'),
this.getGraphDataSet(this.ts.trInline(title2), series2, "#60686b") this.getGraphDataSet(this.ts.trInline(title2), series2, '#60686b')
]; ];
return this.getGraphMultiSeries(labels, dataSets); return this.getGraphMultiSeries(labels, dataSets);
} }
@ -945,7 +945,7 @@ export class CommonService {
} }
public isHtml5VideoSupported(): boolean { public isHtml5VideoSupported(): boolean {
const v = document.createElement("video"); const v = document.createElement('video');
if (v.canPlayType('video/mp4; codecs="avc1.42E01E, mp4a.40.2"')) { if (v.canPlayType('video/mp4; codecs="avc1.42E01E, mp4a.40.2"')) {
return true; return true;
} }
@ -959,7 +959,7 @@ export class CommonService {
} }
public isCordova(): boolean { public isCordova(): boolean {
return this.platform.is("cordova"); return this.platform.is('cordova');
} }
public pageRevisited(pageName: string): Observable<boolean> { public pageRevisited(pageName: string): Observable<boolean> {
@ -970,119 +970,119 @@ export class CommonService {
open calls open calls
*/ */
public openEitListPage() { public openEitListPage() {
this.nav.navigateForward(["/eit/eit-list"]); this.nav.navigateForward(['/eit/eit-list']);
} }
public openAddEitPage() { public openAddEitPage() {
this.nav.navigateForward(["/eit/add-eit"]); this.nav.navigateForward(['/eit/add-eit']);
} }
public openConfirmEitPage() { public openConfirmEitPage() {
this.nav.navigateForward(["/eit/confirm-add-eit"]); this.nav.navigateForward(['/eit/confirm-add-eit']);
} }
public openHome() { public openHome() {
this.nav.navigateRoot(["/home"]); this.nav.navigateRoot(['/home']);
} }
public openForgotPassword() { public openForgotPassword() {
this.nav.navigateForward(["/authentication/forgot"]); this.nav.navigateForward(['/authentication/forgot']);
} }
public openChangePassword() { public openChangePassword() {
this.nav.navigateForward(["/authentication/changepassowrd"]); this.nav.navigateForward(['/authentication/changepassowrd']);
} }
public openProfile() { public openProfile() {
this.nav.navigateForward(["/profile/home"]); this.nav.navigateForward(['/profile/home']);
} }
public openAccuralPage() { public openAccuralPage() {
this.nav.navigateForward(["/accrual-balances/home"]); this.nav.navigateForward(['/accrual-balances/home']);
} }
public openEITPage() { public openEITPage() {
this.nav.navigateForward(["/eit/homepage"]); this.nav.navigateForward(['/eit/homepage']);
} }
public openMyTeamPage() { public openMyTeamPage() {
this.nav.navigateForward(["/my-team/home"]); this.nav.navigateForward(['/my-team/home']);
} }
public static myTeamDetailUrl =["/my-team/details","/my-team/details-2"] public static myTeamDetailUrl =['/my-team/details','/my-team/details-2']
public openMyTeamDetails() { public openMyTeamDetails() {
this.alternateNavigate(CommonService.myTeamDetailUrl,"teamDetail-open",true); this.alternateNavigate(CommonService.myTeamDetailUrl,'teamDetail-open',true);
// this.nav.navigateForward(["/my-team/details"]); // this.nav.navigateForward(["/my-team/details"]);
} }
public openAbsencePage() { public openAbsencePage() {
this.nav.navigateForward(["/absence/home"]); this.nav.navigateForward(['/absence/home']);
} }
public openSubmitAbsencePage() { public openSubmitAbsencePage() {
this.nav.navigateForward(["/absence/submit-absence"]); this.nav.navigateForward(['/absence/submit-absence']);
} }
public openConfirmAbsece() { public openConfirmAbsece() {
this.nav.navigateForward(["/absence/confirm-absence"]); this.nav.navigateForward(['/absence/confirm-absence']);
} }
public openWorkListAttachViewPage() { public openWorkListAttachViewPage() {
this.nav.navigateForward(["/notification/work-list-attach-view"]); this.nav.navigateForward(['/notification/work-list-attach-view']);
} }
public openviewAbsenceAttachment() { public openviewAbsenceAttachment() {
this.nav.navigateForward(["/absence/view-attachements"]); this.nav.navigateForward(['/absence/view-attachements']);
} }
public openNotificationPage() { public openNotificationPage() {
this.nav.navigateForward(["/notification/homepage"]); this.nav.navigateForward(['/notification/homepage']);
} }
public openWorklistMainPage() { public openWorklistMainPage() {
this.nav.navigateForward(["/notification/worklist-main"]); this.nav.navigateForward(['/notification/worklist-main']);
} }
public openWorklistMainPRPage() { public openWorklistMainPRPage() {
this.nav.navigateForward(["/notification/worklist-main-PR"]); this.nav.navigateForward(['/notification/worklist-main-PR']);
} }
public openWorklistMainPOPage() { public openWorklistMainPOPage() {
this.nav.navigateForward(["/notification/worklist-main-PO"]); this.nav.navigateForward(['/notification/worklist-main-PO']);
} }
public openWorklistReplacementRollPage() { public openWorklistReplacementRollPage() {
this.nav.navigateForward(["/notification/work-list-replacement-roll"]); this.nav.navigateForward(['/notification/work-list-replacement-roll']);
} }
public openNotificationDetailsPage() { public openNotificationDetailsPage() {
this.nav.navigateForward(["/notification/work-list-details"]); this.nav.navigateForward(['/notification/work-list-details']);
} }
public openWorklistHistoryPage() { public openWorklistHistoryPage() {
this.nav.navigateForward(["/notification/work-list-action-history"]); this.nav.navigateForward(['/notification/work-list-action-history']);
} }
public openWorklistAttachPage() { public openWorklistAttachPage() {
this.nav.navigateForward(["/notification/work-list-attach"]); this.nav.navigateForward(['/notification/work-list-attach']);
} }
public openWorklistRFCPage() { public openWorklistRFCPage() {
this.nav.navigateForward(["/notification/work-list-rfc"]); this.nav.navigateForward(['/notification/work-list-rfc']);
} }
public openWorklistRollReplacement() { public openWorklistRollReplacement() {
this.nav.navigateForward(["/notification/work-list-replacement-roll"]); this.nav.navigateForward(['/notification/work-list-replacement-roll']);
} }
public openItemHistoryPage() { public openItemHistoryPage() {
this.nav.navigateForward(["/notification/item-history-PO"]); this.nav.navigateForward(['/notification/item-history-PO']);
} }
public openQutationAnalysisPage() { public openQutationAnalysisPage() {
this.nav.navigateForward(["/notification/qutation-analysis-PO"]); this.nav.navigateForward(['/notification/qutation-analysis-PO']);
} }
public openWorklistMainMRPage() { public openWorklistMainMRPage() {
this.nav.navigateForward(["/notification/worklist-main-MR"]); this.nav.navigateForward(['/notification/worklist-main-MR']);
} }
public openMySpecialistPage() { public openMySpecialistPage() {
this.nav.navigateForward(["/my-specialist/home"]); this.nav.navigateForward(['/my-specialist/home']);
} }
public openMySubordinatePage() { public openMySubordinatePage() {
this.nav.navigateForward(["/my-subordinate/home"]); this.nav.navigateForward(['/my-subordinate/home']);
} }
public openChangeImagePage() { public openChangeImagePage() {
this.nav.navigateForward(["/profile/profileImg"]); this.nav.navigateForward(['/profile/profileImg']);
} }
public openPayslipPage() { public openPayslipPage() {
this.nav.navigateForward(["/payslip/home"]); this.nav.navigateForward(['/payslip/home']);
} }
public openEarningsPage() { public openEarningsPage() {
this.nav.navigateForward(["/payslip/Earnings"]); this.nav.navigateForward(['/payslip/Earnings']);
} }
public openDeductionsPage() { public openDeductionsPage() {
this.nav.navigateForward(["/payslip/Deductions"]); this.nav.navigateForward(['/payslip/Deductions']);
} }
public openConfirmLoginPage() { public openConfirmLoginPage() {
this.nav.navigateForward(["/authentication/confirmLogin"]); this.nav.navigateForward(['/authentication/confirmLogin']);
} }
public reload(url: string, from: string) { public reload(url: string, from: string) {
console.log("force reload called from:" + from); console.log('force reload called from:' + from);
// window.location.reload(); // window.location.reload();
location.href = url; location.href = url;
} }
@ -1106,11 +1106,11 @@ export class CommonService {
private alternateNavigate(paths: string[], key: string, root = false) { private alternateNavigate(paths: string[], key: string, root = false) {
let url: string; let url: string;
if (localStorage.getItem(key) === "yes") { if (localStorage.getItem(key) === 'yes') {
localStorage.setItem(key, "no"); localStorage.setItem(key, 'no');
url = paths[0]; url = paths[0];
} else { } else {
localStorage.setItem(key, "yes"); localStorage.setItem(key, 'yes');
url = paths[1]; url = paths[1];
} }
if (root) { if (root) {
@ -1121,14 +1121,14 @@ export class CommonService {
} }
public openLogin() { public openLogin() {
this.nav.navigateRoot(["/authentication/login"]); this.nav.navigateRoot(['/authentication/login']);
} }
public openUserForgot() { public openUserForgot() {
this.nav.navigateForward(["/authentication/checkuser"]); this.nav.navigateForward(['/authentication/checkuser']);
} }
public openSMSPage() { public openSMSPage() {
this.nav.navigateForward(["/authentication/smspage"]); this.nav.navigateForward(['/authentication/smspage']);
} }
public navigateTo(url: string) { public navigateTo(url: string) {
@ -1164,11 +1164,11 @@ export class CommonService {
if (state == this.diagnostic.bluetoothState.POWERED_ON) { if (state == this.diagnostic.bluetoothState.POWERED_ON) {
feedback(); feedback();
} else { } else {
this.presentAlert(this.ts.trPK("bluetooth", "start")); this.presentAlert(this.ts.trPK('bluetooth', 'start'));
} }
}) })
.catch(e => { .catch(e => {
this.presentAlert(this.ts.trPK("bluetooth", "start")); this.presentAlert(this.ts.trPK('bluetooth', 'start'));
}); });
}); });
} }
@ -1198,7 +1198,7 @@ export class CommonService {
} }
for (i = 0; i < list.length; i += 1) { for (i = 0; i < list.length; i += 1) {
node = list[i]; node = list[i];
if (node.PARENT_MENU_NAME !== "") { if (node.PARENT_MENU_NAME !== '') {
// if you have dangling branches check that map[node.parentId] exists // if you have dangling branches check that map[node.parentId] exists
list[map[node.PARENT_MENU_NAME]].children.push(node); list[map[node.PARENT_MENU_NAME]].children.push(node);
} else { } else {
@ -1210,8 +1210,8 @@ export class CommonService {
public reverseFormatDate(date) { public reverseFormatDate(date) {
let FormatedDate; let FormatedDate;
if (date) { if (date) {
FormatedDate = date.replace(/\//g, "-"); FormatedDate = date.replace(/\//g, '-');
FormatedDate = FormatedDate.replace(/ 00:00:00/g, ""); FormatedDate = FormatedDate.replace(/ 00:00:00/g, '');
} else { } else {
FormatedDate = date; FormatedDate = date;
} }
@ -1220,7 +1220,7 @@ export class CommonService {
public formatStandardDate(date) { public formatStandardDate(date) {
let FormatedDate; let FormatedDate;
if (date) { if (date) {
FormatedDate = date.replace(/-/g, "/"); FormatedDate = date.replace(/-/g, '/');
} else { } else {
FormatedDate = date; FormatedDate = date;
} }
@ -1229,7 +1229,7 @@ export class CommonService {
public reverseFormatStandardDate(date) { public reverseFormatStandardDate(date) {
let FormatedDate; let FormatedDate;
if (date) { if (date) {
FormatedDate = date.replace(/\//g, "-"); FormatedDate = date.replace(/\//g, '-');
} else { } else {
FormatedDate = date; FormatedDate = date;
} }
@ -1241,8 +1241,8 @@ export class CommonService {
if (date) { if (date) {
date = date.slice(0, 10); date = date.slice(0, 10);
FormatedDate = date.replace(/-/g, "/"); FormatedDate = date.replace(/-/g, '/');
FormatedDate = FormatedDate + " 00:00:00"; FormatedDate = FormatedDate + ' 00:00:00';
} else { } else {
FormatedDate = date; FormatedDate = date;
} }
@ -1254,8 +1254,8 @@ export class CommonService {
console.log(date); console.log(date);
if (date) { if (date) {
// FormatedDate = date.replace(/-/g, "/"); // FormatedDate = date.replace(/-/g, "/");
FormatedDate = date.split("T")[0]; FormatedDate = date.split('T')[0];
FormatedDate = FormatedDate + " 00:00:00"; FormatedDate = FormatedDate + ' 00:00:00';
console.log(FormatedDate); console.log(FormatedDate);
} else { } else {
FormatedDate = date; FormatedDate = date;
@ -1264,12 +1264,12 @@ export class CommonService {
} }
public setUpdateImage (image){ public setUpdateImage (image){
console.log("setUpdateImage"); console.log('setUpdateImage');
this.setUpdateImg=image; this.setUpdateImg=image;
this.updateImage=true; this.updateImage=true;
} }
public getUpdateImage(){ public getUpdateImage(){
console.log("getUpdateImage"); console.log('getUpdateImage');
const objImg={ const objImg={
img: this.setUpdateImg, img: this.setUpdateImg,
status: this.updateImage status: this.updateImage

@ -0,0 +1,5 @@
<div class="main-container" [ngStyle]="active === true ? {'background': color} : {}">
<div class="main-container-radius" [ngStyle]="active === true ? {'background-color': '#ffffff'} : {'background-color': color}"></div>
<span class="number-span" [ngStyle]="active === true ? {'color': '#ffffff'} : {}">{{value}}</span>
<span class="text-span" [ngStyle]="active === true ? {'color': '#ffffff'} : {}">{{text}}</span>
</div>

@ -0,0 +1,32 @@
.main-container{
width: 72px;
background-color: white;
padding: 10px;
border-radius: 20px;
height: 70px;
text-align: right;
font-family: WorkSans-Regular;
padding-top: 25px;
box-shadow: 0 0 6px rgba(0,0,0,0.16);
position: relative;
}
.main-container-radius{
// content: "";
position: absolute;
width: 30px;
height: 6px;
border-radius: 10px;
background-color: red;
left: 10px;
top: 10px;
}
.number-span{
font-size: 19px;
display: block;
line-height: 18px;
}
.text-span{
font-size: 14px;
color: #888;
}

@ -0,0 +1,27 @@
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { CardFilterComponent } from './card-filter.component';
describe('CardFilterComponent', () => {
let component: CardFilterComponent;
let fixture: ComponentFixture<CardFilterComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ CardFilterComponent ],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(CardFilterComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

@ -0,0 +1,18 @@
import { Component, OnInit, Input } from '@angular/core';
@Component({
selector: 'app-card-filter',
templateUrl: './card-filter.component.html',
styleUrls: ['./card-filter.component.scss'],
})
export class CardFilterComponent implements OnInit {
@Input() value: number;
@Input() text: string;
@Input() active: boolean;
@Input() color: string;
constructor() { }
ngOnInit() {}
}

@ -6,222 +6,68 @@
</ion-buttons> </ion-buttons>
</ion-toolbar> </ion-toolbar>
</ion-header> </ion-header>
<ion-content [ngClass]=" direction == 'ltr' ? 'left' : 'right'"> <ion-content>
<!-- first select type view --> <div class="result-graph">
<!-- <ion-item> <div class="request-heading">
<ion-label>{{ts.trPK('worklist','view')}}</ion-label> <span>Open Request Analysis</span>
<ion-select okText="{{ts.trPK('general','ok')}}" cancelText="{{ts.trPK('general','cancel')}}" [(ngModel)]="notificationType"
(ionChange)=onChangeView($event)>
<ion-select-option value="1" selected="true">{{ts.trPK('worklist','openNot')}}</ion-select-option>
<ion-select-option value="2">{{ts.trPK('worklist','fyi')}}</ion-select-option>
<ion-select-option value="3">{{ts.trPK('worklist','toDo')}}</ion-select-option>
<ion-select-option value="4">{{ts.trPK('worklist','all')}}</ion-select-option>
<ion-select-option value="5">{{ts.trPK('worklist','meNot')}} </ion-select-option>
</ion-select>
</ion-item>
<ion-item>
<ion-label>{{ts.trPK('worklist','searchby')}}</ion-label>
<ion-select okText="{{ts.trPK('general','ok')}}" cancelText="{{ts.trPK('general','cancel')}}" [(ngModel)]="searchBy"
(ionChange)="getValueSelected($event)">
<ion-select-option value="1">{{ts.trPK('worklist','from')}}</ion-select-option>
<ion-select-option value="2">{{ts.trPK('worklist','subject')}}</ion-select-option>
<ion-select-option value="3">{{ts.trPK('worklist','sent')}}</ion-select-option>
<ion-select-option value="4">{{ts.trPK('worklist','itemType')}}</ion-select-option>
<ion-select-option value="5">{{ts.trPK('worklist','none')}}</ion-select-option>
</ion-select>
</ion-item> -->
<ion-grid>
<ion-row>
<ion-col size='3' class="ion-no-padding , menuListCol">
<ion-list class="menuList">
<ion-item class="menuListItem" lines="none">
<ion-button class="menuListBtn" (click)="AllNotification()">
<img *ngIf="!isAll" src="../assets/imgs/menuTabs/All1.png" />
<img *ngIf="isAll" src="../assets/imgs/menuTabs/All2.png" />
</ion-button>
</ion-item>
<ion-item class="menuListItem" lines="none">
<!-- <ion-item lines="none" class="activeTabMenu"*ngIf="isPR"></ion-item> -->
<!-- <ion-button class="menuListBtn" (click)="PRNotification()"><p style="color: black;">PR</p></ion-button> -->
<ion-button ion-button class="menuListBtn" (click)="PRNotification()">
<img *ngIf="!isPR" src="../assets/imgs/menuTabs/PR1.png" />
<img *ngIf="isPR" src="../assets/imgs/menuTabs/PR2.png" />
</ion-button>
</ion-item>
<ion-item class="menuListItem" lines="none">
<ion-button class="menuListBtn" (click)="PONotification()">
<img *ngIf="!isPO" src="../assets/imgs/menuTabs/PO1.png" />
<img *ngIf="isPO" src="../assets/imgs/menuTabs/PO2.png" />
</ion-button>
</ion-item>
<ion-item class="menuListItem" lines="none">
<ion-button class="menuListBtn" (click)="MRNotification()">
<img *ngIf="!isMR" src="../assets/imgs/menuTabs/MR1.png" />
<img *ngIf="isMR" src="../assets/imgs/menuTabs/MR2.png" />
</ion-button>
</ion-item>
<ion-item class="menuListItem" lines="none">
<ion-button class="menuListBtn" (click)="HRNotification()">
<img *ngIf="!isHR" src="../assets/imgs/menuTabs/HR1.png" />
<img *ngIf="isHR" src="../assets/imgs/menuTabs/HR2.png" />
</ion-button>
</ion-item>
<ion-item class="menuListItem" lines="none">
<ion-button class="menuListBtn" (click)="ITGNotification()">
<img *ngIf="!isITG" src="../assets/imgs/menuTabs/ITG1.png" />
<img *ngIf="isITG" src="../assets/imgs/menuTabs/ITG2.png" />
</ion-button>
</ion-item>
</ion-list>
</ion-col>
<ion-col size='9' class="notifincationList">
<ion-list class="notification-list" *ngIf="!noData">
<div class="timelineMain">
<ion-item class="itemListNotification" *ngFor="let notificationList of filteredNotificationList"
lines='none'>
<div class="item-date"> {{notificationList.BEGIN_DATE | dateString }} </div>
<div class="timelineMain-item" slot="start">
<!-- <div class="item-date"> {{notificationList.BEGIN_DATE }} </div> -->
<div class="timelineMain-thumb bg-color-dot timelineMain-icon">
</div> </div>
<div class="result-text-container">
<h2>287</h2>
<span>TOTAL <br> OPEN REQUEST</span>
</div> </div>
<p-chart class="today-graph" type="doughnut" [data]="data" [options]="options"></p-chart>
<ion-label (click)="openNotificationDetail(notificationList)"> {{notificationList.SUBJECT}}
</ion-label>
</ion-item>
</div> </div>
</ion-list>
<ion-list class="emptyItem" *ngIf="noData">
<ion-item class="itemListNotification" lines='none'>
<ion-label> There is no Notification
</ion-label>
</ion-item>
</ion-list>
<!-- <ion-list class="notification-list " *ngIf="isPR"> <ion-row class="filters-row">
<div class="timeline"> <ion-slides [options]="slideOptsOne">
<p>PR</p> <ion-slide *ngFor="let filter of filters; let i=index">
</div> <app-card-filter
</ion-list> [value]="filter.value"
[text]="filter.text"
[color]="filter.color"
[active]="filter.active"
(click)="activeFilter(i)"
></app-card-filter>
</ion-slide>
</ion-slides>
</ion-row>
<ion-row class="search-container">
<ion-icon name="search" ></ion-icon>
<span>Advanced Search</span>
</ion-row>
<ion-list class="notification-list " *ngIf="isPO"> <div class="work-list-container">
<div class="timeline"> <div>
<p>PO</p> <span class="date-span">December 02, 2019</span>
<div class="date-data">
<p>Missing swipes request for James Bond, Approved by David</p>
</div> </div>
</ion-list> <div class="date-data">
<p>Missing swipes request for James Bond, Approved by David</p>
<ion-list class="notification-list " *ngIf="isMR">
<div class="timeline">
<p>MR</p>
</div> </div>
</ion-list> <div class="date-data">
<p>Missing swipes request for James Bond, Approved by David</p>
<ion-list class="notification-list " *ngIf="isHR">
<div class="timeline">
<p>HR</p>
</div> </div>
</ion-list> <div class="date-data">
<p>Missing swipes request for James Bond, Approved by David</p>
<ion-list class="notification-list " *ngIf="isITG">
<div class="timeline">
<p>ITG</p>
</div> </div>
</ion-list> -->
</ion-col>
</ion-row>
</ion-grid>
<!-- *ngIf="rowsNo <= noOfrows" -->
<ion-infinite-scroll (ionInfinite)="doInfinite($event)">
<ion-infinite-scroll-content></ion-infinite-scroll-content>
</ion-infinite-scroll>
</ion-content>
<ion-footer class="footerSearchBtn" *ngIf="!isSearch">
<ion-button color="customnavy" expand="full" fill="outline" (click)="searchBtn()">{{ts.trPK('worklist','search')}}
</ion-button>
</ion-footer>
<ion-footer class="footerSearchBtn" *ngIf="isSearch">
<ion-grid>
<ion-row>
<!-- <ion-col size='3'> </ion-col> -->
<ion-col>
<div class="viewAndSearch">
<ion-item lines="none">
<ion-label>{{ts.trPK('worklist','view')}}</ion-label>
<ion-select okText="{{ts.trPK('general','ok')}}" cancelText="{{ts.trPK('general','cancel')}}"
[(ngModel)]="notificationType" (ionChange)=onChangeView($event)>
<ion-select-option value="1" selected="true">{{ts.trPK('worklist','openNot')}}</ion-select-option>
<ion-select-option value="2">{{ts.trPK('worklist','fyi')}}</ion-select-option>
<ion-select-option value="3">{{ts.trPK('worklist','toDo')}}</ion-select-option>
<ion-select-option value="4">{{ts.trPK('worklist','all')}}</ion-select-option>
<ion-select-option value="5">{{ts.trPK('worklist','meNot')}} </ion-select-option>
</ion-select>
</ion-item>
</div> </div>
<div class="viewAndSearch">
<ion-item>
<ion-label>{{ts.trPK('worklist','searchby')}}</ion-label>
<ion-select okText="{{ts.trPK('general','ok')}}" cancelText="{{ts.trPK('general','cancel')}}"
[(ngModel)]="searchBy" (ionChange)="getValueSelected($event)">
<ion-select-option value="1">{{ts.trPK('worklist','from')}}</ion-select-option>
<ion-select-option value="2">{{ts.trPK('worklist','subject')}}</ion-select-option>
<ion-select-option value="3">{{ts.trPK('worklist','sent')}}</ion-select-option>
<ion-select-option value="4">{{ts.trPK('worklist','itemType')}}</ion-select-option>
<ion-select-option value="5">{{ts.trPK('worklist','none')}}</ion-select-option>
</ion-select>
</ion-item>
<div> <div>
<div *ngIf="HideDateInput==true"> <span class="date-span">December 02, 2019</span>
<ion-item lines='none'> <div class="date-data">
<ion-label>{{ts.trPK('worklist','sent')}} </ion-label> <p>Missing swipes request for James Bond, Approved by David</p>
<ion-datetime placeholder="{{ts.trPK('worklist','enter')}}" displayFormat="DD-MMM-YYYY"
pickerFormat="DD-MMM-YYYY" [(ngModel)]="InputDate"></ion-datetime>
</ion-item>
</div> </div>
<div *ngIf="HideTextInput==true"> <div class="date-data">
<ion-item> <p>Missing swipes request for James Bond, Approved by David</p>
<ion-input placeholder="{{ts.trPK('worklist','enter')}}" [(ngModel)]="inputSearch">
</ion-input>
</ion-item>
</div> </div>
<div class="date-data">
<p>Missing swipes request for James Bond, Approved by David</p>
</div> </div>
<div> <div class="date-data">
<ion-button class="toSearchBtn" color="customnavy" expand="full" fill="outline" <p>Missing swipes request for James Bond, Approved by David</p>
(click)="getAllPushNotificationFun()">
{{ts.trPK('worklist','search')}}</ion-button>
<ion-button class="toSearchBtn" color="customnavy" expand="full" fill="outline" (click)="searchBtn()">
{{ts.trPK('general','close')}}</ion-button>
</div> </div>
<ion-button color="customnavy" (click)="Details()">Call details ITG</ion-button>
<ion-button color="customnavy" (click)="Count()">Call count ITG</ion-button>
<!--
<ion-button color="customnavy" (click)="getAllPushNotificationFun()">{{ts.trPK('worklist','search')}}</ion-button> -->
</div> </div>
</ion-col> </div>
</ion-row> </ion-content>
</ion-grid>
</ion-footer>

@ -217,3 +217,121 @@ ion-input ,ion-datetime{
white-space: normal; white-space: normal;
padding-left: 10%; padding-left: 10%;
} }
///////////////////////////////////////////NEW DESIGN/////////////////////////////////////
ion-content {
--ion-background-color: whitesmoke;
}
.request-heading {
span {
text-align: center;
display: block;
padding-top: 8px;
font-family: workSans-Regular;
}
}
.result-graph {
position: relative;
background: white;
margin-right: 20px;
margin-left: 20px;
margin-top: 20px;
padding-bottom: 20px;
border-radius: 20px;
}
.result-text-container {
padding: 0;
margin: 0;
position: absolute;
left: 50%;
top: 50%;
display: block;
text-align: center;
transform: translate(-50%, -50%);
h2 {
font-size: 38px;
font-family: WorkSans-Bold;
margin: 0 auto;
line-height: 36px;
}
span {
width: 125px;
display: block;
margin: 0 auto;
font-size: 12px;
font-family: workSans-Regular;
}
}
.today-graph {
width: 100%;
max-height: 4cm;
}
// .swiper-container {
// margin: 0 !important;
// width: 100% !important;
// }
.filters-row {
margin-top: 10px;
margin-left: 20px;
}
.work-list-container {
position: relative;
padding-left: 60px;
clear: both;
min-height: 200px;
}
.work-list-container:before{
content: "";
position: absolute;
height: 100%;
width: 4px;
left: 30px;
top: 0;
background-color: #dddddd;
}
.search-container{
float: right;
margin-top: 15px;
background-color: white;
margin-right: 20px;
border-radius: 10px;
padding: 8px;
font-family: WorkSans-Regular;
margin-bottom: 15px;
ion-icon {
margin-right: 3px;
}
span{
font-size: 12px;
}
}
.date-span {
position: relative;
display: block;
margin-bottom: 10px;
}
.date-span:before{
content: "";
position: absolute;
left: -35px;
border-radius: 50%;
width: 15px;
height: 15px;
background-color: #38c9b3;
top: 1px;
}
.date-data{
background-color: white;
padding: 1px;
border-radius: 20px;
font-family: WorkSans-Regular;
padding-left: 15px;
margin-right: 20px;
margin-bottom: 15px;
p{
font-size: 14px;
}
}

@ -1,16 +1,16 @@
import { Component, OnInit, ViewChild } from "@angular/core"; import { Component, OnInit, ViewChild } from '@angular/core';
import { CommonService } from "src/app/hmg-common/services/common/common.service"; import { CommonService } from 'src/app/hmg-common/services/common/common.service';
import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service"; import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service';
import { WorkListRequest } from "../models/workListRequest"; import { WorkListRequest } from '../models/workListRequest';
import * as moment from "moment"; import * as moment from 'moment';
import { WorKListResponse } from "../models/workListResponse"; import { WorKListResponse } from '../models/workListResponse';
import { WorklistService } from "../service/worklist.service"; import { WorklistService } from '../service/worklist.service';
import { IonInfiniteScroll } from '@ionic/angular'; import { IonInfiniteScroll } from '@ionic/angular';
import { WorklistMainService } from '../service/work-list.main.service'; import { WorklistMainService } from '../service/work-list.main.service';
@Component({ @Component({
selector: "app-home", selector: 'app-home',
templateUrl: "./home.component.html", templateUrl: './home.component.html',
styleUrls: ["./home.component.scss"] styleUrls: ['./home.component.scss']
}) })
export class HomeComponent implements OnInit { export class HomeComponent implements OnInit {
// @ViewChild(Navbar) navBar: Navbar; // @ViewChild(Navbar) navBar: Navbar;
@ -19,16 +19,16 @@ export class HomeComponent implements OnInit {
@ViewChild(IonInfiniteScroll) infiniteScroll: IonInfiniteScroll; @ViewChild(IonInfiniteScroll) infiniteScroll: IonInfiniteScroll;
private WorkListObj: WorkListRequest; private WorkListObj: WorkListRequest;
WorkListResObj: any; //WorKListResponse; WorkListResObj: any; //WorKListResponse;
notificationType: string = "1"; notificationType: string = '1';
pageNum: number = 1; pageNum: number = 1;
rowsNo: number; rowsNo: number;
noOfrows: number; noOfrows: number;
selectedValue: string = ""; selectedValue: string = '';
FromUserName: string = ""; FromUserName: string = '';
ItemKeyDisplayName: string = ""; ItemKeyDisplayName: string = '';
SentDate: string = ""; SentDate: string = '';
Subject: string = ""; Subject: string = '';
inputSearch: string = ""; inputSearch: string = '';
HideDateInput: boolean = false; HideDateInput: boolean = false;
HideTextInput: boolean = false; HideTextInput: boolean = false;
InputDate: string; InputDate: string;
@ -43,6 +43,77 @@ export class HomeComponent implements OnInit {
public isITG: boolean = false; public isITG: boolean = false;
public isSearch: boolean = false; public isSearch: boolean = false;
public direction = 'ltr'; public direction = 'ltr';
public options = {
cutoutPercentage: 80,
tooltips: { enabled: false },
legend: { display: false }
};
public data = {
datasets: [
{
data: [120, 30, 30, 30, 50],
backgroundColor: [
'#1fa269',
'#cb3232',
'#124375',
'#3dcab3',
'#3cb9d5'
],
borderWidth: 5
}]
};
public filters = [
{
value: 287,
text: 'All',
active: true,
color: '#124375'
},
{
value: 200,
text: 'HR',
active: false,
color: '#18a169'
},
{
value: 10,
text: 'PO',
active: false,
color: '#38c9b3'
},
{
value: 15,
text: 'PR',
active: false,
color: '#114475'
},
{
value: 50,
text: 'MR',
active: false,
color: '#3cb9d5'
},
{
value: 12,
text: 'ITG',
active: false,
color: '#cc3232'
}
];
public slideOptsOne = {
slidesPerView: 4.3,
spaceBetween: 10
};
constructor( constructor(
public common: CommonService, public common: CommonService,
public ts: TranslatorService, public ts: TranslatorService,
@ -50,17 +121,23 @@ export class HomeComponent implements OnInit {
public workListService: WorklistMainService, public workListService: WorklistMainService,
) { ) {
this.WorkListObj = new WorkListRequest(); this.WorkListObj = new WorkListRequest();
this.WorkListObj.P_NOTIFICATION_TYPE = "1"; this.WorkListObj.P_NOTIFICATION_TYPE = '1';
this.WorkListObj.P_SEARCH_FROM_USER = ""; this.WorkListObj.P_SEARCH_FROM_USER = '';
this.WorkListObj.P_SEARCH_SUBJECT = ""; this.WorkListObj.P_SEARCH_SUBJECT = '';
this.WorkListObj.P_SEARCH_SENT_DATE = ""; this.WorkListObj.P_SEARCH_SENT_DATE = '';
this.WorkListObj.P_SEARCH_ITEM_TYPE_DSP_NAME = ""; this.WorkListObj.P_SEARCH_ITEM_TYPE_DSP_NAME = '';
this.WorkListObj.P_PAGE_NUM = 0; this.WorkListObj.P_PAGE_NUM = 0;
this.WorkListObj.P_PAGE_LIMIT = 50; //number this.WorkListObj.P_PAGE_LIMIT = 50; //number
} }
activeFilter(index: number) {
for (const filter of this.filters) {
filter.active = false;
}
this.filters[index].active = true;
}
ngOnInit() { ngOnInit() {
this.direction = TranslatorService.getCurrentDirection(); // this.direction = TranslatorService.getCurrentDirection();
} }
ionViewDidLoad() { ionViewDidLoad() {
// this.navBar.backButtonClick = () => { // this.navBar.backButtonClick = () => {
@ -75,23 +152,23 @@ export class HomeComponent implements OnInit {
} }
ionViewWillEnter() { ionViewWillEnter() {
this.getAllPushNotificationFun(); // this.getAllPushNotificationFun();
} }
getValueSelected(Value) { getValueSelected(Value) {
this.selectedValue = Value.detail.value; this.selectedValue = Value.detail.value;
if (this.selectedValue == "1") { if (this.selectedValue == '1') {
this.HideDateInput = false; this.HideDateInput = false;
this.HideTextInput = true; this.HideTextInput = true;
} else if (this.selectedValue == "2") { } else if (this.selectedValue == '2') {
this.HideDateInput = false; this.HideDateInput = false;
this.HideTextInput = true; this.HideTextInput = true;
} else if (this.selectedValue == "3") { } else if (this.selectedValue == '3') {
this.HideDateInput = true; this.HideDateInput = true;
this.HideTextInput = false; this.HideTextInput = false;
} else if (this.selectedValue == "4") { } else if (this.selectedValue == '4') {
this.HideDateInput = false; this.HideDateInput = false;
this.HideTextInput = true; this.HideTextInput = true;
} else if (this.selectedValue == "5") { } else if (this.selectedValue == '5') {
this.HideDateInput = false; this.HideDateInput = false;
this.HideTextInput = false; this.HideTextInput = false;
} }
@ -101,35 +178,35 @@ export class HomeComponent implements OnInit {
this.WorkListObj.P_PAGE_NUM = 1; this.WorkListObj.P_PAGE_NUM = 1;
this.IsReachEnd = false; this.IsReachEnd = false;
if (this.selectedValue == "1") { if (this.selectedValue == '1') {
this.WorkListObj.P_SEARCH_FROM_USER = this.inputSearch; this.WorkListObj.P_SEARCH_FROM_USER = this.inputSearch;
this.WorkListObj.P_SEARCH_ITEM_TYPE_DSP_NAME = ""; this.WorkListObj.P_SEARCH_ITEM_TYPE_DSP_NAME = '';
this.WorkListObj.P_SEARCH_SENT_DATE = ""; this.WorkListObj.P_SEARCH_SENT_DATE = '';
this.WorkListObj.P_SEARCH_SUBJECT = ""; this.WorkListObj.P_SEARCH_SUBJECT = '';
} else if (this.selectedValue == "2") { } else if (this.selectedValue == '2') {
this.WorkListObj.P_SEARCH_FROM_USER = ""; this.WorkListObj.P_SEARCH_FROM_USER = '';
this.WorkListObj.P_SEARCH_ITEM_TYPE_DSP_NAME = ""; this.WorkListObj.P_SEARCH_ITEM_TYPE_DSP_NAME = '';
this.WorkListObj.P_SEARCH_SENT_DATE = ""; this.WorkListObj.P_SEARCH_SENT_DATE = '';
this.WorkListObj.P_SEARCH_SUBJECT = this.inputSearch; this.WorkListObj.P_SEARCH_SUBJECT = this.inputSearch;
} else if (this.selectedValue == "3") { } else if (this.selectedValue == '3') {
this.WorkListObj.P_SEARCH_FROM_USER = ""; this.WorkListObj.P_SEARCH_FROM_USER = '';
this.WorkListObj.P_SEARCH_ITEM_TYPE_DSP_NAME = ""; this.WorkListObj.P_SEARCH_ITEM_TYPE_DSP_NAME = '';
if (this.InputDate) if (this.InputDate)
this.WorkListObj.P_SEARCH_SENT_DATE = moment(this.InputDate).format( this.WorkListObj.P_SEARCH_SENT_DATE = moment(this.InputDate).format(
"DD-MMM-YYYY" 'DD-MMM-YYYY'
); );
else this.WorkListObj.P_SEARCH_SENT_DATE = ""; else this.WorkListObj.P_SEARCH_SENT_DATE = '';
this.WorkListObj.P_SEARCH_SUBJECT = ""; this.WorkListObj.P_SEARCH_SUBJECT = '';
} else if (this.selectedValue == "4") { } else if (this.selectedValue == '4') {
this.WorkListObj.P_SEARCH_FROM_USER = ""; this.WorkListObj.P_SEARCH_FROM_USER = '';
this.WorkListObj.P_SEARCH_ITEM_TYPE_DSP_NAME = this.inputSearch; this.WorkListObj.P_SEARCH_ITEM_TYPE_DSP_NAME = this.inputSearch;
this.WorkListObj.P_SEARCH_SENT_DATE = ""; this.WorkListObj.P_SEARCH_SENT_DATE = '';
this.WorkListObj.P_SEARCH_SUBJECT = ""; this.WorkListObj.P_SEARCH_SUBJECT = '';
} else if (this.selectedValue == "5") { } else if (this.selectedValue == '5') {
this.WorkListObj.P_SEARCH_FROM_USER = ""; this.WorkListObj.P_SEARCH_FROM_USER = '';
this.WorkListObj.P_SEARCH_ITEM_TYPE_DSP_NAME = ""; this.WorkListObj.P_SEARCH_ITEM_TYPE_DSP_NAME = '';
this.WorkListObj.P_SEARCH_SENT_DATE = ""; this.WorkListObj.P_SEARCH_SENT_DATE = '';
this.WorkListObj.P_SEARCH_SUBJECT = ""; this.WorkListObj.P_SEARCH_SUBJECT = '';
} }
this.WorklistService.getWorkList(this.WorkListObj).subscribe( this.WorklistService.getWorkList(this.WorkListObj).subscribe(
@ -167,13 +244,13 @@ export class HomeComponent implements OnInit {
console.log(obj); console.log(obj);
this.common.sharedService.setSharedData(obj, HomeComponent.NOTIFICATION_DATA); this.common.sharedService.setSharedData(obj, HomeComponent.NOTIFICATION_DATA);
//this.common.openWorklistMainPage(); //this.common.openWorklistMainPage();
if(obj.REQUEST_TYPE == "PR"){ if(obj.REQUEST_TYPE == 'PR'){
this.common.openWorklistMainPRPage(); this.common.openWorklistMainPRPage();
} }
else if(obj.REQUEST_TYPE == "PO"){ else if(obj.REQUEST_TYPE == 'PO'){
this.common.openWorklistMainPOPage(); this.common.openWorklistMainPOPage();
} }
else if(obj.REQUEST_TYPE == "MO"){ else if(obj.REQUEST_TYPE == 'MO'){
this.common.openWorklistMainMRPage(); this.common.openWorklistMainMRPage();
} }
@ -222,16 +299,16 @@ export class HomeComponent implements OnInit {
Count() { Count() {
this.workListService.getITGCount() this.workListService.getITGCount()
.subscribe((result: any) => { .subscribe((result: any) => {
console.log("ENAD ITG COUNT:") console.log('ENAD ITG COUNT:')
console.log(result); console.log(result);
}); });
} }
filterNotificationByRequestType(reqType) { filterNotificationByRequestType(reqType) {
let filterdType = []; let filterdType = [];
if (reqType == "All") { if (reqType == 'All') {
this.filteredNotificationList = this.WorkListResObj; this.filteredNotificationList = this.WorkListResObj;
if (this.filteredNotificationList == [] || this.filteredNotificationList == null || this.filteredNotificationList == "") { if (this.filteredNotificationList == [] || this.filteredNotificationList == null || this.filteredNotificationList == '') {
this.noData = true; this.noData = true;
return false; return false;
} else { } else {
@ -240,8 +317,8 @@ export class HomeComponent implements OnInit {
} }
} }
for (let i = 0; i < this.WorkListResObj.length; i++) { for (let i = 0; i < this.WorkListResObj.length; i++) {
if(reqType=="HR"){ if(reqType=='HR'){
if ("EIT" == this.WorkListResObj[i].REQUEST_TYPE || "ABSENCE" == this.WorkListResObj[i].REQUEST_TYPE) { if ('EIT' == this.WorkListResObj[i].REQUEST_TYPE || 'ABSENCE' == this.WorkListResObj[i].REQUEST_TYPE) {
filterdType.push(this.WorkListResObj[i]); filterdType.push(this.WorkListResObj[i]);
} }
}else{ }else{
@ -253,7 +330,7 @@ export class HomeComponent implements OnInit {
} }
this.filteredNotificationList = filterdType; this.filteredNotificationList = filterdType;
if (this.filteredNotificationList == [] || this.filteredNotificationList == null || this.filteredNotificationList == "") { if (this.filteredNotificationList == [] || this.filteredNotificationList == null || this.filteredNotificationList == '') {
this.noData = true; this.noData = true;
return false; return false;
} else { } else {
@ -265,14 +342,14 @@ export class HomeComponent implements OnInit {
Details() { Details() {
this.workListService.getITGDetails() this.workListService.getITGDetails()
.subscribe((result: any) => { .subscribe((result: any) => {
console.log("ENAD ITG Details:") console.log('ENAD ITG Details:')
console.log(result); console.log(result);
}); });
} }
AllNotification() { AllNotification() {
this.filterNotificationByRequestType("All"); this.filterNotificationByRequestType('All');
this.isAll = true; this.isAll = true;
this.isPR = false; this.isPR = false;
this.isPO = false; this.isPO = false;
@ -281,7 +358,7 @@ export class HomeComponent implements OnInit {
this.isITG = false; this.isITG = false;
} }
PRNotification() { PRNotification() {
this.filterNotificationByRequestType("PR"); this.filterNotificationByRequestType('PR');
this.isAll = false; this.isAll = false;
this.isPR = true; this.isPR = true;
this.isPO = false; this.isPO = false;
@ -290,7 +367,7 @@ export class HomeComponent implements OnInit {
this.isITG = false; this.isITG = false;
} }
PONotification() { PONotification() {
this.filterNotificationByRequestType("PO"); this.filterNotificationByRequestType('PO');
this.isAll = false; this.isAll = false;
this.isPR = false; this.isPR = false;
this.isPO = true; this.isPO = true;
@ -300,7 +377,7 @@ export class HomeComponent implements OnInit {
} }
MRNotification() { MRNotification() {
this.filterNotificationByRequestType("MO"); this.filterNotificationByRequestType('MO');
this.isAll = false; this.isAll = false;
this.isPR = false; this.isPR = false;
this.isPO = false; this.isPO = false;
@ -309,7 +386,7 @@ export class HomeComponent implements OnInit {
this.isITG = false; this.isITG = false;
} }
HRNotification() { HRNotification() {
this.filterNotificationByRequestType("HR"); this.filterNotificationByRequestType('HR');
this.isAll = false; this.isAll = false;
this.isPR = false; this.isPR = false;
this.isPO = false; this.isPO = false;

@ -9,5 +9,8 @@
@import '~@ionic/angular/css/text-alignment.css'; @import '~@ionic/angular/css/text-alignment.css';
@import '~@ionic/angular/css/text-transformation.css'; @import '~@ionic/angular/css/text-transformation.css';
@import '~@ionic/angular/css/flex-utils.css'; @import '~@ionic/angular/css/flex-utils.css';
@import "../node_modules/primeng/resources/themes/nova-light/theme.css";
@import "../node_modules/primeng/resources/primeng.min.css";
@import "../node_modules/primeicons/primeicons.css";
@import "theme/styles.scss"; @import "theme/styles.scss";
@import "theme/worklist.scss"; @import "theme/worklist.scss";

@ -925,3 +925,10 @@ border:0px
// left: 0; // left: 0;
// width: 100%; // width: 100%;
// //
// .filters-row {
// margin-left:-15px;
// margin-right:-15px;
// }
// .filters-row .swiper-container .swiper-wrapper .swiper-slide:first-child {
// margin-left:32px;
// }
Loading…
Cancel
Save