fix
This commit is contained in:
Olu Amey
@@ -6,6 +6,8 @@ import { IonicModule, IonicRouteStrategy } from '@ionic/angular';
|
||||
import { SplashScreen } from '@ionic-native/splash-screen/ngx';
|
||||
import { StatusBar } from '@ionic-native/status-bar/ngx';
|
||||
|
||||
import { Calendar } from '@ionic-native/calendar/ngx';
|
||||
|
||||
//import { HttpModule } from '@angular/http'
|
||||
import { HTTP } from '@ionic-native/http/ngx';
|
||||
import { HttpClientModule } from '@angular/common/http'
|
||||
@@ -22,6 +24,7 @@ import { AppRoutingModule } from './app-routing.module';
|
||||
providers: [
|
||||
StatusBar,
|
||||
SplashScreen,
|
||||
Calendar,
|
||||
{ provide: RouteReuseStrategy, useClass: IonicRouteStrategy }
|
||||
],
|
||||
bootstrap: [AppComponent]
|
||||
|
||||
@@ -5,5 +5,9 @@
|
||||
</ion-header>
|
||||
|
||||
<ion-content>
|
||||
<div class="ion-padding">
|
||||
|
||||
{{mycal}}
|
||||
|
||||
</div>
|
||||
</ion-content>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { Component, OnInit } from '@angular/core';
|
||||
import { Component, OnInit,ViewChild } from '@angular/core';
|
||||
import { Calendar } from '@ionic-native/calendar/ngx';
|
||||
|
||||
@Component({
|
||||
selector: 'app-merms-calendar',
|
||||
@@ -6,8 +7,23 @@ import { Component, OnInit } from '@angular/core';
|
||||
styleUrls: ['./merms-calendar.page.scss'],
|
||||
})
|
||||
export class MermsCalendarPage implements OnInit {
|
||||
calendar={
|
||||
mode:'month',
|
||||
currentDate: new DataCue(),
|
||||
};
|
||||
|
||||
@ViewChild(Calendar) mycal: Calendar;
|
||||
|
||||
|
||||
constructor() {
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
constructor() { }
|
||||
|
||||
ngOnInit() {
|
||||
}
|
||||
|
||||
@@ -3,22 +3,31 @@
|
||||
<ion-row>
|
||||
<ion-col>
|
||||
<div>
|
||||
<h2>{{ welcomeName }}</h2>
|
||||
<h4>{{ welcomeName }}</h4>
|
||||
</div>
|
||||
</ion-col>
|
||||
<ion-col>
|
||||
<div style="text-align: right;"> <h4>{{ currentDateFormated }}</h4></div>
|
||||
<div style="text-align: right;">
|
||||
<h4>{{ currentDateFormated }}</h4>
|
||||
</div>
|
||||
</ion-col>
|
||||
</ion-row>
|
||||
<ion-row style="height: 80px;">
|
||||
<ion-row style="height: 60px; padding-top: 0px; font-size: 14px;">
|
||||
<ion-col style="background-color:ivory">
|
||||
<div>.</div>
|
||||
|
||||
|
||||
Patient(s)<p>
|
||||
0
|
||||
|
||||
</ion-col>
|
||||
<ion-col style="background-color:honeydew">
|
||||
<div>.</div>
|
||||
</ion-col>
|
||||
<ion-col style="background-color: aquamarine;">
|
||||
<div>.</div>
|
||||
<ion-col style="background-color: aquamarine; ">
|
||||
|
||||
Balance<p>
|
||||
N5000.34
|
||||
|
||||
</ion-col>
|
||||
</ion-row>
|
||||
</ion-grid>
|
||||
@@ -148,14 +157,16 @@
|
||||
</div>
|
||||
</ion-col>
|
||||
<ion-col>
|
||||
<div> <ion-icon name="calendar" style="color:green;" (click)="goCalendar()"></ion-icon></div>
|
||||
<div>
|
||||
<ion-icon name="calendar" style="color:green;" (click)="goCalendar()"></ion-icon>
|
||||
</div>
|
||||
</ion-col>
|
||||
<ion-col>
|
||||
<div>
|
||||
<ion-icon name="grid" style="color:blue;" (click)="goPractice()"></ion-icon>
|
||||
<ion-icon name="grid" style="color:blue;" (click)="goPractice()"></ion-icon>
|
||||
</div>
|
||||
</ion-col>
|
||||
|
||||
|
||||
<ion-col>
|
||||
<div>
|
||||
<ion-icon name="settings" style="color:red;" (click)="goSettings()"></ion-icon>
|
||||
|
||||
@@ -21,7 +21,8 @@ export class MermsDashPage implements OnInit {
|
||||
private mermsServiceProviderService: MermsServiceProviderService,
|
||||
private mermsSessionService : MermsSessionService
|
||||
) {
|
||||
this.welcomeName = "Dr. Something"
|
||||
this.welcomeName =this.mermsSessionService.getUserFormatedName();
|
||||
this.currentDateFormated = this.mermsSessionService.getThisData();
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
|
||||
@@ -1,9 +1,29 @@
|
||||
<ion-header>
|
||||
<ion-toolbar>
|
||||
<ion-title>merms-patient</ion-title>
|
||||
</ion-toolbar>
|
||||
</ion-header>
|
||||
<ion-content class="merms-patient-page">
|
||||
<div class="container">
|
||||
<ion-grid class="top-container">
|
||||
<ion-row>
|
||||
<ion-col size="2" class="navigation">
|
||||
<ion-back-button text="" (click)="goBack()"></ion-back-button>
|
||||
</ion-col>
|
||||
<ion-col size="8" class="page-title">Patient Name</ion-col>
|
||||
</ion-row>
|
||||
</ion-grid>
|
||||
|
||||
|
||||
<ion-content>
|
||||
|
||||
<!-- Item Dividers in a List -->
|
||||
<ion-list>
|
||||
|
||||
</ion-content>
|
||||
<ion-item><ion-label>Search patient </ion-label></ion-item>
|
||||
<ion-item><ion-label>Edit Profile</ion-label></ion-item>
|
||||
<ion-item><ion-label>A4</ion-label></ion-item>
|
||||
<ion-item><ion-label>Practice Time</ion-label></ion-item>
|
||||
|
||||
|
||||
</ion-list>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
</ion-content>
|
||||
@@ -0,0 +1,143 @@
|
||||
.merms-patient-page{
|
||||
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
--padding-top: 0px;
|
||||
--padding-bottom: 40px;
|
||||
--padding-start: 24px;
|
||||
--padding-end: 24px;
|
||||
.container {
|
||||
padding-top: 7vh;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
height: 100%;
|
||||
ion-grid.top-container {
|
||||
flex: 0 0 0;
|
||||
width: 100%;
|
||||
}
|
||||
.navigation {
|
||||
text-align: left;
|
||||
padding-left: 2px;
|
||||
ion-back-button {
|
||||
--color: #000;
|
||||
display: inline-block;
|
||||
--icon-font-size: 30px;
|
||||
}
|
||||
}
|
||||
.page-title {
|
||||
font-style: normal;
|
||||
font-weight: bold;
|
||||
font-size: 12px;
|
||||
line-height: 106.4%;
|
||||
letter-spacing: 0.1em;
|
||||
text-transform: uppercase;
|
||||
color: #000;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
h1 {
|
||||
margin-top: 30px;
|
||||
font-style: normal;
|
||||
font-weight: 600;
|
||||
font-size: 26px;
|
||||
line-height: 135%;
|
||||
color: #000;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
|
||||
.bottom-container {
|
||||
margin-top: 6vh;
|
||||
display: block;
|
||||
//flex: 1;
|
||||
//flex-direction: column;
|
||||
.google-sign-up,
|
||||
.apple-sign-up {
|
||||
display: block;
|
||||
border: 2px solid #000000;
|
||||
box-sizing: border-box;
|
||||
border-radius: 26.98px;
|
||||
padding: 13px 0;
|
||||
text-align: center;
|
||||
background: none;
|
||||
font-weight: bold;
|
||||
font-size: 16px;
|
||||
line-height: 14px;
|
||||
color: #000000;
|
||||
margin-bottom: 20px;
|
||||
position: relative;
|
||||
height: 55px !important;
|
||||
width: 100%;
|
||||
|
||||
span {
|
||||
opacity: 1;
|
||||
font-size: 16px;
|
||||
line-height: 24px;
|
||||
margin: 0;
|
||||
height: 25px;
|
||||
display: inline-block;
|
||||
padding: 0;
|
||||
vertical-align: top;
|
||||
}
|
||||
|
||||
img {
|
||||
height: 24px;
|
||||
margin-right: 13px;
|
||||
}
|
||||
}
|
||||
span {
|
||||
font-size: 12px;
|
||||
line-height: 145%;
|
||||
letter-spacing: -0.2px;
|
||||
color: #000000;
|
||||
opacity: 0.25;
|
||||
text-align: center;
|
||||
display: inline-block;
|
||||
margin-bottom: 20px;
|
||||
&.forgot-password {
|
||||
margin-top: 20px;
|
||||
}
|
||||
}
|
||||
.form {
|
||||
display: flex;
|
||||
flex: 1;
|
||||
flex-direction: column;
|
||||
ion-input {
|
||||
border: 2px solid #000000;
|
||||
box-sizing: border-box;
|
||||
border-radius: 26.98px;
|
||||
margin-bottom: 16px;
|
||||
--padding-start: 20px;
|
||||
font-style: normal;
|
||||
font-weight: normal;
|
||||
font-size: 16px;
|
||||
line-height: 145%;
|
||||
letter-spacing: -0.2px;
|
||||
color: #000000;
|
||||
}
|
||||
button {
|
||||
background: #0b7493;
|
||||
border-radius: 30px;
|
||||
vertical-align: bottom;
|
||||
display: flex;
|
||||
margin: auto auto 0 auto;
|
||||
width: 168px;
|
||||
font-weight: 600;
|
||||
font-size: 16px;
|
||||
line-height: 22px;
|
||||
color: #fff;
|
||||
justify-content: center;
|
||||
padding: 14px 0;
|
||||
opacity: 0.5;
|
||||
height: 50px;
|
||||
min-height: 50px;
|
||||
&.active-button {
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -197,7 +197,18 @@ export class MermsSessionService {
|
||||
let updateResult: any
|
||||
}
|
||||
|
||||
|
||||
getThisData() {
|
||||
const d = new Date();
|
||||
const ye = new Intl.DateTimeFormat('en', { year: 'numeric' }).format(d);
|
||||
const mo = new Intl.DateTimeFormat('en', { month: 'short' }).format(d);
|
||||
const da = new Intl.DateTimeFormat('en', { day: '2-digit' }).format(d);
|
||||
return `${da}-${mo}-${ye}`;
|
||||
|
||||
}
|
||||
|
||||
getUserFormatedName(){
|
||||
return "Dr From Session";
|
||||
}
|
||||
|
||||
validateEmail(email) {
|
||||
const re = /\S+@\S+\.\S+/;
|
||||
|
||||
Reference in New Issue
Block a user