Skip to content

Commit

Permalink
prescription module running with session successfully
Browse files Browse the repository at this point in the history
  • Loading branch information
malavshah9 committed Dec 31, 2017
1 parent 9f6b7ad commit 65715aa
Show file tree
Hide file tree
Showing 9 changed files with 58 additions and 375 deletions.
6 changes: 6 additions & 0 deletions src/pages/signinpage/signinpage.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ page-signinpage {
margin-top: -64px;
text-align: center;
}
.but{
align-items: center;
width:100%;
height:40%;

}



Expand Down
13 changes: 11 additions & 2 deletions src/pages/signinpage/signinpage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export class SigninpagePage {
email_id:string='';
password:string='';
userObject:User_Class;
constructor(public storage:Storage,public load:LoadingController,public toast:ToastController,public navCtrl: NavController,public _db:UserlogProvider){
constructor(public storage:Storage,public toast:ToastController,public navCtrl: NavController,public _db:UserlogProvider){

}
ionViewDidLoad() {
Expand Down Expand Up @@ -55,7 +55,16 @@ export class SigninpagePage {



this._db.Login(new User_Class(0,this.email_id,'','',this.password,'','',0,'',''))
this._db.Login(new User_Class(0,
this.email_id,
'',
'',
this.password,
'',
'',
0,
'',
''))
.subscribe(
(x:User_Class[])=>{
if(this.email_id=='' || this.password=='')
Expand Down
67 changes: 4 additions & 63 deletions src/pages/tutorialpage1/tutorialpage1.html
Original file line number Diff line number Diff line change
@@ -1,81 +1,22 @@
<!--
Generated template for the Tutorialpage1Page page.
See http://ionicframework.com/docs/components/#navigation for more info on
Ionic pages and navigation.
-->
<!--<ion-header>
<ion-navbar color="myapp1">
<ion-buttons end *ngIf="showSkip">
<button ion-button (click)="startApp()" color="primary"></button>
</ion-buttons>
<ion-title>Tutorial</ion-title>
</ion-navbar>
</ion-header>
<ion-content padding class="getstart">
<ion-slides pager >
<ion-slide padding class="getstart">
<button ion-button icon-right (click)="onTutorialNext()">
Skip
<ion-icon name="home"></ion-icon>
</button>
<h2>Paper Less Presciptions</h2>
</ion-slide>
<ion-slide padding class="getstart1">
<h2>Slide 2</h2>
</ion-slide>
<ion-slide padding class="getstart2">
<h2>Slide 3</h2>
<button ion-button icon-right (click)="onTutorialNext()">
Next
<ion-icon name="home"></ion-icon>
</button>
</ion-slide>
</ion-slides>
</ion-content>-->
<!--<ion-header no-shadow>
<ion-navbar>
<ion-buttons end *ngIf="showSkip">
<button ion-button (click)="startApp()" color="primary"></button>
</ion-buttons>
<ion-title>Tutorial</ion-title>
</ion-navbar>
</ion-header>-->
<ion-header>

<ion-navbar color="myapp1">
<ion-buttons end *ngIf="showSkip">
<button ion-button (click)="startApp()" color="primary"></button>
</ion-buttons>


<ion-title>Tutorial</ion-title>
<ion-title>Tutorial</ion-title>
</ion-navbar>

</ion-header>

<ion-content padding>
<ion-content padding>
<ion-slides pager>
<ion-slide>
<img src="../../assets/imgs/logo1.png" class="slide-image" />
<button ion-button icon-right (click)="onTutorialNext()">
<button ion-button icon-right (click)="onTutorialNext()" color="myapp1">
Skip
<ion-icon name="home"></ion-icon>
</button>
<h2 class="slide-title">Medsky...</h2>
<h2 class="slide-title">Medsky</h2>
</ion-slide>
<ion-slide>
<img src="../../assets/imgs/mad.jpg" class="h" />
Expand Down
2 changes: 1 addition & 1 deletion src/pages/viewprescription2/viewprescription2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export class Viewprescription2Page {
});
loadingdata.present();

this._dbprescription. getPrescriptionDate(this.uid,this.doc_id).subscribe(
this._dbprescription. getPrescriptionDate(this.doc_id).subscribe(
(data:prescdata[])=>{
this.allprescdate=data;
console.log(data);
Expand Down
10 changes: 0 additions & 10 deletions src/pages/viewprescription3/classmedicinenames.ts

This file was deleted.

7 changes: 0 additions & 7 deletions src/pages/viewprescription3/classprescc.ts

This file was deleted.

188 changes: 0 additions & 188 deletions src/pages/viewprescription3/temp.ts

This file was deleted.

Loading

0 comments on commit 65715aa

Please sign in to comment.