From 3c3d2514d6e0805daa5cbb58ded854b183e53dcf Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Wed, 21 Aug 2024 09:10:41 -0400 Subject: [PATCH] job list data --- src/app/pages/addjob/addjob.page.html | 39 ++++++++++++++++++++++---- src/app/pages/addjob/addjob.page.scss | 6 ++-- src/app/pages/addjob/addjob.page.ts | 30 +++++++++++++------- src/app/pages/joblist/joblist.page.ts | 39 ++++++++++++++------------ src/app/store/jobgroup-data.service.ts | 39 ++++++++++++++++++++++++++ 5 files changed, 118 insertions(+), 35 deletions(-) diff --git a/src/app/pages/addjob/addjob.page.html b/src/app/pages/addjob/addjob.page.html index ab342c7..c8fad1a 100644 --- a/src/app/pages/addjob/addjob.page.html +++ b/src/app/pages/addjob/addjob.page.html @@ -32,7 +32,7 @@ Reward - + - - - Timeline - + {{item.name}} + + + + + + + + + + + + + + + + Title @@ -96,6 +109,22 @@ + + Depends on + + + None + {{item.title}} + + + + diff --git a/src/app/pages/addjob/addjob.page.scss b/src/app/pages/addjob/addjob.page.scss index 986365b..237fc4f 100644 --- a/src/app/pages/addjob/addjob.page.scss +++ b/src/app/pages/addjob/addjob.page.scss @@ -1,9 +1,11 @@ .side_lb{ + padding-top: 10px; font-weight: bolder; font-size: 14px; + text-align: right; } .inp_lb{ - border-radius: 5px; + border-radius: 10px; background-color: aliceblue; - padding: 2px; + padding: 5px; } \ No newline at end of file diff --git a/src/app/pages/addjob/addjob.page.ts b/src/app/pages/addjob/addjob.page.ts index 849b088..2721170 100644 --- a/src/app/pages/addjob/addjob.page.ts +++ b/src/app/pages/addjob/addjob.page.ts @@ -6,6 +6,7 @@ import {WrenchService} from "../../services/wrench.service"; import {TasksDataService} from "../../store/tasks-data.service"; import {UserWalletService} from "../../store/user-wallet.service"; import {apiConst} from "../../../constants/constant"; +import {JobgroupDataService} from "../../store/jobgroup-data.service"; @Component({ selector: 'app-addjob', @@ -20,23 +21,30 @@ export class AddjobPage implements OnInit { @ViewChild('currency') currency:any; @ViewChild('price') price:any; @ViewChild('country') country:any; + @ViewChild('depend_uid') depend_uid:any; + durationArray:any; curr_session:string=''; result_message:string=''; walletResult:any; walletData: []; isDisabled:boolean=true; - constructor(private navctr: NavController, - private router: Router, - public sessionDataProviderService: SessionDataProviderService, - private alertController:AlertController, - private wrenchService: WrenchService, - private loadingCtrl: LoadingController, - public userWalletService: UserWalletService, - public tasksDataService:TasksDataService,) { + ownersJobsList:any; + + constructor(private navctr: NavController, + private router: Router, + public sessionDataProviderService: SessionDataProviderService, + private alertController: AlertController, + private wrenchService: WrenchService, + private loadingCtrl: LoadingController, + public userWalletService: UserWalletService, + public tasksDataService: TasksDataService, + public jobgroupDataService: JobgroupDataService,) { this.durationArray = this.sessionDataProviderService.durationArray; this.walletResult = this.userWalletService.walletResult.result_list; + this.ownersJobsList = this.jobgroupDataService.jobOwnerJobsData; + debugger; } ngOnInit() { @@ -75,7 +83,8 @@ export class AddjobPage implements OnInit { title:this.title, description:this.description, job_detail:this.job_detail, - category:'' + category:'', + depend_uid: this.depend_uid } loading.present(); @@ -114,7 +123,8 @@ export class AddjobPage implements OnInit { title:string, description:string, job_detail:string, - category:string + category:string, + depend_uid:string }; jobManagerCreateResult:any; diff --git a/src/app/pages/joblist/joblist.page.ts b/src/app/pages/joblist/joblist.page.ts index 635cade..a2bf364 100644 --- a/src/app/pages/joblist/joblist.page.ts +++ b/src/app/pages/joblist/joblist.page.ts @@ -3,6 +3,7 @@ import { Component, OnInit } from '@angular/core'; import { WrenchService } from 'src/app/services/wrench.service'; import {SessionDataProviderService} from "../../store/session-data-provider.service"; import {NavController} from "@ionic/angular"; +import {JobgroupDataService} from "../../store/jobgroup-data.service"; @Component({ selector: 'app-joblist', @@ -20,13 +21,15 @@ export class JoblistPage implements OnInit { private navctr: NavController, private router: Router, public sessionDataProviderService: SessionDataProviderService, - private wrenchService: WrenchService + private wrenchService: WrenchService, + public jobgroupDataService: JobgroupDataService ) { - - addEventListener('app_add_jobs', () => { - this.getJobManagerList() - this.setCloseModal(); - }); + addEventListener('app_add_jobs', () => { + this.getJobManagerList(); // set to retire this call + this.setCloseModal(); + this.jobgroupDataService.getOwnerJobsList(); // create the list of job owner data + }); + this.jobgroupDataService.getOwnerJobsList(); // create the list of job owner data } ngOnInit() { @@ -54,19 +57,24 @@ export class JoblistPage implements OnInit { } usrData: { - action:13005, member_id: number, uid: string, sessionid: string, limit:20, page:1,offset: 0 + action:13005, member_id: number, uid: string, sessionid: string, limit:number, page:1,offset: 0 }; jobManagerJobsTotalData:any; jobManagerJobsData: []; total_jobs:number=0; getJobManagerList(){ - this.curr_session = this.sessionDataProviderService.session; - this.usrData = {action:13005, - member_id: this.sessionDataProviderService.member_id, - uid: this.sessionDataProviderService.member_uid, - sessionid: this.sessionDataProviderService.session , - limit:20, page:1,offset: 0} + this.curr_session = this.sessionDataProviderService.session; + + this.usrData = { + action:13005, + member_id: this.sessionDataProviderService.member_id, + uid: this.sessionDataProviderService.member_uid, + sessionid: this.sessionDataProviderService.session , + limit:60, + page:1, + offset: 0 + } this.wrenchService.getJobManagerList(this.usrData).subscribe( jobManagerJobsTotalData => { @@ -92,9 +100,6 @@ export class JoblistPage implements OnInit { //this.isModalOpen = true; // this.isModalOpenBackdrop= true; } - - - //ionViewDidEnter(){ debugger } ionViewWillLeave(){ this.isModalOpen = false; this.isModalOpenBackdrop= false; @@ -102,9 +107,7 @@ export class JoblistPage implements OnInit { } ionViewDidLeave(){ this.setCloseModal(); } // ngOnDestroy(){ debugger } - processCreateJob(){ - } } diff --git a/src/app/store/jobgroup-data.service.ts b/src/app/store/jobgroup-data.service.ts index d117cb2..3ca3c17 100644 --- a/src/app/store/jobgroup-data.service.ts +++ b/src/app/store/jobgroup-data.service.ts @@ -37,4 +37,43 @@ export class JobgroupDataService { ); } + + usrJobOwnerData: { + action:13005, + member_id: number, + uid: string, + sessionid: string, + limit:number, + page:1, + offset: 0 + }; + jobOwnerTotalData:any; + jobOwnerJobsData: []; + total_owner_jobs:number=0; + + async getOwnerJobsList(){ + + this.usrJobOwnerData = { + action:13005, + member_id: this.sessionDataProviderService.member_id, + uid: this.sessionDataProviderService.member_uid, + sessionid: this.sessionDataProviderService.session , + limit:60, + page:1, + offset: 0 + } + + await this.wrenchService.getJobManagerList(this.usrJobOwnerData).subscribe( + jobOwnerTotalData => { + this.jobOwnerTotalData = jobOwnerTotalData; + console.log("jobOwnerTotalData RETURN->", this.jobOwnerTotalData); + this.jobOwnerJobsData = this.jobOwnerTotalData.result_list; + this.total_owner_jobs=this.jobOwnerJobsData.length; + console.log("jobOwnerJobsData RETURN DATA->", this.jobOwnerJobsData); + // return this.jobOwnerJobsData; + } + ); + + } + }