diff --git a/Mohem/package-lock.json b/Mohem/package-lock.json index 64101252..0b7b6fcf 100644 --- a/Mohem/package-lock.json +++ b/Mohem/package-lock.json @@ -1103,6 +1103,13 @@ "integrity": "sha512-UKNfGmwxy6++21KkZwZxXf0/t1zIKkybwCk6NVRwyuEnPTtNgnynA2G10pYOfTkOFu5UnK8WpqFagRJbHHBHdg==", "requires": { "@types/cordova": "^0.0.34" + }, + "dependencies": { + "@types/cordova": { + "version": "0.0.34", + "resolved": "https://registry.npmjs.org/@types/cordova/-/cordova-0.0.34.tgz", + "integrity": "sha1-6nrd907Ow9dimCegw54smt3HPQQ=" + } } }, "@ionic-native/geolocation": { diff --git a/Mohem/package.json b/Mohem/package.json index 43033639..409df5c5 100755 --- a/Mohem/package.json +++ b/Mohem/package.json @@ -203,4 +203,4 @@ "android" ] } -} \ No newline at end of file +} diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index 936d023a..f3b35531 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -1,25 +1,109 @@ +
-
-

{{ts.trPK('home','hello')}}, {{User_name_Emp}}

- -
+
+ + + + +
+
+
+ +
+
+ + +
+
+ + +

{{User_name_Emp}}

+ +

{{User_Job_name}}

+ +
- - + + + + + +
+ +
+ + + + + + + + + +
+ + + +
+ + + + +
+ + + + + + + + + {{ts.trPK('userProfile','title')}} + + + + + + + + + {{ts.trPK('login','changepassword')}} {{notBadge}} @@ -29,15 +113,15 @@ --> - + +
@@ -55,7 +139,7 @@

{{CompanyImageDescription}}

diff --git a/Mohem/src/app/app.component.scss b/Mohem/src/app/app.component.scss index 0a6314c5..d7c1c6e7 100644 --- a/Mohem/src/app/app.component.scss +++ b/Mohem/src/app/app.component.scss @@ -8,9 +8,112 @@ header .content-ios:not([no-bounce])>.scroll-content::before { bottom: 0; } + +.mohemmLogo{ + + max-width: 46% !important; + border: 0 !important; + margin-left: 70px !important; + margin-top: -24px !important; + margin-bottom: 11px; +} +.closeIcon{ + + height: 10px !important; + margin-left: 255px !important; + margin-top: 0px !important; + background: transparent; + --background: white !important; + +} +// .editIcon{ +// margin-left: 174px !important; +// margin-bottom: -104px !important; +// padding: 6px -3px !important; +// // margin-top: 50px !important; +// background: transparent; +// --background: rgb(235, 232, 232) !important; +// --border-radius: 80% !important; +// // border-color: rgb(211, 208, 208) !important; +// --box-shadow: 3px 0 rgb(194, 191, 191) !important; +// z-index: 3 !important; + +// } + +.menubutton{ + white-space: normal; + color: var(--light); + text-transform: capitalize; + min-height: 39px; + background: #f0ecec; + font-size: 2rem; + position: absolute; + width: 35px !important; + height: 19px; + box-shadow: 3px 0px 7px 0px #c5c2c2; + border-radius: 50%; + + // box-shadow: 0px 2px 7px 0px #dfe1e3 #7f8c8d; + // white-space: normal; + // color: var(--light); + // text-transform: capitalize; + // min-height: 47px; + // background: transparent; + // font-size: 2rem; + // position: absolute; + // top: 40px; +} + +.changeIcon{ + /* background: #c1c1c1; */ + width: 21px; + /* height: 26px; */ + border-radius: 50% !important; + position: relative; + color: #7f8c8d; + + // background: #c1c1c1; + // width: 40px; + // height: 39px; + // border-radius: 50% !important; + // position: relative; + // left: 51px; + // top:16px; +} + +.changeImgBtn{ + // margin: 0; + position: absolute; + top: 18%; + left: 68%; + // -ms-transform: translate(-50%, -50%); + // transform: translate(-50%, -50%); +} + + +.logout{ + background-color:#22C6B3; + border: none; + color:white; + // padding: 20px; + text-align: center; + text-decoration: none; + display: inline-block; + font-size: 12px; + margin-left: 120px !important; + margin-top: 15px !important; + margin-bottom: 20px !important; + border-radius: 30px; +// width: 40px; +height: 26px; +padding: 6px 24px; + +} + .menuImg{ - width: 80px; - height: 80px; + width: 105px !important; + height: 105px !important; + margin-left: 90px !important; display: inline-flex; overflow: hidden; background: transparent; @@ -122,17 +225,19 @@ header margin-left: 0.2cm; } + + .sidebar-menu .header-div { - background: var(--primary); - background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%, var(--secondary) 59%, var(--customnavy) 100%); - background: -webkit-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%, var(--secondary) 59%, var(--customnavy) 100%); - background: linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%, var(--secondary) 59%, var(--customnavy) 100%); - color: var(--light); + // background: var(--primary); + // background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%, var(--secondary) 59%, var(--customnavy) 100%); + // background: -webkit-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%, var(--secondary) 59%, var(--customnavy) 100%); + // background: linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%, var(--secondary) 59%, var(--customnavy) 100%); + // color: var(--light); text-transform: capitalize; - height: 120px; + height: 100px; position: relative; display: block; - margin-bottom: 40px; + margin-bottom: -28px; } .list-md .item-block .item-inner, @@ -154,8 +259,20 @@ button.menu-item.item.item-block.item-ios { .TxtPlace { margin: 0; - padding: 40px 0 10px 0; + padding: 0; text-align: center; + font-weight: bolder; + color: black; + font-size: 16px; +} +.TxtPlaces{ + + margin: 0; + padding: 0; + text-align: center; + font-weight: bolder; + font-size: 14px; + color: darkgray; } .menuFooter { @@ -189,6 +306,17 @@ button.menu-item.item.item-block.item-ios { text-align: center; } ion-thumbnail.menu-thumb{ - width:30px; - height:30px; + width:20px; + height:20px; + // margin-top: 5px !important; +} +.changepassword{ +color: black !important; +font-weight: bolder !important; + +} +.profile{ + color: black !important; + font-weight: bolder !important; + } \ No newline at end of file diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts index fde78091..a1e655df 100644 --- a/Mohem/src/app/app.component.ts +++ b/Mohem/src/app/app.component.ts @@ -28,6 +28,7 @@ export class AppComponent implements OnInit, AfterViewInit { companyUrl: string = "../assets/imgs/CS.png"; companyDesc: string = "Powered By Cloud Solutions"; public direction = "ltr"; + User_Job_name: string; constructor( public ts: TranslatorService, private cs: CommonService, @@ -89,6 +90,8 @@ export class AppComponent implements OnInit, AfterViewInit { this.user_image = user.EMPLOYEE_IMAGE ? "data:image/png;base64," + user.EMPLOYEE_IMAGE : "../assets/imgs/profile.png"; + this.User_Job_name=user.JOB_NAME; + console.log(user); } else { console.log(user); @@ -133,4 +136,18 @@ export class AppComponent implements OnInit, AfterViewInit { this.menu.toggle(); } + openChangePassword(){ + this.cs.openChangePassword(); + this.menu.toggle(); + } + + private changeImage() { + this.cs.openChangeImagePage(); + this.menu.toggle(); + } + + closeMenu(){ + this.menu.toggle(); + } + } diff --git a/Mohem/src/app/hmg-common/hmg-common.module.ts b/Mohem/src/app/hmg-common/hmg-common.module.ts index 3be427e4..e8910167 100644 --- a/Mohem/src/app/hmg-common/hmg-common.module.ts +++ b/Mohem/src/app/hmg-common/hmg-common.module.ts @@ -94,6 +94,7 @@ import { AccordinCustomComponent } from './ui/accordin-custom/accordin-custom.co import { AccordinTabCustomComponent} from './ui/accordin-custom/accordin-tab-custom/accordin-tab-custom.component' import { StatsButtonComponent } from './ui/stats-button/stats-button.component'; import { ServicesButtonComponent } from './ui/services-button/services-button.component'; +import {DashboredService} from './services/dashbored/dashbored.service' @NgModule({ imports: [ CommonModule, @@ -218,6 +219,7 @@ import { ServicesButtonComponent } from './ui/services-button/services-button.co ServicesButtonComponent ], providers: [ + DashboredService, ConnectorService, TranslatorService, Globalization, 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.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..deeffdad --- /dev/null +++ b/Mohem/src/app/hmg-common/services/dashbored/dashbored.service.ts @@ -0,0 +1,99 @@ +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' + +import {OpenPeriodDatesResponse} from '../../services/dashbored/models/openPeriodDatesResponse' +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 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" + + 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 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 + ); +} + public getOpenPeriodDates( onError?: any, errorLabel?: string): Observable { + const request = new Request(); + this.authService.authenticateRequest(request); + return this.con.post(DashboredService.getOpenPeriodDates, request, onError, errorLabel); + } + public getOpenNotifications( onError?: any, errorLabel?: string): Observable { + const request = new Request(); + this.authService.authenticateRequest(request); + return this.con.post(DashboredService.getOpenNotifications, request, onError, errorLabel); + } + public getSubordinatesLeaves( req:GetSubordinatesLeavesRequest,onError?: any, errorLabel?: string): Observable { + this.authService.authenticateRequest(req); + return this.con.post(DashboredService.getSubordinatesLeaves, req, onError, errorLabel); + } + public getSubordinatesAttStatus( req:GetSubordinatesAttdStatusRequest, onError?: any, errorLabel?: string): Observable { + this.authService.authenticateRequest(req); + return this.con.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/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/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.html b/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.html index 4cabc97c..6f53759d 100644 --- a/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.html +++ b/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.html @@ -1,10 +1,28 @@ -
+ + {{'userProfile,changeImg' | translate}} -
+
--> + + +
+ + +
+ + + + + + diff --git a/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.scss b/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.scss index e3f037ce..da5d7c33 100644 --- a/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.scss +++ b/Mohem/src/app/hmg-common/ui/file-uploder-profile/file-uploder-profile.component.scss @@ -8,13 +8,24 @@ transform: translate(-50%, -50%); } .btnImge{ - button{ - border-color:transparent !important; - } + // button{ + border-color:transparent !important; + --background: #22C6B3 !important; + background: #22C6B3 !important; + + height: 57px !important; + width: 60px !important; + border-radius: 50% !important; + // } + } //test .changeIcon{ - background: #19a163; - width: 15px; - height: 15px; + background: #22C6B3 !important; + border-radius: 50% !important; + width: 73px; + height: 55px; + color: white !important; + width: 80px; + height: 71px; } \ 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 f674fb34..165e0062 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -22,6 +22,18 @@ 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'; +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', @@ -126,8 +138,11 @@ public percent: any = 100 - ((this.timeInSeconds / 32400) * 100); private cameraController: Camera, public sharedData: SharedDataService, private sanitizer: DomSanitizer, - private file: File, - private permissions: DevicePermissionsService + // private transfer: Transfer, + private file: File, + // private filePath: FilePath + private permissions: DevicePermissionsService, + public DS: DashboredService ) { this.events.subscribe('img-change', displayImg => { @@ -487,15 +502,90 @@ getSecondsAsDigitalClock(inputSeconds: number) { 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) => { + + });; } + openPeriodDateDashbored(){ + this.DS.getOpenPeriodDates( ()=> {console.log("Error ");} ).subscribe((result:OpenPeriodDatesResponse)=>{ + if (this.common.validResponse(result)) { + console.log("response"); + } + + }); + } + openNotificationsDashbored(){ + this.DS.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.DS.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.DS.getSubordinatesAttStatus( request,()=> {console.log("Error ");} ).subscribe((result:GetSubordinatesAttdStatusResponse)=>{ + if (this.common.validResponse(result)) { + console.log("response"); + console.log(result); + } + + }); + } + + + +} 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; } + + } diff --git a/Mohem/src/app/profile/profile-image/profile-image.component.html b/Mohem/src/app/profile/profile-image/profile-image.component.html index 0544d51b..04bfb165 100644 --- a/Mohem/src/app/profile/profile-image/profile-image.component.html +++ b/Mohem/src/app/profile/profile-image/profile-image.component.html @@ -3,7 +3,7 @@ - {{ts.trPK('userProfile','title')}} + {{ts.trPK('userProfile','changepicture')}}