+
-
@@ -128,9 +128,10 @@
Send Updates
- Send Updates
+
{{interest_msg_status}}
diff --git a/src/app/pages/jobactive/jobactive.page.scss b/src/app/pages/jobactive/jobactive.page.scss
index 790c17c..f9fda44 100644
--- a/src/app/pages/jobactive/jobactive.page.scss
+++ b/src/app/pages/jobactive/jobactive.page.scss
@@ -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;
}
}
diff --git a/src/app/pages/jobactive/jobactive.page.ts b/src/app/pages/jobactive/jobactive.page.ts
index 0d3e19c..4d27f57 100644
--- a/src/app/pages/jobactive/jobactive.page.ts
+++ b/src/app/pages/jobactive/jobactive.page.ts
@@ -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;
}
diff --git a/src/app/pages/jobmanager/jobmanager.page.ts b/src/app/pages/jobmanager/jobmanager.page.ts
index c8b9ea9..de68527 100644
--- a/src/app/pages/jobmanager/jobmanager.page.ts
+++ b/src/app/pages/jobmanager/jobmanager.page.ts
@@ -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){
diff --git a/src/app/pages/jobpastdue/jobpastdue.page.html b/src/app/pages/jobpastdue/jobpastdue.page.html
index c422864..8c2f6ef 100644
--- a/src/app/pages/jobpastdue/jobpastdue.page.html
+++ b/src/app/pages/jobpastdue/jobpastdue.page.html
@@ -1,6 +1,6 @@
- Price: {{jobData.price*0.01}} {{jobData.currency}}
+ Price: {{jobData.price*0.01| number : '1.2-2'}} {{jobData.currency}}
-
-
-
This task is already past the due date. You can extend the timeline or cancel the job.
- Extend Due Date
- Cancel Task
+
+
+ Extend Date Cancel Task
+
+
diff --git a/src/app/pages/jobpastdue/jobpastdue.page.scss b/src/app/pages/jobpastdue/jobpastdue.page.scss
index 8fd1874..0de809a 100644
--- a/src/app/pages/jobpastdue/jobpastdue.page.scss
+++ b/src/app/pages/jobpastdue/jobpastdue.page.scss
@@ -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;
}
}
diff --git a/src/app/pages/jobpastdue/jobpastdue.page.ts b/src/app/pages/jobpastdue/jobpastdue.page.ts
index 23efa50..396c93d 100644
--- a/src/app/pages/jobpastdue/jobpastdue.page.ts
+++ b/src/app/pages/jobpastdue/jobpastdue.page.ts
@@ -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(){
+
+ }
}
diff --git a/src/app/pages/jobreview/jobreview.page.html b/src/app/pages/jobreview/jobreview.page.html
index 57d5164..c7c1ea8 100644
--- a/src/app/pages/jobreview/jobreview.page.html
+++ b/src/app/pages/jobreview/jobreview.page.html
@@ -1,6 +1,6 @@
- Price: {{jobData.price*0.01}} {{jobData.currency}}
+ Price: {{jobData.price*0.01| number : '1.2-2'}} {{jobData.currency}}
Timeline: {{jobData.timeline_days}} days
-
-
-
-
-
-
-
This job is in review, you can accept or reject completion.
- Reject
- Accept
-
+
+
+ Reject
+ Accept
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Activities
-
-
-
Send Message
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/app/pages/jobreview/jobreview.page.scss b/src/app/pages/jobreview/jobreview.page.scss
index 8fd1874..9b308eb 100644
--- a/src/app/pages/jobreview/jobreview.page.scss
+++ b/src/app/pages/jobreview/jobreview.page.scss
@@ -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;
diff --git a/src/app/pages/jobreview/jobreview.page.ts b/src/app/pages/jobreview/jobreview.page.ts
index 58bef43..beba7ac 100644
--- a/src/app/pages/jobreview/jobreview.page.ts
+++ b/src/app/pages/jobreview/jobreview.page.ts
@@ -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(){
+
+ }
}
diff --git a/src/app/pages/mycoupons/mycoupons.page.html b/src/app/pages/mycoupons/mycoupons.page.html
index 89db9b5..00bd7ce 100644
--- a/src/app/pages/mycoupons/mycoupons.page.html
+++ b/src/app/pages/mycoupons/mycoupons.page.html
@@ -52,6 +52,20 @@
+
-
@@ -38,15 +38,17 @@
+
-
+
+
+
+ 0 Pending Coupon
+
+
+
+
+ You currently have a pending coupon. Once coupons are allocated, they will appear here.
+
+
+
+
+
diff --git a/src/app/pages/mycoupons/mycoupons.page.scss b/src/app/pages/mycoupons/mycoupons.page.scss
index 1c3cf7a..b505c32 100644
--- a/src/app/pages/mycoupons/mycoupons.page.scss
+++ b/src/app/pages/mycoupons/mycoupons.page.scss
@@ -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;
diff --git a/src/app/pages/mycoupons/mycoupons.page.ts b/src/app/pages/mycoupons/mycoupons.page.ts
index 0009249..bc73763 100644
--- a/src/app/pages/mycoupons/mycoupons.page.ts
+++ b/src/app/pages/mycoupons/mycoupons.page.ts
@@ -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);
}
);
diff --git a/src/app/pages/mytasks/mytasks.page.html b/src/app/pages/mytasks/mytasks.page.html
index 2258070..871800d 100644
--- a/src/app/pages/mytasks/mytasks.page.html
+++ b/src/app/pages/mytasks/mytasks.page.html
@@ -25,7 +25,7 @@
-
+
diff --git a/src/global.scss b/src/global.scss
index 8be3679..471a23e 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -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;
+ }
+ }
}
\ No newline at end of file
diff --git a/src/global.scss b/src/global.scss
index 8be3679..471a23e 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -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;
+ }
+ }
}
\ No newline at end of file