WrenchBoard/WrenchBoardIonic2023
2
0
Fork 0
Code Issues Pull Requests Releases Activity

fix pend ui

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2024-08-21 12:23:29 -04:00
parent 3c3d2514d6
commit 25864baa5d
5 changed files with 59 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/addjob/addjob.page.ts
+1 -1
View File
@@ -44,7 +44,7 @@ export class AddjobPage implements OnInit {
this.durationArray = this.sessionDataProviderService.durationArray;
this.walletResult = this.userWalletService.walletResult.result_list;
this.ownersJobsList = this.jobgroupDataService.jobOwnerJobsData;
debugger;
//debugger;
}
ngOnInit() {
src/app/pages/ownersjob/ownersjob.page.html
+29 -4
View File
@@ -62,12 +62,32 @@
<div class="ion-padding" slot="content">
<ion-grid>
<ion-row>
<ion-col class="tt">Duration</ion-col>
<ion-row style="background-color: #f1ecec; border-radius: 10px">
<ion-col size="4" class="side_lb">Depends on</ion-col>
<ion-col size="8">
<ion-select
value= {{depend_uid}}
interface="popover"
(ionChange)="verifyEntry()"
style="height: 35px"
class="inp_lb"
[(ngModel)]='depend_uid'
label="Depends on task">
<ion-select-option value="">None</ion-select-option>
<ion-select-option *ngFor="let item of ownersJobsList;" value="{{item.job_uid}}" >{{item.title}}</ion-select-option>
</ion-select>
</ion-col>
</ion-row>
<ion-row>
<ion-col>
<ion-select class="job_duration" [(ngModel)]='job_duration' label="Duration" label-placement="stacked">
<ion-col size="4" class="side_lb">Duration</ion-col>
<ion-col size="8">
<ion-select
class="job_duration"
[(ngModel)]='job_duration'
label="Duration"
interface="popover"
>
<ion-select-option value="0" selected="true">Select Duration</ion-select-option>
<ion-select-option value="1">1 Day</ion-select-option>
<ion-select-option value="2">2 Days</ion-select-option>
@@ -82,6 +102,11 @@
</ion-select>
</ion-col>
</ion-row>
<!-- <ion-row>-->
<!-- <ion-col>-->
<!-- </ion-col>-->
<!-- </ion-row>-->
<ion-row>
<ion-col class="act_but">
<ion-button size="small"
src/app/pages/ownersjob/ownersjob.page.scss
+12
View File
@@ -1,5 +1,17 @@
ion-content {
.side_lb{
padding-top: 10px;
font-weight: bolder;
font-size: 14px;
text-align: right;
}
.inp_lb{
border-radius: 10px;
background-color: aliceblue;
padding: 5px;
}
.back_image {
width: auto;
height: 130px;
src/app/pages/ownersjob/ownersjob.page.ts
+16 -4
View File
@@ -4,6 +4,7 @@ import {Router} from "@angular/router";
import {SessionDataProviderService} from "../../store/session-data-provider.service";
import {WrenchService} from "../../services/wrench.service";
import {SocketToolsService} from "../../services/socket-tools.service";
import {JobgroupDataService} from "../../store/jobgroup-data.service";
@Component({
selector: 'app-ownersjob',
@@ -13,19 +14,24 @@ import {SocketToolsService} from "../../services/socket-tools.service";
export class OwnersjobPage implements OnInit {
@ViewChild('job_duration') job_duration;
@ViewChild('job_recipient') job_recipient;
@ViewChild('depend_uid') depend_uid;
jobData: any;
item_banner:string = 'default.jpg';
session_image_server:string='';
curr_session:string="";
tabs = 'assignjob';
ownersJobsList:any;
constructor(
private navctr: NavController,
private router: Router,
private socketToolsService: SocketToolsService,
public sessionDataProviderService: SessionDataProviderService,
private wrenchService: WrenchService,
private loadingCtrl: LoadingController
private loadingCtrl: LoadingController,
public jobgroupDataService: JobgroupDataService
) {
this.jobData = this.router.getCurrentNavigation().extras.state?.jobData;
@@ -34,8 +40,11 @@ export class OwnersjobPage implements OnInit {
if (this.jobData== undefined){
this.onBack();
}
this.depend_uid = this.jobData.depend_uid;
// debugger;
this.socketToolsService.joinSocketRoom("full-markets-jobs" );
this.socketToolsService.joinSocketRoom("market" );
this.ownersJobsList = this.jobgroupDataService.jobOwnerJobsData;
//debugger;
}
onBack() {
@@ -72,6 +81,7 @@ export class OwnersjobPage implements OnInit {
sessionid: this.sessionDataProviderService.session,
job_id: this.jobData.job_id,
job_uid: this.jobData.job_uid,
depend_uid: this.depend_uid,
duration: 0,
job_description: this.jobData.description,
email: this.job_recipient,
@@ -116,6 +126,7 @@ export class OwnersjobPage implements OnInit {
sessionid: string,
job_id: string,
job_uid: string,
depend_uid: string,
duration: number,
job_description: string,
email:string,
@@ -146,6 +157,7 @@ if ( this.job_duration== undefined || this.job_duration < 1){
sessionid: this.sessionDataProviderService.session,
job_id: this.jobData.job_id,
job_uid: this.jobData.job_uid,
depend_uid: this.depend_uid,
duration: this.job_duration,
job_description: this.jobData.description,
email: '',
@@ -159,10 +171,11 @@ if ( this.job_duration== undefined || this.job_duration < 1){
duration: 5000,
});
loading.present();
await loading.present();
this.wrenchService.assignTask(this.reqData).subscribe(
assigResult => {
loading.dismiss();
this.assigResult = assigResult;
console.log("assigResult RETURN->", this.assigResult);
if ( this.assigResult != undefined && this.assigResult.internal_return > 0){
@@ -170,8 +183,7 @@ if ( this.job_duration== undefined || this.job_duration < 1){
const event = new Event("app-myjob-offers-refresh");
// Dispatch the event.
dispatchEvent(event);
// debugger;
// this.socketToolsService.emmitSocketEvent("send_message","market", "full-market-jobs"); //
// this.socketToolsService.emmitSocketEvent("send_message","market", "full-market-jobs"); //
this.socketToolsService.emmitSocketEvent("marketjob_added","market", "full-markets-jobs");
setTimeout(() => {
this.assign_mak_result ='';
src/app/pages/pendinterest/pendinterest.page.ts
+1 -1
View File
@@ -33,7 +33,7 @@ export class PendinterestPage implements OnInit {
jobInterest(item) {
debugger;
//debugger;
this.router.navigate(['marketdetail'],{state: item});
}