From 652cccbbc384c12f6b511b14af939eeef596339b Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sun, 25 Aug 2024 13:54:16 -0400 Subject: [PATCH] owners job --- src/app/pages/ownersjob/ownersjob.page.html | 21 ++++++++++-- src/app/pages/ownersjob/ownersjob.page.ts | 36 +++++++++++++++++---- 2 files changed, 48 insertions(+), 9 deletions(-) diff --git a/src/app/pages/ownersjob/ownersjob.page.html b/src/app/pages/ownersjob/ownersjob.page.html index e912d83..4896935 100644 --- a/src/app/pages/ownersjob/ownersjob.page.html +++ b/src/app/pages/ownersjob/ownersjob.page.html @@ -63,7 +63,7 @@ - Depends on + Depends on : - Duration + Duration : Select Duration - 1 Day 2 Days 3 Days 4 Days @@ -104,6 +103,22 @@ + + + Timeline : + + + Not Strict + Strict Timeline + + + diff --git a/src/app/pages/ownersjob/ownersjob.page.ts b/src/app/pages/ownersjob/ownersjob.page.ts index f5497cc..7501546 100644 --- a/src/app/pages/ownersjob/ownersjob.page.ts +++ b/src/app/pages/ownersjob/ownersjob.page.ts @@ -1,5 +1,5 @@ import {Component, OnInit, ViewChild} from '@angular/core'; -import {LoadingController, NavController} from "@ionic/angular"; +import {AlertController, LoadingController, NavController} from "@ionic/angular"; import {Router} from "@angular/router"; import {SessionDataProviderService} from "../../store/session-data-provider.service"; import {WrenchService} from "../../services/wrench.service"; @@ -15,6 +15,7 @@ export class OwnersjobPage implements OnInit { @ViewChild('job_duration') job_duration; @ViewChild('job_recipient') job_recipient; @ViewChild('depend_uid') depend_uid; + @ViewChild('strict_timeline') strict_timeline; jobData: any; @@ -30,6 +31,7 @@ export class OwnersjobPage implements OnInit { private socketToolsService: SocketToolsService, public sessionDataProviderService: SessionDataProviderService, private wrenchService: WrenchService, + private alertController: AlertController, private loadingCtrl: LoadingController, public jobgroupDataService: JobgroupDataService ) { @@ -86,7 +88,8 @@ export class OwnersjobPage implements OnInit { duration: 0, job_description: this.jobData.description, email: this.job_recipient, - assign_mode: 110033 + assign_mode: 110033, + strict_timeline: this.strict_timeline }; // console.log('XXX-> ', this.reqData ); @@ -131,7 +134,8 @@ export class OwnersjobPage implements OnInit { duration: number, job_description: string, email:string, - assign_mode: number + assign_mode: number, + strict_timeline:number }; /* @@ -148,12 +152,20 @@ export class OwnersjobPage implements OnInit { async sendOfferToMarket(){ if ( this.job_duration== undefined || this.job_duration < 1){ - alert("Select Duration"); + // alert("Select Duration"); + await this.showAlert("Assign Error", "Select Duration"); return; } + if ( this.strict_timeline== undefined || this.strict_timeline <0){ + // alert("Select Duration"); + await this.showAlert("Assign Error","Select how strict you want the approval timeline to be"); + return; + } + if ( this.jobData.job_uid == this.depend_uid ){ - alert("A task cannot depend on itself"); + // alert("A task cannot depend on itself"); + await this.showAlert("Assign Error", "A task cannot depend on itself"); return; } @@ -169,7 +181,8 @@ export class OwnersjobPage implements OnInit { duration: this.job_duration, job_description: this.jobData.description, email: '', - assign_mode: 110022 + assign_mode: 110022, + strict_timeline: this.strict_timeline }; // console.log('XXX-> ', this.reqData ); //debugger; @@ -209,7 +222,18 @@ export class OwnersjobPage implements OnInit { } + async showAlert(mtitle: string, amessage: string) { + const alert = await this.alertController.create({ + header: 'WrenchBoard', + subHeader: mtitle, + message: amessage, + buttons: ['OK'], + }); + + await alert.present(); + + } // assignTask(reqData){ // return this.getPostData("assigntask", reqData);