diff --git a/src/app/components/taskactivities/taskactivities.component.html b/src/app/components/taskactivities/taskactivities.component.html new file mode 100644 index 0000000..7029943 --- /dev/null +++ b/src/app/components/taskactivities/taskactivities.component.html @@ -0,0 +1,27 @@ +
+ + + + + +
+ Due Date:{{jobData.delivery_date | date }} + {{jobData.contract}} +
+ + +
+
+
+ +
+ {{item.msg_firstname}}-{{item.msg_date}} + {{item.message}} +
+
+ + + +
+ +
\ No newline at end of file diff --git a/src/app/components/taskactivities/taskactivities.component.scss b/src/app/components/taskactivities/taskactivities.component.scss new file mode 100644 index 0000000..8aad473 --- /dev/null +++ b/src/app/components/taskactivities/taskactivities.component.scss @@ -0,0 +1,57 @@ +.lesson { + margin-top: 20px; + + .bold { + font-family: 'semi-bold'; + } + + .color { + color: var(--ion-color-primary); + } + + .grey { + color: grey; + } + + .sec { + display: flex; + justify-content: space-between; + align-items: center; + margin-top: 10px; + } + + .video { + display: flex; + justify-content: space-between; + align-items: center; + background-color: white; + padding: 15px; + box-shadow: 0px 0px 20px 1px rgba(0, 0, 0, 0.1); + border-radius: 10px; + margin-top: 20px; + + .left { + display: flex; + } + + .men_image { + height: 40px; + width: 40px; + border-radius: 100%; + } + + .text { + margin-left: 10px; + } + + .bold_text { + font-size: 16px; + font-family: 'bold'; + } + + .grey_text { + font-size: 14px; + color: grey; + } + } +} diff --git a/src/app/components/taskactivities/taskactivities.component.spec.ts b/src/app/components/taskactivities/taskactivities.component.spec.ts new file mode 100644 index 0000000..855d175 --- /dev/null +++ b/src/app/components/taskactivities/taskactivities.component.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { TaskactivitiesComponent } from './taskactivities.component'; + +describe('TaskactivitiesComponent', () => { + let component: TaskactivitiesComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ TaskactivitiesComponent ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(TaskactivitiesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/components/taskactivities/taskactivities.component.ts b/src/app/components/taskactivities/taskactivities.component.ts new file mode 100644 index 0000000..646ab1e --- /dev/null +++ b/src/app/components/taskactivities/taskactivities.component.ts @@ -0,0 +1,54 @@ +import { Component, OnInit,Input } from '@angular/core'; +import {SessionDataProviderService} from "../../store/session-data-provider.service"; +import {WrenchService} from "../../services/wrench.service"; + +@Component({ + selector: 'app-taskactivities', + templateUrl: './taskactivities.component.html', + styleUrls: ['./taskactivities.component.scss'], +}) +export class TaskactivitiesComponent implements OnInit { +@Input('jobData') jobData:any; + + constructor( + public sessionDataProviderService: SessionDataProviderService, + private wrenchService: WrenchService + ) { } + + ngOnInit() { + console.log("IN COMPO ACT", this.jobData); + this.activeJobMsgList(); + } + contrData: { + action:number, + member_id: number, + uid: string, + sessionid: string, + limit:20, + contract:string, + offset: 0 + }; + msgListTotalData:any; + msgListData:any; + + activeJobMsgList(){ + this.contrData = { + action:14011, + member_id: this.sessionDataProviderService.member_id, + uid: this.sessionDataProviderService.member_uid, + sessionid: this.sessionDataProviderService.session , + limit:20, + contract: this.jobData.contract, + offset: 0} + + this.wrenchService.activeJobMsgList(this.contrData).subscribe( + msgListTotalData => { + this.msgListTotalData = msgListTotalData; + // console.log("REFER RETURN->", this.referTotalData); + this.msgListData = this.msgListTotalData.result_list; + console.log("REFER RETURN DATA->", this.msgListData); + } + ); + + } +} diff --git a/src/app/pages/jobactive/jobactive.module.ts b/src/app/pages/jobactive/jobactive.module.ts index a4fc87e..1e338d5 100644 --- a/src/app/pages/jobactive/jobactive.module.ts +++ b/src/app/pages/jobactive/jobactive.module.ts @@ -7,6 +7,7 @@ import { IonicModule } from '@ionic/angular'; import { JobactivePageRoutingModule } from './jobactive-routing.module'; import { JobactivePage } from './jobactive.page'; +import {TaskactivitiesComponent} from "../../components/taskactivities/taskactivities.component"; @NgModule({ imports: [ @@ -15,6 +16,6 @@ import { JobactivePage } from './jobactive.page'; IonicModule, JobactivePageRoutingModule ], - declarations: [JobactivePage] + declarations: [JobactivePage,TaskactivitiesComponent] }) export class JobactivePageModule {} diff --git a/src/app/pages/jobactive/jobactive.page.html b/src/app/pages/jobactive/jobactive.page.html index 5381222..2b360e5 100644 --- a/src/app/pages/jobactive/jobactive.page.html +++ b/src/app/pages/jobactive/jobactive.page.html @@ -114,75 +114,9 @@
- - - - - -
- Due Date:{{jobData.delivery_date}} - {{jobData.contract}} -
- - -
-
-
- -
- {{item.msg_firstname}}-{{item.msg_date}} - {{item.message}} -
-
- - - -
- +
-
- - - - - - - - - - - - - - Load messages - - - - - ... - - - - - - - - - - - - - - - - - - - - - -
diff --git a/src/app/pages/jobmanager/jobmanager.page.html b/src/app/pages/jobmanager/jobmanager.page.html index 09efe8c..6130941 100644 --- a/src/app/pages/jobmanager/jobmanager.page.html +++ b/src/app/pages/jobmanager/jobmanager.page.html @@ -63,7 +63,7 @@ {{item.title}} {{item.description}} {{item.contract}} {{item.price*0.01}} {{item.currency}} - Due Date: {{item.delivery_date}} + Due Date: {{item.delivery_date | date}}
@@ -84,7 +84,7 @@ {{item.title}} {{item.description}} {{item.contract}} {{item.price*0.01}} {{item.currency}} - Due Date: {{item.delivery_date}} + Due Date: {{item.delivery_date | date}}
@@ -104,7 +104,7 @@ {{item.title}} {{item.description}} {{item.contract}} {{item.price*0.01}} {{item.currency}} - Due Date: {{item.delivery_date}} + Due Date: {{item.delivery_date | date}}
diff --git a/src/app/pages/jobpastdue/jobpastdue.module.ts b/src/app/pages/jobpastdue/jobpastdue.module.ts index 31a16da..caae062 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"; @NgModule({ imports: [ @@ -15,6 +16,6 @@ import { JobpastduePage } from './jobpastdue.page'; IonicModule, JobpastduePageRoutingModule ], - declarations: [JobpastduePage] + declarations: [JobpastduePage,TaskactivitiesComponent] }) export class JobpastduePageModule {} diff --git a/src/app/pages/jobpastdue/jobpastdue.page.html b/src/app/pages/jobpastdue/jobpastdue.page.html index 6791c07..747b012 100644 --- a/src/app/pages/jobpastdue/jobpastdue.page.html +++ b/src/app/pages/jobpastdue/jobpastdue.page.html @@ -115,45 +115,7 @@
- - - - - - - - - - - - - - Load messages - - - - - ... - - - - - - - - - - - - - - - - - - - - +
diff --git a/src/app/pages/jobreview/jobreview.module.ts b/src/app/pages/jobreview/jobreview.module.ts index 13cb9e1..920f8ef 100644 --- a/src/app/pages/jobreview/jobreview.module.ts +++ b/src/app/pages/jobreview/jobreview.module.ts @@ -7,6 +7,7 @@ import { IonicModule } from '@ionic/angular'; import { JobreviewPageRoutingModule } from './jobreview-routing.module'; import { JobreviewPage } from './jobreview.page'; +import {TaskactivitiesComponent} from "../../components/taskactivities/taskactivities.component"; @NgModule({ imports: [ @@ -15,6 +16,6 @@ import { JobreviewPage } from './jobreview.page'; IonicModule, JobreviewPageRoutingModule ], - declarations: [JobreviewPage] + declarations: [JobreviewPage,TaskactivitiesComponent] }) export class JobreviewPageModule {} diff --git a/src/app/pages/jobreview/jobreview.page.html b/src/app/pages/jobreview/jobreview.page.html index e0dfdd7..b639de7 100644 --- a/src/app/pages/jobreview/jobreview.page.html +++ b/src/app/pages/jobreview/jobreview.page.html @@ -115,46 +115,7 @@
- - - - - - - - - - - - - - Load messages - - - - - ... - - - - - - - - - - - - - - - - - - - - - +