From 1e7400b76e5589b467cd9a96c46ffa5ca0374a59 Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Wed, 31 Jan 2024 13:48:41 -0500
Subject: [PATCH] fix home dash

---
 .../add-relatives/add-relatives.component.ts  | 29 ++++++++++++++
 .../familysettings/familysettings.page.html   | 39 -------------------
 src/app/pages/home/home.page.html             | 35 ++++++++++-------
 src/app/pages/home/home.page.ts               |  2 +
 4 files changed, 51 insertions(+), 54 deletions(-)

diff --git a/src/app/components/add-relatives/add-relatives.component.ts b/src/app/components/add-relatives/add-relatives.component.ts
index b4379bb..3593534 100644
--- a/src/app/components/add-relatives/add-relatives.component.ts
+++ b/src/app/components/add-relatives/add-relatives.component.ts
@@ -123,5 +123,34 @@ export class AddRelativesComponent implements OnInit {
     );
   }
 
+  async inviteFamilyReport(){
+
+    this.reqData={
+      action:22031,
+      member_id: this.sessionDataProviderService.member_id,
+      uid: this.sessionDataProviderService.member_uid,
+      sessionid: this.sessionDataProviderService.session ,
+      firstname: this.firstname,
+      lastname: this.lastname,
+      email: this.email,
+      family_type: this.family_type
+    }
+    this.wrenchService.familyInvite(this.reqData).subscribe(
+        addFamilyResult => {
+          this.addFamilyResult = addFamilyResult;
+          console.log("this.wrenchService.createFamilyResult RETURN DATA->", this.addFamilyResult);
+          if (this.addFamilyResult.internal_return> 0){
+            this.firstname='';
+            this.lastname='';
+            this.email='';
+            this.addFamilyResultText =  "Invite Sent.";
+            setTimeout(()=>{
+              this.addFamilyResultText="";
+              this.setCloseModal();
+            },3000);
+          }
+        }
+    );
+  }
 
 }
diff --git a/src/app/pages/familysettings/familysettings.page.html b/src/app/pages/familysettings/familysettings.page.html
index 8c67d94..3ce2c6b 100644
--- a/src/app/pages/familysettings/familysettings.page.html
+++ b/src/app/pages/familysettings/familysettings.page.html
@@ -14,8 +14,6 @@
   </ion-toolbar>
 </ion-header>
 
-
-
 <ion-content  class="ion-padding">
     <div class="boxed_contents">
         <ion-accordion-group>
@@ -51,43 +49,6 @@
                 </div>
             </ion-accordion>
         </ion-accordion-group>
-
-
-<!--        <ion-list>-->
-<!--            <ion-item>-->
-<!--                <ion-icon aria-hidden="true" name="people" slot="start"></ion-icon>-->
-<!--                <ion-label>Add Family</ion-label>-->
-<!--            </ion-item>-->
-<!--            <ion-item>-->
-<!--                <ion-icon aria-hidden="true" name="people" slot="start"></ion-icon>-->
-<!--                <ion-label>Relatives</ion-label>-->
-<!--            </ion-item>-->
-<!--            <ion-item>-->
-<!--                <ion-icon aria-hidden="true" name="chatbubbles-outline" slot="start"></ion-icon>-->
-<!--                <ion-label>Notifications</ion-label>-->
-<!--            </ion-item>-->
-
-<!--            &lt;!&ndash;    <ion-item>&ndash;&gt;-->
-<!--            &lt;!&ndash;      <ion-icon aria-hidden="true" name="bluetooth" slot="start"></ion-icon>&ndash;&gt;-->
-<!--            &lt;!&ndash;      <ion-label>Bluetooth</ion-label>&ndash;&gt;-->
-<!--            &lt;!&ndash;    </ion-item>&ndash;&gt;-->
-<!--            &lt;!&ndash;    <ion-item>&ndash;&gt;-->
-<!--            &lt;!&ndash;      <ion-icon aria-hidden="true" name="call" slot="start"></ion-icon>&ndash;&gt;-->
-<!--            &lt;!&ndash;      <ion-label>Cellular</ion-label>&ndash;&gt;-->
-<!--            &lt;!&ndash;    </ion-item>&ndash;&gt;-->
-<!--        </ion-list>-->
-
-<!--        <ion-card>-->
-
-<!--            <ion-card-header>-->
-<!--                &lt;!&ndash;      <ion-card-title>Card Title</ion-card-title>&ndash;&gt;-->
-<!--                <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>-->
-<!--        </ion-card>-->
     </div>
 
 </ion-content>
diff --git a/src/app/pages/home/home.page.html b/src/app/pages/home/home.page.html
index 6e16dfd..1a1e851 100644
--- a/src/app/pages/home/home.page.html
+++ b/src/app/pages/home/home.page.html
@@ -55,21 +55,26 @@
         </ion-grid>
       </div>
       <ng-template #elseFulltag>
-        <app-familiy-dash></app-familiy-dash>
-        <app-latest-market></app-latest-market>
-<!--        <app-tracking></app-tracking>-->
-        <ion-card  class="map-sec" *ngIf="enableTracking > 0">
-          <app-tracking></app-tracking>
-          <ion-card-content>
-            <ion-list>
-              <ion-item lines="none">
-                <ion-icon name="chevron-forward-outline" slot="end"></ion-icon>
-    <!--            <ion-icon aria-hidden="true" name="airplane" ></ion-icon>-->
-                <ion-label>Family Location</ion-label>
-              </ion-item>
-            </ion-list>
-          </ion-card-content>
-        </ion-card>
+
+        <div *ngIf="home_dash_type=='DEFAULT_HOME_DASH'; ">
+              <app-familiy-dash></app-familiy-dash>
+              <app-latest-market></app-latest-market>
+              <!--        <app-tracking></app-tracking>-->
+              <ion-card  class="map-sec" *ngIf="enableTracking > 0">
+                <app-tracking></app-tracking>
+                <ion-card-content>
+                  <ion-list>
+                    <ion-item lines="none">
+                      <ion-icon name="chevron-forward-outline" slot="end"></ion-icon>
+                      <!--            <ion-icon aria-hidden="true" name="airplane" ></ion-icon>-->
+                      <ion-label>Family Location</ion-label>
+                    </ion-item>
+                  </ion-list>
+                </ion-card-content>
+              </ion-card>
+        </div> 
+
+
 
         <div *ngIf = "homebannerCount <3;">
 <!--          <div class="offer">-->
diff --git a/src/app/pages/home/home.page.ts b/src/app/pages/home/home.page.ts
index a5d8af9..fb89cae 100644
--- a/src/app/pages/home/home.page.ts
+++ b/src/app/pages/home/home.page.ts
@@ -30,6 +30,8 @@ export class HomePage implements OnInit {
   walletData:any;
   enableTracking:number=0;
   etag:string='';
+  home_dash_type:string = "DEFAULT_HOME_DASH";
+
 
   constructor(
     private router: Router,