WrenchBoard/WrenchBoardIonic2023
2
0
Fork 0
Code Issues Pull Requests Releases Activity

fix home dash

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2024-01-31 13:48:41 -05:00
parent 93309e22ff
commit 1e7400b76e
4 changed files with 51 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/components/add-relatives/add-relatives.component.ts
+29
View File
@@ -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);
}
}
);
}
}
src/app/pages/familysettings/familysettings.page.html
-39
View File
@@ -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>
src/app/pages/home/home.page.html
+20 -15
View File
@@ -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">-->
src/app/pages/home/home.page.ts
+2
View File
@@ -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,