From 9147a7aed934e90004ff0e04fa37129fa5933600 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Mon, 25 Dec 2023 20:34:22 -0500 Subject: [PATCH] Job Group assign --- .../job-group/job-group.component.html | 9 ++- .../job-group/job-group.component.ts | 76 ++++++++++++++++++- src/app/pages/ownersjob/ownersjob.page.html | 2 +- src/app/pages/ownersjob/ownersjob.page.ts | 1 + 4 files changed, 83 insertions(+), 5 deletions(-) diff --git a/src/app/components/job-group/job-group.component.html b/src/app/components/job-group/job-group.component.html index 82da56f..c52bad6 100644 --- a/src/app/components/job-group/job-group.component.html +++ b/src/app/components/job-group/job-group.component.html @@ -8,7 +8,7 @@ - Create a group + Create a group @@ -32,6 +32,7 @@
+Group
@@ -55,7 +56,11 @@ - Add Member + Add Member diff --git a/src/app/components/job-group/job-group.component.ts b/src/app/components/job-group/job-group.component.ts index f0bb836..7f0c303 100644 --- a/src/app/components/job-group/job-group.component.ts +++ b/src/app/components/job-group/job-group.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit, ViewChild} from '@angular/core'; +import {Component, Input, OnInit, ViewChild} from '@angular/core'; import {SessionDataProviderService} from "../../store/session-data-provider.service"; import {WrenchService} from "../../services/wrench.service"; import {AlertController, LoadingController} from "@ionic/angular"; @@ -11,6 +11,7 @@ import {JobgroupDataService} from "../../store/jobgroup-data.service"; }) export class JobGroupComponent implements OnInit { @ViewChild('job_group') job_group; +@Input('jobData') jobData:any; constructor( public sessionDataProviderService: SessionDataProviderService, private wrenchService: WrenchService, @@ -67,7 +68,7 @@ export class JobGroupComponent implements OnInit { { text: "Send now", handler: () => { - + this.sendOfferGroup(); }, }, ], @@ -75,4 +76,75 @@ export class JobGroupComponent implements OnInit { await alert.present(); } + async sendOfferGroup(){ + const loading = await this.loadingCtrl.create({ + message: 'Sending...', + duration: 5000, + }); +/* + REQ_LONG(in, "member_id", 1, -1); + REQ_LONG(in, "job_id", 1, -1); + REQ_LONG(in, "group_id", 1, -1); + //REQ_STRING (in, "email", 1, 59, "(.*)"); + REQ_STRING(in, "job_description", 1, 5000, "(.*)"); + */ + this.reqData = { + action:13025, + member_id: this.sessionDataProviderService.member_id, + uid: this.sessionDataProviderService.member_uid, + sessionid: this.sessionDataProviderService.session, + job_id: this.jobData.job_id, + job_uid: this.jobData.job_uid, + group_id: this.job_group, + duration: 0, + job_description: this.jobData.description, + email: '', + assign_mode: 110044 + }; + // console.log('XXX-> ', this.reqData ); + + loading.present(); + + this.wrenchService.assignTask(this.reqData).subscribe( + assigResult => { + this.assigResult = assigResult; + console.log("assigResult RETURN->", this.assigResult); + if ( this.assigResult != undefined && this.assigResult.internal_return > 0){ + this.assign_ind_result = "Task sent to the group "; + const event = new Event("app-myjob-offers-refresh"); + // Dispatch the event. + dispatchEvent(event); + setTimeout(() => { + this.assign_ind_result =''; + }, 3000); + } + else + { + + } + } + ); + + } + + reqData: { + action:number, + member_id: number, + uid: string, + sessionid: string, + job_id: string, + job_uid: string, + group_id: number, + duration: number, + job_description: string, + email:string, + assign_mode: number + }; + assigResult:any; + assign_ind_result:string=''; + assign_mak_result:string=''; + + addGroup(){ + + } } diff --git a/src/app/pages/ownersjob/ownersjob.page.html b/src/app/pages/ownersjob/ownersjob.page.html index de6c4d2..dc4fd26 100644 --- a/src/app/pages/ownersjob/ownersjob.page.html +++ b/src/app/pages/ownersjob/ownersjob.page.html @@ -134,7 +134,7 @@ Preferred List
- +
diff --git a/src/app/pages/ownersjob/ownersjob.page.ts b/src/app/pages/ownersjob/ownersjob.page.ts index 38c3a1f..633b5d9 100644 --- a/src/app/pages/ownersjob/ownersjob.page.ts +++ b/src/app/pages/ownersjob/ownersjob.page.ts @@ -44,6 +44,7 @@ export class OwnersjobPage implements OnInit { } + validateEmail(email) { var re = /\S+@\S+\.\S+/; return re.test(email);