diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html
index a8aaa491..d86016fd 100644
--- a/Mohem/src/app/app.component.html
+++ b/Mohem/src/app/app.component.html
@@ -45,6 +45,15 @@
+
+
+
+ HR REQUEST
+
+
+
diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts
index 020b130c..18b847e5 100644
--- a/Mohem/src/app/app.component.ts
+++ b/Mohem/src/app/app.component.ts
@@ -178,6 +178,11 @@ export class AppComponent implements OnInit {
this.cs.openMyTeamPage();
}
+ public openMyRequestPage() {
+ this.cs.openMyRequestPage();
+ this.menu.toggle();
+ }
+
public profile() {
this.cs.openEditProfile();
this.menu.toggle();
diff --git a/Mohem/src/app/hmg-common/services/common/common.service.ts b/Mohem/src/app/hmg-common/services/common/common.service.ts
index 83f50a82..0548c4d1 100644
--- a/Mohem/src/app/hmg-common/services/common/common.service.ts
+++ b/Mohem/src/app/hmg-common/services/common/common.service.ts
@@ -1118,6 +1118,13 @@ public getMonthNameAr(value: number): string {
public openMyTeamDetailPage() {
this.nav.navigateForward(['/my-team/details']);
}
+ public openMyRequestPage() {
+ this.nav.navigateForward(['/my-team/my-request']);
+ }
+ public openHRRequestPage() {
+ this.nav.navigateForward(['/my-team/hr-request']);
+ }
+
public openPage(link: string) {
this.nav.navigateForward([link]);
diff --git a/Mohem/src/app/hmg-common/services/connector/connector.service.ts b/Mohem/src/app/hmg-common/services/connector/connector.service.ts
index 0d0ca8d9..9405295d 100644
--- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts
+++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts
@@ -27,8 +27,8 @@ export class ConnectorService {
public static retryTimes = 0;
public static timeOut = 120 * 1000;
- public static host = 'https://uat.hmgwebservices.com/';
- //public static host = 'https://hmgwebservices.com/';
+// public static host = 'https://uat.hmgwebservices.com/';
+ public static host = 'https://hmgwebservices.com/';
constructor(public httpClient: HttpClient,
public cs: CommonService,
diff --git a/Mohem/src/app/my-team/my-team.module.ts b/Mohem/src/app/my-team/my-team.module.ts
index 784d9bbb..54b8a875 100644
--- a/Mohem/src/app/my-team/my-team.module.ts
+++ b/Mohem/src/app/my-team/my-team.module.ts
@@ -8,6 +8,9 @@ import { IonicModule } from '@ionic/angular';
import { MyTeamPage } from './my-team.page';
import { HmgCommonModule } from '../hmg-common/hmg-common.module';
+import {MyRequestComponent} from './my-request/my-request.component';
+import {HRRequestComponent} from './/hr-request/hr-request.component';
+
const routes: Routes = [
{
@@ -24,7 +27,16 @@ const routes: Routes = [
{
path: 'details-2',
component: DetailsComponent
+ },
+ {
+ path: 'my-request',
+ component: MyRequestComponent
+ },
+ {
+ path: 'hr-request',
+ component: HRRequestComponent
}
+
]
}
];
@@ -37,6 +49,6 @@ const routes: Routes = [
IonicModule,
RouterModule.forChild(routes)
],
- declarations: [MyTeamPage,HomeComponent,DetailsComponent]
+ declarations: [MyTeamPage,HomeComponent,DetailsComponent,MyRequestComponent,HRRequestComponent]
})
export class MyTeamPageModule {}
diff --git a/Mohem/src/app/my-team/service/my-team.service.ts b/Mohem/src/app/my-team/service/my-team.service.ts
index a15eb1c4..6adcf6bf 100644
--- a/Mohem/src/app/my-team/service/my-team.service.ts
+++ b/Mohem/src/app/my-team/service/my-team.service.ts
@@ -8,6 +8,7 @@ export class MyTeamService {
public static EMPLOYEE_SHARED_DATA = 'employee';
public static getMyTeam = 'Services/ERP.svc/REST/GET_EMPLOYEE_SUBORDINATES';
public static getSuborinateStatus = 'Services/ERP.svc/REST/GET_SUBORDINATES_ATTD_STATUS';
+ public static getUserInfo ='Services/ERP.svc/REST/Get_UserInformation';
constructor(
public con: ConnectorService,
private authService: AuthenticationService
@@ -24,4 +25,11 @@ export class MyTeamService {
return this.con.post(MyTeamService.getSuborinateStatus, request, onError, errorLabel);
}
+ public getUserInfo(absence: any, onError?: any, errorLabel?: string){
+ const request = absence;
+ this.authService.authenticateRequest(request);
+ return this.con.post(MyTeamService.getUserInfo, request, onError, errorLabel);
+ }
+
+
}