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

fix

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2023-08-31 22:08:12 -04:00
parent ad768a945e
commit 02ce34eed6
19 changed files with 197 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/app.component.ts
+1 -1
View File
@@ -8,7 +8,7 @@ import OneSignal from 'onesignal-cordova-plugin';
})
export class AppComponent {
constructor() {
this.OneSignalInit();
// this.OneSignalInit();
}
// Call this function when your app starts
src/app/pages/family/family.page.html
+1 -1
View File
@@ -84,7 +84,7 @@
<ion-label class="bold_text">{{item.title}}</ion-label>
<ion-label class="grey_text">{{item.job_description}}</ion-label>
<ion-label class="price_line">{{item.contract}} {{item.price*0.01}} {{item.currency}} </ion-label>
<ion-label class="due_date">Due Date: {{item.delivery_date}}</ion-label>
<ion-label class="due_date">Due Date: {{item.delivery_date |date}}</ion-label>
</div>
</div>
<div class="right">
src/app/pages/home/home.page.ts
+6 -4
View File
@@ -101,13 +101,15 @@ export class HomePage implements OnInit {
pageToNavigate = 'jobmanager';
break
case 'my-pastdue-jobs':
pageToNavigate = 'jobmanager';
break
case 'pend-interest':
pageToNavigate ='pendinterest';
break;
case 'my-pastdue-jobs':
pageToNavigate = 'jobmanager';
break
case 'offer-interest':
pageToNavigate = 'jobinterest';
@@ -119,7 +121,7 @@ export class HomePage implements OnInit {
}
if(pageToNavigate !=''){
this.router.navigate([pageToNavigate]);
this.router.navigate([pageToNavigate],{state: item});
}
}
selBlogResult:any;
src/app/pages/invite/invite.page.scss
+1 -1
View File
@@ -14,7 +14,7 @@ ion-item {
}
}
ion-card{
margin: 0px;
margin: 10px 0px 0px 0px;
}
ion-header {
ion-toolbar {
src/app/pages/jobactive/jobactive.page.html
+4 -3
View File
@@ -1,6 +1,6 @@
<ion-content>
<div class="bg_image back_image" [style.backgroundImage]="'url(https://www.wrenchboard.com/assets/images/apps/jobs/default.jpg)'">
<div class="bg_image back_image" [style.backgroundImage]="'url(assets/images/taskbanners/'+item_banner+')'">
<div class="ion-padding">
<ion-icon slot="start" name="arrow-back" class="back" (click)="onBack()"></ion-icon>
</div>
@@ -23,7 +23,7 @@
</div>
</div>
<ion-label class="color_text">Price: {{jobData.price*0.01}} {{jobData.currency}}</ion-label>
<ion-label class="color_text">Price: {{jobData.price*0.01| number : '1.2-2'}} {{jobData.currency}}</ion-label>
<div class="items">
<div class="stud">
@@ -128,9 +128,10 @@
<ion-card-content>
<ion-textarea label="Your Message to Job Owner" placeholder="Type message here" [(ngModel)]='yourmessage' ></ion-textarea>
<ion-button color="secondary" expand="block" (click)="sendActiveJobMessage()">Send Updates</ion-button>
</ion-card-content>
<ion-button color="secondary" expand="block" (click)="sendActiveJobMessage()">Send Updates</ion-button>
<ion-label class="description">{{interest_msg_status}}
</ion-label>
</ion-card>
src/app/pages/jobactive/jobactive.page.scss
+12 -3
View File
@@ -1,14 +1,23 @@
ion-content {
.back_image {
width: 100%;
width: auto;
height: 130px;
background-size: contain;
background-repeat: no-repeat;
background-size: contain;
.back {
font-size: 25px;
color: white;
color: black;
}
}
ion-card{
margin: 10px 0px 10px 0px;
ion-card-content{
margin:0px
}
ion-grid{
margin: 0px;
}
}
src/app/pages/jobactive/jobactive.page.ts
+2 -5
View File
@@ -14,18 +14,15 @@ export class JobactivePage implements OnInit {
jobData: any;
tabs = 'activities';
item_banner:string = 'default.jpg';
constructor(
private navctr: NavController,
private router: Router,
public sessionDataProviderService: SessionDataProviderService,
private wrenchService: WrenchService
) {
this.jobData = this.router.getCurrentNavigation().extras.state;
console.log("XXXXX 1", this.router.getCurrentNavigation().extras);
console.log("XXXXX 2", this.router.getCurrentNavigation().extras.state);
//console.log("XXXXX 3", this.router.getCurrentNavigation().extras.state.ID);
this.item_banner = this.jobData.banner;
}
src/app/pages/jobmanager/jobmanager.page.ts
+25 -11
View File
@@ -12,25 +12,31 @@ import {SessionDataProviderService} from "../../store/session-data-provider.serv
})
export class JobmanagerPage implements OnInit {
menuData:any;
tabs = 'active';
constructor(
private navctr: NavController,
private router: Router,
public sessionDataProviderService: SessionDataProviderService,
private wrenchService: WrenchService
) {
this.menuData = this.router.getCurrentNavigation().extras.state;
switch(this.menuData.card_type){
case 'REVIEWJOB':
this.tabs ='review';
break;
case 'PASTDUEJOB':
this.tabs ='pastdue';
break
}
// debugger;
}
ngOnInit() {
this.getManagerJobsData("ACTIVE");
this.getManagerJobsData("PASTDUE");
this.getManagerJobsData("REVIEW");
}
onMyJobs(){
@@ -52,7 +58,14 @@ export class JobmanagerPage implements OnInit {
total_review:number=0;
usrData: {
action:22010, member_id: number, uid: string, sessionid: string, job_mode:string, limit:20, page:1,offset: 0
action:number,
member_id: number,
uid: string,
sessionid: string,
job_mode:string,
limit:20,
page:1,
offset: 0
};
@@ -61,17 +74,20 @@ export class JobmanagerPage implements OnInit {
jobManagerPastDueData: [];
jobManagerReviewData: [];
getManagerJobsData(job_mode){
this.usrData = {action:22010,
this.usrData = {
action:22010,
member_id: this.sessionDataProviderService.member_id,
uid: this.sessionDataProviderService.member_uid,
sessionid: this.sessionDataProviderService.session ,
job_mode: job_mode,
limit:20, page:1,offset: 0}
limit:20,
page:1,
offset: 0
}
this.wrenchService.getJobsManagerData(this.usrData).subscribe(
jobManagerTotalData => {
this.jobManagerActiveTotalData = jobManagerTotalData;
console.log("getManagerJobsData RETURN->", this.jobManagerActiveTotalData);
// debugger;
switch (job_mode){
@@ -89,10 +105,8 @@ export class JobmanagerPage implements OnInit {
break;
}
console.log("getManagerJobsData RETURN DATA->", this.jobManagerActiveData);
}
);
}
jobActive(item){
src/app/pages/jobpastdue/jobpastdue.page.html
+9 -7
View File
@@ -1,6 +1,6 @@
<ion-content>
<div class="bg_image back_image" [style.backgroundImage]="'url(assets/images/market.jpg)'">
<div class="bg_image back_image" [style.backgroundImage]="'url(assets/images/taskbanners/'+item_banner+')'">
<div class="ion-padding">
<ion-icon slot="start" name="arrow-back" class="back" (click)="onBack()"></ion-icon>
</div>
@@ -24,7 +24,7 @@
</div>
</div>
<ion-label class="color_text">Price: {{jobData.price*0.01}} {{jobData.currency}}</ion-label>
<ion-label class="color_text">Price: {{jobData.price*0.01| number : '1.2-2'}} {{jobData.currency}}</ion-label>
<div class="items">
<div class="stud">
@@ -38,15 +38,17 @@
</div>
<ion-card>
<!-- <ion-card-header>-->
<!-- <ion-card-subtitle>Task Actions</ion-card-subtitle>-->
<!-- </ion-card-header>-->
<ion-card-content>
This task is already past the due date. You can extend the timeline or cancel the job.
</ion-card-content>
<ion-button fill="clear">Extend Due Date</ion-button>
<ion-button color="danger" fill="clear">Cancel Task</ion-button>
<ion-grid>
<ion-row>
<ion-col><ion-button color="secondary" expand="block" fill="outline" (click)="extendJobDueDate()">Extend Date</ion-button></ion-col>
<ion-col></ion-col>
<ion-col> <ion-button color="danger" expand="block" fill="outline" (click)="cancelThisJob()">Cancel Task</ion-button></ion-col>
</ion-row>
</ion-grid>
</ion-card>
<!-- <ion-grid>-->
src/app/pages/jobpastdue/jobpastdue.page.scss
+13 -2
View File
@@ -1,12 +1,23 @@
ion-content {
.back_image {
width: 100%;
width: auto;
height: 130px;
background-repeat: no-repeat;
background-size: contain;
.back {
font-size: 25px;
color: white;
color: black;
}
}
ion-card{
margin: 10px 0px 10px 0px;
ion-card-content{
margin:0px
}
ion-grid{
margin: 0px;
}
}
src/app/pages/jobpastdue/jobpastdue.page.ts
+7 -4
View File
@@ -12,6 +12,7 @@ import {WrenchService} from "../../services/wrench.service";
export class JobpastduePage implements OnInit {
jobData: any;
tabs = 'activities';
item_banner:string = 'default.jpg';
constructor(
private navctr: NavController,
@@ -19,11 +20,8 @@ export class JobpastduePage implements OnInit {
public sessionDataProviderService: SessionDataProviderService,
private wrenchService: WrenchService
) {
this.jobData = this.router.getCurrentNavigation().extras.state;
console.log("XXXXX 1", this.router.getCurrentNavigation().extras);
console.log("XXXXX 2", this.router.getCurrentNavigation().extras.state);
//console.log("XXXXX 3", this.router.getCurrentNavigation().extras.state.ID);
this.item_banner = this.jobData.banner;
}
@@ -34,5 +32,10 @@ export class JobpastduePage implements OnInit {
this.navctr.back();
}
extendJobDueDate(){
}
cancelThisJob(){
}
}
src/app/pages/jobreview/jobreview.page.html
+9 -134
View File
@@ -1,6 +1,6 @@
<ion-content>
<div class="bg_image back_image" [style.backgroundImage]="'url(assets/images/market.jpg)'">
<div class="bg_image back_image" [style.backgroundImage]="'url(assets/images/taskbanners/'+item_banner+')'">
<div class="ion-padding">
<ion-icon slot="start" name="arrow-back" class="back" (click)="onBack()"></ion-icon>
</div>
@@ -24,96 +24,38 @@
</div>
</div>
<ion-label class="color_text">Price: {{jobData.price*0.01}} {{jobData.currency}}</ion-label>
<ion-label class="color_text">Price: {{jobData.price*0.01| number : '1.2-2'}} {{jobData.currency}}</ion-label>
<div class="items">
<div class="stud">
<ion-icon slot="start" name="time" color="primary"></ion-icon>
<ion-label>Timeline: {{jobData.timeline_days}} days</ion-label>
</div>
<!-- <div class="stud">-->
<!-- <ion-icon slot="start" name="document-text" color="primary"></ion-icon>-->
<!-- <ion-label>Certificate</ion-label>-->
<!-- </div>-->
</div>
<ion-card>
<!-- <ion-card-header>-->
<!-- <ion-card-subtitle>Task is Completed </ion-card-subtitle>-->
<!-- </ion-card-header>-->
<ion-card-content>
This job is in review, you can accept or reject completion.
</ion-card-content>
<ion-button color="danger" fill="clear">Reject </ion-button>
<ion-button fill="clear">Accept </ion-button>
<ion-grid>
<ion-row>
<ion-col> <ion-button color="danger" expand="block" fill="outline" (click)="rejectCompletetion()">Reject</ion-button></ion-col>
<ion-col></ion-col>
<ion-col><ion-button color="secondary" expand="block" fill="outline" (click)="acceptCompletetion()">Accept</ion-button></ion-col>
</ion-row>
</ion-grid>
</ion-card>
<!-- <ion-grid>-->
<!-- <ion-row>-->
<!-- <ion-col>-->
<!-- <ion-card color="secondary">-->
<!-- <ion-card-header>-->
<!-- <ion-card-subtitle>Card Subtitle</ion-card-subtitle>-->
<!-- </ion-card-header>-->
<!-- <ion-card-content>-->
<!-- <ion-button color="secondary" expand="block" fill="outline" >Extend Due Date</ion-button>-->
<!-- </ion-card-content>-->
<!-- </ion-card>-->
<!-- </ion-col>-->
<!-- <ion-col>-->
<!-- <ion-card color="danger">-->
<!-- <ion-card-header>-->
<!-- <ion-card-subtitle>-->
<!-- Card Subtitle-->
<!-- </ion-card-subtitle>-->
<!-- </ion-card-header>-->
<!-- <ion-card-content>-->
<!-- <ion-button color="secondary" expand="block" fill="outline">Cancel Task</ion-button>-->
<!-- </ion-card-content>-->
<!-- </ion-card>-->
<!-- </ion-col>-->
<!-- </ion-row>-->
<!-- </ion-grid>-->
<ion-segment [(ngModel)]="tabs">
<ion-segment-button value="activities">
<ion-label>Activities</ion-label>
</ion-segment-button>
<!-- <ion-segment-button value="lesson">-->
<!-- <ion-label>Show Interest</ion-label>-->
<!-- </ion-segment-button>-->
<ion-segment-button value="message">
<ion-label>Send Message</ion-label>
</ion-segment-button>
</ion-segment>
<!-- <div *ngIf="tabs =='about'" class="about">-->
<!-- <ion-label class="head_text">{{jobData.offer_code}}</ion-label>-->
<!-- &lt;!&ndash; <div class="mentor" (click)="onMentor()">&ndash;&gt;-->
<!-- <div class="mentor">-->
<!-- <div class="left">-->
<!-- <div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/taskbanners/default.jpg)'"></div>-->
<!-- <div style="margin-left: 10px;">-->
<!-- <ion-label class="bold">Expires</ion-label>-->
<!-- <ion-label class="grey">{{jobData.expire}}</ion-label>-->
<!-- </div>-->
<!-- </div>-->
<!-- &lt;!&ndash; <ion-icon name="chatbubble-ellipses-outline" color="primary"></ion-icon>&ndash;&gt;-->
<!-- </div>-->
<!-- <ion-label class="head_text">Description</ion-label>-->
<!-- <ion-label class="description">{{jobData.job_description}}-->
<!-- </ion-label>-->
<!-- <ion-label class="head_text">Delivery Details</ion-label>-->
<!-- <ion-label class="description">{{jobData.description}}-->
<!-- </ion-label>-->
<!-- </div>-->
<div *ngIf="tabs =='activities'" class="lesson">
<app-taskactivities [jobData]="jobData"></app-taskactivities>
</div>
@@ -134,73 +76,6 @@
</ion-label>
</ion-card>
<!-- <div class="video">-->
<!-- <div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/taskbanners/default.jpg)'"></div>-->
<!-- <div class="story-item">-->
<!-- <div class="menu">-->
<!-- <div class="text">-->
<!-- <div class="select show">-->
<!-- <ion-icon slot="start" name="star" color="light" class="star_icon"></ion-icon>-->
<!-- <ion-label class="rate_num white">All</ion-label>-->
<!-- </div>-->
<!-- <div class="select">-->
<!-- <ion-icon slot="start" name="star" color="primary" class="star_icon"></ion-icon>-->
<!-- <ion-label class="rate_num">1</ion-label>-->
<!-- </div>-->
<!-- <div class="select">-->
<!-- <ion-icon slot="start" name="star" color="primary" class="star_icon"></ion-icon>-->
<!-- <ion-label class="rate_num">2</ion-label>-->
<!-- </div>-->
<!-- <div class="select">-->
<!-- <ion-icon slot="start" name="star" color="primary" class="star_icon"></ion-icon>-->
<!-- <ion-label class="rate_num">3</ion-label>-->
<!-- </div>-->
<!-- <div class="select">-->
<!-- <ion-icon slot="start" name="star" color="primary" class="star_icon"></ion-icon>-->
<!-- <ion-label class="rate_num">4</ion-label>-->
<!-- </div>-->
<!-- <div class="select">-->
<!-- <ion-icon slot="start" name="star" color="primary" class="star_icon"></ion-icon>-->
<!-- <ion-label class="rate_num">5</ion-label>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="reviw_list" *ngFor="let item of [1,2,3,4,5]">-->
<!-- <div class="profile">-->
<!-- <div class="left">-->
<!-- <div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/p2.jpg)'"></div>-->
<!-- <div style="margin-left: 10px;">-->
<!-- <ion-label class="bold">Jonathon Williams</ion-label>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="right">-->
<!-- <div class="select">-->
<!-- <ion-icon slot="start" name="star" color="primary" class="star_icon"></ion-icon>-->
<!-- <ion-label class="rate_num">5</ion-label>-->
<!-- </div>-->
<!-- <ion-icon name="ellipsis-horizontal-circle-outline"></ion-icon>-->
<!-- </div>-->
<!-- </div>-->
<!-- <ion-label>The course is very good. the experience of the menter is very clear and easy to understand-->
<!-- </ion-label>-->
<!-- <div class="like">-->
<!-- <ion-icon slot="start" name="heart" color="danger" class="heart"></ion-icon>-->
<!-- <ion-label class="count">330</ion-label>-->
<!-- <ion-label class="time">2 Days ago</ion-label>-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
src/app/pages/jobreview/jobreview.page.scss
+14 -2
View File
@@ -1,14 +1,26 @@
ion-content {
.back_image {
width: 100%;
width: auto;
height: 130px;
background-repeat: no-repeat;
background-size: contain;
.back {
font-size: 25px;
color: white;
color: black;
}
}
ion-card{
margin: 10px 0px 10px 0px;
ion-card-content{
margin:0px
}
ion-grid{
margin: 0px;
}
}
.flex {
display: flex;
src/app/pages/jobreview/jobreview.page.ts
+8 -5
View File
@@ -12,18 +12,15 @@ import {WrenchService} from "../../services/wrench.service";
export class JobreviewPage implements OnInit {
jobData: any;
tabs = 'activities';
item_banner:string = 'default.jpg';
constructor(
private navctr: NavController,
private router: Router,
public sessionDataProviderService: SessionDataProviderService,
private wrenchService: WrenchService
) {
this.jobData = this.router.getCurrentNavigation().extras.state;
console.log("XXXXX 1", this.router.getCurrentNavigation().extras);
console.log("XXXXX 2", this.router.getCurrentNavigation().extras.state);
//console.log("XXXXX 3", this.router.getCurrentNavigation().extras.state.ID);
this.item_banner = this.jobData.banner;
}
@@ -34,5 +31,11 @@ export class JobreviewPage implements OnInit {
this.navctr.back();
}
acceptCompletetion(){
}
rejectCompletetion(){
}
}
src/app/pages/mycoupons/mycoupons.page.html
+14
View File
@@ -52,6 +52,20 @@
<div *ngIf="tabs =='about'" class="lesson">
<div *ngIf="pending_coupon_count == 0" >
<ion-card color="warning">
<ion-card-header>
<ion-card-title>0 Pending Coupon</ion-card-title>
<!-- <ion-card-subtitle>Card Subtitle</ion-card-subtitle>-->
</ion-card-header>
<ion-card-content>
You currently have a pending coupon. Once coupons are allocated, they will appear here.
</ion-card-content>
</ion-card>
</div>
<div class="video" *ngFor="let item of myCouponPend">
<div class="left">
<div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/line.png)'"></div>
src/app/pages/mycoupons/mycoupons.page.scss
+4 -2
View File
@@ -2,14 +2,16 @@
ion-content {
.back_image {
width: 100%;
height: 230px;
height: 130px;
.back {
font-size: 25px;
color: white;
}
}
ion-card{
margin: 5px 0px 0px 0px;
}
.flex {
display: flex;
justify-content: space-between;
src/app/pages/mycoupons/mycoupons.page.ts
+8 -7
View File
@@ -63,8 +63,9 @@ export class MycouponsPage implements OnInit {
}
myCouponPendTotalData:any;
myCouponPend: [];
myCouponPendTotalData:any;
myCouponPend: [];
pending_coupon_count:number =0 ;
getMyCouponPendData(){
this.usrData = {action:85030,
member_id: this.sessionDataProviderService.member_id,
@@ -73,11 +74,11 @@ export class MycouponsPage implements OnInit {
limit:20, page:1,offset: 0}
this.wrenchService.getCouponPending(this.usrData).subscribe(
myCouponPendTotalData => {
this.myCouponPendTotalData = myCouponPendTotalData;
console.log("myCouponPendTotalData RETURN->", this.myCouponPendTotalData);
this.myCouponPend = this.myCouponPendTotalData.result_list;
// debugger;
console.log("myCouponPend RETURN DATA->", this.myCouponPend);
this.myCouponPendTotalData = myCouponPendTotalData;
console.log("myCouponPendTotalData RETURN->", this.myCouponPendTotalData);
this.myCouponPend = this.myCouponPendTotalData.result_list;
this.pending_coupon_count = this.myCouponPend.length;
console.log("myCouponPend RETURN DATA->", this.myCouponPend);
}
);
src/app/pages/mytasks/mytasks.page.html
+1 -1
View File
@@ -25,7 +25,7 @@
</ion-segment-button>
</ion-segment>
<div *ngIf="tabs =='tasks'">
<div *ngIf="tabs =='tasks'" class="lesson">
<div *ngIf="active_job_count == 0">
<ion-card>
<img alt="WrenchBoard Tasks" src="https://www.wrenchboard.com/assets/images/apps/current-tasks.png" />
src/global.scss
+58
View File
@@ -143,4 +143,62 @@ ion-modal.custom_modal_bottom {
text-align: center;
margin-top: 30px;
// background-color: red;
}
.lesson {
margin-top: 20px;
.bold {
font-family: 'semi-bold';
}
.color {
color: var(--ion-color-primary);
}
.grey {
color: grey;
}
.sec {
display: flex;
justify-content: space-between;
align-items: center;
margin-top: 10px;
}
.video {
display: flex;
justify-content: space-between;
align-items: center;
background-color: white;
padding: 15px;
box-shadow: 0px 0px 20px 1px rgba(0, 0, 0, 0.1);
border-radius: 10px;
margin-top: 20px;
.left {
display: flex;
}
.men_image {
height: 40px;
width: 40px;
border-radius: 100%;
}
.text {
margin-left: 10px;
}
.bold_text {
font-size: 16px;
font-family: 'bold';
}
.grey_text {
font-size: 14px;
color: grey;
}
}
}