diff --git a/src/app/pages/jobmessage/jobmessage.page.html b/src/app/pages/jobmessage/jobmessage.page.html index a91b384..83d5cce 100644 --- a/src/app/pages/jobmessage/jobmessage.page.html +++ b/src/app/pages/jobmessage/jobmessage.page.html @@ -21,14 +21,29 @@ -
+
+
+
{{item.msg_from}} - + {{item.msg_date}} +
+
{{item.msg}}
+
+ +
+
+ - {{item.msg_from}} - {{item.msg_date}} + {{item.msg_from}} - + {{item.msg_date}} + {{item.msg}} - Relply + + + + + diff --git a/src/app/pages/jobmessage/jobmessage.page.scss b/src/app/pages/jobmessage/jobmessage.page.scss index 43ff1e2..3a63a78 100644 --- a/src/app/pages/jobmessage/jobmessage.page.scss +++ b/src/app/pages/jobmessage/jobmessage.page.scss @@ -1,3 +1,22 @@ +.msg-list{ + background-color: aliceblue; + width: 100%; + margin: 5px 0px 10px 0px; + border-radius: 10px; + padding: 10px; + + .mdate{ + font-weight: bolder; + color: darkorchid; + font-size: 12px; + } + .mmsg{ + color: black; + font-size: 12px; + margin-left: 15px; + } +} + .msg-list { margin-top: 10px; diff --git a/src/app/pages/ownersjob/ownersjob.module.ts b/src/app/pages/ownersjob/ownersjob.module.ts index e9c6dcc..f85ce48 100644 --- a/src/app/pages/ownersjob/ownersjob.module.ts +++ b/src/app/pages/ownersjob/ownersjob.module.ts @@ -8,6 +8,7 @@ import { OwnersjobPageRoutingModule } from './ownersjob-routing.module'; import { OwnersjobPage } from './ownersjob.page'; import {MyjobOffersComponent} from "../../components/myjob-offers/myjob-offers.component"; +import {JobDetailsComponent} from "../../components/job-details/job-details.component"; @NgModule({ imports: [ @@ -16,6 +17,6 @@ import {MyjobOffersComponent} from "../../components/myjob-offers/myjob-offers.c IonicModule, OwnersjobPageRoutingModule ], - declarations: [OwnersjobPage,MyjobOffersComponent] + declarations: [OwnersjobPage,MyjobOffersComponent,JobDetailsComponent] }) export class OwnersjobPageModule {} diff --git a/src/app/pages/ownersjob/ownersjob.page.html b/src/app/pages/ownersjob/ownersjob.page.html index 7fd92eb..8949c5a 100644 --- a/src/app/pages/ownersjob/ownersjob.page.html +++ b/src/app/pages/ownersjob/ownersjob.page.html @@ -105,13 +105,14 @@ Recipient Email - - - - - - - + + + + + + + + @@ -149,8 +150,7 @@
- - +
diff --git a/src/app/pages/profile/profile.module.ts b/src/app/pages/profile/profile.module.ts index 64c1127..79d13b3 100644 --- a/src/app/pages/profile/profile.module.ts +++ b/src/app/pages/profile/profile.module.ts @@ -1,11 +1,3 @@ -/* - Authors : initappz (Rahul Jograna) - Website : https://initappz.com/ - App Name : E-Learning App Template - This App Template Source code is licensed as per the - terms found in the Website https://initappz.com/license - Copyright and Good Faith Purchasers © 2021-present initappz. -*/ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; @@ -15,6 +7,7 @@ import { IonicModule } from '@ionic/angular'; import { ProfilePageRoutingModule } from './profile-routing.module'; import { ProfilePage } from './profile.page'; +import {HelpListingComponent} from "../../components/help-listing/help-listing.component"; @NgModule({ imports: [ @@ -23,6 +16,6 @@ import { ProfilePage } from './profile.page'; IonicModule, ProfilePageRoutingModule ], - declarations: [ProfilePage] + declarations: [ProfilePage,HelpListingComponent] }) export class ProfilePageModule { } diff --git a/src/app/pages/profile/profile.page.html b/src/app/pages/profile/profile.page.html index fb3d92f..b84bc19 100644 --- a/src/app/pages/profile/profile.page.html +++ b/src/app/pages/profile/profile.page.html @@ -208,3 +208,40 @@ + + + + + + Help + + Close + + + + + + + + + + + + + + + Close + + + + + + + + + + \ No newline at end of file diff --git a/src/app/pages/profile/profile.page.ts b/src/app/pages/profile/profile.page.ts index 86b8152..0325aad 100644 --- a/src/app/pages/profile/profile.page.ts +++ b/src/app/pages/profile/profile.page.ts @@ -2,6 +2,7 @@ import { Router } from '@angular/router'; import { Component, OnInit } from '@angular/core'; import { SessionDataProviderService } from 'src/app/store/session-data-provider.service'; import {AlertController} from "@ionic/angular"; +import {HelpDataService} from "../../store/help-data.service"; @Component({ selector: 'app-profile', @@ -18,7 +19,8 @@ export class ProfilePage implements OnInit { constructor( private router: Router, private alertController:AlertController, - public sessionDataProviderService:SessionDataProviderService + public sessionDataProviderService:SessionDataProviderService, + public helpDataService:HelpDataService ) { this.accountType = sessionDataProviderService.account_type; } @@ -62,7 +64,7 @@ export class ProfilePage implements OnInit { onPreferences(){} onHistory(){} - onHelp(){} + onInvite() { this.router.navigate(['invite']); } @@ -97,7 +99,17 @@ export class ProfilePage implements OnInit { }); await alert.present(); } + isModalOpen:boolean=false; + onHelp() { + this.helpDataService.getHelpData(); + this.isModalOpen = true; + } + + setCloseModal(){ + // debugger; + this.isModalOpen = false; + } // async requestLogout() { // const alert = await this.alertController.create({ // header: "Log out",