diff --git a/Mohem/src/app/app-routing.module.ts b/Mohem/src/app/app-routing.module.ts index b4b5da86..6a82720c 100644 --- a/Mohem/src/app/app-routing.module.ts +++ b/Mohem/src/app/app-routing.module.ts @@ -1,42 +1,43 @@ -import { NgModule } from '@angular/core'; -import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; + + +const routes: Routes = [ + { path: '', redirectTo: 'authentication/login', pathMatch: 'full' }, + { + path: 'authentication', loadChildren: './authentication/authentication.module#AuthenticationPageModule' + }, + { path: 'home', loadChildren: './home/home.module#HomePageModule' }, + { path: 'profile', loadChildren: './profile/profile.module#ProfilePageModule' }, + { path: 'vacation-rule', loadChildren: './vacation-rule/vacation-rule.module#VacationRulePageModule' }, + { path: 'accrual-balances', loadChildren: './accrual-balances/accrual-balances.module#AccrualBalancesPageModule' }, + { path: 'my-team', loadChildren: './my-team/my-team.module#MyTeamPageModule' }, + { path: 'attendance', loadChildren: './attendance/attendance.module#AttendancePageModule' }, + { path: 'eit', loadChildren: './eit/eit.module#EITPageModule' }, + { path: 'absence', loadChildren: './absence/absence.module#AbsencePageModule' }, + { path: 'notification', loadChildren: './notification/notification.module#NotificationPageModule' }, + { path: 'my-specialist', loadChildren: './my-specialist/my-specialist.module#MySpecialistPageModule' }, + { path: 'my-subordinate', loadChildren: './my-subordinate/my-subordinate.module#MySubordinatePageModule' }, + { path: 'time-card', loadChildren: './time-card/time-card.module#TimeCardPageModule' }, + { path: 'payslip', loadChildren: './payslip/payslip.module#PayslipPageModule' }, + { path: 'attendance-tracking', loadChildren: './attendance-tracking/attendance-tracking.module#AttendanceTrackingPageModule' }, + { path: 'itemforsale', loadChildren: './itemforsale/itemforsale.module#ItemforsalePageModule' }, + { path: 'offersdiscount', loadChildren: './offersdiscount/offersdiscount.module#OffersdiscountPageModule' }, + { path: 'mowadhafi', loadChildren: './mowadhafi/mowadhafi.module#MowadhafiPageModule' }, + { path: 'erm-channel', loadChildren: './erm-channel/erm-channel.module#ErmChannelPageModule' }, + { path: 'backend-integrations', loadChildren: './backend-integrations/backend-integrations.module#BackendIntegrationsPageModule' }, { path: 'sit', loadChildren: './sit/sit.module#SitPageModule' } - -const routes: Routes = [ - { path: '', redirectTo: 'authentication/login', pathMatch: 'full' }, - { - path: 'authentication', loadChildren: './authentication/authentication.module#AuthenticationPageModule' - }, - { path: 'home', loadChildren: './home/home.module#HomePageModule' }, - { path: 'profile', loadChildren: './profile/profile.module#ProfilePageModule' }, - { path: 'vacation-rule', loadChildren: './vacation-rule/vacation-rule.module#VacationRulePageModule' }, - { path: 'accrual-balances', loadChildren: './accrual-balances/accrual-balances.module#AccrualBalancesPageModule' }, - { path: 'my-team', loadChildren: './my-team/my-team.module#MyTeamPageModule' }, - { path: 'attendance', loadChildren: './attendance/attendance.module#AttendancePageModule' }, - { path: 'eit', loadChildren: './eit/eit.module#EITPageModule' }, - { path: 'absence', loadChildren: './absence/absence.module#AbsencePageModule' }, - { path: 'notification', loadChildren: './notification/notification.module#NotificationPageModule' }, - { path: 'my-specialist', loadChildren: './my-specialist/my-specialist.module#MySpecialistPageModule' }, - { path: 'my-subordinate', loadChildren: './my-subordinate/my-subordinate.module#MySubordinatePageModule' }, - { path: 'time-card', loadChildren: './time-card/time-card.module#TimeCardPageModule' }, - { path: 'payslip', loadChildren: './payslip/payslip.module#PayslipPageModule' }, - { path: 'attendance-tracking', loadChildren: './attendance-tracking/attendance-tracking.module#AttendanceTrackingPageModule' }, - { path: 'itemforsale', loadChildren: './itemforsale/itemforsale.module#ItemforsalePageModule' }, - { path: 'offersdiscount', loadChildren: './offersdiscount/offersdiscount.module#OffersdiscountPageModule' }, - { path: 'mowadhafi', loadChildren: './mowadhafi/mowadhafi.module#MowadhafiPageModule' }, - { path: 'erm-channel', loadChildren: './erm-channel/erm-channel.module#ErmChannelPageModule' }, - { path: 'backend-integrations', loadChildren: './backend-integrations/backend-integrations.module#BackendIntegrationsPageModule' } - - - - -]; - -@NgModule({ - imports: [ - /*RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules}),*/ - RouterModule.forRoot(routes), - ], - exports: [RouterModule] -}) -export class AppRoutingModule { } + + + + +]; + +@NgModule({ + imports: [ + /*RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules}),*/ + RouterModule.forRoot(routes), + ], + exports: [RouterModule] +}) +export class AppRoutingModule { } diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts index 90a6786c..5059b339 100644 --- a/Mohem/src/app/app.component.ts +++ b/Mohem/src/app/app.component.ts @@ -151,7 +151,6 @@ export class AppComponent implements OnInit { if (user) { console.log(user); this.userInfo = JSON.parse(localStorage.getItem('bussiness-card-info')); - console.log('ENAD TEST') console.log(this.userInfo) localStorage.setItem("digitalIDUser", JSON.stringify(user)); this.digitalIDUser = user//JSON.stringify(user); 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 cac80b88..ca30feb5 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -1116,12 +1116,21 @@ export class CommonService { public openEitListPage() { this.nav.navigateForward(['/eit/eit-list']); } + public openSitListPage() { + this.nav.navigateForward(['/sit/sit-list']); + } public openAddEitPage() { this.nav.navigateForward(['/eit/add-eit']); } + public openAddSitPage() { + this.nav.navigateForward(['/sit/add-sit']); + } public openConfirmEitPage() { this.nav.navigateForward(['/eit/confirm-add-eit']); } + public openConfirmSitPage() { + this.nav.navigateForward(['/sit/confirm-add-sit']); + } public openConfirmBasicDetailsPage() { this.nav.navigateForward(['/profile/confirm-basic']); } @@ -1165,6 +1174,9 @@ export class CommonService { public openEITPage() { this.nav.navigateForward(['/eit/homepage']); } + public openSITPage() { + this.nav.navigateForward(['/sit/homepage']); + } public openMyTeamPage() { console.log('someeeeeeee'); this.nav.navigateForward(['/my-team/home']); @@ -1299,6 +1311,9 @@ export class CommonService { public eitUpdate() { this.nav.navigateForward(['/eit/eit-update-list']); } + public sitUpdate() { + this.nav.navigateForward(['/sit/sit-update-list']); + } public openAnnouncement() { this.nav.navigateForward(['/backend-integrations/announcement']); } diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index 521cb967..ea1dff06 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -477,13 +477,13 @@ export class HomePage implements OnInit { // tslint:disable-next-line: prefer-for-of for (let i = 0; i < result.GetMenuEntriesList.length; i++) { // tslint:disable-next-line: triple-equals - if (result.GetMenuEntriesList[i].FUNCTION_NAME == 'HMG_TKT_NEW_EIT_SS') { + if (result.GetMenuEntriesList[i].FUNCTION_NAME == 'HMG_TKT_NEW_SIT_SS') { this.ticketRequestObject = result.GetMenuEntriesList[i]; // tslint:disable-next-line: triple-equals } else if (result.GetMenuEntriesList[i].FUNCTION_NAME == 'HR_LOA_SS') { this.leaveRequestObject = result.GetMenuEntriesList[i]; // tslint:disable-next-line: triple-equals - } else if (result.GetMenuEntriesList[i].FUNCTION_NAME == 'HMG_OTL_MISSING_SWIPE_EIT_SS') { + } else if (result.GetMenuEntriesList[i].FUNCTION_NAME == 'HMG_OTL_MISSING_SWIPE_SIT_SS') { this.missingSwipeRequestObject = result.GetMenuEntriesList[i]; } } @@ -698,7 +698,7 @@ export class HomePage implements OnInit { if (subMenu.REQUEST_TYPE === 'ABSENCE') { this.common.openAbsencePage(); } else if (subMenu.REQUEST_TYPE === 'SIT') { - this.common.openEitListPage(); + this.common.openSitListPage(); } else if (subMenu.REQUEST_TYPE === 'PAYSLIP') { this.common.openPayslipPage(); } else if (subMenu.MENU_ENTRY_TYPE === 'MENU') { @@ -706,7 +706,7 @@ export class HomePage implements OnInit { selMenu.GetMenuEntriesList, 'menuEntries' ); - this.common.openEITPage(); + this.common.openSITPage(); } if (subMenu.REQUEST_TYPE === 'TIME_CARD') { this.common.openTimeCardPage(); diff --git a/Mohem/src/app/sit/add-attach/add-attach.component.scss b/Mohem/src/app/sit/add-attach/add-attach.component.scss index e6ced223..12e9f077 100644 --- a/Mohem/src/app/sit/add-attach/add-attach.component.scss +++ b/Mohem/src/app/sit/add-attach/add-attach.component.scss @@ -1,19 +1,20 @@ .inputfile { - width: 0.1px; - height: 0.1px; - opacity: 0; - overflow: hidden; - position: absolute; - width: 40px; - height: 40px; - // z-index: -1; -} - -.imgSize { - width: 22px; - height: 22px; -} -.Header { - font-weight: bold; - color: #1a586d; -} + width: 0.1px; + height: 0.1px; + opacity: 0; + overflow: hidden; + position: absolute; + width: 40px; + height: 40px; + // z-index: -1; + } + + .imgSize { + width: 22px; + height: 22px; + } + .Header { + font-weight: bold; + color: #1a586d; + } + \ No newline at end of file diff --git a/Mohem/src/app/sit/add-attach/add-attach.component.ts b/Mohem/src/app/sit/add-attach/add-attach.component.ts index b692cf45..3a093ab4 100644 --- a/Mohem/src/app/sit/add-attach/add-attach.component.ts +++ b/Mohem/src/app/sit/add-attach/add-attach.component.ts @@ -170,3 +170,4 @@ export class AddAttachComponent implements OnInit { } + diff --git a/Mohem/src/app/sit/add-eit/add-eit.component.scss b/Mohem/src/app/sit/add-eit/add-eit.component.scss deleted file mode 100644 index 774a5de2..00000000 --- a/Mohem/src/app/sit/add-eit/add-eit.component.scss +++ /dev/null @@ -1,40 +0,0 @@ -.footer-button { - border-radius: 2px; - padding: 0 1.1em; - min-height: 45px; - min-width: 200px; -} - -ion-label { - color: var(--customnavy) !important; -} - -.daynamicForm-Label { - font-size: 16px; - color: #a2a5a6 !important; - display: block; - overflow: hidden; - -webkit-flex: 1; - flex: 1; - font-size: inherit; - white-space: normal; - padding: 5px 0px; - margin: 10px auto; - padding-left: 10px; -} - - -.header-toolbar-new{ - --background: #29B5BF; -} -.addEitOkButton{ - white-space: normal !important; - text-transform: capitalize !important; - min-height: 45px !important; - min-width: 5px !important; - margin: 8px !important; - background-color: #29B5BF; - width: 80% !important; - color: white!important; - border-radius: 16px !important; -} \ No newline at end of file diff --git a/Mohem/src/app/sit/add-eit/add-eit.component.html b/Mohem/src/app/sit/add-sit/add-sit.component.html similarity index 100% rename from Mohem/src/app/sit/add-eit/add-eit.component.html rename to Mohem/src/app/sit/add-sit/add-sit.component.html diff --git a/Mohem/src/app/sit/add-sit/add-sit.component.scss b/Mohem/src/app/sit/add-sit/add-sit.component.scss new file mode 100644 index 00000000..29af2c8c --- /dev/null +++ b/Mohem/src/app/sit/add-sit/add-sit.component.scss @@ -0,0 +1,40 @@ +.footer-button { + border-radius: 2px; + padding: 0 1.1em; + min-height: 45px; + min-width: 200px; + } + + ion-label { + color: var(--customnavy) !important; + } + + .daynamicForm-Label { + font-size: 16px; + color: #a2a5a6 !important; + display: block; + overflow: hidden; + -webkit-flex: 1; + flex: 1; + font-size: inherit; + white-space: normal; + padding: 5px 0px; + margin: 10px auto; + padding-left: 10px; + } + + + .header-toolbar-new{ + --background: #29B5BF; + } + .addEitOkButton{ + white-space: normal !important; + text-transform: capitalize !important; + min-height: 45px !important; + min-width: 5px !important; + margin: 8px !important; + background-color: #29B5BF; + width: 80% !important; + color: white!important; + border-radius: 16px !important; + } \ No newline at end of file diff --git a/Mohem/src/app/sit/add-eit/add-eit.component.spec.ts b/Mohem/src/app/sit/add-sit/add-sit.component.spec.ts similarity index 62% rename from Mohem/src/app/sit/add-eit/add-eit.component.spec.ts rename to Mohem/src/app/sit/add-sit/add-sit.component.spec.ts index ef4cc2f3..b8c629b4 100644 --- a/Mohem/src/app/sit/add-eit/add-eit.component.spec.ts +++ b/Mohem/src/app/sit/add-sit/add-sit.component.spec.ts @@ -1,22 +1,22 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { AddEitComponent } from './add-eit.component'; +import { AddSitComponent } from './add-sit.component'; -describe('AddEitComponent', () => { - let component: AddEitComponent; - let fixture: ComponentFixture; +describe('AddSitComponent', () => { + let component: AddSitComponent; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ AddEitComponent ], + declarations: [ AddSitComponent ], schemas: [CUSTOM_ELEMENTS_SCHEMA], }) .compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(AddEitComponent); + fixture = TestBed.createComponent(AddSitComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/Mohem/src/app/sit/add-eit/add-eit.component.ts b/Mohem/src/app/sit/add-sit/add-sit.component.ts similarity index 98% rename from Mohem/src/app/sit/add-eit/add-eit.component.ts rename to Mohem/src/app/sit/add-sit/add-sit.component.ts index ec51f51b..a89f064a 100644 --- a/Mohem/src/app/sit/add-eit/add-eit.component.ts +++ b/Mohem/src/app/sit/add-sit/add-sit.component.ts @@ -24,11 +24,11 @@ import { element } from '@angular/core/src/render3'; // import { EITNotificatonBodyResponse } from 'src/app/notification/models/EITNotificationBodyRes'; import { EITNotificatonBodyResponse } from "../models/EITNotificationBodyRes"; @Component({ - selector: "app-add-eit", - templateUrl: "./add-eit.component.html", - styleUrls: ["./add-eit.component.scss"] + selector: 'app-add-sit', + templateUrl: './add-sit.component.html', + styleUrls: ['./add-sit.component.scss'], }) -export class AddEitComponent implements OnInit { +export class AddSitComponent implements OnInit { @ViewChild("containerDiv") containerDiv: ElementRef; ////*new add*///// @@ -147,9 +147,9 @@ export class AddEitComponent implements OnInit { } handleEitDffStructureResult(result) { - if (result.GetEITDFFStructureList != null) { - this.eitResponse = result.GetEITDFFStructureList; - this.drawEitFields(result.GetEITDFFStructureList); + if (result.GetSITDFFStructureList != null) { + this.eitResponse = result.GetSITDFFStructureList; + this.drawEitFields(result.GetSITDFFStructureList); } } @@ -1552,7 +1552,7 @@ export class AddEitComponent implements OnInit { { isResubmit: false }, "confirmAddEITData" ); - this.cs.openConfirmEitPage(); + this.cs.openConfirmSitPage(); // this.navCtrl.push("ConfirmAddEitPage", { isResubmit: false }); } } @@ -1571,16 +1571,16 @@ export class AddEitComponent implements OnInit { EITTransactionTBL: this.arrValues }; - this.eitService - .validateEITTransaction(this.eitRequest) - .subscribe((result: any) => { - this.handleEITValidateTr(result); - }); + // this.eitService + // .validateEITTransaction(this.eitRequest) + // .subscribe((result: any) => { + this.handleEITValidateTr(); + // }); } } - private handleEITValidateTr(result) { - let data: any = { eitRequest: {}, updated: [] }; - if (this.cs.validResponse(result)) { + private handleEITValidateTr() { + // let data: any = { eitRequest: {}, updated: [] }; + // if (this.cs.validResponse(result)) { // public static SHARED_DATA = 'login-request'; this.cs.sharedService.setSharedData( this.eitRequest, @@ -1601,9 +1601,10 @@ export class AddEitComponent implements OnInit { // data.updated = this.updatedValues; // this.viewCtrl.dismiss(data); } - } else { - this.updatedValues = []; - data = { eitRequest: {}, updated: [] }; - } + // } else { + // this.updatedValues = []; + // data = { eitRequest: {}, updated: [] }; + // } } } + diff --git a/Mohem/src/app/sit/confirm-add-eit/confirm-add-eit.component.scss b/Mohem/src/app/sit/confirm-add-eit/confirm-add-eit.component.scss deleted file mode 100644 index 152f42fa..00000000 --- a/Mohem/src/app/sit/confirm-add-eit/confirm-add-eit.component.scss +++ /dev/null @@ -1,262 +0,0 @@ -.footer-button { - border-radius: 2px; - padding: 0 1.1em; - min-height: 45px; - min-width: 200px; -} - -.imgSize { - width: 22px; - height: 22px; -} - -.Header { - font-weight: bold; - color: #1a586d !important; - font-size: 10px; -} - -.tbData { - font-size: 10px; -} - -.btnBack { - background: transparent; - float: right; -} - -.attachmentDiv{ - background: #ffffff; - height: auto; - text-align: center; - padding-top: 1px; - margin: 10px; - border-radius: 15px; - border: 1px solid grey; -} - -.noDataDiv{ - background: #ffffff; - height: 11%; - text-align: center; - padding-top: 1px; - border-radius: 10px; - margin: 10px; - border-radius: 5px; -} -.submitNote{ - background: #ffffff; - height: 80px; - padding-top: 1px; - margin: 10px; - border-radius: 15px; - border: 1px solid grey; -} - -.approvalList{ - --background: #f0efef; - height: auto; - text-align: center; - padding-top: 1px; - border-radius: 10px; - margin: 10px; - border-radius: 5px; -} - -/************************New Design**********************************/ -.notification-list{ - background: none; - background: none; - border-radius: 32px; - ion-item{ - // margin-top: 5px; - // margin-bottom: 5px; - - background-color: transparent; - .item-date{ - width: 100%; - font-size: 16px; - font-weight: bold; - - text-align: start; - padding: 0; - margin: 0; - - position: absolute; - left: 0; - top: 12%; - } - ion-label , [item-end]{ - - white-space: normal; - font-size: 14px; - padding-top: 15%; - // :root[dir="ltr"]{ - // margin-left: 10px; - // } - // :root[dir="rtl"]{ - // margin-right: 10px; - // } - - } - - } -} - - - - - - -.timeline { - position: relative; - margin: 15px 0 0 0; - // border-bottom: solid 1px var(--cusgray); -} - -.timeline:before { - - content: ''; - position: inherit !important; - top: 0; - bottom: 0; - width: 4px; - // background: #e4e4e4; - z-index: 1; - left: 35px; - /* margin-left: -10px; */ - /* z-index: 1; */ -} - -.timeline .timeline-thumb { - - border-radius: 500px; - width: 70px !important; - z-index: 2; - position: absolute; - left: 0px; - // :root[dir="ltr"]{ - // left: 37px; - // } - // :root[dir="rtl"]{ - // right: 37px; - // } - float: right; - top: 9px; -} - -.timeline .timeline-thumb.timeline-icon { - height: 70px; - // text-align: center; - // color: white; - // border: 5px solid #CBD0D3; - // transform: scale(0.2); -} - - - -.timeline .timeline-item { - width: 40px; - -} - -.timeline .timeline-stats { - position: relative; - font-size: 12px; - color: var(--darkgray); - -} - -.empImge{ - border-radius: 50%; - width:100%; - height: 100%; - border: #dedede solid 1px; - -} -.empImgeRep { - border-radius: 50% !important; - width: 80px; - height: 80px; - border: #dedede solid 1px; -} - -.line{ - padding-bottom:87px; -} - -.attachLable{ - position: absolute; - top: 0px; - z-index: 0; - background: #30b8c6; - color: #fff; - border-radius: 50%; - border: 0px; - width: 24px; - height: 24px; - text-align: center; - font-size: 5px; -} - -.removeLable{ - top: 0px; - z-index: 0; - background: #d8252d; - color: #fff; - border-radius: 50%; - border: 0px; - width: 20px; - height: 20px; - text-align: center; - font-size: 5px; -} - -.note-modal { - // width: 90%; - // height: 50%; - // top: 20%; - // left: 5%; - // right: 5%; - // bottom: 5%; - background: rgba(0, 0, 0, 0.5) !important; - padding: 30% 10% !important; - --height: 12cm !important; - // --width: 80% !important; - --border-radius:20px; - -} -.header-toolbar-new{ - --background: #29B5BF; -} -.title{ - margin-top: -37px; - margin-left: 85px; -} -.title-ar{ - margin-top: -37px; - margin-right: 101px; -} -.confirmEitOkButton{ - white-space: normal !important; - text-transform: capitalize !important; - min-height: 45px !important; - min-width: 5px !important; - margin: 8px !important; - background-color: #29B5BF; - width: 80% !important; - color: white!important; - border-radius: 16px !important; -} - -.approvalTitle-ar{ - font-weight: bold; - font-size: 16px; - text-align: right; - -} -.approvalTitle{ - font-weight: bold; - font-size: 16px; - text-align: left; -} diff --git a/Mohem/src/app/sit/confirm-add-eit/confirm-add-eit.component.html b/Mohem/src/app/sit/confirm-add-sit/confirm-add-sit.component.html similarity index 100% rename from Mohem/src/app/sit/confirm-add-eit/confirm-add-eit.component.html rename to Mohem/src/app/sit/confirm-add-sit/confirm-add-sit.component.html diff --git a/Mohem/src/app/sit/confirm-add-sit/confirm-add-sit.component.scss b/Mohem/src/app/sit/confirm-add-sit/confirm-add-sit.component.scss new file mode 100644 index 00000000..bd1c1bdc --- /dev/null +++ b/Mohem/src/app/sit/confirm-add-sit/confirm-add-sit.component.scss @@ -0,0 +1,263 @@ +.footer-button { + border-radius: 2px; + padding: 0 1.1em; + min-height: 45px; + min-width: 200px; + } + + .imgSize { + width: 22px; + height: 22px; + } + + .Header { + font-weight: bold; + color: #1a586d !important; + font-size: 10px; + } + + .tbData { + font-size: 10px; + } + + .btnBack { + background: transparent; + float: right; + } + + .attachmentDiv{ + background: #ffffff; + height: auto; + text-align: center; + padding-top: 1px; + margin: 10px; + border-radius: 15px; + border: 1px solid grey; + } + + .noDataDiv{ + background: #ffffff; + height: 11%; + text-align: center; + padding-top: 1px; + border-radius: 10px; + margin: 10px; + border-radius: 5px; + } + .submitNote{ + background: #ffffff; + height: 80px; + padding-top: 1px; + margin: 10px; + border-radius: 15px; + border: 1px solid grey; + } + + .approvalList{ + --background: #f0efef; + height: auto; + text-align: center; + padding-top: 1px; + border-radius: 10px; + margin: 10px; + border-radius: 5px; + } + + /************************New Design**********************************/ + .notification-list{ + background: none; + background: none; + border-radius: 32px; + ion-item{ + // margin-top: 5px; + // margin-bottom: 5px; + + background-color: transparent; + .item-date{ + width: 100%; + font-size: 16px; + font-weight: bold; + + text-align: start; + padding: 0; + margin: 0; + + position: absolute; + left: 0; + top: 12%; + } + ion-label , [item-end]{ + + white-space: normal; + font-size: 14px; + padding-top: 15%; + // :root[dir="ltr"]{ + // margin-left: 10px; + // } + // :root[dir="rtl"]{ + // margin-right: 10px; + // } + + } + + } + } + + + + + + + .timeline { + position: relative; + margin: 15px 0 0 0; + // border-bottom: solid 1px var(--cusgray); + } + + .timeline:before { + + content: ''; + position: inherit !important; + top: 0; + bottom: 0; + width: 4px; + // background: #e4e4e4; + z-index: 1; + left: 35px; + /* margin-left: -10px; */ + /* z-index: 1; */ + } + + .timeline .timeline-thumb { + + border-radius: 500px; + width: 70px !important; + z-index: 2; + position: absolute; + left: 0px; + // :root[dir="ltr"]{ + // left: 37px; + // } + // :root[dir="rtl"]{ + // right: 37px; + // } + float: right; + top: 9px; + } + + .timeline .timeline-thumb.timeline-icon { + height: 70px; + // text-align: center; + // color: white; + // border: 5px solid #CBD0D3; + // transform: scale(0.2); + } + + + + .timeline .timeline-item { + width: 40px; + + } + + .timeline .timeline-stats { + position: relative; + font-size: 12px; + color: var(--darkgray); + + } + + .empImge{ + border-radius: 50%; + width:100%; + height: 100%; + border: #dedede solid 1px; + + } + .empImgeRep { + border-radius: 50% !important; + width: 80px; + height: 80px; + border: #dedede solid 1px; + } + + .line{ + padding-bottom:87px; + } + + .attachLable{ + position: absolute; + top: 0px; + z-index: 0; + background: #30b8c6; + color: #fff; + border-radius: 50%; + border: 0px; + width: 24px; + height: 24px; + text-align: center; + font-size: 5px; + } + + .removeLable{ + top: 0px; + z-index: 0; + background: #d8252d; + color: #fff; + border-radius: 50%; + border: 0px; + width: 20px; + height: 20px; + text-align: center; + font-size: 5px; + } + + .note-modal { + // width: 90%; + // height: 50%; + // top: 20%; + // left: 5%; + // right: 5%; + // bottom: 5%; + background: rgba(0, 0, 0, 0.5) !important; + padding: 30% 10% !important; + --height: 12cm !important; + // --width: 80% !important; + --border-radius:20px; + + } + .header-toolbar-new{ + --background: #29B5BF; + } + .title{ + margin-top: -37px; + margin-left: 85px; + } + .title-ar{ + margin-top: -37px; + margin-right: 101px; + } + .confirmEitOkButton{ + white-space: normal !important; + text-transform: capitalize !important; + min-height: 45px !important; + min-width: 5px !important; + margin: 8px !important; + background-color: #29B5BF; + width: 80% !important; + color: white!important; + border-radius: 16px !important; + } + + .approvalTitle-ar{ + font-weight: bold; + font-size: 16px; + text-align: right; + + } + .approvalTitle{ + font-weight: bold; + font-size: 16px; + text-align: left; + } + \ No newline at end of file diff --git a/Mohem/src/app/sit/eit-update-list/eit-update-list.component.spec.ts b/Mohem/src/app/sit/confirm-add-sit/confirm-add-sit.component.spec.ts similarity index 59% rename from Mohem/src/app/sit/eit-update-list/eit-update-list.component.spec.ts rename to Mohem/src/app/sit/confirm-add-sit/confirm-add-sit.component.spec.ts index df56466e..5a44ed71 100644 --- a/Mohem/src/app/sit/eit-update-list/eit-update-list.component.spec.ts +++ b/Mohem/src/app/sit/confirm-add-sit/confirm-add-sit.component.spec.ts @@ -1,22 +1,22 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { EitUpdateListComponent } from './eit-update-list.component'; +import { ConfirmAddSitComponent } from './confirm-add-sit.component'; -describe('EitUpdateListComponent', () => { - let component: EitUpdateListComponent; - let fixture: ComponentFixture; +describe('ConfirmAddSitComponent', () => { + let component: ConfirmAddSitComponent; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ EitUpdateListComponent ], + declarations: [ ConfirmAddSitComponent ], schemas: [CUSTOM_ELEMENTS_SCHEMA], }) .compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(EitUpdateListComponent); + fixture = TestBed.createComponent(ConfirmAddSitComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/Mohem/src/app/sit/confirm-add-eit/confirm-add-eit.component.ts b/Mohem/src/app/sit/confirm-add-sit/confirm-add-sit.component.ts similarity index 97% rename from Mohem/src/app/sit/confirm-add-eit/confirm-add-eit.component.ts rename to Mohem/src/app/sit/confirm-add-sit/confirm-add-sit.component.ts index 72cf9af1..efe286ca 100644 --- a/Mohem/src/app/sit/confirm-add-eit/confirm-add-eit.component.ts +++ b/Mohem/src/app/sit/confirm-add-sit/confirm-add-sit.component.ts @@ -13,14 +13,14 @@ import { TranslatorService } from 'src/app/hmg-common/services/translator/transl import { EitService } from '../services/eit.service'; import { AddEitResponse } from '../models/add.eit.response'; import { FileUploader } from 'ng2-file-upload'; -import { SubmitEitModalComponent } from '../submit-eit-modal/submit-eit-modal.component'; +import { SubmitSitModalComponent } from '../submit-sit-modal/submit-sit-modal.component'; @Component({ - selector: 'app-confirm-add-eit', - templateUrl: './confirm-add-eit.component.html', - styleUrls: ['./confirm-add-eit.component.scss'], + selector: 'app-confirm-add-sit', + templateUrl: './confirm-add-sit.component.html', + styleUrls: ['./confirm-add-sit.component.scss'], }) -export class ConfirmAddEitComponent implements OnInit { +export class ConfirmAddSitComponent implements OnInit { private P_TransactionID: number; private eitRequest: EitRequest; @@ -97,8 +97,8 @@ export class ConfirmAddEitComponent implements OnInit { this.menuType = this.selMenu.List_Menu.MENU_TYPE; this.headerTitle = this.selMenu.GetMenuEntriesList.PROMPT; this.addrespList = this.cs.sharedService.getSharedData(AddEitResponse.SHARED_DATA); - this.itemKey = this.addrespList.SubmitEITTransactionList.P_ITEM_KEY; - this.P_TransactionID = this.addrespList.SubmitEITTransactionList.P_TRANSACTION_ID; + this.itemKey = this.addrespList.SubmitSITTransactionList.P_ITEM_KEY; + this.P_TransactionID = this.addrespList.SubmitSITTransactionList.P_TRANSACTION_ID; this.isDelete = this.isResubmitEIT = this.cs.sharedService.getSharedData('confirmAddEITData', false).isDelete; @@ -301,7 +301,7 @@ export class ConfirmAddEitComponent implements OnInit { this.cs.sharedService.setSharedData( this.attachListOver, 'submitAttachmentList'); this.cs.sharedService.setSharedData(this.eitComments, 'eitComments'); const modal = await this.modalController.create({ - component: SubmitEitModalComponent, + component: SubmitSitModalComponent, backdropDismiss: false, }); diff --git a/Mohem/src/app/sit/eit-list/eit-list.component.scss b/Mohem/src/app/sit/eit-list/eit-list.component.scss deleted file mode 100644 index 1c5f758a..00000000 --- a/Mohem/src/app/sit/eit-list/eit-list.component.scss +++ /dev/null @@ -1,334 +0,0 @@ -.footer-button { - border-radius: 2px; - padding: 0 1.1em; - min-height: 45px; - min-width: 200px; -} - -.datetime{ - // text-align: center; - // font-family: WorkSans-Bold; - // margin-left: 111px; - text-align: center; - font-family: WorkSans-Bold; - margin-left: 47px; - margin-top: -19px; - - } -.iconCalendar{ - // margin-left: -241px; - // margin-top: 5px; - margin-left: 30px !important; - width: 22% !important; - height: 26px !important; - margin-top: -69px !important; - margin-bottom: 20px !important; - } -h4 { - font-size: 2.2rem; - text-align: center; - color: #000000; -} -.grids{ - border-radius: 20px !important; - background: white; - padding-left: 1px; - padding-right: 1px; - margin: 13px; - padding-top: 0px; - padding-bottom: 3px; - padding-left: 13px; - padding-right: 13px; - border: 1px solid #cac8c8; - } - - .bgcolor { - - color: white; - border-top-right-radius: 19px; - border-top-left-radius: 15px; - padding-top: 1; - padding-bottom: 0; - margin-top: 0; - margin-bottom: 0; - /* border-radius: 12px !important; */ - background: #29B5BF; - border-bottom: 1px solid #a7a4a4; - border-top: 1px solid #cac8c8; - margin-left: -13px; - margin-right: -13px; -} -.colEit{ - border-right: 1px solid #cac8c8; - border-bottom-left-radius: -10px !important; - padding-top: 8px; - padding-bottom: 8px; - margin-left: 18px; - font-size: 12px !important; -} - -.header-div { - - background-color: #29B5BF; - text-transform: capitalize; - height: 160px; - // position: relative; - display: block; - margin-bottom: -28px; -} - -.header-toolbar-new{ - --background: #29B5BF; -} - -.addClass{ - background-color: #29B5BF; - width: 80px; - height: 80px; - right: 8%; - position: fixed; - color: white; - bottom: 5%; - border-radius: 50%; - z-index: 999; - -webkit-box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59); - -moz-box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59); - box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59); -} - -.contentEit:before { - position: absolute; -content: ""; -// background: #29B5BF; -height: 140px; -width: 100%; -left: 0; -top: 0px; -z-index: 1; -} - -.hrClass{ - border-width: 0; - box-sizing: content-box; - border-bottom: 1px solid #e6e6e6; - background: #fff !important; - height: 1px; -} - -//////////////////////////////// -.content:before { - position: absolute; -content: ""; -background: #29B5BF; -height: 140px; -width: 100%; -left: 0; -top: 0px; -z-index: 1; -} - - -.colorBG{ - --background: #f0efef; - } - -.Title{ - text-align: center; - color: white; - margin-top: -33px; - font-size: 17px; -} -.title{ - text-align: center; - color: black; - margin-top: 5px; - font-size: 17px; -} -.today-graph{ - display: block !important; - height: 196px; - width: 365px; - /* padding-left: 51px; */ - margin-left: 28px !important; -} - - .headerGrid{ - // background-color: white !important; - // border: 1px solid #cac8c8 !important; - // border-radius: 20px !important; - // padding-top: 28px; - // padding-bottom: 53px; - // margin-left: 9px; - // margin-right: 13px; - // margin-top: -94px; - // margin-bottom: 10px; - background-color: white !important; - border: 1px solid #cac8c8 !important; - /* padding-top: 28px; */ - padding-bottom: 53px; - padding-top: -30px; - margin-left: 13px; - margin-right: 13px; - /* margin-top: -86px; */ - margin-bottom: 10px; - position: relative; - z-index: 1; - border-radius: 20px; - margin-top: 17px; - } - .result-graph{ - font-size: 14px; - margin-left: -48px; - margin-right: 3px; - margin-bottom: -30px; - - - - } - - .green-label{ - font-size: 15px !important; - margin-left: 7px !important; - margin-right: 42px; - } - .green-label-ar{ - font-size: 15px !important; - margin-left: 7px !important; - margin-right: 15px; - } - .blue-label{ - font-size: 15px !important; - margin-left: 7px !important; - margin-right: 13px; - } - .light-label{ - font-size: 15px !important; - margin-left: 7px !important; - margin-right: -26px; - } - .light-label-ar{ - font-size: 15px !important; - margin-right: 7px !important; - margin-left: -26px; - } - - .light-dote{ - background-color: #3CB9D5; - width: 12px; - height: 12px; - border-radius: 50% !important; - display: inline-block; - } - .blue-dote{ - - background-color: #29B5BF; - width: 12px; - height: 12px; - border-radius: 50% !important; - display: inline-block; - } - .green-dote{ - background-color: #1FA269; - width: 12px; - height: 12px; - border-radius: 50% !important; - display: inline-block; - margin-right: -1px; - } - .col{ - text-align: right; - } - - .gridService{ - - /* margin-top: 87px; */ - border-radius: 10px; - /* margin-bottom: -49px; */ - margin-left: 14px; - margin-right: 14px; - - } - .columns{ - margin: 3px; - margin-bottom: 13px; - background: white; - border-radius: 27px; - padding-left: 30px; - padding-right: 6px; - padding-top: 19px; - padding-bottom: 8px; - border: 1px solid #cac8c8 !important; - } - - - .service{ - font-size: 22px; - color: black; - letter-spacing: 1px; - font-weight: bold; - } - .services{ - - font-size: 12px; - color: black; - } - - .adult-dote{ - background-color: #3CB9D5; - width: 15px; - height: 15px; - border-radius: 50% !important; - display: inline-block; - margin-left: -17px; - margin-right: 5px; - } - - .adult-dote-ar{ - background-color: #3CB9D5; - width: 15px; - height: 15px; - border-radius: 50% !important; - display: inline-block; - margin-right: 0px; - margin-left: 5px; - } - .child-dote{ - - background-color: #29B5BF; - width: 15px; - height: 15px; - border-radius: 50% !important; - display: inline-block; - margin-left: -17px; - margin-right: 5px; - } - .child-dote-ar{ - background-color: #29B5BF; - width: 15px; - height: 15px; - border-radius: 50% !important; - display: inline-block; - margin-right: 1px; - margin-left: 5px; - } - .infants-dote{ - background-color: #1FA269; - width: 15px; - height: 15px; - border-radius: 50% !important; - display: inline-block; - margin-left: -17px; - margin-right: 5px; - // margin-bottom: 6px; - } - - .infants-dote-ar{ - background-color: #1FA269; - width: 15px; - height: 15px; - border-radius: 50% !important; - display: inline-block; - margin-right: 1px; - margin-left: 5px; - } - diff --git a/Mohem/src/app/sit/eit.page.html b/Mohem/src/app/sit/eit.page.html deleted file mode 100644 index 9834be83..00000000 --- a/Mohem/src/app/sit/eit.page.html +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Mohem/src/app/sit/eit.page.ts b/Mohem/src/app/sit/eit.page.ts deleted file mode 100644 index 0ae31acd..00000000 --- a/Mohem/src/app/sit/eit.page.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-eit', - templateUrl: './eit.page.html', - styleUrls: ['./eit.page.scss'], -}) -export class EITPage implements OnInit { - - constructor() { } - - ngOnInit() { - } - -} diff --git a/Mohem/src/app/sit/home/home.component.ts b/Mohem/src/app/sit/home/home.component.ts index 7402a672..83e5157d 100644 --- a/Mohem/src/app/sit/home/home.component.ts +++ b/Mohem/src/app/sit/home/home.component.ts @@ -57,6 +57,8 @@ export class HomeComponent implements OnInit { this.cs.openAbsencePage(); } else if (menuEntry.REQUEST_TYPE === 'EIT') { this.cs.openEitListPage(); + } else if (menuEntry.REQUEST_TYPE === 'SIT') { + this.cs.openSitListPage(); } else if (menuEntry.REQUEST_TYPE === 'BASIC_DETAILS') { this.cs.openProfile('basicDetails'); } else if (menuEntry.REQUEST_TYPE === 'ADDRESS') { diff --git a/Mohem/src/app/sit/services/eit.service.ts b/Mohem/src/app/sit/services/eit.service.ts index 9063a6ff..312e9e26 100644 --- a/Mohem/src/app/sit/services/eit.service.ts +++ b/Mohem/src/app/sit/services/eit.service.ts @@ -15,14 +15,14 @@ export class EitService { /* EIT Services URLs */ public static getMenuEntries = 'Services/ERP.svc/REST/GET_MENU_ENTRIES'; - public static getEITTransctions = 'Services/ERP.svc/REST/GET_EIT_TRANSACTIONS'; - public static getEITDFFStrutre = 'Services/ERP.svc/REST/GET_EIT_DFF_STRUCTURE'; + public static getEITTransctions = 'Services/ERP.svc/REST/GET_SIT_TRANSACTIONS'; + public static getEITDFFStrutre = 'Services/ERP.svc/REST/GET_SIT_DFF_STRUCTURE'; public static getSetValue = 'Services/ERP.svc/REST/GET_VALUE_SET_VALUES'; public static getDefaultValue = 'Services/ERP.svc/REST/GET_DEFAULT_VALUE'; - public static validateEITTransctions = 'Services/ERP.svc/REST/VALIDATE_EIT_TRANSACTION'; - public static submitEit = 'Services/ERP.svc/REST/SUBMIT_EIT_TRANSACTION'; - public static resubmitEit = 'Services/ERP.svc/REST/RESUBMIT_EIT_TRANSACTION'; - public static startEitProcess = 'Services/ERP.svc/REST/START_EIT_APPROVAL_PROCESS'; + public static validateEITTransctions = 'Services/ERP.svc/REST/VALIDATE_SIT_TRANSACTION'; + public static submitEit = 'Services/ERP.svc/REST/SUBMIT_SIT_TRANSACTION'; + public static resubmitEit = 'Services/ERP.svc/REST/RESUBMIT_SIT_TRANSACTION'; + public static startEitProcess = 'Services/ERP.svc/REST/START_SIT_APPROVAL_PROCESS'; public static updateAttach = 'Services/ERP.svc/REST/UPDATE_ATTACHMENT'; public static deleteAttach = 'Services/ERP.svc/REST/DELETE_ATTACHMENT'; public static getApproversList = 'Services/ERP.svc/REST/GET_APPROVERS_LIST'; diff --git a/Mohem/src/app/sit/eit-list/eit-list.component.html b/Mohem/src/app/sit/sit-list/sit-list.component.html similarity index 100% rename from Mohem/src/app/sit/eit-list/eit-list.component.html rename to Mohem/src/app/sit/sit-list/sit-list.component.html diff --git a/Mohem/src/app/sit/sit-list/sit-list.component.scss b/Mohem/src/app/sit/sit-list/sit-list.component.scss new file mode 100644 index 00000000..749fd900 --- /dev/null +++ b/Mohem/src/app/sit/sit-list/sit-list.component.scss @@ -0,0 +1,335 @@ +.footer-button { + border-radius: 2px; + padding: 0 1.1em; + min-height: 45px; + min-width: 200px; + } + + .datetime{ + // text-align: center; + // font-family: WorkSans-Bold; + // margin-left: 111px; + text-align: center; + font-family: WorkSans-Bold; + margin-left: 47px; + margin-top: -19px; + + } + .iconCalendar{ + // margin-left: -241px; + // margin-top: 5px; + margin-left: 30px !important; + width: 22% !important; + height: 26px !important; + margin-top: -69px !important; + margin-bottom: 20px !important; + } + h4 { + font-size: 2.2rem; + text-align: center; + color: #000000; + } + .grids{ + border-radius: 20px !important; + background: white; + padding-left: 1px; + padding-right: 1px; + margin: 13px; + padding-top: 0px; + padding-bottom: 3px; + padding-left: 13px; + padding-right: 13px; + border: 1px solid #cac8c8; + } + + .bgcolor { + + color: white; + border-top-right-radius: 19px; + border-top-left-radius: 15px; + padding-top: 1; + padding-bottom: 0; + margin-top: 0; + margin-bottom: 0; + /* border-radius: 12px !important; */ + background: #29B5BF; + border-bottom: 1px solid #a7a4a4; + border-top: 1px solid #cac8c8; + margin-left: -13px; + margin-right: -13px; + } + .colEit{ + border-right: 1px solid #cac8c8; + border-bottom-left-radius: -10px !important; + padding-top: 8px; + padding-bottom: 8px; + margin-left: 18px; + font-size: 12px !important; + } + + .header-div { + + background-color: #29B5BF; + text-transform: capitalize; + height: 160px; + // position: relative; + display: block; + margin-bottom: -28px; + } + + .header-toolbar-new{ + --background: #29B5BF; + } + + .addClass{ + background-color: #29B5BF; + width: 80px; + height: 80px; + right: 8%; + position: fixed; + color: white; + bottom: 5%; + border-radius: 50%; + z-index: 999; + -webkit-box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59); + -moz-box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59); + box-shadow: 2px -1px 13px 0px rgba(0,0,0,0.59); + } + + .contentEit:before { + position: absolute; + content: ""; + // background: #29B5BF; + height: 140px; + width: 100%; + left: 0; + top: 0px; + z-index: 1; + } + + .hrClass{ + border-width: 0; + box-sizing: content-box; + border-bottom: 1px solid #e6e6e6; + background: #fff !important; + height: 1px; + } + + //////////////////////////////// + .content:before { + position: absolute; + content: ""; + background: #29B5BF; + height: 140px; + width: 100%; + left: 0; + top: 0px; + z-index: 1; + } + + + .colorBG{ + --background: #f0efef; + } + + .Title{ + text-align: center; + color: white; + margin-top: -33px; + font-size: 17px; + } + .title{ + text-align: center; + color: black; + margin-top: 5px; + font-size: 17px; + } + .today-graph{ + display: block !important; + height: 196px; + width: 365px; + /* padding-left: 51px; */ + margin-left: 28px !important; + } + + .headerGrid{ + // background-color: white !important; + // border: 1px solid #cac8c8 !important; + // border-radius: 20px !important; + // padding-top: 28px; + // padding-bottom: 53px; + // margin-left: 9px; + // margin-right: 13px; + // margin-top: -94px; + // margin-bottom: 10px; + background-color: white !important; + border: 1px solid #cac8c8 !important; + /* padding-top: 28px; */ + padding-bottom: 53px; + padding-top: -30px; + margin-left: 13px; + margin-right: 13px; + /* margin-top: -86px; */ + margin-bottom: 10px; + position: relative; + z-index: 1; + border-radius: 20px; + margin-top: 17px; + } + .result-graph{ + font-size: 14px; + margin-left: -48px; + margin-right: 3px; + margin-bottom: -30px; + + + + } + + .green-label{ + font-size: 15px !important; + margin-left: 7px !important; + margin-right: 42px; + } + .green-label-ar{ + font-size: 15px !important; + margin-left: 7px !important; + margin-right: 15px; + } + .blue-label{ + font-size: 15px !important; + margin-left: 7px !important; + margin-right: 13px; + } + .light-label{ + font-size: 15px !important; + margin-left: 7px !important; + margin-right: -26px; + } + .light-label-ar{ + font-size: 15px !important; + margin-right: 7px !important; + margin-left: -26px; + } + + .light-dote{ + background-color: #3CB9D5; + width: 12px; + height: 12px; + border-radius: 50% !important; + display: inline-block; + } + .blue-dote{ + + background-color: #29B5BF; + width: 12px; + height: 12px; + border-radius: 50% !important; + display: inline-block; + } + .green-dote{ + background-color: #1FA269; + width: 12px; + height: 12px; + border-radius: 50% !important; + display: inline-block; + margin-right: -1px; + } + .col{ + text-align: right; + } + + .gridService{ + + /* margin-top: 87px; */ + border-radius: 10px; + /* margin-bottom: -49px; */ + margin-left: 14px; + margin-right: 14px; + + } + .columns{ + margin: 3px; + margin-bottom: 13px; + background: white; + border-radius: 27px; + padding-left: 30px; + padding-right: 6px; + padding-top: 19px; + padding-bottom: 8px; + border: 1px solid #cac8c8 !important; + } + + + .service{ + font-size: 22px; + color: black; + letter-spacing: 1px; + font-weight: bold; + } + .services{ + + font-size: 12px; + color: black; + } + + .adult-dote{ + background-color: #3CB9D5; + width: 15px; + height: 15px; + border-radius: 50% !important; + display: inline-block; + margin-left: -17px; + margin-right: 5px; + } + + .adult-dote-ar{ + background-color: #3CB9D5; + width: 15px; + height: 15px; + border-radius: 50% !important; + display: inline-block; + margin-right: 0px; + margin-left: 5px; + } + .child-dote{ + + background-color: #29B5BF; + width: 15px; + height: 15px; + border-radius: 50% !important; + display: inline-block; + margin-left: -17px; + margin-right: 5px; + } + .child-dote-ar{ + background-color: #29B5BF; + width: 15px; + height: 15px; + border-radius: 50% !important; + display: inline-block; + margin-right: 1px; + margin-left: 5px; + } + .infants-dote{ + background-color: #1FA269; + width: 15px; + height: 15px; + border-radius: 50% !important; + display: inline-block; + margin-left: -17px; + margin-right: 5px; + // margin-bottom: 6px; + } + + .infants-dote-ar{ + background-color: #1FA269; + width: 15px; + height: 15px; + border-radius: 50% !important; + display: inline-block; + margin-right: 1px; + margin-left: 5px; + } + + \ No newline at end of file diff --git a/Mohem/src/app/sit/eit-list/eit-list.component.spec.ts b/Mohem/src/app/sit/sit-list/sit-list.component.spec.ts similarity index 61% rename from Mohem/src/app/sit/eit-list/eit-list.component.spec.ts rename to Mohem/src/app/sit/sit-list/sit-list.component.spec.ts index c34639df..20cce98d 100644 --- a/Mohem/src/app/sit/eit-list/eit-list.component.spec.ts +++ b/Mohem/src/app/sit/sit-list/sit-list.component.spec.ts @@ -1,22 +1,22 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { EitListComponent } from './eit-list.component'; +import { SitListComponent } from './sit-list.component'; -describe('EitListComponent', () => { - let component: EitListComponent; - let fixture: ComponentFixture; +describe('SitListComponent', () => { + let component: SitListComponent; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ EitListComponent ], + declarations: [ SitListComponent ], schemas: [CUSTOM_ELEMENTS_SCHEMA], }) .compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(EitListComponent); + fixture = TestBed.createComponent(SitListComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/Mohem/src/app/sit/eit-list/eit-list.component.ts b/Mohem/src/app/sit/sit-list/sit-list.component.ts similarity index 92% rename from Mohem/src/app/sit/eit-list/eit-list.component.ts rename to Mohem/src/app/sit/sit-list/sit-list.component.ts index 5bde6589..b99be8dc 100644 --- a/Mohem/src/app/sit/eit-list/eit-list.component.ts +++ b/Mohem/src/app/sit/sit-list/sit-list.component.ts @@ -1,4 +1,4 @@ -import { AddEitComponent } from './../add-eit/add-eit.component'; +import { AddSitComponent } from './../add-sit/add-sit.component'; import { ModalController } from '@ionic/angular'; import { CommonService } from 'src/app/hmg-common/services/common/common.service'; import { EitRequest } from './../models/eit.request'; @@ -14,11 +14,11 @@ import { AuthenticationService } from 'src/app/hmg-common/services/authenticatio import { AuthenticatedUser } from 'src/app/hmg-common/services/authentication/models/authenticated-user'; @Component({ - selector: 'app-eit-list', - templateUrl: './eit-list.component.html', - styleUrls: ['./eit-list.component.scss'], + selector: 'app-sit-list', + templateUrl: './sit-list.component.html', + styleUrls: ['./sit-list.component.scss'], }) -export class EitListComponent implements OnInit { +export class SitListComponent implements OnInit { Sdate: any; emp_no: any; balance:any; @@ -89,11 +89,11 @@ export class EitListComponent implements OnInit { // accrualNetInfants // accrualUNetChild // accrualNetAdult - if(this.accrualBalancesList){ - this.accrualNetAdult = this.accrualBalancesList[1].ACCRUAL_NET_ENTITLEMENT; - this.accrualUNetChild = this.accrualBalancesList[2].ACCRUAL_NET_ENTITLEMENT; - this. accrualNetInfants = this.accrualBalancesList[3].ACCRUAL_NET_ENTITLEMENT; - } + // if(this.accrualBalancesList){ + // this.accrualNetAdult = this.accrualBalancesList[1].ACCRUAL_NET_ENTITLEMENT; + // this.accrualUNetChild = this.accrualBalancesList[2].ACCRUAL_NET_ENTITLEMENT; + // this. accrualNetInfants = this.accrualBalancesList[3].ACCRUAL_NET_ENTITLEMENT; + // } this.data = { // labels: ['earingTotal', 'deductionTotal'], datasets: [ @@ -116,25 +116,25 @@ export class EitListComponent implements OnInit { } }); } - public getAccrualBalance() { - if (this.Sdate) { - let today = new Date(this.Sdate); - let day = today.getDate(); - let month = today.getMonth() + 1; - let year = today.getFullYear(); - let todayDate = month + '/' + day + '/' + year; - let effectiveDate = todayDate; - const request = { - P_SELECTED_EMPLOYEE_NUMBER: this.selEmp, - P_EFFECTIVE_DATE: effectiveDate - }; - this.accrualService - .getAccrualBalances(request) - .subscribe((result: any) => { - this.handleAccrualResult(result); - }); - } - } + // public getAccrualBalance() { + // if (this.Sdate) { + // let today = new Date(this.Sdate); + // let day = today.getDate(); + // let month = today.getMonth() + 1; + // let year = today.getFullYear(); + // let todayDate = month + '/' + day + '/' + year; + // let effectiveDate = todayDate; + // const request = { + // P_SELECTED_EMPLOYEE_NUMBER: this.selEmp, + // P_EFFECTIVE_DATE: effectiveDate + // }; + // this.accrualService + // .getAccrualBalances(request) + // .subscribe((result: any) => { + // this.handleAccrualResult(result); + // }); + // } + // } handleAccrualResult(result) { if (this.cs.validResponse(result)) { this.balance=result.GetAccrualBalancesList; @@ -161,13 +161,13 @@ export class EitListComponent implements OnInit { handleEITTransactionsResult(result) { if (this.cs.validResponse(result)) { - if (this.cs.hasData(result.GetEITTransactionList)) { - this.getResEITTransactionList = result.GetEITTransactionList; + if (this.cs.hasData(result.GetSITTransactionList)) { + this.getResEITTransactionList = result.GetSITTransactionList; this.P_PAGE_NUM++; this.EITTransactionsListObj.P_PAGE_NUM = this.P_PAGE_NUM; const lastItemIndex = this.getResEITTransactionList.length - 1; - if (result.GetEITTransactionList[lastItemIndex] && result.GetEITTransactionList[lastItemIndex].Collection_Transaction[0]) { - const lastitem = result.GetEITTransactionList[lastItemIndex].Collection_Transaction[0]; + if (result.GetSITTransactionList[lastItemIndex] && result.GetSITTransactionList[lastItemIndex].Collection_Transaction[0]) { + const lastitem = result.GetSITTransactionList[lastItemIndex].Collection_Transaction[0]; // tslint:disable-next-line: triple-equals if (lastitem.NO_OF_ROWS == lastitem.ROW_NUM) { this.IsReachEnd = true; @@ -185,10 +185,10 @@ export class EitListComponent implements OnInit { this.EITService.getEITTransactionsList(this.EITTransactionsListObj). subscribe((result: any) => { if (this.cs.validResponse(result)) { - if (this.cs.hasData(result.GetEITTransactionList)) { + if (this.cs.hasData(result.GetSITTransactionList)) { this.P_PAGE_NUM++; this.EITTransactionsListObj.P_PAGE_NUM = this.P_PAGE_NUM; - result.GetEITTransactionList.forEach(vr => { + result.GetSITTransactionList.forEach(vr => { console.log(vr.length); if(vr.length && vr.length != 0){ if (vr.Collection_Transaction[0].ROW_NUM == vr.Collection_Transaction[0].NO_OF_ROWS) { @@ -272,7 +272,7 @@ export class EitListComponent implements OnInit { this.transactionNo++; // tslint:disable-next-line: max-line-length this.cs.sharedService.setSharedData({ dirfromNotificationPage: false, submitEITObjList: item, transNo: this.transactionNo }, 'AddEITData'); - this.cs.openAddEitPage(); + this.cs.openAddSitPage(); // this.navCtrl.push('AddEitPage', { dirfromNotificationPage: false, submitEITObjList: item, transNo: this.transactionNo }); } async openEit(index) { @@ -285,7 +285,7 @@ export class EitListComponent implements OnInit { // tslint:disable-next-line: max-line-length this.cs.sharedService.setSharedData({ dirfromNotificationPage: false, submitEITObjList: item, transNo: this.transactionNo }, 'AddEITData'); const modalPage = await this.modalCtrl.create({ - component: AddEitComponent + component: AddSitComponent }); // modalPage.present(); @@ -443,7 +443,7 @@ export class EitListComponent implements OnInit { // //this.cs.sharedService.setSharedData(result.SubmitEITTransactionList.P_TRANSACTION_ID,"TransactionIDResubmit"); // // this.sharedData.setSharedData(this.eitRequest,EitRequest.SHARED_DATA); this.cs.sharedService.setSharedData({ isResubmit: false, isDelete: this.isDelete }, 'confirmAddEITData'); - this.cs.openConfirmEitPage(); + this.cs.openConfirmSitPage(); // this.navCtrl.push("ConfirmAddEitPage", { isResubmit: false, isDelete: this.isDelete }); } } @@ -607,3 +607,4 @@ export class EitListComponent implements OnInit { + diff --git a/Mohem/src/app/sit/eit-update-list/eit-update-list.component.html b/Mohem/src/app/sit/sit-update-list/sit-update-list.component.html similarity index 100% rename from Mohem/src/app/sit/eit-update-list/eit-update-list.component.html rename to Mohem/src/app/sit/sit-update-list/sit-update-list.component.html diff --git a/Mohem/src/app/sit/eit-update-list/eit-update-list.component.scss b/Mohem/src/app/sit/sit-update-list/sit-update-list.component.scss similarity index 100% rename from Mohem/src/app/sit/eit-update-list/eit-update-list.component.scss rename to Mohem/src/app/sit/sit-update-list/sit-update-list.component.scss diff --git a/Mohem/src/app/sit/confirm-add-eit/confirm-add-eit.component.spec.ts b/Mohem/src/app/sit/sit-update-list/sit-update-list.component.spec.ts similarity index 59% rename from Mohem/src/app/sit/confirm-add-eit/confirm-add-eit.component.spec.ts rename to Mohem/src/app/sit/sit-update-list/sit-update-list.component.spec.ts index 4e7175df..4dae0866 100644 --- a/Mohem/src/app/sit/confirm-add-eit/confirm-add-eit.component.spec.ts +++ b/Mohem/src/app/sit/sit-update-list/sit-update-list.component.spec.ts @@ -1,22 +1,22 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { ConfirmAddEitComponent } from './confirm-add-eit.component'; +import { SitUpdateListComponent } from './sit-update-list.component'; -describe('ConfirmAddEitComponent', () => { - let component: ConfirmAddEitComponent; - let fixture: ComponentFixture; +describe('SitUpdateListComponent', () => { + let component: SitUpdateListComponent; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ ConfirmAddEitComponent ], + declarations: [ SitUpdateListComponent ], schemas: [CUSTOM_ELEMENTS_SCHEMA], }) .compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(ConfirmAddEitComponent); + fixture = TestBed.createComponent(SitUpdateListComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/Mohem/src/app/sit/eit-update-list/eit-update-list.component.ts b/Mohem/src/app/sit/sit-update-list/sit-update-list.component.ts similarity index 93% rename from Mohem/src/app/sit/eit-update-list/eit-update-list.component.ts rename to Mohem/src/app/sit/sit-update-list/sit-update-list.component.ts index 98431cd3..ff244d2d 100644 --- a/Mohem/src/app/sit/eit-update-list/eit-update-list.component.ts +++ b/Mohem/src/app/sit/sit-update-list/sit-update-list.component.ts @@ -1,4 +1,4 @@ -import { AddEitComponent } from './../add-eit/add-eit.component'; +import { AddSitComponent } from './../add-sit/add-sit.component'; import { ModalController } from '@ionic/angular'; import { EitRequest } from './../models/eit.request'; import { Component, OnInit } from '@angular/core'; @@ -7,11 +7,11 @@ import { EITNotificatonBodyResponse } from '../models/EITNotificationBodyRes'; import { EitService } from '../services/eit.service'; @Component({ - selector: 'app-eit-update-list', - templateUrl: './eit-update-list.component.html', - styleUrls: ['./eit-update-list.component.scss'], + selector: 'app-sit-update-list', + templateUrl: './sit-update-list.component.html', + styleUrls: ['./sit-update-list.component.scss'], }) -export class EitUpdateListComponent implements OnInit { +export class SitUpdateListComponent implements OnInit { public notificationBodyRes: any = {}; private updatedData: any = []; @@ -41,7 +41,7 @@ export class EitUpdateListComponent implements OnInit { let item = this.notificationBodyRes[index].Collection_Notification; this.cs.sharedService.setSharedData({ dirfromNotificationPage: true, submitEITObjList: item }, 'AddEITData') const modal = await this.modalController.create({ - component: AddEitComponent + component: AddSitComponent }); modal.onDidDismiss() @@ -98,7 +98,7 @@ export class EitUpdateListComponent implements OnInit { this.cs.sharedService.setSharedData(result.ResubmitEITTransactionList.P_TRANSACTION_ID, "TransactionIDResubmit"); this.cs.sharedService.setSharedData(this.eitRequest, EitRequest.SHARED_DATA); this.cs.sharedService.setSharedData({ isResubmit: true }, 'confirmAddEITData'); - this.cs.openConfirmEitPage(); + this.cs.openConfirmSitPage(); } } @@ -133,3 +133,4 @@ export class EitUpdateListComponent implements OnInit { } } + diff --git a/Mohem/src/app/sit/eit.module.ts b/Mohem/src/app/sit/sit.module.ts similarity index 56% rename from Mohem/src/app/sit/eit.module.ts rename to Mohem/src/app/sit/sit.module.ts index 98d5bde0..a897b266 100644 --- a/Mohem/src/app/sit/eit.module.ts +++ b/Mohem/src/app/sit/sit.module.ts @@ -1,53 +1,53 @@ import { AddAttachComponent } from './add-attach/add-attach.component'; -import { ConfirmAddEitComponent } from './confirm-add-eit/confirm-add-eit.component'; -import { AddEitComponent } from './add-eit/add-eit.component'; +import { ConfirmAddSitComponent } from './confirm-add-sit/confirm-add-sit.component'; +import { AddSitComponent } from './add-sit/add-sit.component'; import { HmgCommonModule } from 'src/app/hmg-common/hmg-common.module'; import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { Routes, RouterModule } from '@angular/router'; import { IonicModule } from '@ionic/angular'; -import { EITPage } from './eit.page'; +import { SitPage } from './sit.page'; import { HomeComponent } from './home/home.component'; -import { EitListComponent } from './eit-list/eit-list.component'; +import { SitListComponent } from './sit-list/sit-list.component'; import { DatePicker } from '@ionic-native/date-picker/ngx'; import { WorkListAttachViewComponent } from '../notification/work-list-attach-view/work-list-attach-view.component'; -import { EitUpdateListComponent } from './eit-update-list/eit-update-list.component'; -import { SubmitEitModalComponent } from './submit-eit-modal/submit-eit-modal.component'; +import { SitUpdateListComponent } from './sit-update-list/sit-update-list.component'; +import { SubmitSitModalComponent } from './submit-sit-modal/submit-sit-modal.component'; const routes: Routes = [ { path: '', - component: EITPage, + component: SitPage, children: [ { path: 'homepage', component: HomeComponent }, { - path: 'eit-list', - component: EitListComponent + path: 'sit-list', + component: SitListComponent }, { - path: 'add-eit', - component: AddEitComponent + path: 'add-sit', + component: AddSitComponent }, { - path: 'confirm-add-eit', - component: ConfirmAddEitComponent + path: 'confirm-add-sit', + component: ConfirmAddSitComponent }, { path: 'add-attach', component: AddAttachComponent }, { - path: 'eit-update-list', - component: EitUpdateListComponent + path: 'sit-update-list', + component: SitUpdateListComponent }, { - path: 'eit-submit-modal', - component: SubmitEitModalComponent + path: 'sit-submit-modal', + component: SubmitSitModalComponent } ] } @@ -62,14 +62,14 @@ const routes: Routes = [ RouterModule.forChild(routes) ], declarations: [ - EITPage, + SitPage, HomeComponent, - EitListComponent, - AddEitComponent, - ConfirmAddEitComponent, + SitListComponent, + AddSitComponent, + ConfirmAddSitComponent, AddAttachComponent, - EitUpdateListComponent, - SubmitEitModalComponent + SitUpdateListComponent, + SubmitSitModalComponent ], entryComponents: [ WorkListAttachViewComponent @@ -78,4 +78,4 @@ const routes: Routes = [ DatePicker ] }) -export class EITPageModule { } +export class SitPageModule { } \ No newline at end of file diff --git a/Mohem/src/app/sit/sit.page.html b/Mohem/src/app/sit/sit.page.html new file mode 100644 index 00000000..67cbe279 --- /dev/null +++ b/Mohem/src/app/sit/sit.page.html @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/Mohem/src/app/sit/eit.page.scss b/Mohem/src/app/sit/sit.page.scss similarity index 100% rename from Mohem/src/app/sit/eit.page.scss rename to Mohem/src/app/sit/sit.page.scss diff --git a/Mohem/src/app/sit/eit.page.spec.ts b/Mohem/src/app/sit/sit.page.spec.ts similarity index 67% rename from Mohem/src/app/sit/eit.page.spec.ts rename to Mohem/src/app/sit/sit.page.spec.ts index 527bd8b0..56a2f600 100644 --- a/Mohem/src/app/sit/eit.page.spec.ts +++ b/Mohem/src/app/sit/sit.page.spec.ts @@ -1,22 +1,22 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { EITPage } from './eit.page'; +import { SitPage } from './sit.page'; -describe('EITPage', () => { - let component: EITPage; - let fixture: ComponentFixture; +describe('SitPage', () => { + let component: SitPage; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ EITPage ], + declarations: [ SitPage ], schemas: [CUSTOM_ELEMENTS_SCHEMA], }) .compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(EITPage); + fixture = TestBed.createComponent(SitPage); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/Mohem/src/app/sit/sit.page.ts b/Mohem/src/app/sit/sit.page.ts new file mode 100644 index 00000000..50d94858 --- /dev/null +++ b/Mohem/src/app/sit/sit.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-sit', + templateUrl: './sit.page.html', + styleUrls: ['./sit.page.scss'], +}) +export class SitPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/Mohem/src/app/sit/submit-eit-modal/submit-eit-modal.component.html b/Mohem/src/app/sit/submit-sit-modal/submit-sit-modal.component.html similarity index 100% rename from Mohem/src/app/sit/submit-eit-modal/submit-eit-modal.component.html rename to Mohem/src/app/sit/submit-sit-modal/submit-sit-modal.component.html diff --git a/Mohem/src/app/sit/submit-eit-modal/submit-eit-modal.component.scss b/Mohem/src/app/sit/submit-sit-modal/submit-sit-modal.component.scss similarity index 100% rename from Mohem/src/app/sit/submit-eit-modal/submit-eit-modal.component.scss rename to Mohem/src/app/sit/submit-sit-modal/submit-sit-modal.component.scss diff --git a/Mohem/src/app/sit/submit-eit-modal/submit-eit-modal.component.spec.ts b/Mohem/src/app/sit/submit-sit-modal/submit-sit-modal.component.spec.ts similarity index 59% rename from Mohem/src/app/sit/submit-eit-modal/submit-eit-modal.component.spec.ts rename to Mohem/src/app/sit/submit-sit-modal/submit-sit-modal.component.spec.ts index 7171d957..70df563a 100644 --- a/Mohem/src/app/sit/submit-eit-modal/submit-eit-modal.component.spec.ts +++ b/Mohem/src/app/sit/submit-sit-modal/submit-sit-modal.component.spec.ts @@ -1,22 +1,22 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { SubmitEitModalComponent } from './submit-eit-modal.component'; +import { SubmitSitModalComponent } from './submit-sit-modal.component'; -describe('SubmitEitModalComponent', () => { - let component: SubmitEitModalComponent; - let fixture: ComponentFixture; +describe('SubmitSitModalComponent', () => { + let component: SubmitSitModalComponent; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ SubmitEitModalComponent ], + declarations: [ SubmitSitModalComponent ], schemas: [CUSTOM_ELEMENTS_SCHEMA], }) .compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(SubmitEitModalComponent); + fixture = TestBed.createComponent(SubmitSitModalComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/Mohem/src/app/sit/submit-eit-modal/submit-eit-modal.component.ts b/Mohem/src/app/sit/submit-sit-modal/submit-sit-modal.component.ts similarity index 82% rename from Mohem/src/app/sit/submit-eit-modal/submit-eit-modal.component.ts rename to Mohem/src/app/sit/submit-sit-modal/submit-sit-modal.component.ts index 41e6c26a..4e6f8e82 100644 --- a/Mohem/src/app/sit/submit-eit-modal/submit-eit-modal.component.ts +++ b/Mohem/src/app/sit/submit-sit-modal/submit-sit-modal.component.ts @@ -4,11 +4,11 @@ import { ModalController } from '@ionic/angular'; import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; @Component({ - selector: 'app-submit-eit-modal', - templateUrl: './submit-eit-modal.component.html', - styleUrls: ['./submit-eit-modal.component.scss'], + selector: 'app-submit-sit-modal', + templateUrl: './submit-sit-modal.component.html', + styleUrls: ['./submit-sit-modal.component.scss'], }) -export class SubmitEitModalComponent implements OnInit { +export class SubmitSitModalComponent implements OnInit { submitAttachmentList :any =[]; eitComments: string; constructor( public ts: TranslatorService,private modalCtrl: ModalController, private cs: CommonService){