+
+
+
-
-
-
-
-
-
-
{{item.title}}
-
{{item.description}}
+
+ {{item.title}}
+ {{item.description}}
+ Last Remind : {{ item.remind | date }}
+
+
+
+
+
-
-
-
-
-
diff --git a/src/app/components/suggestedlist/suggestedlist.component.scss b/src/app/components/suggestedlist/suggestedlist.component.scss
index a574dc2..7543399 100644
--- a/src/app/components/suggestedlist/suggestedlist.component.scss
+++ b/src/app/components/suggestedlist/suggestedlist.component.scss
@@ -1,4 +1,3 @@
-
ion-content {
.back_image {
width: 100%;
@@ -10,8 +9,6 @@ ion-content {
}
}
-
-
.flex {
display: flex;
justify-content: space-between;
@@ -121,6 +118,7 @@ ion-content {
}
.lesson {
+
margin-top: 20px;
.bold {
@@ -357,6 +355,12 @@ ion-content {
}
}
+.remind_text{
+ color: #2dd36f;
+ font-size: 10px;
+}
+
+
.fam1{
margin:10px 0px 10px 0px;
background-color: aliceblue;
diff --git a/src/app/components/suggestedlist/suggestedlist.component.ts b/src/app/components/suggestedlist/suggestedlist.component.ts
index f807514..e209ef8 100644
--- a/src/app/components/suggestedlist/suggestedlist.component.ts
+++ b/src/app/components/suggestedlist/suggestedlist.component.ts
@@ -41,10 +41,10 @@ export class SuggestedlistComponent implements OnInit {
suggested_count:number = 0;
getFamilySuggestList(){
this.familySuggestData = this.familyDataService.familySuggestData;
- this.suggested_count = this.familySuggestData?.length;
+ this.suggested_count = this.familySuggestData?.length;
setTimeout(()=>{
this.familySuggestData = this.familyDataService.familySuggestData; // just read no server reqyuest
- this.suggested_count = this.familySuggestData?.length;
+ this.suggested_count = this.familySuggestData?.length;
}, 5000);
// this.usrData = {
diff --git a/src/app/pages/familylogin/familylogin.page.ts b/src/app/pages/familylogin/familylogin.page.ts
index 316790b..71bf6ba 100644
--- a/src/app/pages/familylogin/familylogin.page.ts
+++ b/src/app/pages/familylogin/familylogin.page.ts
@@ -3,7 +3,7 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { WrenchService } from 'src/app/services/wrench.service';
import { SessionDataProviderService } from 'src/app/store/session-data-provider.service';
import { BlogDataService } from 'src/app/store/blog-data.service';
-import {NavController} from "@ionic/angular";
+import {LoadingController, NavController} from "@ionic/angular";
import { AlertController } from '@ionic/angular';
//import { BarcodeScanner } from '@capacitor-community/barcode-scanner';
import { Preferences } from '@capacitor/preferences';
@@ -41,7 +41,8 @@ export class FamilyloginPage implements OnInit {
public bannersDataService:BannersDataService,
public userWalletService: UserWalletService,
public intervalRefreshService: IntervalRefreshService,
- public familyDataService:FamilyDataService
+ public familyDataService:FamilyDataService,
+ private loadingCtrl: LoadingController,
) {
}
@@ -58,16 +59,22 @@ export class FamilyloginPage implements OnInit {
loginData: {
username: string, pin: string, sessionid: string, action: '11025',login_mode: '1105'
};
- startLogin() {
+ async startLogin() {
+ const loading = await this.loadingCtrl.create({
+ message: 'Please wait ... ',
+ duration: 5500,
+ });
// this.username='Y7P0WW9B05';
// this.pin='1234';
if (this.username == null || this.username == '' || this.pin == null || this.pin == '') {
this.showAlert('Invalid Login', 'Enter username(email) and pin to login');
return;
- }
+ };
+ loading.present();
this.loginData = { username: this.username, pin: this.pin, sessionid: 'DUMMY-APP-SESSION-STARTER', action: '11025',login_mode: '1105' }
this.wrenchService.loginUser(this.loginData).subscribe(
loginResult => {
+ loading.dismiss();
this.loginResult = loginResult;
console.log("INTERNAL RETURN->" + this.loginResult.internal_return);
if (loginResult != null && loginResult.internal_return == 100 && this.sessionDataProviderService.ConstructGlobalSessionData(this.loginResult) == true) {
@@ -81,7 +88,7 @@ export class FamilyloginPage implements OnInit {
};
setName();
-this.startUpCalls();
+ this.startUpCalls();
this.router.navigate(['tabs/tab1']);
}
else{
diff --git a/src/app/pages/home/home.page.html b/src/app/pages/home/home.page.html
index 2a98abc..002c401 100644
--- a/src/app/pages/home/home.page.html
+++ b/src/app/pages/home/home.page.html
@@ -9,9 +9,10 @@
{{firstname}}