diff --git a/android/app/src/main/res/xml/config.xml b/android/app/src/main/res/xml/config.xml index 41b1b33..813a010 100644 --- a/android/app/src/main/res/xml/config.xml +++ b/android/app/src/main/res/xml/config.xml @@ -6,6 +6,10 @@ + + + + diff --git a/package-lock.json b/package-lock.json index 1765929..0f97edb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -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", diff --git a/package.json b/package.json index e00fd25..3c4ac7f 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index d68fe57..a1bcf86 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -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] diff --git a/src/app/merms-calendar/merms-calendar.page.html b/src/app/merms-calendar/merms-calendar.page.html index dccef3f..02a01c6 100644 --- a/src/app/merms-calendar/merms-calendar.page.html +++ b/src/app/merms-calendar/merms-calendar.page.html @@ -5,5 +5,9 @@ +
+ {{mycal}} + +
diff --git a/src/app/merms-calendar/merms-calendar.page.ts b/src/app/merms-calendar/merms-calendar.page.ts index 4c1d316..55b287f 100644 --- a/src/app/merms-calendar/merms-calendar.page.ts +++ b/src/app/merms-calendar/merms-calendar.page.ts @@ -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() { } diff --git a/src/app/merms-dash/merms-dash.page.html b/src/app/merms-dash/merms-dash.page.html index b15703f..4b847a9 100644 --- a/src/app/merms-dash/merms-dash.page.html +++ b/src/app/merms-dash/merms-dash.page.html @@ -3,22 +3,31 @@
-

{{ welcomeName }}

+

{{ welcomeName }}

 -

{{ currentDateFormated }}

+
+

{{ currentDateFormated }}

+
- + -
.
+ + + Patient(s)

+ 0 +

.
 - -
.
+ + + Balance

+ N5000.34 + @@ -148,14 +157,16 @@ -

+
+ +
- +
- +
diff --git a/src/app/merms-dash/merms-dash.page.ts b/src/app/merms-dash/merms-dash.page.ts index f84ba5b..f32305c 100644 --- a/src/app/merms-dash/merms-dash.page.ts +++ b/src/app/merms-dash/merms-dash.page.ts @@ -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() { diff --git a/src/app/merms-patient/merms-patient.page.html b/src/app/merms-patient/merms-patient.page.html index de7ecaf..812a50b 100644 --- a/src/app/merms-patient/merms-patient.page.html +++ b/src/app/merms-patient/merms-patient.page.html @@ -1,9 +1,29 @@ - - - merms-patient - - + +
+ + + + + + Patient Name + + + - + + + - + Search patient + Edit Profile + A4 + Practice Time + + + + + +
+ + + \ No newline at end of file diff --git a/src/app/merms-patient/merms-patient.page.scss b/src/app/merms-patient/merms-patient.page.scss index e69de29..3550a7b 100644 --- a/src/app/merms-patient/merms-patient.page.scss +++ b/src/app/merms-patient/merms-patient.page.scss @@ -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; + } + } + } + } + + +} \ No newline at end of file diff --git a/src/app/merms-session.service.ts b/src/app/merms-session.service.ts index f717277..04fd8d3 100644 --- a/src/app/merms-session.service.ts +++ b/src/app/merms-session.service.ts @@ -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+/;