From 4bdc08b42da85050077fce031b146ad4e9721452 Mon Sep 17 00:00:00 2001 From: ashwaq Date: Tue, 7 Jan 2020 15:42:55 +0300 Subject: [PATCH 1/5] add dashbored --- .../confirm-login/confirm-login.component.ts | 22 +++++++++---------- Mohem/src/app/hmg-common/hmg-common.module.ts | 2 ++ .../dashbored/dashbored.service.spec.ts | 12 ++++++++++ .../services/dashbored/dashbored.service.ts | 17 ++++++++++++++ .../app/notification/home/home.component.ts | 5 +++-- 5 files changed, 45 insertions(+), 13 deletions(-) create mode 100644 Mohem/src/app/hmg-common/services/dashbored/dashbored.service.spec.ts create mode 100644 Mohem/src/app/hmg-common/services/dashbored/dashbored.service.ts diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts index f661aa72..fcb3a40e 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts @@ -568,31 +568,31 @@ export class ConfirmLoginComponent implements OnInit { - // title: 'Biometric Authetnciation', // (Android Only) | optional | Default: " Biometric Sign On" + title: 'Biometric Authetnciation', // (Android Only) | optional | Default: " Biometric Sign On" - // subtitle: 'Coolest Plugin ever' ,// (Android Only) | optional | Default: null + subtitle: 'Coolest Plugin ever' ,// (Android Only) | optional | Default: null - // description: this.ts.trPK("general", "auth-please"),// optional | Default: null + description: this.ts.trPK("general", "auth-please"),// optional | Default: null - // fallbackButtonTitle: this.ts.trPK("general", "use-pin"), // optional | When disableBackup is false defaults to "Use Pin". + fallbackButtonTitle: this.ts.trPK("general", "use-pin"), // optional | When disableBackup is false defaults to "Use Pin". - // // When disableBackup is true defaults to "Cancel" + // When disableBackup is true defaults to "Cancel" - // disableBackup:true, // optional | default: false + disableBackup:true, // optional | default: false - clientId: "Fingerprint Authetnciation", + // clientId: "Fingerprint Authetnciation", - clientSecret: "Ate343_9347lajF", // Only necessary for Android + // clientSecret: "Ate343_9347lajF", // Only necessary for Android - disableBackup: true, // Only for Android(optional) + // disableBackup: true, // Only for Android(optional) - localizedFallbackTitle: this.ts.trPK("general", "use-pin"), // Only for iOS + // localizedFallbackTitle: this.ts.trPK("general", "use-pin"), // Only for iOS - localizedReason: this.ts.trPK("general", "auth-please") // Only for iOS + // localizedReason: this.ts.trPK("general", "auth-please") // Only for iOS }) diff --git a/Mohem/src/app/hmg-common/hmg-common.module.ts b/Mohem/src/app/hmg-common/hmg-common.module.ts index 520715e4..84e44c4f 100644 --- a/Mohem/src/app/hmg-common/hmg-common.module.ts +++ b/Mohem/src/app/hmg-common/hmg-common.module.ts @@ -100,6 +100,7 @@ import {FileUploderProfileComponent} from './ui/file-uploder-profile/file-uplode import { OpenNativeSettings } from '@ionic-native/open-native-settings/ngx'; import { AccordinCustomComponent } from './ui/accordin-custom/accordin-custom.component'; import { AccordinTabCustomComponent} from './ui/accordin-custom/accordin-tab-custom/accordin-tab-custom.component' +import {DashboredService} from './services/dashbored/dashbored.service' @NgModule({ imports: [ CommonModule, @@ -221,6 +222,7 @@ import { AccordinTabCustomComponent} from './ui/accordin-custom/accordin-tab-cus AccordinCustomComponent ], providers: [ + DashboredService, ConnectorService, TranslatorService, Globalization, diff --git a/Mohem/src/app/hmg-common/services/dashbored/dashbored.service.spec.ts b/Mohem/src/app/hmg-common/services/dashbored/dashbored.service.spec.ts new file mode 100644 index 00000000..1d4f49bd --- /dev/null +++ b/Mohem/src/app/hmg-common/services/dashbored/dashbored.service.spec.ts @@ -0,0 +1,12 @@ +import { TestBed } from '@angular/core/testing'; + +import { DashboredService } from './dashbored.service'; + +describe('DashboredService', () => { + beforeEach(() => TestBed.configureTestingModule({})); + + it('should be created', () => { + const service: DashboredService = TestBed.get(DashboredService); + expect(service).toBeTruthy(); + }); +}); diff --git a/Mohem/src/app/hmg-common/services/dashbored/dashbored.service.ts b/Mohem/src/app/hmg-common/services/dashbored/dashbored.service.ts new file mode 100644 index 00000000..8cb5a14a --- /dev/null +++ b/Mohem/src/app/hmg-common/services/dashbored/dashbored.service.ts @@ -0,0 +1,17 @@ +import { Injectable } from '@angular/core'; +import { AuthenticationService } from "src/app/hmg-common/services/authentication/authentication.service"; +import { ConnectorService } from "src/app/hmg-common/services/connector/connector.service"; +import { Observable } from 'rxjs'; + +@Injectable({ + providedIn: 'root' +}) +export class DashboredService { + + constructor( + public api: ConnectorService, + public authService: AuthenticationService, + ) { } + + +} diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index 5383e1bf..2a1eb375 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -7,7 +7,6 @@ import { WorKListResponse } from "../models/workListResponse"; import { WorklistService } from "../service/worklist.service"; import { IonInfiniteScroll } from '@ionic/angular'; import { WorklistMainService } from '../service/work-list.main.service'; - @Component({ selector: "app-home", templateUrl: "./home.component.html", @@ -48,7 +47,7 @@ export class HomeComponent implements OnInit { public common: CommonService, public ts: TranslatorService, public WorklistService: WorklistService, - public workListService: WorklistMainService + public workListService: WorklistMainService, ) { this.WorkListObj = new WorkListRequest(); this.WorkListObj.P_NOTIFICATION_TYPE = "1"; @@ -332,4 +331,6 @@ export class HomeComponent implements OnInit { this.isSearch = !this.isSearch; } + + } From 7456ab6e0a72c476cec69957076ac32e4f9efacc Mon Sep 17 00:00:00 2001 From: ashwaq Date: Thu, 9 Jan 2020 08:54:07 +0300 Subject: [PATCH 2/5] add dashbored services --- .../services/dashbored/dashbored.service.ts | 30 +++++++++ .../models/GetOpenNotificationsList.ts | 11 ++++ .../models/GetOpenNotificationsResponse.ts | 7 ++ .../models/GetSubordinatesAttdStatusList.ts | 16 +++++ .../GetSubordinatesAttdStatusRequest.ts | 7 ++ .../GetSubordinatesAttdStatusResponse.ts | 7 ++ .../models/GetSubordinatesLeavesList.ts | 35 ++++++++++ .../models/GetSubordinatesLeavesRequest.ts | 8 +++ .../models/GetSubordinatesLeavesResponse.ts | 7 ++ .../dashbored/models/openPeriodDatesList.ts | 7 ++ .../models/openPeriodDatesResponse.ts | 7 ++ Mohem/src/app/home/home.page.ts | 64 +++++++++++++++++++ 12 files changed, 206 insertions(+) create mode 100644 Mohem/src/app/hmg-common/services/dashbored/models/GetOpenNotificationsList.ts create mode 100644 Mohem/src/app/hmg-common/services/dashbored/models/GetOpenNotificationsResponse.ts create mode 100644 Mohem/src/app/hmg-common/services/dashbored/models/GetSubordinatesAttdStatusList.ts create mode 100644 Mohem/src/app/hmg-common/services/dashbored/models/GetSubordinatesAttdStatusRequest.ts create mode 100644 Mohem/src/app/hmg-common/services/dashbored/models/GetSubordinatesAttdStatusResponse.ts create mode 100644 Mohem/src/app/hmg-common/services/dashbored/models/GetSubordinatesLeavesList.ts create mode 100644 Mohem/src/app/hmg-common/services/dashbored/models/GetSubordinatesLeavesRequest.ts create mode 100644 Mohem/src/app/hmg-common/services/dashbored/models/GetSubordinatesLeavesResponse.ts create mode 100644 Mohem/src/app/hmg-common/services/dashbored/models/openPeriodDatesList.ts create mode 100644 Mohem/src/app/hmg-common/services/dashbored/models/openPeriodDatesResponse.ts diff --git a/Mohem/src/app/hmg-common/services/dashbored/dashbored.service.ts b/Mohem/src/app/hmg-common/services/dashbored/dashbored.service.ts index 8cb5a14a..97e8681e 100644 --- a/Mohem/src/app/hmg-common/services/dashbored/dashbored.service.ts +++ b/Mohem/src/app/hmg-common/services/dashbored/dashbored.service.ts @@ -2,16 +2,46 @@ import { Injectable } from '@angular/core'; import { AuthenticationService } from "src/app/hmg-common/services/authentication/authentication.service"; import { ConnectorService } from "src/app/hmg-common/services/connector/connector.service"; import { Observable } from 'rxjs'; +import {OpenPeriodDatesResponse} from '../../services/dashbored/models/openPeriodDatesResponse' +import {Request} from '../../services/models/request'; +import {GetSubordinatesLeavesRequest} from './models/GetSubordinatesLeavesRequest'; +import {GetSubordinatesLeavesResponse} from './models/GetSubordinatesLeavesResponse'; +import {GetSubordinatesAttdStatusRequest} from './models/GetSubordinatesAttdStatusRequest'; +import {GetSubordinatesAttdStatusResponse} from './models/GetSubordinatesAttdStatusResponse'; +import {GetOpenNotificationsResponse} from './models/GetOpenNotificationsResponse' @Injectable({ providedIn: 'root' }) export class DashboredService { + public static getOpenPeriodDates = 'Services/ERP.svc/REST/GET_OPEN_PERIOD_DATES'; + public static getOpenNotifications = 'Services/ERP.svc/REST/GET_OPEN_NOTIFICATIONS'; + public static getSubordinatesLeaves = 'Services/ERP.svc/REST/GET_SUBORDINATES_LEAVES'; + public static getSubordinatesAttStatus = 'Services/ERP.svc/REST/GET_SUBORDINATES_ATTD_STATUS'; constructor( public api: ConnectorService, public authService: AuthenticationService, ) { } + public getOpenPeriodDates( onError?: any, errorLabel?: string): Observable { + const request = new Request(); + this.authService.authenticateRequest(request); + return this.api.post(DashboredService.getOpenPeriodDates, request, onError, errorLabel); + } + public getOpenNotifications( onError?: any, errorLabel?: string): Observable { + const request = new Request(); + this.authService.authenticateRequest(request); + return this.api.post(DashboredService.getOpenNotifications, request, onError, errorLabel); + } + public getSubordinatesLeaves( req:GetSubordinatesLeavesRequest,onError?: any, errorLabel?: string): Observable { + this.authService.authenticateRequest(req); + return this.api.post(DashboredService.getSubordinatesLeaves, req, onError, errorLabel); + } + public getSubordinatesAttStatus( req:GetSubordinatesAttdStatusRequest, onError?: any, errorLabel?: string): Observable { + this.authService.authenticateRequest(req); + return this.api.post(DashboredService.getSubordinatesAttStatus, req, onError, errorLabel); + } + } diff --git a/Mohem/src/app/hmg-common/services/dashbored/models/GetOpenNotificationsList.ts b/Mohem/src/app/hmg-common/services/dashbored/models/GetOpenNotificationsList.ts new file mode 100644 index 00000000..baef1032 --- /dev/null +++ b/Mohem/src/app/hmg-common/services/dashbored/models/GetOpenNotificationsList.ts @@ -0,0 +1,11 @@ +export class GetOpenNotificationsList + +{ +public ITEM_TYPE: number; + +public ITEM_TYPE_DISPLAY_NAME:number; + +public OPEN_NTF_NUMBER:number; + + +} \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/services/dashbored/models/GetOpenNotificationsResponse.ts b/Mohem/src/app/hmg-common/services/dashbored/models/GetOpenNotificationsResponse.ts new file mode 100644 index 00000000..7165f0b4 --- /dev/null +++ b/Mohem/src/app/hmg-common/services/dashbored/models/GetOpenNotificationsResponse.ts @@ -0,0 +1,7 @@ +import { GetOpenNotificationsList } from './GetOpenNotificationsList'; +import { Response } from '../../../services/models/response' + + +export class GetOpenNotificationsResponse extends Response { + public GetOpenNotificationsList: GetOpenNotificationsList []; +} \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/services/dashbored/models/GetSubordinatesAttdStatusList.ts b/Mohem/src/app/hmg-common/services/dashbored/models/GetSubordinatesAttdStatusList.ts new file mode 100644 index 00000000..7a2cf0b0 --- /dev/null +++ b/Mohem/src/app/hmg-common/services/dashbored/models/GetSubordinatesAttdStatusList.ts @@ -0,0 +1,16 @@ +export class GetSubordinatesAttdStatusList + +{ +public NUMBER_OF_EMPLOYEES: number; + +public LATE_IN:number; + +public EARLY_OUT:number; + +public ON_TIME:number; + +public ABSENCE:number; + + + +} \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/services/dashbored/models/GetSubordinatesAttdStatusRequest.ts b/Mohem/src/app/hmg-common/services/dashbored/models/GetSubordinatesAttdStatusRequest.ts new file mode 100644 index 00000000..740656b8 --- /dev/null +++ b/Mohem/src/app/hmg-common/services/dashbored/models/GetSubordinatesAttdStatusRequest.ts @@ -0,0 +1,7 @@ +import { Request } from '../../../services/models/request' + +export class GetSubordinatesAttdStatusRequest extends Request{ + //public static SHARED_DATA = ''; + public P_SCHEDULE_DATE_FROM :any; + public P_SCHEDULE_DATE_TO :any; +} \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/services/dashbored/models/GetSubordinatesAttdStatusResponse.ts b/Mohem/src/app/hmg-common/services/dashbored/models/GetSubordinatesAttdStatusResponse.ts new file mode 100644 index 00000000..f66cae7b --- /dev/null +++ b/Mohem/src/app/hmg-common/services/dashbored/models/GetSubordinatesAttdStatusResponse.ts @@ -0,0 +1,7 @@ +import { GetSubordinatesAttdStatusList } from './GetSubordinatesAttdStatusList'; +import { Response } from '../../../services/models/response' + + +export class GetSubordinatesAttdStatusResponse extends Response { + public GetSubordinatesAttdStatusList: GetSubordinatesAttdStatusList []; +} \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/services/dashbored/models/GetSubordinatesLeavesList.ts b/Mohem/src/app/hmg-common/services/dashbored/models/GetSubordinatesLeavesList.ts new file mode 100644 index 00000000..08818ef8 --- /dev/null +++ b/Mohem/src/app/hmg-common/services/dashbored/models/GetSubordinatesLeavesList.ts @@ -0,0 +1,35 @@ +export class GetSubordinatesLeavesList + +{ + public LVL: number; + +public EMPLOYEE_NUMBER:String; + +public EMPLOYEE_NAME:String; + +public ORGANIZATION_ID:number; + +public ORGANIZATION_NAME:String + +public SUPERVISOR_NUMBER:String; + +public SUPERVISOR_NAME:String; + +public SUPERVISOR_ORGANIZATION_ID:number; + +public SUPERVISOR_ORGANIZATION_NAME:String; + +public EVENT_DATE:any;//DATE; + +public LEAVE_TYPE:String; + +public DATE_START:any;//DATE; + +public DATE_END:any;//DATE; + +public ABSENCE_ATTENDANCE_TYPE_NAME:String; + +public CALENDAR_ENTRY_DESC:String; + +public STATUS:String; +} \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/services/dashbored/models/GetSubordinatesLeavesRequest.ts b/Mohem/src/app/hmg-common/services/dashbored/models/GetSubordinatesLeavesRequest.ts new file mode 100644 index 00000000..30a4befd --- /dev/null +++ b/Mohem/src/app/hmg-common/services/dashbored/models/GetSubordinatesLeavesRequest.ts @@ -0,0 +1,8 @@ +import { Request } from '../../../services/models/request' + +export class GetSubordinatesLeavesRequest extends Request{ + //public static SHARED_DATA = ''; + public P_DATE_FROM :any; + public P_DATE_TO :any; + +} \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/services/dashbored/models/GetSubordinatesLeavesResponse.ts b/Mohem/src/app/hmg-common/services/dashbored/models/GetSubordinatesLeavesResponse.ts new file mode 100644 index 00000000..469cad3e --- /dev/null +++ b/Mohem/src/app/hmg-common/services/dashbored/models/GetSubordinatesLeavesResponse.ts @@ -0,0 +1,7 @@ +import { GetSubordinatesLeavesList } from './GetSubordinatesLeavesList'; +import { Response } from '../../../services/models/response' + + +export class GetSubordinatesLeavesResponse extends Response { + public GetSubordinatesLeavesList: GetSubordinatesLeavesList []; +} \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/services/dashbored/models/openPeriodDatesList.ts b/Mohem/src/app/hmg-common/services/dashbored/models/openPeriodDatesList.ts new file mode 100644 index 00000000..dbcab478 --- /dev/null +++ b/Mohem/src/app/hmg-common/services/dashbored/models/openPeriodDatesList.ts @@ -0,0 +1,7 @@ +export class OpenPeriodDatesList { + public P_CLOSING_PERIOD_DATE: any; + public P_PERIOD_END_DATE: any; + public P_PERIOD_START_DATE: any; + public P_RETURN_MSG: string; + public P_RETURN_STATUS: string; +} \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/services/dashbored/models/openPeriodDatesResponse.ts b/Mohem/src/app/hmg-common/services/dashbored/models/openPeriodDatesResponse.ts new file mode 100644 index 00000000..3b559bc7 --- /dev/null +++ b/Mohem/src/app/hmg-common/services/dashbored/models/openPeriodDatesResponse.ts @@ -0,0 +1,7 @@ +import { OpenPeriodDatesList } from './openPeriodDatesList'; +import { Response } from '../../../services/models/response' + + +export class OpenPeriodDatesResponse extends Response { + public openPeriodDatesList: OpenPeriodDatesList []; +} \ No newline at end of file diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index c4f01a48..d9318037 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -25,6 +25,14 @@ import { DomSanitizer } from '@angular/platform-browser'; import {FileUploderProfileComponent} from '../hmg-common/ui/file-uploder-profile/file-uploder-profile.component' import { SharedDataService } from '../hmg-common/services/shared-data-service/shared-data.service'; import { DevicePermissionsService } from '../hmg-common/services/device-permissions/device-permissions.service'; +import {DashboredService} from '../hmg-common/services/dashbored/dashbored.service' +import { OpenPeriodDatesResponse } from '../hmg-common/services/dashbored/models/openPeriodDatesResponse'; +import {GetSubordinatesAttdStatusRequest} from '../hmg-common/services/dashbored/models/GetSubordinatesAttdStatusRequest'; +import {GetSubordinatesLeavesRequest} from '../hmg-common/services/dashbored/models/GetSubordinatesLeavesRequest' +import {GetOpenNotificationsResponse}from '../hmg-common/services/dashbored/models/GetOpenNotificationsResponse' +import {GetSubordinatesAttdStatusResponse}from '../hmg-common/services/dashbored/models/GetSubordinatesAttdStatusResponse' +import {GetSubordinatesLeavesResponse}from '../hmg-common/services/dashbored/models/GetSubordinatesLeavesResponse' + @Component({ selector: "app-home", @@ -63,6 +71,7 @@ export class HomePage implements OnInit { private cameraController: Camera, public sharedData: SharedDataService, private sanitizer: DomSanitizer, + public dashboredService:DashboredService, //private transfer: Transfer, private file: File, //private filePath: FilePath @@ -377,4 +386,59 @@ export class HomePage implements OnInit { openPersonalInfo() { this.common.openProfile(); } + + openPeriodDateDashbored(){ + this.dashboredService.getOpenPeriodDates( ()=> {console.log("Error ");} ).subscribe((result:OpenPeriodDatesResponse)=>{ + if (this.common.validResponse(result)) { + console.log("response"); + } + + }); + + } + + openNotificationsDashbored(){ + this.dashboredService.getOpenNotifications( ()=> {console.log("Error ");} ).subscribe((result:GetOpenNotificationsResponse)=>{ + if (this.common.validResponse(result)) { + console.log("response"); + console.log(result); + } + + }); + + } + + getSubordinatesLeaves(){ + let request:GetSubordinatesLeavesRequest=new GetSubordinatesLeavesRequest(); + request.P_DATE_FROM="/Date(1578603600000+0300)/"; //test + request.P_DATE_TO="/Date(1576011600000+0300)/"; //test + + this.dashboredService.getSubordinatesLeaves( request,()=> {console.log("Error ");} ).subscribe((result:GetSubordinatesLeavesResponse)=>{ + if (this.common.validResponse(result)) { + console.log("response"); + console.log(result); + } + + }); + + } + + getSubordinatesAttStatus(){ + let request: GetSubordinatesAttdStatusRequest = new GetSubordinatesAttdStatusRequest(); + request.P_SCHEDULE_DATE_FROM="/Date(1578603600000+0300)/"; //test + request.P_SCHEDULE_DATE_TO="/Date(1576011600000+0300)/";//test + + this.dashboredService.getSubordinatesAttStatus( request,()=> {console.log("Error ");} ).subscribe((result:GetSubordinatesAttdStatusResponse)=>{ + if (this.common.validResponse(result)) { + console.log("response"); + console.log(result); + } + + }); + + } + + + + } From d5407c8f90aa8c835a95bb81330e188e8656f865 Mon Sep 17 00:00:00 2001 From: "Fatimah.Alshammari" Date: Thu, 9 Jan 2020 09:25:20 +0300 Subject: [PATCH 3/5] add dachboard services --- .../dashbored/AttensanceTrackingList.ts | 9 +++ .../dashbored/OpenMissingSwipesList.ts | 9 +++ .../dashbored/OrganizationsSalariesList.ts | 4 ++ .../dashbored/PerformanceAppraisalList.ts | 6 ++ .../dashbored/attendance-tracking.response.ts | 8 +++ .../services/dashbored/dashbored.service.ts | 56 ++++++++++++++++++- .../dashbored/open-missing-swipes.response.ts | 8 +++ .../organization-salaries.response.ts | 6 ++ .../performance-appraisal.response.ts | 9 +++ Mohem/src/app/home/home.page.ts | 41 +++++++++++++- 10 files changed, 154 insertions(+), 2 deletions(-) create mode 100644 Mohem/src/app/hmg-common/services/dashbored/AttensanceTrackingList.ts create mode 100644 Mohem/src/app/hmg-common/services/dashbored/OpenMissingSwipesList.ts create mode 100644 Mohem/src/app/hmg-common/services/dashbored/OrganizationsSalariesList.ts create mode 100644 Mohem/src/app/hmg-common/services/dashbored/PerformanceAppraisalList.ts create mode 100644 Mohem/src/app/hmg-common/services/dashbored/attendance-tracking.response.ts create mode 100644 Mohem/src/app/hmg-common/services/dashbored/open-missing-swipes.response.ts create mode 100644 Mohem/src/app/hmg-common/services/dashbored/organization-salaries.response.ts create mode 100644 Mohem/src/app/hmg-common/services/dashbored/performance-appraisal.response.ts diff --git a/Mohem/src/app/hmg-common/services/dashbored/AttensanceTrackingList.ts b/Mohem/src/app/hmg-common/services/dashbored/AttensanceTrackingList.ts new file mode 100644 index 00000000..e4b22244 --- /dev/null +++ b/Mohem/src/app/hmg-common/services/dashbored/AttensanceTrackingList.ts @@ -0,0 +1,9 @@ + + +export class AttendanceTrackingList{ + public SCHEDULED_HOURS :string; + public SPENT_HOURS : string; + public REMAINING_HOURS : string; + public RETURN_STATUS : string; + public RETURN_MSG : string; +} \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/services/dashbored/OpenMissingSwipesList.ts b/Mohem/src/app/hmg-common/services/dashbored/OpenMissingSwipesList.ts new file mode 100644 index 00000000..8b433128 --- /dev/null +++ b/Mohem/src/app/hmg-common/services/dashbored/OpenMissingSwipesList.ts @@ -0,0 +1,9 @@ + + +export class OpenMissingSwipesList{ + public OPEN_MISSING_SWIPES :number; + public RETURN_STATUS : string; + public RETURN_MSG : string; + +} + \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/services/dashbored/OrganizationsSalariesList.ts b/Mohem/src/app/hmg-common/services/dashbored/OrganizationsSalariesList.ts new file mode 100644 index 00000000..16416bb3 --- /dev/null +++ b/Mohem/src/app/hmg-common/services/dashbored/OrganizationsSalariesList.ts @@ -0,0 +1,4 @@ +export class OrganizationsSalariesList{ + public ORGANIZATION_NAME :string; + public ORGANIZATIONS_SALARIES : number; +} \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/services/dashbored/PerformanceAppraisalList.ts b/Mohem/src/app/hmg-common/services/dashbored/PerformanceAppraisalList.ts new file mode 100644 index 00000000..c932202a --- /dev/null +++ b/Mohem/src/app/hmg-common/services/dashbored/PerformanceAppraisalList.ts @@ -0,0 +1,6 @@ + +export class PerformanceAppraisalList{ + public APPRAISAL_SCORE :string; + public APPRAISAL_YEAR : number; + +} \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/services/dashbored/attendance-tracking.response.ts b/Mohem/src/app/hmg-common/services/dashbored/attendance-tracking.response.ts new file mode 100644 index 00000000..82ec2ae0 --- /dev/null +++ b/Mohem/src/app/hmg-common/services/dashbored/attendance-tracking.response.ts @@ -0,0 +1,8 @@ + + +import { Response } from "src/app/hmg-common/services/models/response"; +import { AttendanceTrackingList } from './AttensanceTrackingList'; + + export class AttendanceTrackingResponse extends Response{ + public GetGetAttendanceTrackingList : AttendanceTrackingList[]; + } \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/services/dashbored/dashbored.service.ts b/Mohem/src/app/hmg-common/services/dashbored/dashbored.service.ts index 8cb5a14a..808b5603 100644 --- a/Mohem/src/app/hmg-common/services/dashbored/dashbored.service.ts +++ b/Mohem/src/app/hmg-common/services/dashbored/dashbored.service.ts @@ -2,16 +2,70 @@ import { Injectable } from '@angular/core'; import { AuthenticationService } from "src/app/hmg-common/services/authentication/authentication.service"; import { ConnectorService } from "src/app/hmg-common/services/connector/connector.service"; import { Observable } from 'rxjs'; +import { Request } from "src/app/hmg-common/services/models/request"; +import { OrganizationSalariesResponse } from './organization-salaries.response'; +import { OpenMissingSwipesResponse } from './open-missing-swipes.response'; +import { PerformanceAppraisalResponse } from './performance-appraisal.response'; +import {AttendanceTrackingResponse} from './attendance-tracking.response' + @Injectable({ providedIn: 'root' }) export class DashboredService { + public static organizationSalariesUrl="Services/ERP.svc/REST/GET_ORGANIZATIONS_SALARIES" + public static openmissingswipesUrl="Services/ERP.svc/REST/GET_OPEN_MISSING_SWIPES" + public static performanceappraisalUrl="Services/ERP.svc/REST/GET_Performance_Appraisal" + public static attendancetrackingUrl="Services/ERP.svc/REST/GET_Attendance_Tracking" + constructor( - public api: ConnectorService, + public con: ConnectorService, public authService: AuthenticationService, ) { } + public getOrganizationSalaries(onError ?:any ,oerrorLable ?:any):Observable{ + const request = new Request(); + this.authService.authenticateRequest(request); + return this.con.post( + DashboredService.organizationSalariesUrl, + request, + onError, + oerrorLable + );} + + public getOpenMissingSwipes(onError ?:any ,oerrorLable ?:any):Observable{ + const request = new Request(); + this.authService.authenticateRequest(request); + return this.con.post( + DashboredService.openmissingswipesUrl, + request, + onError, + oerrorLable + ); + } + + + public getPerformanceAppraisal(onError ?:any ,oerrorLable ?:any):Observable{ + const request = new Request(); + this.authService.authenticateRequest(request); + return this.con.post( + DashboredService.performanceappraisalUrl, + request, + onError, + oerrorLable + ); +} +public getAttendanceTracking(onError ?:any ,oerrorLable ?:any):Observable{ + const request = new Request(); + this.authService.authenticateRequest(request); + return this.con.post( + DashboredService.attendancetrackingUrl, + request, + onError, + oerrorLable + ); +} + } diff --git a/Mohem/src/app/hmg-common/services/dashbored/open-missing-swipes.response.ts b/Mohem/src/app/hmg-common/services/dashbored/open-missing-swipes.response.ts new file mode 100644 index 00000000..63945935 --- /dev/null +++ b/Mohem/src/app/hmg-common/services/dashbored/open-missing-swipes.response.ts @@ -0,0 +1,8 @@ + + +import { Response } from "src/app/hmg-common/services/models/response"; +import { OpenMissingSwipesList } from './OpenMissingSwipesList'; + + export class OpenMissingSwipesResponse extends Response{ +public GetGetOpenMissingSwipesList : OpenMissingSwipesList[]; + } \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/services/dashbored/organization-salaries.response.ts b/Mohem/src/app/hmg-common/services/dashbored/organization-salaries.response.ts new file mode 100644 index 00000000..9dbd2e53 --- /dev/null +++ b/Mohem/src/app/hmg-common/services/dashbored/organization-salaries.response.ts @@ -0,0 +1,6 @@ +import { Response } from "src/app/hmg-common/services/models/response"; +import { OrganizationsSalariesList } from './OrganizationsSalariesList'; + + export class OrganizationSalariesResponse extends Response{ + public GetGetOrganizationsSalariesList : OrganizationsSalariesList[]; + } \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/services/dashbored/performance-appraisal.response.ts b/Mohem/src/app/hmg-common/services/dashbored/performance-appraisal.response.ts new file mode 100644 index 00000000..9dbe5845 --- /dev/null +++ b/Mohem/src/app/hmg-common/services/dashbored/performance-appraisal.response.ts @@ -0,0 +1,9 @@ + + + +import { Response } from "src/app/hmg-common/services/models/response"; +import { PerformanceAppraisalList } from './PerformanceAppraisalList'; + + export class PerformanceAppraisalResponse extends Response{ +public GetGetPerformanceAppraisalList :PerformanceAppraisalList[]; + } \ No newline at end of file diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index c4f01a48..b3c48889 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -25,6 +25,12 @@ import { DomSanitizer } from '@angular/platform-browser'; import {FileUploderProfileComponent} from '../hmg-common/ui/file-uploder-profile/file-uploder-profile.component' import { SharedDataService } from '../hmg-common/services/shared-data-service/shared-data.service'; import { DevicePermissionsService } from '../hmg-common/services/device-permissions/device-permissions.service'; +import { DashboredService } from '../hmg-common/services/dashbored/dashbored.service'; +import { OrganizationSalariesResponse } from '../hmg-common/services/dashbored/organization-salaries.response'; +import { OpenMissingSwipesResponse} from '../hmg-common/services/dashbored/open-missing-swipes.response'; +import {PerformanceAppraisalResponse} from '../hmg-common/services/dashbored/performance-appraisal.response'; +import { AttendanceTrackingResponse } from '../hmg-common/services/dashbored/attendance-tracking.response'; + @Component({ selector: "app-home", @@ -66,7 +72,8 @@ export class HomePage implements OnInit { //private transfer: Transfer, private file: File, //private filePath: FilePath - private permissions: DevicePermissionsService + private permissions: DevicePermissionsService, + public DS :DashboredService ) { this.events.subscribe("img-change", displayImg => { @@ -377,4 +384,36 @@ export class HomePage implements OnInit { openPersonalInfo() { this.common.openProfile(); } + + +/*************************************Dashboards Services**********************************************************8 */ + +showOrganizationSalaries(){ + this.DS.getOrganizationSalaries() .subscribe((result: OrganizationSalariesResponse ) => { + + });; +} + +showOpenMissingSwipes(){ + this.DS.getOpenMissingSwipes() .subscribe((result: OpenMissingSwipesResponse) => { + + });; + +} +showPerformanceAppraisal(){ + this.DS.getPerformanceAppraisal() .subscribe((result: PerformanceAppraisalResponse) => { + + });; + + +} + +showAttendanceTracking(){ + this.DS.getAttendanceTracking() .subscribe((result: AttendanceTrackingResponse) => { + + });; + + } +} + From a6fe8c183a7b598f488d894a512bb360a3501d01 Mon Sep 17 00:00:00 2001 From: Mohamed Mekawy Date: Tue, 21 Jan 2020 16:16:12 +0300 Subject: [PATCH 4/5] merdge dashbored services to new design --- Mohem/package.json | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/Mohem/package.json b/Mohem/package.json index b4fc242d..ed651699 100755 --- a/Mohem/package.json +++ b/Mohem/package.json @@ -190,7 +190,20 @@ "cordova-plugin-fingerprint-aio": { "FACEID_USAGE_DESCRIPTION": "User Authentication" }, - "cordova-plugin-firebasex": {} + "cordova-plugin-firebasex": { + "FIREBASE_ANALYTICS_COLLECTION_ENABLED": "true", + "FIREBASE_PERFORMANCE_COLLECTION_ENABLED": "true", + "FIREBASE_CRASHLYTICS_COLLECTION_ENABLED": "true", + "ANDROID_ICON_ACCENT": "#FF00FFFF", + "ANDROID_PLAY_SERVICES_TAGMANAGER_VERSION": "17.0.0", + "ANDROID_FIREBASE_ANALYTICS_VERSION": "17.2.1", + "ANDROID_FIREBASE_MESSAGING_VERSION": "20.0.0", + "ANDROID_FIREBASE_CONFIG_VERSION": "19.0.3", + "ANDROID_FIREBASE_PERF_VERSION": "19.0.1", + "ANDROID_FIREBASE_AUTH_VERSION": "19.1.0", + "ANDROID_CRASHLYTICS_VERSION": "2.10.1", + "ANDROID_CRASHLYTICS_NDK_VERSION": "2.1.1" + } }, "platforms": [ "browser", @@ -198,4 +211,4 @@ "android" ] } -} \ No newline at end of file +} From e90be39807ade4c4cdfdf69be691d60a9cd61a95 Mon Sep 17 00:00:00 2001 From: Mohamed Mekawy Date: Wed, 22 Jan 2020 12:31:17 +0300 Subject: [PATCH 5/5] edit code --- Mohem/src/app/home/home.page.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index d1ff580f..dee4f44b 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -409,7 +409,7 @@ showOpenMissingSwipes(){ showPerformanceAppraisal(){ this.DS.getPerformanceAppraisal() .subscribe((result: PerformanceAppraisalResponse) => { - });; + }); }