From b66b723abed333b3598e3e91f864ec83d43046d9 Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Tue, 13 Feb 2024 09:21:52 -0500
Subject: [PATCH] Family reward

---
 .../pages/familymember/familymember.page.html | 44 +++++++++++--------
 .../pages/familymember/familymember.page.scss |  7 +--
 .../pages/familymember/familymember.page.ts   | 21 ++++++---
 3 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/src/app/pages/familymember/familymember.page.html b/src/app/pages/familymember/familymember.page.html
index 8a2d9c1..c81397f 100644
--- a/src/app/pages/familymember/familymember.page.html
+++ b/src/app/pages/familymember/familymember.page.html
@@ -96,18 +96,20 @@
     </div>
 
     <div *ngIf="tabs =='lesson'" class="lesson">
-        <div class="video" *ngFor="let item of familyMemberWalletData" >
+        <div class="video" *ngFor="let item of familyMemberWalletData" style=" background-image: linear-gradient(to right, aliceblue, #e7e8e8,aliceblue);">
 
             <ion-grid class="wallet-tools">
                 <ion-row>
-                    <div style="font-weight: bolder; font-size: 18px; color: #8b198e;"> {{member_firstname}} Wallet</div>
+                    <div style="font-weight: bolder; font-size: 18px; color: #8b198e;"> {{member_firstname}}  {{item.description}} Wallet</div>
                 </ion-row>
                 <ion-row>
                     <ion-col>
                         <div class="left">
                             <div class="bg_image men_image"  [style.backgroundImage]="'url(https://www.wrenchboard.com/assets/images/apps/currency/'+item.description.toLowerCase()+'.svg)'"></div>
                             <div class="text">
-                                <ion-label class="bold_text">Balance : {{item.amount*0.01 | number : '1.2-2'}} {{item.description}}</ion-label>
+                                <ion-label
+                                        style="font-size: 22px;"
+                                        class="bold_text">Balance : {{item.amount*0.01 | number : '1.2-2'}} {{item.description}}</ion-label>
                             </div>
                         </div>
 
@@ -115,21 +117,24 @@
                 </ion-row>
                 <ion-row>
                     <ion-col>
-                        <ion-toolbar *ngIf="toolBarShow == '1' ">
-                            <ion-buttons class="actions" slot="end">
-                                <ion-button size="small"
-                                            fill="solid"
-                                            color="secondary"
-                                            shape="round"
-                                            (click)="startAddfund(item)">
-                                   Send Reward
-                                    <ion-icon name="chevron-forward-circle-outline"></ion-icon>
-                                </ion-button>
-<!--                                <ion-button size="small" fill="solid" shape="round" (click)="startWalletPlan()">Plan Account-->
-<!--                                    <ion-icon name="chevron-forward-circle-outline"></ion-icon>-->
-<!--                                </ion-button>-->
-                            </ion-buttons>
-                        </ion-toolbar>
+                        <div style="text-align: right"  *ngIf="toolBarShow == '1' ">
+                            <ion-button size="small"
+                                        fill="solid"
+                                        color="secondary"
+                                        shape="round"
+                                        (click)="startAddfund(item)">
+                                Send Reward
+                                <ion-icon name="chevron-forward-circle-outline"></ion-icon>
+                            </ion-button>
+                        </div>
+<!--                        <ion-toolbar *ngIf="toolBarShow == '1' ">-->
+<!--                            <ion-buttons class="actions" slot="end">-->
+
+<!--&lt;!&ndash;                                <ion-button size="small" fill="solid" shape="round" (click)="startWalletPlan()">Plan Account&ndash;&gt;-->
+<!--&lt;!&ndash;                                    <ion-icon name="chevron-forward-circle-outline"></ion-icon>&ndash;&gt;-->
+<!--&lt;!&ndash;                                </ion-button>&ndash;&gt;-->
+<!--                            </ion-buttons>-->
+<!--                        </ion-toolbar>-->
 
                         <div *ngIf="toolBarShow == item.wallet_uid ">
                              <ion-grid class="send-grid">
@@ -178,13 +183,14 @@
                                                 (click)="backToToolBar()"
                                                 color="danger"
                                                 shape="round"
-                                                size="small">Cancel</ion-button>
+                                                size="small">Return</ion-button>
                                     </ion-col>
                                     <ion-col class="sendpart">
                                         <ion-button
                                                 (click)="sendReward(item)"
                                                 color="secondary"
                                                 shape="round"
+                                                style="padding: 0px 10px 0px 10px"
                                                 size="small">Send</ion-button>
                                     </ion-col>
                                 </ion-row>
diff --git a/src/app/pages/familymember/familymember.page.scss b/src/app/pages/familymember/familymember.page.scss
index b4149d0..28d4fa7 100644
--- a/src/app/pages/familymember/familymember.page.scss
+++ b/src/app/pages/familymember/familymember.page.scss
@@ -16,7 +16,8 @@ ion-content {
   .send-grid{
     background-color: #eff2f4;
     border-radius: 10px;
-    font-size: 14px;
+    padding: 10px;
+    font-size: 16px;
     font-weight: bolder;
     ion-select, ion-input{
       border-radius: 10px;
@@ -193,8 +194,8 @@ ion-content {
         border-radius: 100%;
       }
 .wallet-tools{
-  background-color: white;
-  background-image: linear-gradient(to right, aliceblue, #ecf0f3,aliceblue);
+  // background-color: white;
+ // background-image: linear-gradient(to right, aliceblue, #ecf0f3,aliceblue);
     ion-toolbar{
     --ion-background-color: white;
       border-radius: 10px;
diff --git a/src/app/pages/familymember/familymember.page.ts b/src/app/pages/familymember/familymember.page.ts
index e155839..e8f4052 100644
--- a/src/app/pages/familymember/familymember.page.ts
+++ b/src/app/pages/familymember/familymember.page.ts
@@ -41,11 +41,15 @@ export class FamilymemberPage implements OnInit {
     this.familyMemberData  =  this.router.getCurrentNavigation().extras.state;
     //debugger;
 
+      if ( this.familyMemberData != undefined && this.familyMemberData.itemData != undefined ){
+        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;
+      }else{
+        this.onBack();
+      }
 
-    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;
     this.etag = '' + Date.now();
    // this.userWalletService.getWalletData();
   }
@@ -250,7 +254,11 @@ familyTransfer(reqData){
 
   sendResultData:any;
 
-  sendReward(item){
+  async sendReward(item){
+    const loading = await this.loadingCtrl.create({
+      message: 'Sending...',
+      duration: 5500,
+    });
 
     this.reqSend = {
       action:22014,
@@ -266,8 +274,11 @@ familyTransfer(reqData){
       family_transfer_mode: 100
     };
 
+    await loading.present();
+
     this.wrenchService.familyTransfer(this.reqSend).subscribe(
         sendResultData => {
+          loading.dismiss();
           this.sendResultData = sendResultData;
           console.log("sendResultData RETURN->", this.sendResultData);