From ec4b26dab245905e8b31793d12232b993ae81b64 Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Sat, 9 Sep 2023 18:51:49 -0400
Subject: [PATCH] task family

---
 src/app/pages/family/family.page.html         |  2 +-
 src/app/pages/family/family.page.ts           |  7 ++--
 .../pages/familymember/familymember.page.html | 32 ++++---------------
 .../pages/familymember/familymember.page.ts   |  9 ++++--
 src/app/services/wrench.service.ts            |  2 ++
 src/assets/images/task-list.svg               |  1 +
 6 files changed, 22 insertions(+), 31 deletions(-)
 create mode 100644 src/assets/images/task-list.svg

diff --git a/src/app/pages/family/family.page.html b/src/app/pages/family/family.page.html
index 6f2f19e..0fb77aa 100644
--- a/src/app/pages/family/family.page.html
+++ b/src/app/pages/family/family.page.html
@@ -78,7 +78,7 @@
 
         <div class="video" *ngFor="let item of jobManagerActiveData">
           <div class="left">
-            <div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/line.png)'"></div>
+            <div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/task-list.svg)'"></div>
 
             <div class="text">
               <ion-label class="bold_text">{{item.title}}</ion-label>
diff --git a/src/app/pages/family/family.page.ts b/src/app/pages/family/family.page.ts
index 12df50d..f135f06 100644
--- a/src/app/pages/family/family.page.ts
+++ b/src/app/pages/family/family.page.ts
@@ -44,11 +44,14 @@ export class FamilyPage implements OnInit {
     this.router.navigate(['enroll']);
   }
   familyMemebr(item){
-     this.router.navigate(['familymember'],{state: item});
+      var famItem = {jobManagerActiveData: this.jobManagerActiveData,
+                                              familyPendingData:this.familyPendingData,
+                                              itemData:item};
+     this.router.navigate(['familymember'],{state: famItem});
   }
 
   usrData: {
-    action:22010, member_id: number, uid: string, sessionid: string, limit:20, page:1,offset: 0
+    action:number, member_id: number, uid: string, sessionid: string, limit:20, page:1,offset: 0
   };
   familyTotalData:any;
   familyData: [];
diff --git a/src/app/pages/familymember/familymember.page.html b/src/app/pages/familymember/familymember.page.html
index ad1ba8a..f7637e9 100644
--- a/src/app/pages/familymember/familymember.page.html
+++ b/src/app/pages/familymember/familymember.page.html
@@ -57,37 +57,19 @@
         </div>
 
 
-        <div class="video" *ngFor="let item of [1,2,3,4,5,6]">
+        <div class="video" *ngFor="let item of jobManagerActiveData">
             <div class="left">
-                <div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/line.png)'"></div>
+                <div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/task-list.svg)'"></div>
 
                 <div class="text">
-                    <ion-label class="bold_text">Why Using Figma ?</ion-label>
-                    <ion-label class="grey_text">10 mins</ion-label>
+                    <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 |date}}</ion-label>
                 </div>
             </div>
             <div class="right">
-                <ion-icon name="lock-closed-outline"></ion-icon>
-            </div>
-        </div>
-
-        <div class="sec">
-            <ion-label class="grey">Suggested Tasks</ion-label>
-            <ion-label class="color">0</ion-label>
-        </div>
-
-
-        <div class="video" *ngFor="let item of [1,2,3,4,5,6]">
-            <div class="left">
-                <div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/line.png)'"></div>
-
-                <div class="text">
-                    <ion-label class="bold_text">Why Using Figma ?</ion-label>
-                    <ion-label class="grey_text">10 mins</ion-label>
-                </div>
-            </div>
-            <div class="right">
-                <ion-icon name="lock-closed-outline"></ion-icon>
+                <ion-icon name="chevron-forward-outline" color="medium"></ion-icon>
             </div>
         </div>
 
diff --git a/src/app/pages/familymember/familymember.page.ts b/src/app/pages/familymember/familymember.page.ts
index 187f137..fa874a3 100644
--- a/src/app/pages/familymember/familymember.page.ts
+++ b/src/app/pages/familymember/familymember.page.ts
@@ -19,6 +19,7 @@ export class FamilymemberPage implements OnInit {
   member_username:string='';
   member_pin:string='';
   family_uid:string='';
+  jobManagerActiveData:any;
 
   member_qr_string ='0000000';
 
@@ -29,9 +30,11 @@ export class FamilymemberPage implements OnInit {
       private wrenchService: WrenchService,
   ) {
     this.familyMemberData  =  this.router.getCurrentNavigation().extras.state;
-    this.member_firstname= this.familyMemberData.firstname;
-    this.member_lastname = this.familyMemberData.lastname;
-    this.family_uid = this.familyMemberData.family_uid;
+    //debugger;
+    this.member_firstname= this.familyMemberData.itemData.firstname;
+    this.member_lastname = this.familyMemberData.itemData.lastname;
+    this.family_uid = this.familyMemberData.itemData.family_uid;
+    this.jobManagerActiveData = this.familyMemberData.jobManagerActiveData;
   }
 
   ngOnInit() {
diff --git a/src/app/services/wrench.service.ts b/src/app/services/wrench.service.ts
index 19a1818..6dd300d 100644
--- a/src/app/services/wrench.service.ts
+++ b/src/app/services/wrench.service.ts
@@ -209,6 +209,8 @@ export class WrenchService {
     familyManage(postData){
         return this.getPostData("/familymanage", postData);
     }
+
+
   /*
 
 
diff --git a/src/assets/images/task-list.svg b/src/assets/images/task-list.svg
new file mode 100644
index 0000000..dde19c3
--- /dev/null
+++ b/src/assets/images/task-list.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 64 64" id="TaskList"><defs><linearGradient id="a" x1="-6.694" x2="50.806" y1="11.031" y2="72.531" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f6cf8a" class="stopColore17fff svgShape"></stop><stop offset=".095" stop-color="#ff6e85" class="stopColord67dfc svgShape"></stop><stop offset=".264" stop-color="#000000" class="stopColorb876f3 svgShape"></stop><stop offset=".487" stop-color="#6bafe5" class="stopColor876be5 svgShape"></stop><stop offset=".751" stop-color="#4687ba" class="stopColor455dd1 svgShape"></stop><stop offset="1" stop-color="#006abd" class="stopColor004ebd svgShape"></stop></linearGradient><linearGradient id="b" x1=".29" x2="57.79" y1="4.501" y2="66.001" xlink:href="#a"></linearGradient><linearGradient id="c" x1="14.767" x2="72.267" y1="-9.034" y2="52.466" xlink:href="#a"></linearGradient><linearGradient id="d" x1="4.281" x2="61.781" y1=".77" y2="62.27" xlink:href="#a"></linearGradient><linearGradient id="e" x1="2.285" x2="59.785" y1="2.636" y2="64.136" xlink:href="#a"></linearGradient><linearGradient id="f" x1="9.27" x2="66.77" y1="-3.894" y2="57.606" xlink:href="#a"></linearGradient></defs><path fill="url(#a)" fill-rule="evenodd" d="M36.107,43.575l-1.288-.28a9.254,9.254,0,0,0-.671-1.619l.714-1.108a1,1,0,0,0-.04-1.138,10.975,10.975,0,0,0-2.252-2.252,1,1,0,0,0-1.138-.04l-1.109.713a9.282,9.282,0,0,0-1.618-.67l-.28-1.288a1,1,0,0,0-.832-.777,10.975,10.975,0,0,0-3.186,0,1,1,0,0,0-.832.777l-.28,1.288a9.254,9.254,0,0,0-1.619.671l-1.108-.714a1,1,0,0,0-1.138.04,10.975,10.975,0,0,0-2.252,2.252,1,1,0,0,0-.04,1.138l.713,1.109a9.287,9.287,0,0,0-.67,1.618l-1.288.28a1,1,0,0,0-.777.832,10.971,10.971,0,0,0,0,3.186,1,1,0,0,0,.777.832l1.288.28a9.259,9.259,0,0,0,.671,1.619l-.714,1.108a1,1,0,0,0,.04,1.138,10.974,10.974,0,0,0,2.252,2.252,1,1,0,0,0,1.138.04l1.109-.713a9.289,9.289,0,0,0,1.618.67l.28,1.288a1,1,0,0,0,.832.777,10.971,10.971,0,0,0,3.186,0,1,1,0,0,0,.832-.777l.28-1.288a9.259,9.259,0,0,0,1.619-.671l1.108.714a1,1,0,0,0,1.138-.04,10.975,10.975,0,0,0,2.252-2.252,1,1,0,0,0,.04-1.138l-.713-1.109a9.285,9.285,0,0,0,.67-1.618l1.288-.28a1,1,0,0,0,.777-.832,10.975,10.975,0,0,0,0-3.186A1,1,0,0,0,36.107,43.575Zm-1.129,3.048L33.8,46.88a1,1,0,0,0-.762.751,7.24,7.24,0,0,1-.908,2.192,1,1,0,0,0,.007,1.07l.653,1.015a9.184,9.184,0,0,1-.882.882l-1.015-.653a1,1,0,0,0-1.07-.007,7.241,7.241,0,0,1-2.192.908,1,1,0,0,0-.751.762l-.256,1.178a8.95,8.95,0,0,1-1.247,0L25.12,53.8a1,1,0,0,0-.751-.762,7.242,7.242,0,0,1-2.192-.908,1,1,0,0,0-1.07.007l-1.015.653a9.17,9.17,0,0,1-.882-.882l.653-1.015a1,1,0,0,0,.007-1.07,7.242,7.242,0,0,1-.908-2.192,1,1,0,0,0-.762-.751l-1.178-.256a8.95,8.95,0,0,1,0-1.247L18.2,45.12a1,1,0,0,0,.762-.751,7.241,7.241,0,0,1,.908-2.192,1,1,0,0,0-.007-1.07l-.653-1.015a9.184,9.184,0,0,1,.882-.882l1.015.653a1,1,0,0,0,1.07.007,7.24,7.24,0,0,1,2.192-.908,1,1,0,0,0,.751-.762l.256-1.178a8.95,8.95,0,0,1,1.247,0h0L26.88,38.2a1,1,0,0,0,.751.762,7.239,7.239,0,0,1,2.192.908,1,1,0,0,0,1.07-.007l1.015-.653a9.2,9.2,0,0,1,.882.882l-.653,1.015a1,1,0,0,0-.007,1.07,7.239,7.239,0,0,1,.908,2.192,1,1,0,0,0,.762.751l1.178.256A8.95,8.95,0,0,1,34.978,46.623Z"></path><path fill="url(#a)" fill-rule="evenodd" d="M26,40.352A5.648,5.648,0,1,0,31.648,46,5.651,5.651,0,0,0,26,40.352Zm0,9.3A3.648,3.648,0,1,1,29.648,46,3.649,3.649,0,0,1,26,49.648Z"></path><path fill="url(#b)" fill-rule="evenodd" d="M46,3H6A1,1,0,0,0,5,4V60a1,1,0,0,0,1,1H46a1,1,0,0,0,1-1V4A1,1,0,0,0,46,3ZM45,59H7V5H45Z"></path><path fill="url(#c)" fill-rule="evenodd" d="M58.942,15.662,54.949,3.684a1,1,0,0,0-1.9,0L49.058,15.662A1.024,1.024,0,0,0,49,16V56a5,5,0,0,0,10,0V16A1.026,1.026,0,0,0,58.942,15.662ZM54,7.162,56.613,15H51.387ZM57,56a3,3,0,0,1-6,0V53h6Zm0-5H51V17h6Z"></path><path fill="url(#d)" fill-rule="evenodd" d="M12,25H40a1,1,0,0,0,0-2H12a1,1,0,0,0,0,2Z"></path><path fill="url(#e)" fill-rule="evenodd" d="M12,29H40a1,1,0,0,0,0-2H12a1,1,0,0,0,0,2Z"></path><path fill="url(#b)" fill-rule="evenodd" d="M12,33H40a1,1,0,0,0,0-2H12a1,1,0,0,0,0,2Z"></path><path fill="url(#f)" fill-rule="evenodd" d="M12,21H40a1,1,0,0,0,1-1V8a1,1,0,0,0-1-1H12a1,1,0,0,0-1,1V20A1,1,0,0,0,12,21ZM13,9H39V19H13Z"></path></svg>
\ No newline at end of file