diff --git a/Mohem/package.json b/Mohem/package.json old mode 100755 new mode 100644 index 54683c89..3caf1fb0 --- a/Mohem/package.json +++ b/Mohem/package.json @@ -101,6 +101,7 @@ "date-fns": "^1.30.1", "es6-promise-plugin": "^4.1.0", "ionic2-calendar": "^0.5.8", + "ionic4-rating": "^1.0.9", "ng-circle-progress": "^1.5.1", "ng2-file-upload": "^1.3.0", "ng2-pdf-viewer": "^5.3.2", @@ -221,4 +222,4 @@ "ios" ] } -} \ No newline at end of file +} diff --git a/Mohem/src/app/app-routing.module.ts b/Mohem/src/app/app-routing.module.ts index 9fabe5a8..54eb3061 100644 --- a/Mohem/src/app/app-routing.module.ts +++ b/Mohem/src/app/app-routing.module.ts @@ -1,39 +1,41 @@ -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: 'backend-integrations', loadChildren: './backend-integrations/backend-integrations.module#BackendIntegrationsPageModule' } +import { NgModule } from '@angular/core'; +import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; - - - -]; - -@NgModule({ - imports: [ - /*RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules}),*/ - RouterModule.forRoot(routes), - ], - exports: [RouterModule] -}) -export class AppRoutingModule { } + +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: '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 { } diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts index 18b847e5..c4c8a5cd 100644 --- a/Mohem/src/app/app.component.ts +++ b/Mohem/src/app/app.component.ts @@ -67,9 +67,9 @@ export class AppComponent implements OnInit { private hideSplashScreen() { setTimeout(() => { - this.splashScreen.hide(); + this.splashScreen.hide(); }, 1000); -} + } public initializeApp() { this.cs.startLoading(); @@ -106,9 +106,10 @@ export class AppComponent implements OnInit { private startReceivingPushService() { this.pushService.startReceiving(); setTimeout(() => { - console.log(' in setTimeout startReceiving'); - this.getLastLoginInfo(); - }, 4000); + console.log(' in setTimeout startReceiving'); + this.getLastLoginInfo(); + + }, 4000); } public subscribeEvents() { @@ -119,23 +120,27 @@ export class AppComponent implements OnInit { }); this.events.subscribe('setMenu', () => { const user = this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => { - if (user) { - console.log(user); - localStorage.setItem("digitalIDUser", JSON.stringify(user)); - this.digitalIDUser = user//JSON.stringify(user); - this.companyUrl = user.CompanyImageURL ? user.CompanyImageURL : '../assets/imgs/CSLogo.png'; - this.companyDesc = user.CompanyImageDescription ? user.CompanyImageDescription : 'Powered By Cloud Solutions'; - this.User_name_Emp = user.EMPLOYEE_DISPLAY_NAME; - if (this.cs.getUpdateImage().status) { - this.user_image = this.sanitizer.bypassSecurityTrustUrl('data:image/png;base64,' + this.cs.getUpdateImage().img); - } else { - this.user_image = user.EMPLOYEE_IMAGE ? 'data:image/png;base64,' + user.EMPLOYEE_IMAGE : '../assets/imgs/profile.png'; - } - this.User_Job_name = user.JOB_NAME; + if (user) { + console.log(user); + + localStorage.setItem("digitalIDUser", JSON.stringify(user)); + this.digitalIDUser = user//JSON.stringify(user); + this.companyUrl = user.CompanyImageURL ? user.CompanyImageURL : '../assets/imgs/CSLogo.png'; + this.companyDesc = user.CompanyImageDescription ? user.CompanyImageDescription : 'Powered By Cloud Solutions'; + this.User_name_Emp = user.EMPLOYEE_DISPLAY_NAME; + if (this.cs.getUpdateImage().status) { + this.user_image = this.sanitizer.bypassSecurityTrustUrl('data:image/png;base64,' + this.cs.getUpdateImage().img); } else { - console.log(user); + this.user_image = user.EMPLOYEE_IMAGE ? 'data:image/png;base64,' + user.EMPLOYEE_IMAGE : '../assets/imgs/profile.png'; } - }); + this.User_Job_name = user.JOB_NAME; + //erm channel + if (!CommonService.SKIP) + this.cs.navigateForward('/erm-channel/survey'); + } else { + console.log(user); + } + }); }); this.events.subscribe('getNotCount', badge => { this.notBadge = badge; }); this.events.subscribe('myTeamFlag', myTeamFlag => { this.TeamFlag = myTeamFlag; }); @@ -200,14 +205,14 @@ export class AppComponent implements OnInit { async openDigitalId() { const modal = await this.modalController.create({ - component: DigitalIdComponent, - cssClass: 'digital-id-modal-css', - componentProps: { - 'userInfo':this.digitalIDUser//JSON.parse(this.digitalIDUser) - } + component: DigitalIdComponent, + cssClass: 'digital-id-modal-css', + componentProps: { + 'userInfo': this.digitalIDUser//JSON.parse(this.digitalIDUser) + } }); return await modal.present(); -} + } private changeImage() { this.cs.openChangeImagePage(); @@ -219,40 +224,40 @@ export class AppComponent implements OnInit { } public getLastLoginInfo() { - this.deviceToken = this.cs.getDeviceToken(); + this.deviceToken = this.cs.getDeviceToken(); if (this.deviceToken) { - console.log('login enabled first time: ' + this.deviceToken); + console.log('login enabled first time: ' + this.deviceToken); } else { this.pushService.startReceiving(); setTimeout(() => { - this.deviceToken = localStorage.getItem('deviceToken'); + this.deviceToken = localStorage.getItem('deviceToken'); }, 1000); } this.requestGetLoginInfo = { - DeviceType: this.cs.getDeviceType(), - DeviceToken: this.deviceToken + DeviceType: this.cs.getDeviceType(), + DeviceToken: this.deviceToken }; - this.authService.getLoginInfo(this.requestGetLoginInfo, () => {}, this.ts.trPK('general', 'ok')).subscribe(res => { + this.authService.getLoginInfo(this.requestGetLoginInfo, () => { }, this.ts.trPK('general', 'ok')).subscribe(res => { if (this.cs.validResponse(res)) { - if (res.Mohemm_GetMobileLoginInfoList.length > 0) { - this.cs.sharedService.setSharedData(res.Mohemm_GetMobileLoginInfoList[0], AuthenticationService.IMEI_USER_DATA); - this.user = true; - this.events.publish('user', this.user); + if (res.Mohemm_GetMobileLoginInfoList.length > 0) { + this.cs.sharedService.setSharedData(res.Mohemm_GetMobileLoginInfoList[0], AuthenticationService.IMEI_USER_DATA); + this.user = true; + this.events.publish('user', this.user); - if (this.logoutFlage) { - this.cs.openLogin(); - } - } else { - this.user = false; - this.events.publish('user', this.user); + if (this.logoutFlage) { + this.cs.openLogin(); + } + } else { + this.user = false; + this.events.publish('user', this.user); - if (this.logoutFlage) { - this.cs.openLogin(); - } - } - } else {} + if (this.logoutFlage) { + this.cs.openLogin(); + } + } + } else { } }); } } diff --git a/Mohem/src/app/erm-channel/erm-channel.module.ts b/Mohem/src/app/erm-channel/erm-channel.module.ts new file mode 100644 index 00000000..9b422bfc --- /dev/null +++ b/Mohem/src/app/erm-channel/erm-channel.module.ts @@ -0,0 +1,41 @@ +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 { IonicRatingModule } from 'ionic4-rating'; +import { ErmChannelPage } from './erm-channel.page'; +import { HomeComponent } from './home/home.component'; +import { SurveyComponent } from './survey/survey.component'; +import { HmgCommonModule } from '../hmg-common/hmg-common.module'; + +const routes: Routes = [ + { + path: '', + component: ErmChannelPage, + children: [ + { + path: 'home', + component: HomeComponent + }, + { + path: 'survey', + component: SurveyComponent + }, + ] + } +]; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + IonicRatingModule, + HmgCommonModule, + RouterModule.forChild(routes) + ], + declarations: [ErmChannelPage, HomeComponent, SurveyComponent] +}) +export class ErmChannelPageModule { } diff --git a/Mohem/src/app/erm-channel/erm-channel.page.html b/Mohem/src/app/erm-channel/erm-channel.page.html new file mode 100644 index 00000000..d26b79fd --- /dev/null +++ b/Mohem/src/app/erm-channel/erm-channel.page.html @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Mohem/src/app/erm-channel/erm-channel.page.scss b/Mohem/src/app/erm-channel/erm-channel.page.scss new file mode 100644 index 00000000..e69de29b diff --git a/Mohem/src/app/erm-channel/erm-channel.page.spec.ts b/Mohem/src/app/erm-channel/erm-channel.page.spec.ts new file mode 100644 index 00000000..9a886696 --- /dev/null +++ b/Mohem/src/app/erm-channel/erm-channel.page.spec.ts @@ -0,0 +1,27 @@ +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ErmChannelPage } from './erm-channel.page'; + +describe('ErmChannelPage', () => { + let component: ErmChannelPage; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ErmChannelPage ], + schemas: [CUSTOM_ELEMENTS_SCHEMA], + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ErmChannelPage); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/Mohem/src/app/erm-channel/erm-channel.page.ts b/Mohem/src/app/erm-channel/erm-channel.page.ts new file mode 100644 index 00000000..503ffb66 --- /dev/null +++ b/Mohem/src/app/erm-channel/erm-channel.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-erm-channel', + templateUrl: './erm-channel.page.html', + styleUrls: ['./erm-channel.page.scss'], +}) +export class ErmChannelPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/Mohem/src/app/erm-channel/home/home.component.html b/Mohem/src/app/erm-channel/home/home.component.html new file mode 100644 index 00000000..45909076 --- /dev/null +++ b/Mohem/src/app/erm-channel/home/home.component.html @@ -0,0 +1,12 @@ +
+ +
Skip
+
+ + + + + + +
+
\ No newline at end of file diff --git a/Mohem/src/app/erm-channel/home/home.component.scss b/Mohem/src/app/erm-channel/home/home.component.scss new file mode 100644 index 00000000..284af1b8 --- /dev/null +++ b/Mohem/src/app/erm-channel/home/home.component.scss @@ -0,0 +1,44 @@ +.full-ads{ + position: absolute; + height: 100%; + width: 100%; + background-size: cover; +} +.skip-btn{ + position: absolute; + background: black; + color: #fff; + margin: 10px; + right: 10px; + padding: 5px; + border-radius: 5px; +} + +.info-container { + width: 100%; + text-align: center; + bottom: 10%; + position: absolute; +} +.info-container ion-icon{ + margin: 10px; + font-size: 32px; + padding: 10px; + border-radius: 50%; + display: inline-block; +} +.red{ + background: #ff5757; + + color: #fff; +} +.green{ + background: #23f172; + + color: #fff; +} +.white{ + background: #fff; + + color: #000; +} \ No newline at end of file diff --git a/Mohem/src/app/erm-channel/home/home.component.spec.ts b/Mohem/src/app/erm-channel/home/home.component.spec.ts new file mode 100644 index 00000000..5ec1377b --- /dev/null +++ b/Mohem/src/app/erm-channel/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/erm-channel/home/home.component.ts b/Mohem/src/app/erm-channel/home/home.component.ts new file mode 100644 index 00000000..92b38fc5 --- /dev/null +++ b/Mohem/src/app/erm-channel/home/home.component.ts @@ -0,0 +1,19 @@ +import { Component, OnInit } from '@angular/core'; +import { NavController } from '@ionic/angular'; +import { CommonService } from 'src/app/hmg-common/services/common/common.service'; + +@Component({ + selector: 'app-home', + templateUrl: './home.component.html', + styleUrls: ['./home.component.scss'], +}) +export class HomeComponent implements OnInit { + + constructor(public nav: NavController,) { } + + ngOnInit() { } + skip() { + this.nav.pop(); + CommonService.SKIP = true; + } +} diff --git a/Mohem/src/app/erm-channel/survey/survey.component.html b/Mohem/src/app/erm-channel/survey/survey.component.html new file mode 100644 index 00000000..e0a38107 --- /dev/null +++ b/Mohem/src/app/erm-channel/survey/survey.component.html @@ -0,0 +1,71 @@ + +
Skip
+ + + + This is to get feedback about the user experience + + + + + + +

1. How would you like to rate

+
+
+ + + + + +
+ + + +

2. How do you satisfied about this application

+
+
+ + + + + + + + + + + + + + + + + + + +
+ + +

Please give us a comments

+
+
+ + + + + + + + + + + +
+ +
+ + {{'general,submit' | translate}} + +
+
\ No newline at end of file diff --git a/Mohem/src/app/erm-channel/survey/survey.component.scss b/Mohem/src/app/erm-channel/survey/survey.component.scss new file mode 100644 index 00000000..6746f0f9 --- /dev/null +++ b/Mohem/src/app/erm-channel/survey/survey.component.scss @@ -0,0 +1,50 @@ + +.survey-content{ + --background:#f5f5f5; + +} +.title-text{ font-size: 28px; font-weight: bold;text-align: center; margin-top:20%} +.survey-content{ + margin-top:50px; +} +.subheading{ + margin:30px 30px 0px 30px; + font-size: 20px; +font-weight: bold;} + +.bottom-line{ + height: 150px; +} +.doctor-card{ + background: #fff; + margin: 10px 20px 10px 20px; + border-radius: 10px; +} +.comments{ + margin-left: 20px; + margin-bottom: 0; + font-weight: bold; +} +.faces-row{ +margin-left: 20px; +margin-right:20px; +} +.faces-row ion-col{ + background: #fff; + text-align: center; + border-radius: 7px; + margin: 5px; +} +ion-footer .footer-button{ + --background: #259CB8; + width: 80%; +} +.skip-btn{ + position: absolute; + background: black; + color: #fff; + margin: 10px; + right: 10px; + padding: 5px; + border-radius: 5px; +} \ No newline at end of file diff --git a/Mohem/src/app/erm-channel/survey/survey.component.spec.ts b/Mohem/src/app/erm-channel/survey/survey.component.spec.ts new file mode 100644 index 00000000..702e7887 --- /dev/null +++ b/Mohem/src/app/erm-channel/survey/survey.component.spec.ts @@ -0,0 +1,27 @@ +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SurveyComponent } from './survey.component'; + +describe('SurveyComponent', () => { + let component: SurveyComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ SurveyComponent ], + schemas: [CUSTOM_ELEMENTS_SCHEMA], + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(SurveyComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/Mohem/src/app/erm-channel/survey/survey.component.ts b/Mohem/src/app/erm-channel/survey/survey.component.ts new file mode 100644 index 00000000..fbcc59ea --- /dev/null +++ b/Mohem/src/app/erm-channel/survey/survey.component.ts @@ -0,0 +1,20 @@ +import { Component, OnInit } from '@angular/core'; +import { NavController } from '@ionic/angular'; +import { CommonService } from 'src/app/hmg-common/services/common/common.service'; +import { TranslatorService } from 'src/app/hmg-common/services/translator/translator.service'; + +@Component({ + selector: 'app-survey', + templateUrl: './survey.component.html', + styleUrls: ['./survey.component.scss'], +}) +export class SurveyComponent implements OnInit { + rate: any; + constructor(public ts: TranslatorService, public cs: CommonService, public nav: NavController) { } + + ngOnInit() { } + skip() { + this.nav.pop(); + CommonService.SKIP = true; + } +} 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 da63c675..4c9c75ea 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -35,7 +35,7 @@ export class CommonService { public static MOHEMM_WIFI_SSID = ""; public static MOHEMM_WIFI_PASSWORD = ""; - + public static SKIP = false; public static months_en_long = [ 'January', 'February', @@ -81,8 +81,8 @@ export class CommonService { private progressLoaders: any[] = []; private loadingProgress: any; - public updateImage:boolean=false; - public setUpdateImg:any; + public updateImage: boolean = false; + public setUpdateImg: any; DT: any; activeType: any; constructor( @@ -105,7 +105,7 @@ export class CommonService { public diagnostic: Diagnostic, public iab: InAppBrowser, private menu: MenuController, - ) {} + ) { } public back() { // this.nav.pop(); @@ -118,61 +118,61 @@ export class CommonService { public getMonthName(value: number): string { switch (value) { - case 1: - return 'January'; - case 2: - return 'February'; - case 3: - return 'March'; - case 4: - return 'April'; - case 5: - return 'May'; - case 6: - return 'June'; - case 7: - return 'July'; - case 8: - return 'August'; - case 9: - return 'September'; - case 10: - return 'October'; - case 11: - return 'November'; - case 12: - return 'December'; + case 1: + return 'January'; + case 2: + return 'February'; + case 3: + return 'March'; + case 4: + return 'April'; + case 5: + return 'May'; + case 6: + return 'June'; + case 7: + return 'July'; + case 8: + return 'August'; + case 9: + return 'September'; + case 10: + return 'October'; + case 11: + return 'November'; + case 12: + return 'December'; } -} + } -public getMonthNameAr(value: number): string { + public getMonthNameAr(value: number): string { switch (value) { - case 1: - return 'يناير'; - case 2: - return ' فبراير'; - case 3: - return 'مارس'; - case 4: - return 'أبريل'; - case 5: - return 'مايو'; - case 6: - return 'يونيو'; - case 7: - return 'يوليو'; - case 8: - return 'أغسطس'; - case 9: - return 'سبتمبر'; - case 10: - return ' اكتوبر'; - case 11: - return ' نوفمبر'; - case 12: - return 'ديسمبر'; + case 1: + return 'يناير'; + case 2: + return ' فبراير'; + case 3: + return 'مارس'; + case 4: + return 'أبريل'; + case 5: + return 'مايو'; + case 6: + return 'يونيو'; + case 7: + return 'يوليو'; + case 8: + return 'أغسطس'; + case 9: + return 'سبتمبر'; + case 10: + return ' اكتوبر'; + case 11: + return ' نوفمبر'; + case 12: + return 'ديسمبر'; } -} + } public round(value: number, decimal: number): string { const valueStr = value.toString(); @@ -290,7 +290,7 @@ public getMonthNameAr(value: number): string { public confirmNotAllowedDialog() { this.openHome(); this.alertDialog( - () => {}, + () => { }, this.ts.trPK('general', 'ok'), this.ts.trPK('general', 'info'), this.ts.trPK('general', 'not-allowed') @@ -436,7 +436,7 @@ public getMonthNameAr(value: number): string { message: message, buttons: [ { - text:this.ts.trPK('general', 'ok'), + text: this.ts.trPK('general', 'ok'), handler: () => { if (onAccept) { onAccept(); @@ -587,8 +587,8 @@ public getMonthNameAr(value: number): string { public getDeviceType(): string { if (this.platform.is('mobile')) { - // return "Mobile " + (this.platform.is("ios") ? "Iphone" : "android"); - return (this.platform.is('ios') ? 'Iphone' : 'android'); + // return "Mobile " + (this.platform.is("ios") ? "Iphone" : "android"); + return (this.platform.is('ios') ? 'Iphone' : 'android'); } else { return 'Desktop'; @@ -620,7 +620,7 @@ public getMonthNameAr(value: number): string { private openBrowserHtml(url, onExit?, onFaild?, onSuccess?) { const browser = window.open(url, '_blank', 'location=no'); - browser.addEventListener('loadstart', () => {}); + browser.addEventListener('loadstart', () => { }); browser.addEventListener('loaderror', () => { if (onFaild) { @@ -696,7 +696,7 @@ public getMonthNameAr(value: number): string { public openLocation(lat: number, lng: number) { this.platform.ready().then(() => { this.launchNavigation.navigate([lat, lng]).then( - () => {}, + () => { }, err => { // this.failedToOpenMap(); window.open('https://maps.google.com/?q=' + lat + ',' + lng); @@ -896,7 +896,7 @@ public getMonthNameAr(value: number): string { return targetCode >= minDigit && targetCode <= maxDigit; } - public enterPage() {} + public enterPage() { } private smsAlertDialog = null; public presentSMSPasswordDialog( @@ -928,7 +928,7 @@ public getMonthNameAr(value: number): string { text: this.ts.trPK('general', 'cancel'), role: 'cancel', cssClass: 'cancel-button', - handler: () => {} + handler: () => { } }, { text: this.ts.trPK('general', 'ok'), @@ -1075,10 +1075,10 @@ public getMonthNameAr(value: number): string { /* open calls */ - public openAttenTrackingpage(){ + public openAttenTrackingpage() { this.nav.navigateForward(['/attendance-tracking/home']); } - public openAttendanceOptionsComponent(){ + public openAttendanceOptionsComponent() { this.nav.navigateForward(['/home/attendance-option']); } public openEitListPage() { @@ -1129,10 +1129,10 @@ public getMonthNameAr(value: number): string { public openPage(link: string) { this.nav.navigateForward([link]); } - public static myTeamDetailUrl =['/my-team/details','/my-team/details-2'] + public static myTeamDetailUrl = ['/my-team/details', '/my-team/details-2'] public openMyTeamDetails() { - this.alternateNavigate(CommonService.myTeamDetailUrl,'teamDetail-open',true); - // this.nav.navigateForward(["/my-team/details"]); + this.alternateNavigate(CommonService.myTeamDetailUrl, 'teamDetail-open', true); + // this.nav.navigateForward(["/my-team/details"]); } public openAbsencePage() { this.nav.navigateForward(['/absence/home']); @@ -1183,7 +1183,7 @@ public getMonthNameAr(value: number): string { this.nav.navigateForward(['/notification/item-history-PO']); } - public openMOItemHistoryPage(){ + public openMOItemHistoryPage() { this.nav.navigateForward(['/notification/item-history-MO']); } public openQutationAnalysisPage() { @@ -1237,7 +1237,7 @@ public getMonthNameAr(value: number): string { } - + public navigatePage(path) { this.nav.navigateForward([path]); } @@ -1264,7 +1264,7 @@ public getMonthNameAr(value: number): string { this.nav.navigateBack([url]); } - + private alternateNavigate(paths: string[], key: string, root = false) { let url: string; if (localStorage.getItem(key) === 'yes') { @@ -1385,7 +1385,7 @@ public getMonthNameAr(value: number): string { public formatDate(date) { let FormatedDate; console.log(date); - + if (date) { date = date.slice(0, 10); FormatedDate = date.replace(/-/g, '/'); @@ -1410,34 +1410,34 @@ public getMonthNameAr(value: number): string { return FormatedDate; } - public setUpdateImage (image,status?){ + public setUpdateImage(image, status?) { console.log('setUpdateImage'); - this.setUpdateImg=image; - this.updateImage=status; + this.setUpdateImg = image; + this.updateImage = status; } - public getUpdateImage(){ + public getUpdateImage() { console.log('getUpdateImage'); - const objImg={ - img: this.setUpdateImg, + const objImg = { + img: this.setUpdateImg, status: this.updateImage } return objImg; - + + } + setDeviceToken(deviceToken) { + this.DT = deviceToken; } - setDeviceToken(deviceToken){ - this.DT=deviceToken; - } - getDeviceToken(){ - return this.DT; - } + getDeviceToken() { + return this.DT; + } - setActiveTypeLogin(activeType){ - this.activeType=activeType; - } + setActiveTypeLogin(activeType) { + this.activeType = activeType; + } - getActiveTypeLogin(){ - return this.activeType; - } + getActiveTypeLogin() { + return this.activeType; + } } 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 e3d2cc13..352d691d 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -27,13 +27,13 @@ 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, - private events: Events, - public ts: TranslatorService) {} + public cs: CommonService, + private events: Events, + public ts: TranslatorService) { } public post( service: string, @@ -98,18 +98,18 @@ export class ConnectorService { public postNoLoad(service: string, data: any, onError: any, errorLabel?: string): Observable { return this.httpClient - .post( + .post( ConnectorService.host + service, data, ConnectorService.httpOptions) - .pipe( - timeout(ConnectorService.timeOut), - retry(ConnectorService.retryTimes), - tap((res) => { - this.handleResponse(res, onError, errorLabel, true); - }, (error) => { - this.handleError(error, onError, errorLabel, true); - })); + .pipe( + timeout(ConnectorService.timeOut), + retry(ConnectorService.retryTimes), + tap((res) => { + this.handleResponse(res, onError, errorLabel, true); + }, (error) => { + this.handleError(error, onError, errorLabel, true); + })); } // absolute url connection @@ -198,23 +198,23 @@ export class ConnectorService { let deviceToken = localStorage.getItem('deviceToken'); const requestGetLoginInfo = { - DeviceType: this.cs.getDeviceType(), - DeviceToken: deviceToken + DeviceType: this.cs.getDeviceType(), + DeviceToken: deviceToken }; - this.getLoginInfo(requestGetLoginInfo, () => {}, this.ts.trPK('general', 'ok')).subscribe(res => { + this.getLoginInfo(requestGetLoginInfo, () => { }, this.ts.trPK('general', 'ok')).subscribe(res => { if (this.cs.validResponse(res)) { - if (res.Mohemm_GetMobileLoginInfoList.length > 0) { - this.cs.sharedService.setSharedData(res.Mohemm_GetMobileLoginInfoList[0], 'imei-user-data'); - const user = true; - this.events.publish('user', user); - this.cs.openLogin(); - } else { - const user = false; - this.events.publish('user', user); - this.cs.openLogin(); - } - } else {} + if (res.Mohemm_GetMobileLoginInfoList.length > 0) { + this.cs.sharedService.setSharedData(res.Mohemm_GetMobileLoginInfoList[0], 'imei-user-data'); + const user = true; + this.events.publish('user', user); + this.cs.openLogin(); + } else { + const user = false; + this.events.publish('user', user); + this.cs.openLogin(); + } + } else { } }); } @@ -257,7 +257,7 @@ export class ConnectorService { this.cs.stopLoading(); this.cs.presentAcceptDialog(result.ErrorEndUserMessage, () => { console.log("presentAcceptDialog"); - this.cs.sharedService.clearAll(); + this.cs.sharedService.clearAll(); // this.cs.openLogin(); this.getLastLoginInfo(); }); diff --git a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.html b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.html index f2e3b4a3..a41dd15d 100644 --- a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.html +++ b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.html @@ -1,12 +1,12 @@
- + - - + +
diff --git a/Mohem/src/app/home/home.page.html b/Mohem/src/app/home/home.page.html index 9c9ed380..aada661e 100644 --- a/Mohem/src/app/home/home.page.html +++ b/Mohem/src/app/home/home.page.html @@ -56,17 +56,27 @@ + - - - - - - - - - - + + + {{'general,other-services' | translate}} + + + + + + + + + + + + + + + + diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index 07934f42..3eaf395c 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -783,7 +783,7 @@ export class HomePage implements OnInit { return await modal.present(); } itemForSale() { - this.common.navigateForward('/itemforsale/home'); + this.common.navigateForward('/itemforsale/items'); } offersDiscount() { this.common.navigateForward('/offersdiscount/home'); diff --git a/Mohem/src/app/itemforsale/home/home.component.html b/Mohem/src/app/itemforsale/home/home.component.html index ef0a3a6c..709ca806 100644 --- a/Mohem/src/app/itemforsale/home/home.component.html +++ b/Mohem/src/app/itemforsale/home/home.component.html @@ -13,14 +13,14 @@
-
Select Category
-
Completed
+
{{ts.trPK('itemforsale','select-category')}}
+
{{ts.trPK('itemforsale','completed')}}
-
Add Details
+
{{ts.trPK('itemforsale','add-details')}}
{{step >2 ? "Completed" : "Locked"}}
@@ -28,7 +28,7 @@
-
Review & Sell
+
{{ts.trPK('itemforsale','review-sell')}}
{{step >3 ? "Completed" : "Locked"}}
diff --git a/Mohem/src/app/itemforsale/itemforsale.module.ts b/Mohem/src/app/itemforsale/itemforsale.module.ts index bde723c4..6a7aea24 100644 --- a/Mohem/src/app/itemforsale/itemforsale.module.ts +++ b/Mohem/src/app/itemforsale/itemforsale.module.ts @@ -10,6 +10,7 @@ import { HomeComponent } from './home/home.component'; import { ItemsComponent } from './items/items.component'; import { ItemDetailsComponent } from './item-details/item-details.component'; import { MyAdsComponent } from './my-ads/my-ads.component'; +import { HmgCommonModule } from '../hmg-common/hmg-common.module'; const routes: Routes = [ { @@ -41,6 +42,7 @@ const routes: Routes = [ CommonModule, FormsModule, IonicModule, + HmgCommonModule, RouterModule.forChild(routes) ], declarations: [ItemforsalePage, HomeComponent, ItemsComponent, ItemDetailsComponent, MyAdsComponent] diff --git a/Mohem/src/app/itemforsale/items/items.component.html b/Mohem/src/app/itemforsale/items/items.component.html index 3b1d5d63..65186524 100644 --- a/Mohem/src/app/itemforsale/items/items.component.html +++ b/Mohem/src/app/itemforsale/items/items.component.html @@ -8,31 +8,34 @@
- + - Item for sale + {{ts.trPK('itemforsale','title')}} - My Posted Ads + {{ts.trPK('itemforsale','my-posted-ad')}}
- +
+
+ +
- + -

Browse Category

+

{{ts.trPK('itemforsale','browse-categories')}}

@@ -149,6 +152,7 @@
+
@@ -173,12 +177,13 @@ +
- - + +
- - {{ts.trPK('general','next')}} + + {{ts.trPK('itemforsale','create-new-ad')}}
diff --git a/Mohem/src/app/itemforsale/items/items.component.scss b/Mohem/src/app/itemforsale/items/items.component.scss index 01fd8409..96f389c8 100644 --- a/Mohem/src/app/itemforsale/items/items.component.scss +++ b/Mohem/src/app/itemforsale/items/items.component.scss @@ -75,6 +75,11 @@ ion-card-title{ .green{ color:#00AE4D; } +ion-segment-button{ + --background-checked: #000; + --indicator-color : transparent!important; + border: none; +} ion-segment-button ion-label{ padding: 0; font-size: 12px; @@ -105,4 +110,26 @@ margin: 5px; } .edit{ margin-left:20px !important; +} +.fab-button{ + position: fixed; + bottom: 5%; + z-index: 2; + right: 10%; +} +.fab-button ion-fab-button{ + --background: #259CB8; +} +ion-footer{ + position: absolute; + bottom: 0; +} +ion-footer .footer-button{ + --background: #259CB8; + width: 80%; + background: #259CB8; + border-radius: 10px; +} +ion-segment{ + height:40px } \ No newline at end of file diff --git a/Mohem/src/app/itemforsale/items/items.component.ts b/Mohem/src/app/itemforsale/items/items.component.ts index f93913bb..73fc2398 100644 --- a/Mohem/src/app/itemforsale/items/items.component.ts +++ b/Mohem/src/app/itemforsale/items/items.component.ts @@ -18,4 +18,8 @@ export class ItemsComponent implements OnInit { segmentChanged(value) { this.segment = value.detail.value; } + openSale() { + this.cs.navigateForward('/itemforsale/home'); + } + } diff --git a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html index 0f66b227..d34d972a 100644 --- a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html +++ b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html @@ -474,7 +474,7 @@ {{action.name}} - Request Info + {{'worklistMain, worklistMain' | translate}} diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html index 5df1b8b5..7a2f6d89 100644 --- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html +++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html @@ -58,7 +58,7 @@ - + @@ -108,7 +108,7 @@ -
+
diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss index a7c50320..bf94ef38 100644 --- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss +++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss @@ -27,9 +27,13 @@ } .star-fav{ float: right; - margin: 15px; + margin: 10px; + } + .star-fav-left{ + float: right; + margin: 10px 5px; } - .uk-margin{margin: 15px 0px 0px 15px; + .uk-margin{margin: 15px 15px 0px 15px; font-weight: bold; clear: both; position: relative; @@ -57,4 +61,5 @@ } .square{ clear: both; - } \ No newline at end of file + } + \ No newline at end of file diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html index 7536c23e..a0af5788 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html @@ -40,7 +40,7 @@ - + @@ -75,7 +75,7 @@ {{employee.NAME}} -
+
@@ -100,7 +100,7 @@ {{employee.EMPLOYEE_DISPLAY_NAME}} -
+
@@ -128,7 +128,7 @@ -
+
@@ -162,7 +162,7 @@ - +

diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss index ac775fbf..b9b5da54 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss @@ -81,16 +81,18 @@ button.item-button.button.button-md.button-clear.button-clear-md { border-radius: 21px; padding-left: 10px !important; } + .filterInput-ar{ // border: solid var(--gray) 1px; // border-radius: 21px; // padding-left: 10px !important; border: solid var(--gray) 1px; border-radius: 21px; + // width:250px // padding-left: 145px !important; - margin-left: 123px; + //margin-left: 123px; // padding-right: 129px; - margin-right: -136px; + //margin-right: -136px; } .filterBtn{ @@ -178,9 +180,9 @@ ion-radio{ } .star-fav{ float: right; - margin: 15px; + margin: 15px 0px 0px 0px; } -.uk-margin{margin: 15px 0px 0px 15px; +.uk-margin{margin: 15px 15px 0px 15px; font-weight: bold; clear: both; position: relative; @@ -190,4 +192,8 @@ ion-radio{ bottom: 10px; position: relative;} + .star-fav-left{ + float: left; + margin: 10px 5px; + } \ No newline at end of file diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts index b6557cc5..71b1570d 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts @@ -78,6 +78,7 @@ export class WorkListReplacementRollComponent implements OnInit { if (requestInfoDel != null) { this.userSelected = true; this.inputSearch = requestInfoDel.NAME; + this.selEmp = requestInfoDel; } } diff --git a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.scss b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.scss index c40369aa..b625942e 100644 --- a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.scss +++ b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.scss @@ -87,6 +87,7 @@ border-radius: 21px; padding-left: 10px !important; } + .filterBtn{ background: var(--newgreen); --background: var (--newgreen); diff --git a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.scss b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.scss index 409f7446..cf5e4beb 100644 --- a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.scss +++ b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.scss @@ -42,9 +42,9 @@ font-size: 10px; } .req_info{ - width: 25px; - height: 25px; + width: 20px; + height: 20px; display: inline-block; - margin: 5px; + margin:15px 10px 0px 0px; } \ No newline at end of file diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss index 61bff403..ee5a0d37 100644 --- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss +++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss @@ -34,10 +34,10 @@ font-size: 10px; } .req_info{ - width: 25px; - height: 25px; + width: 20px; + height: 20px; display: inline-block; - margin: 5px; + margin: 15px 10px 0px 0px; } .name{ color:black !important ;font-weight: bold; diff --git a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.scss b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.scss index 409f7446..d5902df1 100644 --- a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.scss +++ b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.scss @@ -42,9 +42,9 @@ font-size: 10px; } .req_info{ - width: 25px; - height: 25px; + width: 20px; + height: 20px; display: inline-block; - margin: 5px; + margin: 15px 10px 0px 0px; } \ No newline at end of file diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss index 76877e22..a8895a39 100644 --- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss +++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss @@ -44,8 +44,8 @@ font-size: 10px; } .req_info{ - width: 25px; - height: 25px; + width: 20px; + height: 20px; display: inline-block; - margin: 5px; + margin:15px 10px 0px 0px; } diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss index d9e971bd..e8434bee 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss @@ -97,12 +97,13 @@ .dateActionHistory{ display: inline-block; margin-left: 5px; + text-align: left; } .req_info{ - width: 25px; - height: 25px; + width: 20px; + height: 20px; display: inline-block; - margin: 5px; + margin: 15px 10px 0px 0px; } diff --git a/Mohem/src/app/offersdiscount/home/home.component.html b/Mohem/src/app/offersdiscount/home/home.component.html index c3fe6413..133c86cc 100644 --- a/Mohem/src/app/offersdiscount/home/home.component.html +++ b/Mohem/src/app/offersdiscount/home/home.component.html @@ -4,7 +4,7 @@ - {{ts.trPK('itemforsale','title')}} + {{ts.trPK('itemforsale','offersdiscount')}}
@@ -17,13 +17,13 @@ - + -

Browse Category

+

{{ts.trPK('itemforsale','browse-categories')}}

diff --git a/Mohem/src/app/offersdiscount/offer-details/offer-details.component.html b/Mohem/src/app/offersdiscount/offer-details/offer-details.component.html index 6e684c6d..df6095d9 100644 --- a/Mohem/src/app/offersdiscount/offer-details/offer-details.component.html +++ b/Mohem/src/app/offersdiscount/offer-details/offer-details.component.html @@ -4,7 +4,7 @@ - {{ts.trPK('itemforsale','title')}} + {{ts.trPK('itemforsale','offersdiscount')}}
diff --git a/Mohem/src/app/offersdiscount/offersdiscount.module.ts b/Mohem/src/app/offersdiscount/offersdiscount.module.ts index 4c53786e..c453cbe2 100644 --- a/Mohem/src/app/offersdiscount/offersdiscount.module.ts +++ b/Mohem/src/app/offersdiscount/offersdiscount.module.ts @@ -8,6 +8,7 @@ import { IonicModule } from '@ionic/angular'; import { OffersdiscountPage } from './offersdiscount.page'; import { HomeComponent } from './home/home.component'; import { OfferDetailsComponent } from './offer-details/offer-details.component'; +import { HmgCommonModule } from '../hmg-common/hmg-common.module'; const routes: Routes = [ @@ -34,6 +35,7 @@ const routes: Routes = [ CommonModule, FormsModule, IonicModule, + HmgCommonModule, RouterModule.forChild(routes) ], declarations: [OffersdiscountPage, HomeComponent, OfferDetailsComponent] diff --git a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss index b8e5d124..d44e960a 100644 --- a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss +++ b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss @@ -116,8 +116,8 @@ button.item-button.button.button-md.button-clear.button-clear-md { .filterInput-ar{ border: solid var(--gray) 1px; border-radius: 21px; - margin-left: 115px; - margin-right: -132px; + // margin-left: 115px; + // margin-right: -132px; } .filterBtn{ diff --git a/Mohem/src/assets/icon/home/HR req.png b/Mohem/src/assets/icon/home/HR req.png new file mode 100644 index 00000000..77bb9db7 Binary files /dev/null and b/Mohem/src/assets/icon/home/HR req.png differ diff --git a/Mohem/src/assets/icon/home/announcement@2x.png b/Mohem/src/assets/icon/home/announcement@2x.png new file mode 100644 index 00000000..f80dd054 Binary files /dev/null and b/Mohem/src/assets/icon/home/announcement@2x.png differ diff --git a/Mohem/src/assets/icon/home/item_for_sale.png b/Mohem/src/assets/icon/home/item_for_sale.png new file mode 100644 index 00000000..2e9cbbe3 Binary files /dev/null and b/Mohem/src/assets/icon/home/item_for_sale.png differ diff --git a/Mohem/src/assets/icon/home/offers_discount.png b/Mohem/src/assets/icon/home/offers_discount.png new file mode 100644 index 00000000..d081b00c Binary files /dev/null and b/Mohem/src/assets/icon/home/offers_discount.png differ diff --git a/Mohem/src/assets/icon/rate/bad.svg b/Mohem/src/assets/icon/rate/bad.svg new file mode 100644 index 00000000..1a717423 --- /dev/null +++ b/Mohem/src/assets/icon/rate/bad.svg @@ -0,0 +1,3 @@ + + + diff --git a/Mohem/src/assets/icon/rate/close.svg b/Mohem/src/assets/icon/rate/close.svg new file mode 100644 index 00000000..195fbfe8 --- /dev/null +++ b/Mohem/src/assets/icon/rate/close.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/Mohem/src/assets/icon/rate/dislike.svg b/Mohem/src/assets/icon/rate/dislike.svg new file mode 100644 index 00000000..9a70b738 --- /dev/null +++ b/Mohem/src/assets/icon/rate/dislike.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Mohem/src/assets/icon/rate/good.svg b/Mohem/src/assets/icon/rate/good.svg new file mode 100644 index 00000000..690d4d0b --- /dev/null +++ b/Mohem/src/assets/icon/rate/good.svg @@ -0,0 +1,3 @@ + + + diff --git a/Mohem/src/assets/icon/rate/info.svg b/Mohem/src/assets/icon/rate/info.svg new file mode 100644 index 00000000..039dfff8 --- /dev/null +++ b/Mohem/src/assets/icon/rate/info.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/Mohem/src/assets/icon/rate/like.svg b/Mohem/src/assets/icon/rate/like.svg new file mode 100644 index 00000000..4611580d --- /dev/null +++ b/Mohem/src/assets/icon/rate/like.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/Mohem/src/assets/icon/rate/normal.svg b/Mohem/src/assets/icon/rate/normal.svg new file mode 100644 index 00000000..1885ab6a --- /dev/null +++ b/Mohem/src/assets/icon/rate/normal.svg @@ -0,0 +1,3 @@ + + + diff --git a/Mohem/src/assets/icon/rate/poor.svg b/Mohem/src/assets/icon/rate/poor.svg new file mode 100644 index 00000000..95ce430d --- /dev/null +++ b/Mohem/src/assets/icon/rate/poor.svg @@ -0,0 +1,3 @@ + + + diff --git a/Mohem/src/assets/icon/rate/star-half.svg b/Mohem/src/assets/icon/rate/star-half.svg new file mode 100644 index 00000000..2b0894e5 --- /dev/null +++ b/Mohem/src/assets/icon/rate/star-half.svg @@ -0,0 +1,4 @@ + + + + diff --git a/Mohem/src/assets/icon/rate/star-unfill.svg b/Mohem/src/assets/icon/rate/star-unfill.svg new file mode 100644 index 00000000..0b0fc380 --- /dev/null +++ b/Mohem/src/assets/icon/rate/star-unfill.svg @@ -0,0 +1,4 @@ + + + + diff --git a/Mohem/src/assets/icon/rate/star0fill.svg b/Mohem/src/assets/icon/rate/star0fill.svg new file mode 100644 index 00000000..51627d8f --- /dev/null +++ b/Mohem/src/assets/icon/rate/star0fill.svg @@ -0,0 +1,3 @@ + + + diff --git a/Mohem/src/assets/icon/rate/xcellent.svg b/Mohem/src/assets/icon/rate/xcellent.svg new file mode 100644 index 00000000..eab98b33 --- /dev/null +++ b/Mohem/src/assets/icon/rate/xcellent.svg @@ -0,0 +1,3 @@ + + + diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 66beb226..a1c75dfe 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -213,6 +213,18 @@ "en": "Allow the Mohemm app to access your location for marking your attendance", "ar": "اسمح لتطبيق مهم بالوصول إلى موقعك لتحديد حضورك" }, + "other-services": { + "en": "Other Services", + "ar": "خدمات أخرى" + }, + "items-sales": { + "en": "Items for sale", + "ar": "بضاعه للبع" + }, + "offers-discount": { + "en": "Offers & Discount", + "ar": "العروض والخصومات" + }, "not-now": { "en": "not now", "ar": "لاحقاً" @@ -2083,121 +2095,121 @@ "en": "you shoud add comment", "ar": "يجب عليك اضافة تعليق" }, - "product-name":{ - "en":"Product Name", - "ar":"اسم المنتج" + "product-name": { + "en": "Product Name", + "ar": "اسم المنتج" }, - "product-description":{ - "en":"Product Description", - "ar":"وصف للمنتج" + "product-description": { + "en": "Product Description", + "ar": "وصف للمنتج" }, - "Unit-price":{ - "en":"Unit Price", - "ar":"سعر الوحدة" + "Unit-price": { + "en": "Unit Price", + "ar": "سعر الوحدة" }, - "manufacturer-name":{ - "en":"Manufacturer Name", - "ar":"اسم المصنع" + "manufacturer-name": { + "en": "Manufacturer Name", + "ar": "اسم المصنع" }, - "manufacturer-part-number":{ - "en":"Manufacturer Part Number", - "ar":"رقم قطعة المصنع" + "manufacturer-part-number": { + "en": "Manufacturer Part Number", + "ar": "رقم قطعة المصنع" }, - "supplier-name":{ - "en":"Supplier Name", - "ar":"اسم المورد" + "supplier-name": { + "en": "Supplier Name", + "ar": "اسم المورد" }, - "supplier-contact":{ - "en":"Supplier Contact", - "ar":"عقد المورد" + "supplier-contact": { + "en": "Supplier Contact", + "ar": "عقد المورد" }, - "charge-to-patient":{ - "en":"Charge to Patient", - "ar":"رسوم على المرضى" + "charge-to-patient": { + "en": "Charge to Patient", + "ar": "رسوم على المرضى" }, - "justification":{ - "en":"Justification", - "ar":"تبرير" + "justification": { + "en": "Justification", + "ar": "تبرير" }, - "item-code":{ - "en":"Item Code", - "ar":"رمز الصنف" + "item-code": { + "en": "Item Code", + "ar": "رمز الصنف" }, - "item-description":{ - "en":"Item Description", - "ar":"وصف الصنف" + "item-description": { + "en": "Item Description", + "ar": "وصف الصنف" }, - "group-code":{ - "en":"Group Code", - "ar":"رمز المجموعة" + "group-code": { + "en": "Group Code", + "ar": "رمز المجموعة" }, - "group-description":{ - "en":"Group Description", - "ar":"وصف المجموعة" + "group-description": { + "en": "Group Description", + "ar": "وصف المجموعة" }, - "subgroup-code":{ - "en":"Subgroup Code", - "ar":"رمز المجموعة الفرعية" + "subgroup-code": { + "en": "Subgroup Code", + "ar": "رمز المجموعة الفرعية" }, - "subgroup-description":{ - "en":"Subgroup Description", - "ar":"وصف المجموعة الفرعية" + "subgroup-description": { + "en": "Subgroup Description", + "ar": "وصف المجموعة الفرعية" }, - "primary-uom":{ - "en":"Primary UOM", - "ar":"Primary UOM" + "primary-uom": { + "en": "Primary UOM", + "ar": "Primary UOM" }, - "template-name":{ - "en":"Template Name", - "ar":"اسم القالب" + "template-name": { + "en": "Template Name", + "ar": "اسم القالب" }, - "item-creation-status":{ - "en":"Item Creation Status", - "ar":"حالة انشاء العنصر" + "item-creation-status": { + "en": "Item Creation Status", + "ar": "حالة انشاء العنصر" }, - "standardization-approval-status":{ - "en":"Standardization Approval Status", - "ar":"حالةالموافقة على المعايرة" + "standardization-approval-status": { + "en": "Standardization Approval Status", + "ar": "حالةالموافقة على المعايرة" }, - "standardization-approval-rejection-reason":{ - "en":"Standardization Approval Rejection Reason", - "ar":"سبب رفض الموافقة على المعايرة" + "standardization-approval-rejection-reason": { + "en": "Standardization Approval Rejection Reason", + "ar": "سبب رفض الموافقة على المعايرة" }, - "category":{ - "en":"Category", - "ar":"فئة" + "category": { + "en": "Category", + "ar": "فئة" }, - "requester":{ - "en":"Requester", - "ar":"مقدم الطلب" + "requester": { + "en": "Requester", + "ar": "مقدم الطلب" }, - "analyzed-by":{ - "en":"Analyzed By", - "ar":"تحليل بواسطة" + "analyzed-by": { + "en": "Analyzed By", + "ar": "تحليل بواسطة" }, - "approved-date":{ - "en":"Approved Date", - "ar":"تاريخ الموافقة" + "approved-date": { + "en": "Approved Date", + "ar": "تاريخ الموافقة" }, - "item-type":{ - "en":"Item Type", - "ar":"نوع الصنف" + "item-type": { + "en": "Item Type", + "ar": "نوع الصنف" }, - "related-to":{ - "en":"Related To", - "ar":"" + "related-to": { + "en": "Related To", + "ar": "" }, - "request-date":{ - "en":"Request Date", - "ar":"متعلق بـ" + "request-date": { + "en": "Request Date", + "ar": "متعلق بـ" }, - "analyzed-date":{ - "en":"Analyzed Date", - "ar":"تاريخ التحليل" + "analyzed-date": { + "en": "Analyzed Date", + "ar": "تاريخ التحليل" }, - "urgent":{ - "en":"Urgent", - "ar":"عاجل" + "urgent": { + "en": "Urgent", + "ar": "عاجل" } }, "worklistMain": { @@ -2772,6 +2784,42 @@ "title": { "en": "Item for sale", "ar": "سلعه للبيع" + }, + "my-posted-ad": { + "en": "My Posted Ads", + "ar": "إعلاناتي المنشورة" + }, + "browse-categories": { + "en": "Browse Categories", + "ar": "تصفح الفئات" + }, + "create-new-ad": { + "en": "Create new ad", + "ar": "إنشاء إعلان جديد" + }, + "select-category": { + "en": "Select Category", + "ar": "اختر الفئة" + }, + "completed": { + "en": "Completed", + "ar": "مكتمل" + }, + "add-details": { + "en": "Add Details", + "ar": "أضف التفاصيل" + }, + "review-sell": { + "en": "Review & Sell", + "ar": "مراجعة وبيع" + }, + "search-items": { + "en": "Search Items", + "ar": "عناصر البحث" + }, + "offersdiscount": { + "en": "Offers & Discount", + "ar": "العروض والخصومات" } }, "attendance-tracking": { diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index 3c3a5deb..e47b5f2f 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1571,4 +1571,17 @@ table.monthview-datetable th small { .fav-profileImageDiv{ width: 100%; text-align: start; -} \ No newline at end of file +} +ion-segment-button { + --indicator-color: transparent !important; + --indicator-color-checked: transparent !important; + } + #surveyRatingNew ion-button{ + background: #fff !important; + } + #surveyRatingNew ion-buttons{ + border-radius: 12px; + background: #fff; + width: 75%; + margin: auto; + } \ No newline at end of file diff --git a/Mohem/src/theme/worklist.scss b/Mohem/src/theme/worklist.scss index 6d003cfc..e872fddf 100644 --- a/Mohem/src/theme/worklist.scss +++ b/Mohem/src/theme/worklist.scss @@ -475,7 +475,7 @@ left: 66px; } .dateActionHistory{ - text-align: end; + text-align: start; // margin-top: -25px; }