From 3fb2d9af6a183ffcfb08acda201f307bb39b0b37 Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Wed, 15 Nov 2023 07:02:16 -0500
Subject: [PATCH] family page

---
 src/app/pages/family/family.page.html         |  2 +-
 src/app/pages/family/family.page.ts           |  2 +
 .../familysettings/familysettings.page.html   |  4 +-
 .../familysettings/familysettings.page.ts     |  6 ++
 .../pages/transaction/transaction.page.html   | 93 ++++++++++++++-----
 .../pages/transaction/transaction.page.scss   |  6 +-
 6 files changed, 88 insertions(+), 25 deletions(-)

diff --git a/src/app/pages/family/family.page.html b/src/app/pages/family/family.page.html
index a4ed2bf..5c370c3 100644
--- a/src/app/pages/family/family.page.html
+++ b/src/app/pages/family/family.page.html
@@ -15,7 +15,7 @@
 </ion-header>
 <ion-content>
   <div class="boxed_contents">
-    <div class="bg_image back_image" [style.backgroundImage]="'url(assets/images/family.jpg)'">
+    <div class="bg_image back_image" [style.backgroundImage]="'url('+session_image_server+'/'+curr_session+'/familybanner/'+member_uid+')'">
       <div class="ion-padding">
         <ion-icon slot="start" name="arrow-back" class="back" (click)="onBack()"></ion-icon>
       </div>
diff --git a/src/app/pages/family/family.page.ts b/src/app/pages/family/family.page.ts
index d16af7d..3e1185a 100644
--- a/src/app/pages/family/family.page.ts
+++ b/src/app/pages/family/family.page.ts
@@ -29,7 +29,9 @@ export class FamilyPage implements OnInit {
 
 
   }
+    member_uid:string='';
   ngOnInit() {
+    this.member_uid=  this.sessionDataProviderService.member_uid
     this.getFamilyData();
     this.getFamilyPeningData();
     this.getFamilyActiveJobsData();
diff --git a/src/app/pages/familysettings/familysettings.page.html b/src/app/pages/familysettings/familysettings.page.html
index 6722e64..7710a38 100644
--- a/src/app/pages/familysettings/familysettings.page.html
+++ b/src/app/pages/familysettings/familysettings.page.html
@@ -38,12 +38,12 @@
   </ion-list>
 
   <ion-card>
-    <img alt="Silhouette of mountains" src="assets/images/family.jpg" />
+
     <ion-card-header>
 <!--      <ion-card-title>Card Title</ion-card-title>-->
       <ion-card-subtitle>Family Banner</ion-card-subtitle>
     </ion-card-header>
-
+    <img alt="Family" src="{{session_image_server}}/{{curr_session}}/familybanner/{{member_uid}}" />
     <ion-card-content>
      Change Banner
     </ion-card-content>
diff --git a/src/app/pages/familysettings/familysettings.page.ts b/src/app/pages/familysettings/familysettings.page.ts
index 28ecbd1..1738909 100644
--- a/src/app/pages/familysettings/familysettings.page.ts
+++ b/src/app/pages/familysettings/familysettings.page.ts
@@ -20,8 +20,14 @@ export class FamilysettingsPage implements OnInit {
 
 
   }
+  member_uid:string='';
+  curr_session:string='';
+  session_image_server:string='';
 
   ngOnInit() {
+    this.member_uid=  this.sessionDataProviderService.member_uid;
+    this.curr_session =  this.sessionDataProviderService.session;
+    this.session_image_server = this.sessionDataProviderService.session_image_server;
   }
 
   onBack() {
diff --git a/src/app/pages/transaction/transaction.page.html b/src/app/pages/transaction/transaction.page.html
index 42644c2..f24ea58 100644
--- a/src/app/pages/transaction/transaction.page.html
+++ b/src/app/pages/transaction/transaction.page.html
@@ -45,31 +45,82 @@
 <!--                    <ion-label class="bold">Wallet(s)</ion-label>-->
 <!--                    &lt;!&ndash;                <ion-label class="color">.</ion-label>&ndash;&gt;-->
 <!--                </div>-->
-                <div class="video wallets" *ngFor="let item of walletData">
-                    <div class="left">
-                        <div class="bg_image men_image" [style.backgroundImage]="'url(https://www.wrenchboard.com/assets/images/apps/currency/'+item.code.toLowerCase()+'.svg)'"></div>
-                    </div>
-                        <div class="text">
-                            <ion-label class="bold_text">{{item.description}}</ion-label>
-                            <ion-label class="grey_text"><span class="balance_line">Balance {{item.amount*0.01 | number : '1.2-2'}} </span></ion-label>
-                            <ion-grid>
-                                <ion-row>
-                                    <ion-col></ion-col>
-                                    <ion-col>
-                                        <ion-button size="small"  shape="round" expand="block" (click)="addCredit(item)">Add Credit</ion-button>
-                                    </ion-col>
 
-                                    <ion-col>
-                                        <div *ngIf="item.action_type == 'AC_AD_WR_FUND' " >
-                                            <ion-button color="success" shape="round" size="small" expand="block" (click)="startRedeem(item)">Redeem</ion-button>
-                                        </div>
-                                    </ion-col>
+                <ion-accordion-group>
+                    <ion-accordion *ngFor="let item of walletData" value="{{item.wallet_uid}}">
+                        <ion-item slot="header" color="light">
+                            <ion-label><span style="font-weight: bolder">{{item.description}}</span> Balance {{item.amount*0.01 | number : '1.2-2'}}</ion-label>
+                        </ion-item>
+                        <div class="ion-padding acc-item" slot="content">
+                            <div class="video wallets">
+                                <div class="left">
+                                    <div class="bg_image men_image" [style.backgroundImage]="'url(https://www.wrenchboard.com/assets/images/apps/currency/'+item.code.toLowerCase()+'.svg)'"></div>
+                                </div>
+                                <div class="text">
+                                    <ion-label class="bold_text">{{item.description}}</ion-label>
+                                    <ion-label class="grey_text"><span class="balance_line">Balance {{item.amount*0.01 | number : '1.2-2'}} </span></ion-label>
+                                    <ion-grid>
+                                        <ion-row>
+                                            <ion-col></ion-col>
+                                            <ion-col>
+                                                <ion-button size="small"  shape="round" expand="block" (click)="addCredit(item)">Add Credit</ion-button>
+                                            </ion-col>
+
+                                            <ion-col>
+                                                <div *ngIf="item.action_type == 'AC_AD_WR_FUND' " >
+                                                    <ion-button color="success" shape="round" size="small" expand="block" (click)="startRedeem(item)">Redeem</ion-button>
+                                                </div>
+                                            </ion-col>
+
+
+                                        </ion-row>
+                                    </ion-grid>
+                                </div>
+                            </div>
 
 
-                                </ion-row>
-                            </ion-grid>
                         </div>
-                </div>
+                    </ion-accordion>
+<!--                    <ion-accordion value="second">-->
+<!--                        <ion-item slot="header" color="light">-->
+<!--                            <ion-label>Second Accordion</ion-label>-->
+<!--                        </ion-item>-->
+<!--                        <div class="ion-padding" slot="content">Second Content</div>-->
+<!--                    </ion-accordion>-->
+<!--                    <ion-accordion value="third">-->
+<!--                        <ion-item slot="header" color="light">-->
+<!--                            <ion-label>Third Accordion</ion-label>-->
+<!--                        </ion-item>-->
+<!--                        <div class="ion-padding" slot="content">Third Content</div>-->
+<!--                    </ion-accordion>-->
+                </ion-accordion-group>
+
+
+<!--                <div class="video wallets" *ngFor="let item of walletData">-->
+<!--                    <div class="left">-->
+<!--                        <div class="bg_image men_image" [style.backgroundImage]="'url(https://www.wrenchboard.com/assets/images/apps/currency/'+item.code.toLowerCase()+'.svg)'"></div>-->
+<!--                    </div>-->
+<!--                        <div class="text">-->
+<!--                            <ion-label class="bold_text">{{item.description}}</ion-label>-->
+<!--                            <ion-label class="grey_text"><span class="balance_line">Balance {{item.amount*0.01 | number : '1.2-2'}} </span></ion-label>-->
+<!--                            <ion-grid>-->
+<!--                                <ion-row>-->
+<!--                                    <ion-col></ion-col>-->
+<!--                                    <ion-col>-->
+<!--                                        <ion-button size="small"  shape="round" expand="block" (click)="addCredit(item)">Add Credit</ion-button>-->
+<!--                                    </ion-col>-->
+
+<!--                                    <ion-col>-->
+<!--                                        <div *ngIf="item.action_type == 'AC_AD_WR_FUND' " >-->
+<!--                                            <ion-button color="success" shape="round" size="small" expand="block" (click)="startRedeem(item)">Redeem</ion-button>-->
+<!--                                        </div>-->
+<!--                                    </ion-col>-->
+
+
+<!--                                </ion-row>-->
+<!--                            </ion-grid>-->
+<!--                        </div>-->
+<!--                </div>-->
 
 
             </div>
diff --git a/src/app/pages/transaction/transaction.page.scss b/src/app/pages/transaction/transaction.page.scss
index f6246ea..d61c0d8 100644
--- a/src/app/pages/transaction/transaction.page.scss
+++ b/src/app/pages/transaction/transaction.page.scss
@@ -15,8 +15,12 @@ ion-header {
 
 
 ion-content {
+  .acc-item{
+    background-color: #3171e0;
+  }
+
   .wallets{
-    background-color: #dddae1;
+    background-color: #f3f2f4;
     width: 100%;
     min-height: 110px;
     padding: 0px;