diff --git a/src/app/components/job-details/job-details.component.html b/src/app/components/job-details/job-details.component.html
new file mode 100644
index 0000000..9534c8c
--- /dev/null
+++ b/src/app/components/job-details/job-details.component.html
@@ -0,0 +1,21 @@
+
;
+
+ beforeEach(waitForAsync(() => {
+ TestBed.configureTestingModule({
+ declarations: [ JobDetailsComponent ],
+ imports: [IonicModule.forRoot()]
+ }).compileComponents();
+
+ fixture = TestBed.createComponent(JobDetailsComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ }));
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/components/job-details/job-details.component.ts b/src/app/components/job-details/job-details.component.ts
new file mode 100644
index 0000000..5850248
--- /dev/null
+++ b/src/app/components/job-details/job-details.component.ts
@@ -0,0 +1,28 @@
+import {Component, Input, OnInit} from '@angular/core';
+import {Router} from "@angular/router";
+import {SessionDataProviderService} from "../../store/session-data-provider.service";
+
+@Component({
+ selector: 'app-job-details',
+ templateUrl: './job-details.component.html',
+ styleUrls: ['./job-details.component.scss'],
+})
+export class JobDetailsComponent implements OnInit {
+ @Input('jobData') jobData:any;
+ session_image_server:string='';
+ curr_session:string='';
+ constructor(private router: Router, public sessionDataProviderService: SessionDataProviderService) {
+ // debugger;
+ //this.jobData = this.router.getCurrentNavigation().extras.state;
+ // if (this.jobData==undefined){
+ // return;
+ // }
+ }
+
+ ngOnInit() {
+ console.log("jobData => ", this.jobData);
+ this.session_image_server = this.sessionDataProviderService.session_image_server;
+ this.curr_session=this.sessionDataProviderService.session;
+ }
+
+}
diff --git a/src/app/pages/home/home.page.html b/src/app/pages/home/home.page.html
index c4ed679..2a98abc 100644
--- a/src/app/pages/home/home.page.html
+++ b/src/app/pages/home/home.page.html
@@ -28,7 +28,7 @@
-
+
diff --git a/src/app/pages/jobactive/jobactive.module.ts b/src/app/pages/jobactive/jobactive.module.ts
index 1e338d5..b49b87e 100644
--- a/src/app/pages/jobactive/jobactive.module.ts
+++ b/src/app/pages/jobactive/jobactive.module.ts
@@ -8,6 +8,7 @@ import { JobactivePageRoutingModule } from './jobactive-routing.module';
import { JobactivePage } from './jobactive.page';
import {TaskactivitiesComponent} from "../../components/taskactivities/taskactivities.component";
+import {JobDetailsComponent} from "../../components/job-details/job-details.component";
@NgModule({
imports: [
@@ -16,6 +17,6 @@ import {TaskactivitiesComponent} from "../../components/taskactivities/taskactiv
IonicModule,
JobactivePageRoutingModule
],
- declarations: [JobactivePage,TaskactivitiesComponent]
+ declarations: [JobactivePage,TaskactivitiesComponent,JobDetailsComponent]
})
export class JobactivePageModule {}
diff --git a/src/app/pages/jobactive/jobactive.page.html b/src/app/pages/jobactive/jobactive.page.html
index 3fb022e..21feb91 100644
--- a/src/app/pages/jobactive/jobactive.page.html
+++ b/src/app/pages/jobactive/jobactive.page.html
@@ -91,6 +91,9 @@
Task Updates
+
+ Details
+
Activities
@@ -99,7 +102,9 @@
-
+
diff --git a/src/app/pages/jobactive/jobactive.page.ts b/src/app/pages/jobactive/jobactive.page.ts
index 73a3fd9..6b04b82 100644
--- a/src/app/pages/jobactive/jobactive.page.ts
+++ b/src/app/pages/jobactive/jobactive.page.ts
@@ -28,6 +28,7 @@ export class JobactivePage implements OnInit {
) {
this.jobData = this.router.getCurrentNavigation().extras.state;
this.item_banner = this.jobData.banner;
+ //debugger;
}
diff --git a/src/app/pages/jobpastdue/jobpastdue.module.ts b/src/app/pages/jobpastdue/jobpastdue.module.ts
index 9f9bb2e..48b9dca 100644
--- a/src/app/pages/jobpastdue/jobpastdue.module.ts
+++ b/src/app/pages/jobpastdue/jobpastdue.module.ts
@@ -7,6 +7,7 @@ import { IonicModule } from '@ionic/angular';
import { JobpastduePageRoutingModule } from './jobpastdue-routing.module';
import { JobpastduePage } from './jobpastdue.page';
import {TaskactivitiesComponent} from "../../components/taskactivities/taskactivities.component";
+import {JobDetailsComponent} from "../../components/job-details/job-details.component";
@NgModule({
imports: [
@@ -15,6 +16,6 @@ import {TaskactivitiesComponent} from "../../components/taskactivities/taskactiv
IonicModule,
JobpastduePageRoutingModule
],
- declarations: [JobpastduePage,TaskactivitiesComponent]
+ declarations: [JobpastduePage,TaskactivitiesComponent,JobDetailsComponent]
})
export class JobpastduePageModule {}
diff --git a/src/app/pages/jobpastdue/jobpastdue.page.html b/src/app/pages/jobpastdue/jobpastdue.page.html
index f74c53f..b1c111b 100644
--- a/src/app/pages/jobpastdue/jobpastdue.page.html
+++ b/src/app/pages/jobpastdue/jobpastdue.page.html
@@ -53,17 +53,19 @@
-
+
+
+ Extend Date
+
+ Cancel Task
+
+
+
+
This task is already past the due date. You can extend the timeline or cancel the job.
-
-
- Extend Date
-
- Cancel Task
-
-
+
@@ -99,10 +101,12 @@
Task Updates
-
+
+ Details
+
- Activities
-
+ Activities
+
@@ -111,6 +115,10 @@
+
+
diff --git a/src/app/pages/jobreview/jobreview.module.ts b/src/app/pages/jobreview/jobreview.module.ts
index 920f8ef..d63010b 100644
--- a/src/app/pages/jobreview/jobreview.module.ts
+++ b/src/app/pages/jobreview/jobreview.module.ts
@@ -8,6 +8,7 @@ import { JobreviewPageRoutingModule } from './jobreview-routing.module';
import { JobreviewPage } from './jobreview.page';
import {TaskactivitiesComponent} from "../../components/taskactivities/taskactivities.component";
+import {JobDetailsComponent} from "../../components/job-details/job-details.component";
@NgModule({
imports: [
@@ -16,6 +17,6 @@ import {TaskactivitiesComponent} from "../../components/taskactivities/taskactiv
IonicModule,
JobreviewPageRoutingModule
],
- declarations: [JobreviewPage,TaskactivitiesComponent]
+ declarations: [JobreviewPage,TaskactivitiesComponent,JobDetailsComponent]
})
export class JobreviewPageModule {}
diff --git a/src/app/pages/jobreview/jobreview.page.html b/src/app/pages/jobreview/jobreview.page.html
index 384afaa..87a30d7 100644
--- a/src/app/pages/jobreview/jobreview.page.html
+++ b/src/app/pages/jobreview/jobreview.page.html
@@ -51,10 +51,7 @@
-
-
- This job is in review, you can accept or reject completion.
-
+
Reject
@@ -62,6 +59,10 @@
Accept
+
+ This job is in review, you can accept or reject completion.
+
+
{{response_result}}
@@ -72,6 +73,9 @@
Response
+
+ Details
+
Activities
@@ -80,7 +84,9 @@
-
+
diff --git a/src/app/store/REMEMBER.txt b/src/app/store/REMEMBER.txt
index 7a10e34..6b3fc2f 100644
--- a/src/app/store/REMEMBER.txt
+++ b/src/app/store/REMEMBER.txt
@@ -85,6 +85,7 @@ ionic generate service usersoffers-data
ionic generate component market-messages
ionic generate service help-data
+ionic generate component job-details
https://masteringionic.com/blog/working-with-capacitor-googlemaps-in-ionic
ionic generate interface interfaces/location