From 090a127eaa432dc02e21f8111703d8b6c4fdf10e Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sat, 9 Dec 2023 08:53:00 -0500 Subject: [PATCH] job group --- .../job-group/job-group.component.html | 14 ++++++ .../job-group/job-group.component.scss | 0 .../job-group/job-group.component.spec.ts | 24 ++++++++++ .../job-group/job-group.component.ts | 19 ++++++++ src/app/pages/activetask/activetask.page.html | 2 +- src/app/pages/activetask/activetask.page.ts | 48 +++++++++++++++++++ src/app/pages/ownersjob/ownersjob.module.ts | 3 +- src/app/pages/ownersjob/ownersjob.page.html | 4 +- 8 files changed, 109 insertions(+), 5 deletions(-) create mode 100644 src/app/components/job-group/job-group.component.html create mode 100644 src/app/components/job-group/job-group.component.scss create mode 100644 src/app/components/job-group/job-group.component.spec.ts create mode 100644 src/app/components/job-group/job-group.component.ts diff --git a/src/app/components/job-group/job-group.component.html b/src/app/components/job-group/job-group.component.html new file mode 100644 index 0000000..a3759e6 --- /dev/null +++ b/src/app/components/job-group/job-group.component.html @@ -0,0 +1,14 @@ + + + + + You do not have any group currently + + + + + Create a group + + + + diff --git a/src/app/components/job-group/job-group.component.scss b/src/app/components/job-group/job-group.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/components/job-group/job-group.component.spec.ts b/src/app/components/job-group/job-group.component.spec.ts new file mode 100644 index 0000000..daabf25 --- /dev/null +++ b/src/app/components/job-group/job-group.component.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { JobGroupComponent } from './job-group.component'; + +describe('JobGroupComponent', () => { + let component: JobGroupComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ JobGroupComponent ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(JobGroupComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/components/job-group/job-group.component.ts b/src/app/components/job-group/job-group.component.ts new file mode 100644 index 0000000..df3c6af --- /dev/null +++ b/src/app/components/job-group/job-group.component.ts @@ -0,0 +1,19 @@ +import { Component, OnInit } from '@angular/core'; +import {SessionDataProviderService} from "../../store/session-data-provider.service"; +import {WrenchService} from "../../services/wrench.service"; +import {LoadingController} from "@ionic/angular"; + +@Component({ + selector: 'app-job-group', + templateUrl: './job-group.component.html', + styleUrls: ['./job-group.component.scss'], +}) +export class JobGroupComponent implements OnInit { + + constructor( public sessionDataProviderService: SessionDataProviderService, + private wrenchService: WrenchService, + private loadingCtrl: LoadingController) { } + + ngOnInit() {} + +} diff --git a/src/app/pages/activetask/activetask.page.html b/src/app/pages/activetask/activetask.page.html index 82c4063..43ea06d 100644 --- a/src/app/pages/activetask/activetask.page.html +++ b/src/app/pages/activetask/activetask.page.html @@ -179,7 +179,7 @@ - Request Extension + Request Extension diff --git a/src/app/pages/activetask/activetask.page.ts b/src/app/pages/activetask/activetask.page.ts index b9459f3..55e56de 100644 --- a/src/app/pages/activetask/activetask.page.ts +++ b/src/app/pages/activetask/activetask.page.ts @@ -303,4 +303,52 @@ export class ActivetaskPage implements OnInit { } } + async requestExtension(){ + let reqData = { + contract: this.jobData.contract, + contract_uid: this.jobData.contract_uid, + job_action: 'NOTIFY_REQEXTENT', + } + + const loading = await this.loadingCtrl.create({ + message: 'Sending...', + duration: 2500, + }); + + const alert = await this.alertController.create({ + header: "Request Extensions", + message: "Confirm you are ready to send request?", + buttons: [ + { + text: "Cancel", + role: "cancel", + handler: () => { + // this.getMyOffersData(); + }, + }, + { + text: "Send Request", + handler: () => { +loading.present(); + // API CALL TO MARK TASK AS COMPLETED BY WORKER + this.wrenchService.workerJobAction(reqData).subscribe((res)=> { + loading.dismiss(); + if (res.status != 200 || res.data.internal_return < 0) { + // setReqStatus({loading:false, status: false, message: 'unable to complete request. Try again'}) + // Alert("Unable to set task as completed, try again soon"); + } else { + // this.router.navigate(['mytasks']); + } + } + ); + + + }, + }, + ], + }); + await alert.present(); + + + } } diff --git a/src/app/pages/ownersjob/ownersjob.module.ts b/src/app/pages/ownersjob/ownersjob.module.ts index f85ce48..8233047 100644 --- a/src/app/pages/ownersjob/ownersjob.module.ts +++ b/src/app/pages/ownersjob/ownersjob.module.ts @@ -9,6 +9,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"; +import {JobGroupComponent} from "../../components/job-group/job-group.component"; @NgModule({ imports: [ @@ -17,6 +18,6 @@ import {JobDetailsComponent} from "../../components/job-details/job-details.comp IonicModule, OwnersjobPageRoutingModule ], - declarations: [OwnersjobPage,MyjobOffersComponent,JobDetailsComponent] + declarations: [OwnersjobPage,MyjobOffersComponent,JobDetailsComponent,JobGroupComponent] }) export class OwnersjobPageModule {} diff --git a/src/app/pages/ownersjob/ownersjob.page.html b/src/app/pages/ownersjob/ownersjob.page.html index 8949c5a..de6c4d2 100644 --- a/src/app/pages/ownersjob/ownersjob.page.html +++ b/src/app/pages/ownersjob/ownersjob.page.html @@ -134,9 +134,7 @@ Preferred List
- -
Comming Soon
- +