MERMS/MermsProviders
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix

Browse Source
This commit is contained in:
Olu Amey
2020-11-22 16:14:13 -05:00
parent b79e520061
commit f1440bf6ce
11 changed files with 249 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/app/src/main/res/xml/config.xml
+4
View File
@@ -6,6 +6,10 @@
<param name="android-package" value="com.silkimen.cordovahttp.CordovaHttpPlugin"/>
</feature>
<feature name="Calendar">
<param name="android-package" value="nl.xservices.plugins.Calendar"/>
</feature>
<feature name="Device">
<param name="android-package" value="org.apache.cordova.device.Device"/>
</feature>
package-lock.json
Generated
+14 -1
View File
@@ -1,6 +1,6 @@
{
"name": "mermsproviders",
"version": "10.0.1",
"version": "10.0.11",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -2369,6 +2369,14 @@
}
}
},
"@ionic-native/calendar": {
"version": "5.30.0",
"resolved": "https://registry.npmjs.org/@ionic-native/calendar/-/calendar-5.30.0.tgz",
"integrity": "sha512-qrffPZDkpkZGj+2C6EjILOkhBN8acvcprj6olH0x88mMHHrWNUVKLkVjE5+HGjgZZUeOwOQlW5TNedJ7gaaRAg==",
"requires": {
"@types/cordova": "^0.0.34"
}
},
"@ionic-native/core": {
"version": "5.29.0",
"resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-5.29.0.tgz",
@@ -4613,6 +4621,11 @@
"resolved": "https://registry.npmjs.org/cordova-plugin-advanced-http/-/cordova-plugin-advanced-http-3.1.0.tgz",
"integrity": "sha512-zlTlNJyTttE7TV5vW2WGvHqpbKMDVrr1meZU0fy4y3ObrI/hGk2UDcDNwpZdMfaytNZwDKU4sRgsTgQYdFNBew=="
},
"cordova-plugin-calendar": {
"version": "5.1.5",
"resolved": "https://registry.npmjs.org/cordova-plugin-calendar/-/cordova-plugin-calendar-5.1.5.tgz",
"integrity": "sha512-Qrz+Yo3ifpCsi0CWfLFrnP37Tgp3jxDmtNKILhU+f3g2EsbWwLc7VsKq8zCrxJihGr/vKpEoSFtWZGpEM3zobQ=="
},
"cordova-plugin-device": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/cordova-plugin-device/-/cordova-plugin-device-2.0.3.tgz",
package.json
+2
View File
@@ -22,6 +22,7 @@
"@babel/polyfill": "^7.12.1",
"@capacitor/android": "^2.4.2",
"@capacitor/core": "2.4.2",
"@ionic-native/calendar": "^5.30.0",
"@ionic-native/core": "^5.0.0",
"@ionic-native/device": "^5.29.0",
"@ionic-native/http": "^5.29.0",
@@ -29,6 +30,7 @@
"@ionic-native/status-bar": "^5.0.0",
"@ionic/angular": "^5.4.4",
"cordova-plugin-advanced-http": "^3.1.0",
"cordova-plugin-calendar": "^5.1.5",
"cordova-plugin-device": "^2.0.3",
"cordova-plugin-file": "^6.0.2",
"rxjs": "^6.5.5",
src/app/app.module.ts
+3
View File
@@ -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]
src/app/merms-calendar/merms-calendar.page.html
+4
View File
@@ -5,5 +5,9 @@
</ion-header>
<ion-content>
<div class="ion-padding">
{{mycal}}
</div>
</ion-content>
src/app/merms-calendar/merms-calendar.page.ts
+18 -2
View File
@@ -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() {
}
src/app/merms-dash/merms-dash.page.html
+20 -9
View File
@@ -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>
src/app/merms-dash/merms-dash.page.ts
+2 -1
View File
@@ -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() {
src/app/merms-patient/merms-patient.page.html
+27 -7
View File
@@ -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>
src/app/merms-patient/merms-patient.page.scss
+143
View File
@@ -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;
}
}
}
}
}
src/app/merms-session.service.ts
+12 -1
View File
@@ -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+/;