diff --git a/src/app/components/add-family/add-family.component.html b/src/app/components/add-family/add-family.component.html index 0899f2b..3fad187 100644 --- a/src/app/components/add-family/add-family.component.html +++ b/src/app/components/add-family/add-family.component.html @@ -5,11 +5,21 @@
- + - + @@ -17,25 +27,68 @@ + + + - - - {{item}} - - - - - {{item}} - + +
+
+ + Year +
+ +
+ + + {{item1}} + + +
+ +
+ + + +
+
+ Month +
+ +
+ + {{item[1]}} + + +
+ +
+ + + + + + +
- {{profileMessage}} - Add + {{addFamilyResult}} + Add
diff --git a/src/app/components/add-family/add-family.component.ts b/src/app/components/add-family/add-family.component.ts index d4316f8..2e4d161 100644 --- a/src/app/components/add-family/add-family.component.ts +++ b/src/app/components/add-family/add-family.component.ts @@ -1,6 +1,7 @@ -import { Component, OnInit } from '@angular/core'; +import {Component, OnInit, ViewChild} from '@angular/core'; import {SessionDataProviderService} from "../../store/session-data-provider.service"; import {WrenchService} from "../../services/wrench.service"; +import {LoadingController} from "@ionic/angular"; @Component({ selector: 'app-add-family', @@ -10,9 +11,18 @@ import {WrenchService} from "../../services/wrench.service"; export class AddFamilyComponent implements OnInit { isModalOpen:boolean = false; isModalOpenBackdrop:boolean = false; + + @ViewChild('firstname') firstname; + @ViewChild('lastname') lastname; + @ViewChild('month') month; + @ViewChild('year') year; + addFamilyResult:string=''; + + constructor( public sessionDataProviderService: SessionDataProviderService, - private wrenchService: WrenchService + private wrenchService: WrenchService, + private loadingCtrl: LoadingController ) { } regMonth:any; @@ -20,7 +30,7 @@ export class AddFamilyComponent implements OnInit { ngOnInit() { this.regMonth=this.sessionDataProviderService.getMonths(); this.regYear = this.sessionDataProviderService.getChildAddYears(); - // debugger; + //debugger; } @@ -37,4 +47,72 @@ export class AddFamilyComponent implements OnInit { },1000); } + isDisabled:boolean= true; + verifyEntry(){ + this.isDisabled= true; + if ( this.firstname.length> 1 && this.lastname.length> 1 && this.month> 0 && this.year> 0 ){ + this.isDisabled= false; + } + } +/* + 'member_id' => int 1 + 'sessionid' => string '9C780E24425EBE70E1AE3D385193E6FF0DF839A5CA62CD6A6DCE9A5065530968' (length=64) + 'uid' => string '3119b744-42ad-4834-bb83-b737588754ca' (length=36) + 'firstname' => string 'First406' (length=8) + 'lastname' => string 'Last151' (length=7) + 'year' => int 2002 + 'month' => int 8 + 'action' => int 22015 + */ + reqData: { + action:number, + member_id: number, + uid: string, + sessionid: string, + firstname:string, + lastname: string, + month: number, + year: number + }; + + createFamilyResult:any; + + async addFamilyMember(){ + const loading = await this.loadingCtrl.create({ + message: 'Creating Family Member...', + duration: 5000, + }); + +this.reqData={ + action:22015, + member_id: this.sessionDataProviderService.member_id, + uid: this.sessionDataProviderService.member_uid, + sessionid: this.sessionDataProviderService.session , + firstname: this.firstname, + lastname: this.lastname, + month: this.month, + year: this.year +} + loading.present(); + + this.wrenchService.familyAdd(this.reqData).subscribe( + createFamilyResult => { + loading.dismiss(); + this.createFamilyResult = createFamilyResult; + console.log("this.wrenchService.createFamilyResult RETURN DATA->", this.createFamilyResult); + if (this.createFamilyResult.internal_return> 0){ + this.firstname=''; + this.lastname=''; + + this.createFamilyResult = "Family Added"; + setTimeout(()=>{ + this.createFamilyResult=""; + },3000); + } + } + ); + } + + + } diff --git a/src/app/pages/familysettings/familysettings.page.ts b/src/app/pages/familysettings/familysettings.page.ts index a281d8a..aa7d846 100644 --- a/src/app/pages/familysettings/familysettings.page.ts +++ b/src/app/pages/familysettings/familysettings.page.ts @@ -83,6 +83,7 @@ export class FamilysettingsPage implements OnInit { loading.present(); this.wrenchService.uploadFile(this.uploadData).subscribe( uploadResult => { + loading.dismiss() this.uploadResult = uploadResult; console.log("this.wrenchService.uploadFile RETURN DATA->", this.uploadResult); } diff --git a/src/app/services/wrench.service.ts b/src/app/services/wrench.service.ts index a125d6c..e92443b 100644 --- a/src/app/services/wrench.service.ts +++ b/src/app/services/wrench.service.ts @@ -79,6 +79,11 @@ export class WrenchService { completeMobileSignup(reqData) { return this.getPostData('completemobileuser', reqData); } +// + + familyAdd(reqData) { + return this.getPostData('familyadd', reqData); + } referHx(reqData) { return this.getPostData('refferhx', reqData); diff --git a/src/app/store/session-data-provider.service.ts b/src/app/store/session-data-provider.service.ts index 06c2667..940be6f 100644 --- a/src/app/store/session-data-provider.service.ts +++ b/src/app/store/session-data-provider.service.ts @@ -84,8 +84,22 @@ export class SessionDataProviderService { session_contructed:boolean = false; getMonths(){ - return ["January","February","March","April","May","June","July", - "August","September","October","November","December"]; + // return ["January","February","March","April","May","June","July", + // "August","September","October","November","December"]; + return [ + [ 1, 'January'], + [ 2, 'February'], + [ 3, 'March'], + [ 4, 'April'], + [ 5, 'May'], + [ 6, 'June'], + [ 7, 'July'], + [ 8, 'August'], + [ 9, 'September'], + [ 10, 'October'], + [ 11, 'November'], + [ 12, 'December'] + ]; } getChildAddYears(){ var currY = new Date().getFullYear();