Skip to content

Commit

Permalink
med frontend
Browse files Browse the repository at this point in the history
  • Loading branch information
Parthshah05 committed Mar 4, 2018
2 parents 5ca0e28 + a9abc2e commit ebce220
Show file tree
Hide file tree
Showing 49 changed files with 1,204 additions and 72 deletions.
1 change: 1 addition & 0 deletions config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,5 @@
<plugin name="cordova-plugin-device" spec="1.1.4" />
<plugin name="cordova-plugin-splashscreen" spec="~4.0.1" />
<plugin name="cordova-plugin-ionic-webview" spec="^1.1.11" />
<plugin name="cordova-plugin-calendar" spec="^5.0.0" />
</widget>
20 changes: 20 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 13 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,18 @@
"@angular/http": "5.0.3",
"@angular/platform-browser": "5.0.3",
"@angular/platform-browser-dynamic": "5.0.3",
"@ionic-native/calendar": "^4.5.3",
"@ionic-native/core": "4.4.0",
<<<<<<< HEAD
"@ionic-native/social-sharing": "^4.5.3",
=======
"@ionic-native/facebook": "^4.5.2",
>>>>>>> a9abc2ea8ce07410f7bedc0b5da33b9de5457ac7
"@ionic-native/splash-screen": "4.4.0",
"@ionic-native/status-bar": "4.4.0",
"@ionic/storage": "^2.1.3",
"cordova-plugin-calendar": "^5.0.0",
"cordova-plugin-facebook4": "^1.9.1",
"ionic-angular": "3.9.2",
"ionicons": "3.0.0",
"rxjs": "5.5.2",
Expand All @@ -35,5 +42,10 @@
"@ionic/app-scripts": "3.1.6",
"typescript": "2.4.2"
},
"description": "An Ionic project"
"description": "An Ionic project",
"cordova": {
"plugins": {
"cordova-plugin-calendar": {}
}
}
}
33 changes: 28 additions & 5 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,22 @@ import { Viewprescription2Page } from "../pages/viewprescription2/viewprescripti
import { Viewprescription3Page } from "../pages/viewprescription3/viewprescription3";
import { Searchdocpage1Page } from '../pages/searchdocpage1/searchdocpage1'
import { Searchmedpage1Page } from "../pages/searchmedpage1/searchmedpage1";

import { ChatwithbotPage } from "../pages/chatwithbot/chatwithbot";
import { BlogdbProvider } from "../providers/blogdb/blogdb";

import { StatusBar } from '@ionic-native/status-bar';
import { SplashScreen } from '@ionic-native/splash-screen';
import { PrescriptionProvider } from '../providers/prescription/prescription';
import { SearchproProvider } from '../providers/searchpro/searchpro';
import { UserlogProvider } from "../providers/userlog/userlog";
import { BlogdbProvider } from '../providers/blogdb/blogdb';
//import { Tutorialpage1Page } from '../pages/tutorialpage1/tutorialpage1';
import { ChangepassPage } from '../pages/changepass/changepass';
import { ForgetpassPage } from "../pages/forgetpass/forgetpass";

import { Calendar } from '@ionic-native/calendar';
import { ReminderproviderProvider } from '../providers/reminderprovider/reminderprovider';
import { ViewreminderpagePage } from "../pages/viewreminderpage/viewreminderpage";
import { AddremiderpagePage } from "../pages/addremiderpage/addremiderpage";
import { BlogdescriptionPage } from "../pages/blogdescription/blogdescription";

@NgModule({
declarations: [
Expand All @@ -47,7 +53,13 @@ import { BlogdbProvider } from '../providers/blogdb/blogdb';
Viewprescription2Page,
Viewprescription3Page,
Searchmedpage1Page,
Searchdocpage1Page
Searchdocpage1Page,
ChangepassPage,
ForgetpassPage,
ChatwithbotPage,
AddremiderpagePage,
ViewreminderpagePage,
BlogdescriptionPage
],
imports: [
BrowserModule,
Expand All @@ -74,7 +86,13 @@ import { BlogdbProvider } from '../providers/blogdb/blogdb';
Viewprescription3Page,

Searchmedpage1Page,
Searchdocpage1Page
Searchdocpage1Page,
ChangepassPage,
ForgetpassPage,
ChatwithbotPage,
ViewreminderpagePage,
AddremiderpagePage,
BlogdescriptionPage
],
providers: [
StatusBar,
Expand All @@ -84,7 +102,12 @@ import { BlogdbProvider } from '../providers/blogdb/blogdb';
SearchproProvider,
UserlogProvider,
BlogdbProvider,
<<<<<<< HEAD
SocialSharing
=======
Calendar,
ReminderproviderProvider
>>>>>>> a9abc2ea8ce07410f7bedc0b5da33b9de5457ac7
]
})
export class AppModule {}
12 changes: 12 additions & 0 deletions src/pages/about/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
</ion-header>

<ion-content padding>
<ion-refresher (ionRefresh)="doRefresh($event);">
<ion-refresher-content>


</ion-refresher-content>
</ion-refresher>
<ion-card *ngFor="let i of bg">

<ion-item>
Expand Down Expand Up @@ -40,6 +46,12 @@ <h2>{{i.fk_doc_email_id}}</h2>
<ion-icon name="share"></ion-icon>
<div>Share</div>
</button>

<button ion-button icon-left clear small (tap)="onRead(i.blog_id)" style="cursor:pointer;" >
<ion-icon name="text"></ion-icon>
<div>Read More</div>
</button>

</ion-col>
<ion-col center text-center>
<ion-note>
Expand Down
43 changes: 43 additions & 0 deletions src/pages/about/about.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,26 @@
import { Storage } from "@ionic/storage";
import { Component } from '@angular/core';
<<<<<<< HEAD
import { ToastController, NavController } from 'ionic-angular';
=======
import { NavController,ToastController } from 'ionic-angular';
>>>>>>> a9abc2ea8ce07410f7bedc0b5da33b9de5457ac7
import { BlogdbProvider } from "../../providers/blogdb/blogdb";
import { SocialSharing } from "@ionic-native/social-sharing";
import { blog } from "./blog";
<<<<<<< HEAD
import { like } from "./like";


=======
import { BlogdescriptionPage} from "../blogdescription/blogdescription";
>>>>>>> a9abc2ea8ce07410f7bedc0b5da33b9de5457ac7
@Component({
selector: 'page-about',
templateUrl: 'about.html'
})
export class AboutPage {
<<<<<<< HEAD
bg: blog[];
lk: like;
l1: like[] = [];
Expand All @@ -25,6 +34,32 @@ export class AboutPage {
ionViewDidLoad() {
this.storage.get('id').then((val) => {
this.email = val;
=======
bg:blog[];
like:number=0;
comment:number=0;
constructor(public navCtrl: NavController,public bgdata:BlogdbProvider,public toast:ToastController) {

}
doRefresh(refresher){



this.bgdata.getAllBlogs().subscribe(
(data:blog[])=>{
this.bg=data;
}
);

refresher.complete();

}
ionViewDidLoad(){
let t1=this.toast.create({
message:"Pull Down to Refresh Content",
duration:5000,
position:"bottom"
>>>>>>> a9abc2ea8ce07410f7bedc0b5da33b9de5457ac7
});
this.bgdata.getAllBlogs().subscribe(
(data: blog[]) => {
Expand All @@ -48,6 +83,7 @@ export class AboutPage {
}
}
);
t1.present();
}
tapev(e) {
this.bgdata.getLikeEmail(e.fk_blog_id, this.email).subscribe(
Expand Down Expand Up @@ -89,5 +125,12 @@ export class AboutPage {
});
t1.present();
}
onRead(i:any)
{

this.navCtrl.push(BlogdescriptionPage,{
param1:i
});
}

}
50 changes: 50 additions & 0 deletions src/pages/addremiderpage/addremiderpage.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<!--
Generated template for the AddremiderpagePage page.
See http://ionicframework.com/docs/components/#navigation for more info on
Ionic pages and navigation.
-->
<ion-header>

<ion-navbar color="myapp1">
<ion-buttons start>
<button ion-button color="white" clear left on-tap="dismissmodal()">Cancel</button>
</ion-buttons>
<form [formGroup]="addreminderformgroup" (ngSubmit)="logForm()">
<ion-title>Add Reminder Page</ion-title>

<ion-buttons end>
<button ion-button color="white" type="submit" [disabled]="!addreminderformgroup.valid" clear right on-tap="addEvent()">OK</button>
</ion-buttons>
</form>
</ion-navbar>

</ion-header>


<ion-content padding>
<form [formGroup]="addreminderformgroup" (ngSubmit)="logForm()">
<ion-item>
<ion-label>Medicine Name</ion-label>
<ion-input type="text" formControlName="medicineReminder" [(ngModel)]="medicineName"></ion-input>
</ion-item>
<ion-item>
<ion-label>Description</ion-label>
<ion-textarea formControlName="reminderDesc" [(ngModel)]="reminderDesc"></ion-textarea>
</ion-item>





<ion-item>
<ion-label> Start Date</ion-label>
<ion-datetime displayFormat="DD/MM/YY HH:mm" formControlName="startDates" pickerFormat="DD/MM/YY HH:mm" [(ngModel)]="startDate"></ion-datetime>
</ion-item>
<ion-item>
<ion-label>End Date</ion-label>
<ion-datetime displayFormat="DD/MM/YY HH:mm" formControlName="endDates" pickerFormat="DD/MM/YY HH:mm" [(ngModel)]="endDate"></ion-datetime>
</ion-item>
</form>
</ion-content>

13 changes: 13 additions & 0 deletions src/pages/addremiderpage/addremiderpage.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { AddremiderpagePage } from './addremiderpage';

@NgModule({
declarations: [
AddremiderpagePage,
],
imports: [
IonicPageModule.forChild(AddremiderpagePage),
],
})
export class AddremiderpagePageModule {}
3 changes: 3 additions & 0 deletions src/pages/addremiderpage/addremiderpage.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
page-addremiderpage {

}
Loading

0 comments on commit ebce220

Please sign in to comment.