diff --git a/src/app/pages/family/family.page.html b/src/app/pages/family/family.page.html index ee3046b..67994bb 100644 --- a/src/app/pages/family/family.page.html +++ b/src/app/pages/family/family.page.html @@ -1,5 +1,6 @@ +
@@ -133,17 +134,21 @@
- - Silhouette of mountains - - No Pending - You have 0 pending suggestions - +
+ + Silhouette of mountains + + No Pending + You have 0 pending suggestions + + + + It's fun when the family recommends activities for your approval. Any family member can log in to their profile and send what they are interested in. + + +
+ - - It's fun when the family recommends activities for your approval. Any family member can log in to their profile and send what they are interested in. - -
@@ -188,7 +193,7 @@
-
+
{{item.title}}
diff --git a/src/app/pages/invite/invite.page.html b/src/app/pages/invite/invite.page.html index 0aaa8f1..8c0bed0 100644 --- a/src/app/pages/invite/invite.page.html +++ b/src/app/pages/invite/invite.page.html @@ -21,25 +21,43 @@ + + + Card Title + Card Subtitle + - - - - + + + + + - - - - + + + + + + + + + + + + + + + + + Send + + + + + + - - - - - - Login - diff --git a/src/app/pages/invite/invite.page.ts b/src/app/pages/invite/invite.page.ts index e51732f..80ebe8b 100644 --- a/src/app/pages/invite/invite.page.ts +++ b/src/app/pages/invite/invite.page.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import {Component, OnInit, ViewChild} from '@angular/core'; import {NavController} from "@ionic/angular"; import {Router} from "@angular/router"; import { WrenchService } from 'src/app/services/wrench.service'; @@ -11,6 +11,10 @@ import {SessionDataProviderService} from "../../store/session-data-provider.serv }) export class InvitePage implements OnInit { + @ViewChild('firstname') firstname; + @ViewChild('lastname') lastname; + @ViewChild('email') email; + constructor( private navctr: NavController, private router: Router, @@ -19,6 +23,9 @@ export class InvitePage implements OnInit { ) { } + sendRefer(){ + + } ngOnInit() { this.getReferData(); } diff --git a/src/app/pages/mytasks/mytasks.page.html b/src/app/pages/mytasks/mytasks.page.html index a9a7387..6401292 100644 --- a/src/app/pages/mytasks/mytasks.page.html +++ b/src/app/pages/mytasks/mytasks.page.html @@ -25,18 +25,20 @@
+
+ + WrenchBoard Tasks + + Current Tasks + Card Subtitle + - - WrenchBoard Tasks - - Current Tasks - Card Subtitle - + + Here's a small text description for the card content. Nothing more, nothing less. + + +
- - Here's a small text description for the card content. Nothing more, nothing less. - -
diff --git a/src/app/pages/mytasks/mytasks.page.ts b/src/app/pages/mytasks/mytasks.page.ts index b5387e8..95ee87a 100644 --- a/src/app/pages/mytasks/mytasks.page.ts +++ b/src/app/pages/mytasks/mytasks.page.ts @@ -13,6 +13,11 @@ export class MytasksPage implements OnInit { tabs: any = 'tasks'; + active_job_count:number =0; + pastdue_job_count:number =0; + review_job_count:number =0; + + constructor( private router: Router, public sessionDataProviderService: SessionDataProviderService, @@ -55,6 +60,7 @@ export class MytasksPage implements OnInit { this.jobsData = this.jobsTotalData.result_list; // debugger; console.log("JOBS RETURN DATA->", this.jobsData); + this.active_job_count = this.jobsData.length; // this.blogDataService.setBlogData(this.blogResult.blog_data); } );