Skip to content

E
eduhealth
Commit 1fb6550b by amalk
Options

Merge branch 'master' into amal

parents 8e69083c af916aae
Showing with 397 additions and 61 deletions
config.xml
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
<preference name="SplashShowOnlyFirstTime" value="false" /> <preference name="SplashShowOnlyFirstTime" value="false" />
<preference name="SplashScreen" value="screen" /> <preference name="SplashScreen" value="screen" />
<preference name="SplashScreenDelay" value="3000" /> <preference name="SplashScreenDelay" value="3000" />
<preference name="orientation" value="portrait" />
<platform name="android"> <platform name="android">
<edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application" xmlns:android="http://schemas.android.com/apk/res/android"> <edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application" xmlns:android="http://schemas.android.com/apk/res/android">
<application android:networkSecurityConfig="@xml/network_security_config" /> <application android:networkSecurityConfig="@xml/network_security_config" />
......
package-lock.json
This source diff could not be displayed because it is too large. You can view the blob instead.
package.json
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
"@ionic-native/splash-screen": "^5.0.0", "@ionic-native/splash-screen": "^5.0.0",
"@ionic-native/status-bar": "^5.0.0", "@ionic-native/status-bar": "^5.0.0",
"@ionic/angular": "^4.1.0", "@ionic/angular": "^4.1.0",
"cordova": "^9.0.0",
"cordova-android": "^7.1.4", "cordova-android": "^7.1.4",
"cordova-plugin-device": "^2.0.2", "cordova-plugin-device": "^2.0.2",
"cordova-plugin-ionic-keyboard": "^2.1.3", "cordova-plugin-ionic-keyboard": "^2.1.3",
......
src/app/app-routing.module.ts
...@@ -24,9 +24,13 @@ const routes: Routes = [ ...@@ -24,9 +24,13 @@ const routes: Routes = [
loadChildren: './signup/signup.module#SignupPageModule' loadChildren: './signup/signup.module#SignupPageModule'
}, },
{ {
path: 'details', path: 'details/:id',
loadChildren: './details/details.module#DetailsPageModule' loadChildren: './details/details.module#DetailsPageModule'
} },
{ path: 'medicalauthorization/:id',
loadChildren: './medicalauthorization/medicalauthorization.module#MedicalauthorizationPageModule'
}
]; ];
@NgModule({ @NgModule({
......
src/app/details/details.page.html
...@@ -12,33 +12,35 @@ ...@@ -12,33 +12,35 @@
</ion-header> </ion-header>
<ion-content> <ion-content>
<div class="detail_wrapper"> <div class="detail_wrapper">
<div *ngIf ="student_details">
<div class="detail_circle_img"> <div class="detail_circle_img">
<img src="../../assets/imgs/asset_img1.png"> <img src="../../assets/imgs/asset_img1.png">
</div> </div>
<h4>Arnold Schelz</h4> <h4>{{student_details.first_name}} {{student_details.last_name}}</h4>
<div class="detail_grid"> <div class="detail_grid">
<ion-row> <ion-row>
<ion-col col> <ion-col col>
<p>Student Number</p> <p>Student Number</p>
<h3>2455</h3> <h3>{{student_details.student_number}}</h3>
</ion-col> </ion-col>
<ion-col col> <ion-col col>
<p>Graduation Year</p> <p>Graduation Year</p>
<h3>2019</h3> <h3>{{student_details.graduation_year}}</h3>
</ion-col> </ion-col>
<ion-col col> <ion-col col>
<p>Grade</p> <p>Grade</p>
<h3>1</h3> <h3>{{student_details.grade}}</h3>
</ion-col> </ion-col>
</ion-row> </ion-row>
<ion-row> <ion-row>
<ion-col col> <ion-col col>
<p>DOB</p> <p>DOB</p>
<h3>13-05-1996</h3> <h3>{{student_details.dob}}</h3>
</ion-col> </ion-col>
<ion-col col> <ion-col col>
<p>School Name</p> <p>School Name</p>
<h3>EU School</h3> <h3>{{student_details.school_name}}</h3>
</ion-col> </ion-col>
<ion-col col> <ion-col col>
<p>Gender</p> <p>Gender</p>
...@@ -46,49 +48,50 @@ ...@@ -46,49 +48,50 @@
</ion-col> </ion-col>
</ion-row> </ion-row>
</div> </div>
</div>
<div class="detail_listing"> <div class="detail_listing">
<ul> <ul>
<li> <li (click)="goToPage('medicalauthorization')">
<img src="../../assets/imgs/m1.png"> <img src="../../assets/imgs/m1.png" >
<p>Students<br> Profile</p> <p>Students<br> Profile</p>
</li> </li>
<li> <li (click)="goToPage('medicalauthorization')">
<img src="../../assets/imgs/m2.png"> <img src="../../assets/imgs/m2.png">
<p>Health care<br> form</p> <p>Health care<br> form</p>
</li> </li>
<li> <li (click)="goToPage('medicalauthorization')">
<img src="../../assets/imgs/m3.png"> <img src="../../assets/imgs/m3.png">
<p>Medication <br>Authorization</p> <p>Medication <br>Authorization</p>
</li> </li>
<li> <li (click)="goToPage('medicalauthorization')">
<img src="../../assets/imgs/m4.png"> <img src="../../assets/imgs/m4.png">
<p>Treatment<br> Authorization</p> <p>Treatment<br> Authorization</p>
</li> </li>
<li> <li (click)="goToPage('medicalauthorization')">
<img src="../../assets/imgs/m5.png"> <img src="../../assets/imgs/m5.png">
<p>Medication<br>Trackings</p> <p>Medication<br>Trackings</p>
</li> </li>
<li> <li (click)="goToPage('medicalauthorization')">
<img src="../../assets/imgs/m6.png"> <img src="../../assets/imgs/m6.png">
<p>Treatment<br>Trackings</p> <p>Treatment<br>Trackings</p>
</li> </li>
<li> <li (click)="goToPage('medicalauthorization')">
<img src="../../assets/imgs/m7.png"> <img src="../../assets/imgs/m7.png">
<p>Screenings</p> <p>Screenings</p>
</li> </li>
<li> <li (click)="goToPage('medicalauthorization')">
<img src="../../assets/imgs/m1.png"> <img src="../../assets/imgs/m1.png">
<p>Chart Visits</p> <p>Chart Visits</p>
</li> </li>
<li> <li (click)="goToPage('medicalauthorization')">
<img src="../../assets/imgs/m8.png"> <img src="../../assets/imgs/m8.png">
<p>Immunizations</p> <p>Immunizations</p>
</li> </li>
<li> <li (click)="goToPage('medicalauthorization')">
<img src="../../assets/imgs/m9.png"> <img src="../../assets/imgs/m9.png">
<p>Medical History</p> <p>Medical History</p>
</li> </li>
<li> <li (click)="goToPage('medicalauthorization')">
<img src="../../assets/imgs/m10.png"> <img src="../../assets/imgs/m10.png">
<p>Health History</p> <p>Health History</p>
</li> </li>
......
src/app/details/details.page.ts
import {Component,OnInit, ElementRef, NgZone, ViewChild} from '@angular/core'; import {Component,OnInit, ElementRef, NgZone, ViewChild} from '@angular/core';
import { trigger, transition, animate, style } from '@angular/animations'; import { trigger, transition, animate, style } from '@angular/animations';
import { Router,ActivatedRoute } from '@angular/router'; import { Router, ActivatedRoute } from '@angular/router';
import { MyserviceService} from '../myservice.service'
@Component({ @Component({
...@@ -20,14 +21,40 @@ import { Router,ActivatedRoute } from '@angular/router'; ...@@ -20,14 +21,40 @@ import { Router,ActivatedRoute } from '@angular/router';
] ]
}) })
export class DetailsPage implements OnInit { export class DetailsPage implements OnInit {
stud1:boolean;
stud2:boolean;
stud3:boolean;
navCtrl: any; navCtrl: any;
isToggle = false; isToggle = false;
id: any;
constructor() { } student_details:any;
constructor(private route: ActivatedRoute ,private myservice:MyserviceService,private router: Router) {
}
ngOnInit() { ngOnInit() {
this.id = this.route.snapshot.paramMap.get('id');
console.log(this.id);
this.get_StudentDetails();
} }
get_StudentDetails() {
var This= this;
this.myservice.presentLoader();
console.log('Id',this.id)
this.myservice.load_get('student_details/id/'+this.id).subscribe(resp =>
{
console.log(resp);
This.myservice.dismissLoader();
this.student_details=resp;
})
}
goToPage(path,data=null){
this.router.navigateByUrl('/medicalauthorization/'+this.id);
document.body.scrollTop = document.documentElement.scrollTop = 0;
}
popToggle(){ popToggle(){
this.isToggle = !this.isToggle; this.isToggle = !this.isToggle;
......
src/app/home/home.page.html
<ion-header> <ion-header>
<div class="nav_title"> <div class="nav_title floatLeft">
<h4>Students Details</h4> <h4>Students Details</h4>
</div> </div>
<button class="nav_btn floatRight" (click)="logout()">
<ion-icon name="log-out" ></ion-icon>
</button>
<div class="clear"></div>
</ion-header> </ion-header>
<ion-content> <ion-content>
<div class="list_wrapper"> <div class="list_wrapper">
......
src/app/home/home.page.scss
.nav_title{
width: calc(100% - 50px);
padding-left: 10px;
}
ion-icon{
color: #292929;
}
.list_wrapper{ .list_wrapper{
padding: 15px; padding: 15px;
padding-top: 0px; padding-top: 0px;
......
src/app/home/home.page.ts
...@@ -19,19 +19,25 @@ export class HomePage { ...@@ -19,19 +19,25 @@ export class HomePage {
details details
goToPage(path,data){ goToPage(path,data){
this.router.navigate(['details']); console.log(data)
//this.router.navigateByUrl(path);
this.router.navigateByUrl('/details/'+data);
document.body.scrollTop = document.documentElement.scrollTop = 0; document.body.scrollTop = document.documentElement.scrollTop = 0;
} }
get_students_data() get_students_data(){
var This= this
{ console.log('Homepage')
//this.myservice.presentLoader() this.myservice.presentLoader()
this.myservice.load_get('student_data').subscribe (resp=> { this.myservice.load_get('student_data').subscribe (resp=> {
// this.myservice.dismissLoader(); This.myservice.dismissLoader();
console.log(resp); console.log(resp);
this.student_data = resp.data; this.student_data = resp.data;
console.log(this.student_data); console.log(this.student_data);
}); });
}
} logout() {
console.log('Logout')
this.router.navigateByUrl('/login',{replaceUrl: true});
document.body.scrollTop = document.documentElement.scrollTop = 0;
}
} }
src/app/login/login.page.ts
...@@ -62,39 +62,41 @@ export class LoginPage implements OnInit { ...@@ -62,39 +62,41 @@ export class LoginPage implements OnInit {
} }
login() login()
{ {
var This= this
var data = null var data = null
console.log(this.LoginForm.value); console.log(this.LoginForm.value);
this.myservice.presentLoader(); this.myservice.presentLoader();
var obj = {'value': this.LoginForm.value } var obj = {'value': this.LoginForm.value }
this.myservice.load_post(obj,'login').subscribe(resp =>{ this.myservice.load_post(obj,'login').subscribe(resp =>{
this.myservice.dismissLoader(); This.myservice.dismissLoader();
console.log(resp.username); console.log(resp.username);
if(resp.username === this.LoginForm.value['email'] && resp.password === this.LoginForm.value['password']){
this.myservice.presentToast('Login Success');
if(resp.username === this.LoginForm.value['email'] && resp.password === this.LoginForm.value['password']) this.gotoPage();
{ this.LoginForm.reset();
}
this.myservice.presentToast('Login Success');
this.router.navigateByUrl('home',{queryParams:data});
document.body.scrollTop = document.documentElement.scrollTop = 0;
}
else { else {
this.myservice.presentToast('Invalid credentials'); this.myservice.presentToast('Invalid credentials');
this.LoginForm.reset();
} }
}); });
} }
user_signup() user_signup()
{ {
console.log(this.signupForm.value); if(this.signupForm.valid) {
// this.myservice.load_post(this.signupForm.value,'login').subscribe(response=> var data =null;
// { this.myservice.presentToast('Your account has been created successfully');
// console.log(response); this.isShow = !this.isShow;
// }); }
}
gotoPage() {
var data = null;
var This= this;
setTimeout( () => {
This.router.navigateByUrl('home',{queryParams:data,replaceUrl: true});
document.body.scrollTop = document.documentElement.scrollTop = 0;
}, 500);
} }
} }
src/app/medicalauthorization/medicalauthorization.module.ts 0 → 100644
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { Routes, RouterModule } from '@angular/router';
import { IonicModule } from '@ionic/angular';
import { MedicalauthorizationPage } from './medicalauthorization.page';
const routes: Routes = [
{
path: '',
component: MedicalauthorizationPage
}
];
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
RouterModule.forChild(routes)
],
declarations: [MedicalauthorizationPage]
})
export class MedicalauthorizationPageModule {}
src/app/medicalauthorization/medicalauthorization.page.html 0 → 100644
<ion-header>
<button class="nav_btn nav_back floatLeft">
<ion-back-button>
</ion-back-button>
</button>
<div class="nav_title floatLeft">
<h4>Medical Authorizations</h4>
</div>
<div class="clear"></div>
</ion-header>
<ion-content *ngIf="medicalresp">
<div class="list_wrapper">
<ul>
<li>
<div class="list_main" (click)="toggleGroup(0)" [ngClass]="{active:isGroupShown(0)}">
<div class="col floatLeft">
<p>Name</p>
<h3><strong>Medication Authorizations</strong></h3>
</div>
<div class="col floatLeft borderNone">
<p>Expiry Date</p>
<h3>{{medicalresp.expiry_date}}</h3>
</div>
<div class="clear"></div>
</div>
<div class="list_sub" *ngIf="isGroupShown(0)">
<div class="list_bar">
<div class="col floatLeft">
<p>Name of medicine</p>
<h3>{{medicalresp.name_medicine}}</h3>
</div>
<div class="col floatLeft borderNone">
<p>Times Per Day</p>
<h3>{{medicalresp.time_perday}}</h3>
</div>
<div class="clear"></div>
</div>
<div class="list_bar">
<div class="col floatLeft">
<p>Tme of first medication</p>
<h3>{{medicalresp.date_first_medicine}}{{medicalresp.time_first_medicine}}</h3>
</div>
<div class="col floatLeft borderNone">
<p>Quantity Available</p>
<h3>{{medicalresp.quantity_available}}</h3>
</div>
<div class="clear"></div>
</div>
</div>
</li>
<!-- <li>
<div class="list_main" (click)="toggleGroup(1)" [ngClass]="{active:isGroupShown(1)}">
<div class="col floatLeft">
<p>Name</p>
<h3><strong>Medication Authorizations</strong></h3>
</div>
<div class="col floatLeft borderNone">
<p>Expiry Date</p>
<h3>06/12/2019</h3>
</div>
<div class="clear"></div>
</div>
<div class="list_sub" *ngIf="isGroupShown(1)">
<div class="list_bar">
<div class="col floatLeft">
<p>Name of medicine</p>
<h3>Potassium Chloride</h3>
</div>
<div class="col floatLeft borderNone">
<p>Times Per Day</p>
<h3>2 Days</h3>
</div>
<div class="clear"></div>
</div>
<div class="list_bar">
<div class="col floatLeft">
<p>Tme of first medication</p>
<h3>06/11/2019 11:00 AM</h3>
</div>
<div class="col floatLeft borderNone">
<p>Quantity Available</p>
<h3>20</h3>
</div>
<div class="clear"></div>
</div>
</div>
</li> -->
</ul>
</div>
</ion-content>
\ No newline at end of file
src/app/medicalauthorization/medicalauthorization.page.scss 0 → 100644
.nav_title{
width: calc(100% - 50px);
padding-left: 0px;
}
.list_wrapper{
ul{
margin:0px;
padding:10px;
li{
list-style: none;
margin-bottom: 10px;
.list_main{
padding: 10px;
background-color: #e8effa !important;
border-left:3px solid #1b4077;
background-image: url("../../assets/imgs/asset_drop_btn_right.png");
background-position: right 15px top 17px;
background-repeat: no-repeat;
background-size: 20px;
padding-right: 40px;
p{
margin:0px;
padding:0px;
color: #0d0d0d;
font-weight: 300;
padding-bottom: 5px;
font-size: 13px;
}
h3{
margin:0px;
padding:0px;
color: #0d0d0d;
font-size: 14px;
font-weight: 400;
}
.col{
padding-right: 10px;
margin-right: 10px;
border-right:1px solid #686868;
}
}
.active{
background: url("../../assets/imgs/asset_drop_btn.png");
background-position: right 15px top 17px;
background-repeat: no-repeat;
background-size: 20px;
}
.list_sub{
padding: 10px;
background: #e8effa;
border-left:3px solid #1b4077;
border-top: 1px solid #c7c7c7;
.list_bar{
padding-bottom: 10px;
}
p{
margin:0px;
padding:0px;
color: #0d0d0d;
font-weight: 300;
padding-bottom: 5px;
font-size: 13px;
}
h3{
margin:0px;
padding:0px;
color: #0d0d0d;
font-size: 14px;
font-weight: 400;
}
.col{
padding-right: 10px;
width: calc(50% - 10px);
margin-right: 10px;
border-right:1px solid #686868;
}
}
}
}
}
\ No newline at end of file
src/app/medicalauthorization/medicalauthorization.page.spec.ts 0 → 100644
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MedicalauthorizationPage } from './medicalauthorization.page';
describe('MedicalauthorizationPage', () => {
let component: MedicalauthorizationPage;
let fixture: ComponentFixture<MedicalauthorizationPage>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ MedicalauthorizationPage ],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(MedicalauthorizationPage);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/medicalauthorization/medicalauthorization.page.ts 0 → 100644
import {Component,OnInit, ElementRef, NgZone, ViewChild} from '@angular/core';
import { trigger, transition, animate, style } from '@angular/animations';
import {MyserviceService} from '../myservice.service';
import { Router, ActivatedRoute } from '@angular/router';
@Component({
selector: 'app-medicalauthorization',
templateUrl: './medicalauthorization.page.html',
styleUrls: ['./medicalauthorization.page.scss']
})
export class MedicalauthorizationPage implements OnInit {
id:any;
shownGroup = null;
medicalresp:any
constructor(public myservice:MyserviceService,private router: Router,private route: ActivatedRoute) {
this.shownGroup = 0;
}
ngOnInit() {
this.id = this.route.snapshot.paramMap.get('id');
console.log(this.id);
this.get_medical_data();
}
isGroupShown(group) {
return this.shownGroup === group;
}
toggleGroup(group) {
if (this.isGroupShown(group)) {
this.shownGroup = null;
} else {
this.shownGroup = group;
}
}
get_medical_data(){
this.myservice.presentLoader();
this.myservice.load_get('get_medicalauthorization/id/'+this.id).subscribe(resp =>{
this.myservice.dismissLoader();
console.log('Response',resp);
this.medicalresp= resp;
})
}
}
src/app/myservice.service.ts
...@@ -35,8 +35,6 @@ export class MyserviceService { ...@@ -35,8 +35,6 @@ export class MyserviceService {
} }
async presentLoader() { async presentLoader() {
// Dismiss previously created loading
if (this.currentLoading != null) { if (this.currentLoading != null) {
this.currentLoading.dismiss(); this.currentLoading.dismiss();
} }
...@@ -50,17 +48,15 @@ export class MyserviceService { ...@@ -50,17 +48,15 @@ export class MyserviceService {
} }
async dismissLoader() { async dismissLoader() {
if (this.currentLoading != null) { await this.loadingController.dismiss();
await this.loadingController.dismiss();
this.currentLoading = null; this.currentLoading = null;
} console.log('Dismis loader')
return; // return;
} }
async presentToast(message) { async presentToast(message) {
const toast = await this.toastController.create({ const toast = await this.toastController.create({
message: message, message: message,
duration: 3000 duration: 2000
}); });
toast.present(); toast.present();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment