From e96e13941297a970c426223de0ba9bc415acb207 Mon Sep 17 00:00:00 2001 From: malavshah9 Date: Sun, 31 Dec 2017 13:54:32 +0530 Subject: [PATCH] prescription module completed --- src/pages/signinpage/signinpage.ts | 14 +- src/pages/signuppage/signuppage.ts | 14 +- src/pages/viewprescription3/classprescc.ts | 7 + src/pages/viewprescription3/temp.ts | 188 ++++++++++++++++++ .../viewprescription3/viewprescription3.html | 143 ++++--------- .../viewprescription3/viewprescription3.scss | 45 ++--- .../viewprescription3/viewprescription3.ts | 53 ++++- 7 files changed, 309 insertions(+), 155 deletions(-) create mode 100644 src/pages/viewprescription3/classprescc.ts create mode 100644 src/pages/viewprescription3/temp.ts diff --git a/src/pages/signinpage/signinpage.ts b/src/pages/signinpage/signinpage.ts index 98a4c6c..bb01b02 100644 --- a/src/pages/signinpage/signinpage.ts +++ b/src/pages/signinpage/signinpage.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { IonicPage, NavController,LoadingController,ToastController} from 'ionic-angular'; +import { IonicPage, NavController,ToastController} from 'ionic-angular'; import { TabsPage } from '../../pages/tabs/tabs'; import { UserlogProvider } from "../../providers/userlog/userlog"; import { User_Class } from "../../providers/userlog/user_class"; @@ -21,7 +21,7 @@ export class SigninpagePage { email_id:string=''; password:string=''; userObject:User_Class; - constructor(public load:LoadingController,public toast:ToastController,public navCtrl: NavController,public _db:UserlogProvider){ + constructor(public toast:ToastController,public navCtrl: NavController,public _db:UserlogProvider){ } ionViewDidLoad() { @@ -52,15 +52,9 @@ export class SigninpagePage { else{ if(x.length==1){ alert('login successfully'); - let l1=this.load.create({ - content:"Loading...", - duration:3000 - - }); - l1.present(); - + //t1.present(); - l1.dismissAll(); + this.navCtrl.push(TabsPage); diff --git a/src/pages/signuppage/signuppage.ts b/src/pages/signuppage/signuppage.ts index be0220e..e336048 100644 --- a/src/pages/signuppage/signuppage.ts +++ b/src/pages/signuppage/signuppage.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { IonicPage, NavController,LoadingController,ToastController} from 'ionic-angular'; +import { IonicPage, NavController,ToastController} from 'ionic-angular'; import { UserlogProvider } from "../../providers/userlog/userlog"; import { User_Class } from "../../providers/userlog/user_class"; import { TabsPage } from "../tabs/tabs"; @@ -23,7 +23,7 @@ export class SignuppagePage { mno:string=''; userObject:User_Class; - constructor(public load:LoadingController,public toast:ToastController,public navCtrl: NavController, public data:UserlogProvider) { + constructor(public toast:ToastController,public navCtrl: NavController, public data:UserlogProvider) { } ionViewDidLoad() { @@ -60,15 +60,9 @@ export class SignuppagePage { alert("enter Mobile No"); } else{ - let l1=this.load.create({ - content:"Loading...", - duration:3000 - - }); - // l1.present(); - + t1.present(); - //l1.dismissAll(); + this.navCtrl.push(TabsPage); } diff --git a/src/pages/viewprescription3/classprescc.ts b/src/pages/viewprescription3/classprescc.ts new file mode 100644 index 0000000..6ffe3c0 --- /dev/null +++ b/src/pages/viewprescription3/classprescc.ts @@ -0,0 +1,7 @@ +export class presc +{ + constructor(public med_name:String,public mor:String,public non:String,public nig:String,public day:String) + { + + } +} \ No newline at end of file diff --git a/src/pages/viewprescription3/temp.ts b/src/pages/viewprescription3/temp.ts new file mode 100644 index 0000000..21baa93 --- /dev/null +++ b/src/pages/viewprescription3/temp.ts @@ -0,0 +1,188 @@ +
+
Written by
+
{{doc_name}}
+
+ +
+
Date
+
{{pres_date}}
+
+ +
+
Medicines
+
Timings
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/pages/viewprescription3/viewprescription3.html b/src/pages/viewprescription3/viewprescription3.html index d906bad..9fcb9ce 100644 --- a/src/pages/viewprescription3/viewprescription3.html +++ b/src/pages/viewprescription3/viewprescription3.html @@ -14,111 +14,46 @@ - -
Written By Doctor{{doc_name}}
Date{{pres_date}}
Medicine NameTimings
-Morning DosesNoon DosesNight DosesNumber of Days
{{item}}
- - - - - - - - - - - - - - - - - - - - - {{item}} - - - - - {{item}} - - - - - {{item}} - + + + + + + + + + + + + - - {{item}} - - - - - {{item}} - - - -
Written By Doctor{{doc_name}}
Date{{pres_date}}
Medicine NameTimings
-Morning DosesNoon DosesNight DosesNumber of Days
-
-
-
Morning DoseNoon DoseNight DoseDays to Take
+ {{item}}
+ Instruction: {{ins_array[i]}} + 		+ {{mor_array[i]}} + + {{non_array[i]}} + + {{nig_array[i]}} + + {{day_array[i]}} -
-
- - - + - - + + \ No newline at end of file diff --git a/src/pages/viewprescription3/viewprescription3.scss b/src/pages/viewprescription3/viewprescription3.scss index d8ea377..16491bc 100644 --- a/src/pages/viewprescription3/viewprescription3.scss +++ b/src/pages/viewprescription3/viewprescription3.scss @@ -1,31 +1,30 @@ page-viewprescription3 { -.card-background-page { - ion-card { - position: relative; + table{ + width:100%; text-align: center; + height: 100%; + font-family: sans-serif; + //background: linear-gradient(45deg, #0b352e, #9eecd8); } + tr { + border-top: 2px solid #ddd; + border-bottom: 2px solid #ddd; + border-left: 2px solid #ddd; + border-right: 2px solid #ddd; + - .card-title { - position: absolute; - top: 36%; - font-size: 2.0em; - width: 100%; - font-weight: bold; - color: #fff; } - - .card-subtitle { - font-size: 1.0em; - position: absolute; - top: 52%; - width: 100%; - color: #fff; - } - .tab1{ - border: 1px solid black; - } - + th { + background-color: #4CAF50; + color: white; + border: 2px solid #000000; } - +td{ + border: 2px solid #000000 } + + + tr:hover {background-color: #f5f5f5; + } +} \ No newline at end of file diff --git a/src/pages/viewprescription3/viewprescription3.ts b/src/pages/viewprescription3/viewprescription3.ts index 85ca70e..c8a71e4 100644 --- a/src/pages/viewprescription3/viewprescription3.ts +++ b/src/pages/viewprescription3/viewprescription3.ts @@ -3,7 +3,7 @@ import { IonicPage, NavController, NavParams,LoadingController,ToastController } import { PrescriptionProvider } from "../../providers/prescription/prescription"; import { prescription3 } from "./classprescription3"; import { medicinesnames } from "./classmedicinenames"; - +import { presc } from './classprescc'; /** * Generated class for the Viewprescription3Page page. @@ -20,9 +20,12 @@ import { medicinesnames } from "./classmedicinenames"; export class Viewprescription3Page { pk_pres_id:Number; + datas:presc[]; + // prescriptions:prescription3[]=[]; //prescription details - i:Number=0; +// i:Number=0; + doc_name:String; pres_date:String; medicines:String; @@ -37,7 +40,10 @@ export class Viewprescription3Page { ins_array:String[]=[]; days:String; day_array:String[]=[]; - + + + + medicine_name:String[]=[]; medicine_type:String[]=[]; @@ -82,10 +88,34 @@ this.mor_array=this.mornings.split(','); this.non_array=this.noons.split(','); this.nig_array=this.nights.split(','); -this.initData(); -//----// - }, +this.initData(this.medicine_name); +/*for(let item of this.medicine_name) +{ + this.datas.push({med_name:item}); +}*/ +/* +for(let data of this.displayData,let itm of this.medicine_name) +{ + * data.medicinename=""; +}*/ + +/*for(let it of this.day_array) +{ + alert(" viewprescription3.ts ma "+it); + +} +alert("viewprrescription ma length aa 6" +this.day_array.length); +var i=0; +for(i=0;i