diff --git a/Mohem/package.json b/Mohem/package.json index a229f9f8..e048f67e 100755 --- a/Mohem/package.json +++ b/Mohem/package.json @@ -37,7 +37,7 @@ "@ionic-native/diagnostic": "^5.17.0", "@ionic-native/file": "^5.17.0", "@ionic-native/file-path": "^5.17.0", - "@ionic-native/fingerprint-aio": "^5.16.0", + "@ionic-native/fingerprint-aio": "^5.17.1", "@ionic-native/geolocation": "^5.10.0", "@ionic-native/globalization": "^5.17.0", "@ionic-native/health": "^5.4.0", 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 0140e19a..f661aa72 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts @@ -570,9 +570,9 @@ export class ConfirmLoginComponent implements OnInit { // 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". @@ -713,7 +713,7 @@ export class ConfirmLoginComponent implements OnInit { this.authService.setAuthenticatedUser(result).subscribe(() => { console.log("insert"); - if (!this.platform.is("mobile")) { + if (this.platform.is("cordova")) { this.insertMobileLogin(); diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.html b/Mohem/src/app/authentication/sms-page/sms-page.page.html index a26b8d07..5eca319e 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.html +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.html @@ -26,9 +26,9 @@

{{displayTime}}



- {{'verificationcode,verificationcode' | translate}} + - + diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.ts b/Mohem/src/app/authentication/sms-page/sms-page.page.ts index 2172f349..825f64fd 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.ts +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.ts @@ -339,7 +339,7 @@ export class SmsPageComponent implements OnInit { - if (this.platform.is("mobile")) { + if (this.platform.is("cordova")) { this.insertMobileLogin(); diff --git a/Mohem/src/app/eit/add-eit/add-eit.component.ts b/Mohem/src/app/eit/add-eit/add-eit.component.ts index cf7adcab..81cc100e 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.ts +++ b/Mohem/src/app/eit/add-eit/add-eit.component.ts @@ -661,7 +661,7 @@ export class AddEitComponent implements OnInit { this.eitService.getDefaultValue(body).subscribe((result: any) => { let elem = this.getElementByName(segmentName); - console.log(elem); + // console.log(elem); // if(elem.dataset.hiddenval){ // elem.dataset.hiddenval=""; // return false; @@ -694,7 +694,7 @@ export class AddEitComponent implements OnInit { if (isSelectElement) { let elem = this.getSelectElementByName(segmentName); elem = document.getElementById(elem), - alert(elem.length); + //alert(elem.length); // var firstoption = document.createElement("option"); // firstoption.text = text; // firstoption.value = val; @@ -703,11 +703,11 @@ export class AddEitComponent implements OnInit { //elem.text=text; }else{ - console.log("else - " + elem.value); + // console.log("else - " + elem.value); elem.value = val; elem.innerText = text; elem.setAttribute("value", val); - console.log("else - " + elem.value); + // console.log("else - " + elem.value); } } if (isHidden || isReadOnlyList) { 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 958d91c0..adb01bad 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -24,7 +24,7 @@ export class ConnectorService { public static timeOut = 30 * 1000; // public static host = 'http://10.50.100.113:6060/'; // development service - public static host = "https://uat.hmgwebservices.com/"; +public static host = "https://uat.hmgwebservices.com/"; //public static host = 'https://hmgwebservices.com/'; // public static host = 'http://10.50.100.198:6060/'; // public static host = 'http://10.50.100.113:6060/'; // development service diff --git a/Mohem/src/app/hmg-common/ui/sms/sms.page.html b/Mohem/src/app/hmg-common/ui/sms/sms.page.html index c49cc795..a783455d 100644 --- a/Mohem/src/app/hmg-common/ui/sms/sms.page.html +++ b/Mohem/src/app/hmg-common/ui/sms/sms.page.html @@ -23,9 +23,9 @@

{{displayTime}}



- {{'verificationcode.verificationcode' | translate}} + - + diff --git a/Mohem/src/app/home/home.page.html b/Mohem/src/app/home/home.page.html index 7be21549..b72be1d4 100644 --- a/Mohem/src/app/home/home.page.html +++ b/Mohem/src/app/home/home.page.html @@ -78,7 +78,7 @@ - diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index cb09b009..c4f01a48 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -306,8 +306,6 @@ export class HomePage implements OnInit { this.common.openChangePassword(); } private openPayslip() { - - this.common.openPayslipPage(); } private attendance() { diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index 845b11ba..5383e1bf 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -241,9 +241,16 @@ export class HomeComponent implements OnInit { } } for (let i = 0; i < this.WorkListResObj.length; i++) { - if (reqType == this.WorkListResObj[i].REQUEST_TYPE) { - filterdType.push(this.WorkListResObj[i]); + if(reqType=="HR"){ + if ("EIT" == this.WorkListResObj[i].REQUEST_TYPE || "ABSENCE" == this.WorkListResObj[i].REQUEST_TYPE) { + filterdType.push(this.WorkListResObj[i]); + } + }else{ + if (reqType == this.WorkListResObj[i].REQUEST_TYPE) { + filterdType.push(this.WorkListResObj[i]); + } } + } this.filteredNotificationList = filterdType; diff --git a/Mohem/src/app/payslip/home/home.component.ts b/Mohem/src/app/payslip/home/home.component.ts index 007c348c..22e62ac3 100644 --- a/Mohem/src/app/payslip/home/home.component.ts +++ b/Mohem/src/app/payslip/home/home.component.ts @@ -4,6 +4,7 @@ import { TranslatorService } from 'src/app/hmg-common/services/translator/transl import { CommonService } from 'src/app/hmg-common/services/common/common.service'; import { MenuResponse } from 'src/app/hmg-common/services/menu/models/menu-response'; import { SharedDataService } from 'src/app/hmg-common/services/shared-data-service/shared-data.service'; + @Component({ selector: 'app-home', templateUrl: './home.component.html', @@ -28,39 +29,52 @@ export class HomeComponent implements OnInit { public payslipService:PayslipService, public ts: TranslatorService, public common: CommonService, - public sharedData: SharedDataService, + public sharedData: SharedDataService ) {} ngOnInit() { - console.log("test"); - - this.selEmp = this.common.sharedService.getSharedData( - MenuResponse.SHARED_SEL_EMP, - false - ); - console.log(" this.selEmp" + this.selEmp); - this.respID = this.common.sharedService.getSharedData( - MenuResponse.SHARED_SEL_RESP_ID, - false - ); - console.log(" this.respID" + this.respID); - - this.selMenu = new MenuResponse(); - this.selMenu = this.common.sharedService.getSharedData( - MenuResponse.SHARED_DATA, - false - ); - console.log(" this.selMenu" + this.selMenu); + // this.selEmp = this.common.sharedService.getSharedData( + // MenuResponse.SHARED_SEL_EMP, + // false + // ); + // if(this.selEmp){}else{ + // this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => { + // if (user) { + // this.selEmp = user.ASSIGNMENT_NUMBER; + + // } + // }); + // } + + // console.log(" this.selEmp" + this.selEmp); + // this.respID = this.common.sharedService.getSharedData( + // MenuResponse.SHARED_SEL_RESP_ID, + // false + // ); + // if(this.respID){}else{ + // this.respID=-999; + // } + // console.log(" this.respID" + this.respID); + + // this.selMenu = new MenuResponse(); + // this.selMenu = this.common.sharedService.getSharedData( + // MenuResponse.SHARED_DATA, + // false + // ); + // console.log(" this.selMenu" + this.selMenu); this.getPayslip(); } getPayslip(){ + // this.selEmp ="13777"; + console.log("this.selEmp????????"+this.selEmp) + this.respID=-999; const request = { P_SELECTED_EMPLOYEE_NUMBER: this.selEmp,//'125346',//this.selEmp, - P_MENU_TYPE: this.selMenu.List_Menu.MENU_TYPE,// 'E',//this.selMenu.List_Menu.MENU_TYPE, - P_SELECTED_RESP_ID:this.respID//"-999" //this.respID, + P_MENU_TYPE:"E",// 'E',//this.selMenu.List_Menu.MENU_TYPE, + P_SELECTED_RESP_ID: this.respID//"-999" //this.respID, // P_PAGE_NUM: this.P_PAGE_NUM, // P_PAGE_LIMIT: this.P_PAGE_LIMIT }; diff --git a/Mohem/src/app/payslip/service/payslip.service.ts b/Mohem/src/app/payslip/service/payslip.service.ts index 0ef5274f..847438a3 100644 --- a/Mohem/src/app/payslip/service/payslip.service.ts +++ b/Mohem/src/app/payslip/service/payslip.service.ts @@ -3,6 +3,7 @@ import { ConnectorService } from '../../hmg-common/services/connector/connector. import { AuthenticationService } from '../../hmg-common/services/authentication/authentication.service'; import { Observable } from 'node_modules/@angular/cli/node_modules/rxjs'; + @Injectable({ providedIn: 'root' }) @@ -19,10 +20,11 @@ export class PayslipService { ) { } -public getPayslip(PayslipRequest: any, onError?: any,errorLabel?: string): Observable { +public getPayslip(PayslipRequest: any , onError?: any,errorLabel?: string): Observable { const request = PayslipRequest; this.authService.authenticateRequest(request); - return this.api.post(PayslipService.getPayslip,request,onError,errorLabel); + request.P_SELECTED_EMPLOYEE_NUMBER = request.UserName; + return this.api.post(PayslipService.getPayslip, request, onError, errorLabel); } public getSummeryOFPayment(PayslipRequest: any, onError?: any,errorLabel?: string): Observable { const request = PayslipRequest; diff --git a/Mohem/src/app/time-card/home/home.component.html b/Mohem/src/app/time-card/home/home.component.html new file mode 100644 index 00000000..afc16a36 --- /dev/null +++ b/Mohem/src/app/time-card/home/home.component.html @@ -0,0 +1,3 @@ +

+ home works! +

diff --git a/Mohem/src/app/time-card/home/home.component.scss b/Mohem/src/app/time-card/home/home.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/Mohem/src/app/time-card/home/home.component.spec.ts b/Mohem/src/app/time-card/home/home.component.spec.ts new file mode 100644 index 00000000..5ec1377b --- /dev/null +++ b/Mohem/src/app/time-card/home/home.component.spec.ts @@ -0,0 +1,27 @@ +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { HomeComponent } from './home.component'; + +describe('HomeComponent', () => { + let component: HomeComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ HomeComponent ], + schemas: [CUSTOM_ELEMENTS_SCHEMA], + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(HomeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/Mohem/src/app/time-card/home/home.component.ts b/Mohem/src/app/time-card/home/home.component.ts new file mode 100644 index 00000000..a7aad8ad --- /dev/null +++ b/Mohem/src/app/time-card/home/home.component.ts @@ -0,0 +1,14 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-home', + templateUrl: './home.component.html', + styleUrls: ['./home.component.scss'], +}) +export class HomeComponent implements OnInit { + + constructor() { } + + ngOnInit() {} + +} diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.html b/Mohem/src/app/time-card/time-card-details/time-card-details.component.html new file mode 100644 index 00000000..633c94d1 --- /dev/null +++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.html @@ -0,0 +1,3 @@ +

+ time-card-details works! +

diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss b/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.spec.ts b/Mohem/src/app/time-card/time-card-details/time-card-details.component.spec.ts new file mode 100644 index 00000000..976086ff --- /dev/null +++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.spec.ts @@ -0,0 +1,27 @@ +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { TimeCardDetailsComponent } from './time-card-details.component'; + +describe('TimeCardDetailsComponent', () => { + let component: TimeCardDetailsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ TimeCardDetailsComponent ], + schemas: [CUSTOM_ELEMENTS_SCHEMA], + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(TimeCardDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts new file mode 100644 index 00000000..8fa456db --- /dev/null +++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts @@ -0,0 +1,14 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-time-card-details', + templateUrl: './time-card-details.component.html', + styleUrls: ['./time-card-details.component.scss'], +}) +export class TimeCardDetailsComponent implements OnInit { + + constructor() { } + + ngOnInit() {} + +} diff --git a/Mohem/src/app/time-card/time-card.module.ts b/Mohem/src/app/time-card/time-card.module.ts index 4e1ae971..e79e452f 100644 --- a/Mohem/src/app/time-card/time-card.module.ts +++ b/Mohem/src/app/time-card/time-card.module.ts @@ -6,11 +6,23 @@ import { Routes, RouterModule } from '@angular/router'; import { IonicModule } from '@ionic/angular'; import { TimeCardPage } from './time-card.page'; +import { TimeCardDetailsComponent } from './time-card-details/time-card-details.component'; +import { HomeComponent } from './home/home.component'; const routes: Routes = [ { path: '', - component: TimeCardPage + component: TimeCardPage, + children: [ + { + path: 'home', + component: HomeComponent + }, + { + path: 'time-card-details', + component: TimeCardDetailsComponent + } + ] } ]; @@ -21,6 +33,10 @@ const routes: Routes = [ IonicModule, RouterModule.forChild(routes) ], - declarations: [TimeCardPage] + declarations: [ + TimeCardPage, + HomeComponent, + TimeCardDetailsComponent + ] }) export class TimeCardPageModule {} diff --git a/Mohem/src/app/time-card/time-card.page.html b/Mohem/src/app/time-card/time-card.page.html index 5a318c63..67cbe279 100644 --- a/Mohem/src/app/time-card/time-card.page.html +++ b/Mohem/src/app/time-card/time-card.page.html @@ -1,9 +1,3 @@ - - - time-card - - - - - + + \ No newline at end of file diff --git a/Mohem/src/app/uI-elements/date-time.input.ts b/Mohem/src/app/uI-elements/date-time.input.ts index 4b623765..aa5c15d8 100644 --- a/Mohem/src/app/uI-elements/date-time.input.ts +++ b/Mohem/src/app/uI-elements/date-time.input.ts @@ -45,7 +45,7 @@ export class DateTimeInput extends UiElement { "" + " " + this.label + "" + // "
" + this.value + "
" + - "" + + "" + // " "+ // " "+ // " "+ diff --git a/Mohem/src/app/uI-elements/date.input.ts b/Mohem/src/app/uI-elements/date.input.ts index 630fa6ac..9e486e9e 100644 --- a/Mohem/src/app/uI-elements/date.input.ts +++ b/Mohem/src/app/uI-elements/date.input.ts @@ -44,7 +44,7 @@ export class DateInput extends UiElement { "" + " " + this.label + "" + // "
" + this.value + "
" + - "" + + "" + // " "+ // " "+ // " "+ diff --git a/Mohem/src/imgs/MissingSwipe.png b/Mohem/src/imgs/MissingSwipe.png new file mode 100644 index 00000000..ec7ffcf5 Binary files /dev/null and b/Mohem/src/imgs/MissingSwipe.png differ diff --git a/Mohem/src/imgs/MyTimeCard.png b/Mohem/src/imgs/MyTimeCard.png new file mode 100644 index 00000000..9ff482cc Binary files /dev/null and b/Mohem/src/imgs/MyTimeCard.png differ diff --git a/Mohem/src/imgs/Timeback.png b/Mohem/src/imgs/Timeback.png new file mode 100644 index 00000000..287f57ab Binary files /dev/null and b/Mohem/src/imgs/Timeback.png differ diff --git a/Mohem/src/imgs/WorkOnBreak.png b/Mohem/src/imgs/WorkOnBreak.png new file mode 100644 index 00000000..f1f1faa2 Binary files /dev/null and b/Mohem/src/imgs/WorkOnBreak.png differ