From 1369b572788bb4069e9d01917e8795a66243a907 Mon Sep 17 00:00:00 2001 From: malavshah9 Date: Fri, 5 Jan 2018 09:48:57 +0530 Subject: [PATCH 1/5] read blog module needs changes --- package-lock.json | 10 ++++ package.json | 2 + src/app/app.module.ts | 11 +++- src/pages/about/about.html | 12 +++++ src/pages/about/about.ts | 32 +++++++++-- .../blogdescription/blogdescription.html | 34 ++++++++++++ .../blogdescription/blogdescription.module.ts | 13 +++++ .../blogdescription/blogdescription.scss | 3 ++ src/pages/blogdescription/blogdescription.ts | 48 +++++++++++++++++ src/pages/chatwithbot/chatwithbot.html | 18 +++++++ src/pages/chatwithbot/chatwithbot.module.ts | 13 +++++ src/pages/chatwithbot/chatwithbot.scss | 3 ++ src/pages/chatwithbot/chatwithbot.ts | 25 +++++++++ src/pages/home/home.html | 8 +++ src/pages/home/home.ts | 6 ++- .../viewprescription3/viewprescription3.ts | 54 ++++++++++++++++--- src/providers/blogdb/blogdb.ts | 8 ++- 17 files changed, 285 insertions(+), 15 deletions(-) create mode 100644 src/pages/blogdescription/blogdescription.html create mode 100644 src/pages/blogdescription/blogdescription.module.ts create mode 100644 src/pages/blogdescription/blogdescription.scss create mode 100644 src/pages/blogdescription/blogdescription.ts create mode 100644 src/pages/chatwithbot/chatwithbot.html create mode 100644 src/pages/chatwithbot/chatwithbot.module.ts create mode 100644 src/pages/chatwithbot/chatwithbot.scss create mode 100644 src/pages/chatwithbot/chatwithbot.ts diff --git a/package-lock.json b/package-lock.json index 9cb30c0..c1af685 100644 --- a/package-lock.json +++ b/package-lock.json @@ -96,6 +96,11 @@ "resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-4.4.0.tgz", "integrity": "sha512-Gyq8clDPeRG2AvcCydqDaYEByjIeJqWOryDkHl117wGUhZ+bY/489unL3u6ua7usGjWfUtM4Oj6hFgEzEu+kWg==" }, + "@ionic-native/facebook": { + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/@ionic-native/facebook/-/facebook-4.5.2.tgz", + "integrity": "sha512-TGO0nsEqZCy4ULAIhvo1D/8M1FPSble3WOOv6geriYHbjR5a5hu4uFSPbzKJxBzpzseRX0PDdd3HyPvoCsBLcQ==" + }, "@ionic-native/splash-screen": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/@ionic-native/splash-screen/-/splash-screen-4.4.0.tgz", @@ -902,6 +907,11 @@ "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", "dev": true }, + "cordova-plugin-facebook4": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/cordova-plugin-facebook4/-/cordova-plugin-facebook4-1.9.1.tgz", + "integrity": "sha512-B45qw+Z+GT2iIQWeF8M9EvmAzoi6Akems0FHq/dum9gRfl0uekgdaFTKiPZNgP1Q8BsC8xJU+VkhtRxsiT9gTw==" + }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", diff --git a/package.json b/package.json index ab89401..3357ea2 100644 --- a/package.json +++ b/package.json @@ -21,9 +21,11 @@ "@angular/platform-browser": "5.0.3", "@angular/platform-browser-dynamic": "5.0.3", "@ionic-native/core": "4.4.0", + "@ionic-native/facebook": "^4.5.2", "@ionic-native/splash-screen": "4.4.0", "@ionic-native/status-bar": "4.4.0", "@ionic/storage": "^2.1.3", + "cordova-plugin-facebook4": "^1.9.1", "ionic-angular": "3.9.2", "ionicons": "3.0.0", "rxjs": "5.5.2", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 2b7b2fc..fd5e017 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -20,6 +20,7 @@ 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 { StatusBar } from '@ionic-native/status-bar'; @@ -28,6 +29,7 @@ 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 { BlogdescriptionPage } from "../pages/blogdescription/blogdescription"; //import { Tutorialpage1Page } from '../pages/tutorialpage1/tutorialpage1'; @@ -46,7 +48,9 @@ import { BlogdbProvider } from '../providers/blogdb/blogdb'; Viewprescription2Page, Viewprescription3Page, Searchmedpage1Page, - Searchdocpage1Page + Searchdocpage1Page, + ChatwithbotPage, + BlogdescriptionPage ], imports: [ BrowserModule, @@ -73,7 +77,10 @@ import { BlogdbProvider } from '../providers/blogdb/blogdb'; Viewprescription3Page, Searchmedpage1Page, - Searchdocpage1Page + Searchdocpage1Page, + + ChatwithbotPage, + BlogdescriptionPage ], providers: [ StatusBar, diff --git a/src/pages/about/about.html b/src/pages/about/about.html index 1434e4b..fa638ef 100644 --- a/src/pages/about/about.html +++ b/src/pages/about/about.html @@ -7,6 +7,12 @@ + + + + + + @@ -36,6 +42,12 @@

{{i.fk_doc_email_id}}

{{comment}} Share
+ + + diff --git a/src/pages/about/about.ts b/src/pages/about/about.ts index d3a5af5..54c012e 100644 --- a/src/pages/about/about.ts +++ b/src/pages/about/about.ts @@ -1,8 +1,8 @@ import { Component } from '@angular/core'; -import { NavController } from 'ionic-angular'; +import { NavController,ToastController } from 'ionic-angular'; import { BlogdbProvider } from "../../providers/blogdb/blogdb"; import { blog } from "./blog"; - +import { BlogdescriptionPage} from "../blogdescription/blogdescription"; @Component({ selector: 'page-about', templateUrl: 'about.html' @@ -11,15 +11,34 @@ export class AboutPage { bg:blog[]; like:number=0; comment:number=0; - constructor(public navCtrl: NavController,public bgdata:BlogdbProvider) { + 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" + }); this.bgdata.getAllBlogs().subscribe( (data:blog[])=>{ this.bg=data; } ); + t1.present(); } tapev(e) { @@ -29,5 +48,12 @@ comment:number=0; { this.comment++; } + onRead(i:any) + { + + this.navCtrl.push(BlogdescriptionPage,{ + param1:i + }); + } } diff --git a/src/pages/blogdescription/blogdescription.html b/src/pages/blogdescription/blogdescription.html new file mode 100644 index 0000000..33f8239 --- /dev/null +++ b/src/pages/blogdescription/blogdescription.html @@ -0,0 +1,34 @@ + + + + + Blog Description + + + + + + +{{blogid}} + + + + {{item.blog_title}} + {{date | date: 'ddMMyyyy'}}{{item.blog_date}} +
+
{{item.fk_doc_email_id}}
+
{{item.fk_spec_id}}
+
+ + + + {{item.blog_desc}} + + + + diff --git a/src/pages/blogdescription/blogdescription.module.ts b/src/pages/blogdescription/blogdescription.module.ts new file mode 100644 index 0000000..a7dc865 --- /dev/null +++ b/src/pages/blogdescription/blogdescription.module.ts @@ -0,0 +1,13 @@ +import { NgModule } from '@angular/core'; +import { IonicPageModule } from 'ionic-angular'; +import { BlogdescriptionPage } from './blogdescription'; + +@NgModule({ + declarations: [ + BlogdescriptionPage, + ], + imports: [ + IonicPageModule.forChild(BlogdescriptionPage), + ], +}) +export class BlogdescriptionPageModule {} diff --git a/src/pages/blogdescription/blogdescription.scss b/src/pages/blogdescription/blogdescription.scss new file mode 100644 index 0000000..19d11f2 --- /dev/null +++ b/src/pages/blogdescription/blogdescription.scss @@ -0,0 +1,3 @@ +page-blogdescription { + +} diff --git a/src/pages/blogdescription/blogdescription.ts b/src/pages/blogdescription/blogdescription.ts new file mode 100644 index 0000000..972131f --- /dev/null +++ b/src/pages/blogdescription/blogdescription.ts @@ -0,0 +1,48 @@ +import { Component} from '@angular/core'; +import { IonicPage, NavController, NavParams,LoadingController } from 'ionic-angular'; +import { BlogdbProvider } from "../../providers/blogdb/blogdb"; +import { blog } from "../about/blog"; +/** + * Generated class for the BlogdescriptionPage page. + * + * See https://ionicframework.com/docs/components/#navigation for more info on + * Ionic pages and navigation. + */ + +@IonicPage() +@Component({ + selector: 'page-blogdescription', + templateUrl: 'blogdescription.html', +}) +export class BlogdescriptionPage { + blogid:Number; + blogdata:blog[]; + constructor(public navCtrl: NavController, public navParams: NavParams,public db:BlogdbProvider,public loadingcontroller:LoadingController) { + } + + ionViewDidLoad() { + this.blogid=this.navParams.get('param1'); + + console.log('ionViewDidLoad BlogdescriptionPage'); + this.db.blogid=this.blogid; + let loadingdata=this.loadingcontroller.create({ + content:"Fetching your prescriptions" + }); + loadingdata.present(); + this.db.getBlogById().subscribe( + (data:blog[])=>{ + this.blogdata=data; + console.log(data); + } + , + function(error){ + console.log("error"+error) + }, + function(){ + console.log("success"); + loadingdata.dismiss(); + } + ); + } + +} diff --git a/src/pages/chatwithbot/chatwithbot.html b/src/pages/chatwithbot/chatwithbot.html new file mode 100644 index 0000000..1c5ab67 --- /dev/null +++ b/src/pages/chatwithbot/chatwithbot.html @@ -0,0 +1,18 @@ + + + + + Chat with Bot + + + + + + + + diff --git a/src/pages/chatwithbot/chatwithbot.module.ts b/src/pages/chatwithbot/chatwithbot.module.ts new file mode 100644 index 0000000..36cda9f --- /dev/null +++ b/src/pages/chatwithbot/chatwithbot.module.ts @@ -0,0 +1,13 @@ +import { NgModule } from '@angular/core'; +import { IonicPageModule } from 'ionic-angular'; +import { ChatwithbotPage } from './chatwithbot'; + +@NgModule({ + declarations: [ + ChatwithbotPage, + ], + imports: [ + IonicPageModule.forChild(ChatwithbotPage), + ], +}) +export class ChatwithbotPageModule {} diff --git a/src/pages/chatwithbot/chatwithbot.scss b/src/pages/chatwithbot/chatwithbot.scss new file mode 100644 index 0000000..b9c207b --- /dev/null +++ b/src/pages/chatwithbot/chatwithbot.scss @@ -0,0 +1,3 @@ +page-chatwithbot { + +} diff --git a/src/pages/chatwithbot/chatwithbot.ts b/src/pages/chatwithbot/chatwithbot.ts new file mode 100644 index 0000000..4936058 --- /dev/null +++ b/src/pages/chatwithbot/chatwithbot.ts @@ -0,0 +1,25 @@ +import { Component } from '@angular/core'; +import { IonicPage, NavController, NavParams } from 'ionic-angular'; + +/** + * Generated class for the ChatwithbotPage page. + * + * See https://ionicframework.com/docs/components/#navigation for more info on + * Ionic pages and navigation. + */ + +@IonicPage() +@Component({ + selector: 'page-chatwithbot', + templateUrl: 'chatwithbot.html', +}) +export class ChatwithbotPage { + + constructor(public navCtrl: NavController, public navParams: NavParams) { + } + + ionViewDidLoad() { + console.log('ionViewDidLoad ChatwithbotPage'); + } + +} diff --git a/src/pages/home/home.html b/src/pages/home/home.html index d561016..e2f843b 100644 --- a/src/pages/home/home.html +++ b/src/pages/home/home.html @@ -49,5 +49,13 @@

MEDSKY

Here you can search Medicines and Doctors both. + + + Chat With Our Bot + + + Here you can chat with our bot.Get some answers for deases as per symtones. + + diff --git a/src/pages/home/home.ts b/src/pages/home/home.ts index f7a6179..8196015 100644 --- a/src/pages/home/home.ts +++ b/src/pages/home/home.ts @@ -4,6 +4,7 @@ import { Viewprescription1Page } from "../viewprescription1/viewprescription1"; import { Searchdocandmed1Page } from '../searchdocandmed1/searchdocandmed1'; import { Storage } from "@ionic/storage"; import { Validators } from '@angular/forms/src/validators'; +import { ChatwithbotPage } from "../chatwithbot/chatwithbot"; @Component({ selector: 'page-home', templateUrl: 'home.html' @@ -43,5 +44,8 @@ export class HomePage { { this.navCtrl.push(Searchdocandmed1Page); } - + onChat() + { + this.navCtrl.push(ChatwithbotPage); + } } diff --git a/src/pages/viewprescription3/viewprescription3.ts b/src/pages/viewprescription3/viewprescription3.ts index af3d8dc..4d957d5 100644 --- a/src/pages/viewprescription3/viewprescription3.ts +++ b/src/pages/viewprescription3/viewprescription3.ts @@ -18,6 +18,7 @@ import { prescription3 } from "./classprescription3"; templateUrl: 'viewprescription3.html', }) export class Viewprescription3Page { +indexing:String[]=[]; pk_pres_id:Number; doc_name:String; pres_date:String; @@ -35,7 +36,8 @@ day_array:String[]=[]; medicine_name:String[]=[]; medicine_type:String[]=[]; medicinenames:String[]=[]; - +sortedmedname:String[]=[]; +temp:String; constructor(public navCtrl: NavController, public navParams: NavParams,public loadingcontroller:LoadingController,public _dbprescription:PrescriptionProvider) { } @@ -74,6 +76,9 @@ this.mor_array=this.mornings.split(','); this.non_array=this.noons.split(','); this.nig_array=this.nights.split(','); this.initData(this.medicine_name); + + + }, function(error){ console.log("error"+error) @@ -89,10 +94,15 @@ this.initData(this.medicine_name); } initData(items:any[]) { - for(let item of this.medicinenames) - { - - this._dbprescription.mid=item; + var i:Number; + for(let item of this.medicinenames) + { + this._dbprescription.mid=item; + i=this.medicinenames.indexOf(this._dbprescription.mid); + alert(i); + this.indexing.push(i.toString()); + + this._dbprescription. getmedicinename() .subscribe( (data:any[])=>{ @@ -111,10 +121,40 @@ this.initData(this.medicine_name); function() { console.log("Success"); + } ); - } - } + } + //this.sortData(); +} + sortData() + { + var i=0; + var j=0; + var t,s; + + i=this.indexing.length; + alert("indexing ->length " + i); + for(j=0;j Date: Mon, 8 Jan 2018 11:35:40 +0530 Subject: [PATCH 2/5] user progile doing --- src/app/app.module.ts | 10 ++- src/pages/changepass/changepass.html | 42 +++++++++++ src/pages/changepass/changepass.module.ts | 13 ++++ src/pages/changepass/changepass.scss | 3 + src/pages/changepass/changepass.ts | 32 ++++++++ src/pages/forgetpass/forgetpass.html | 33 +++++++++ src/pages/forgetpass/forgetpass.module.ts | 13 ++++ src/pages/forgetpass/forgetpass.scss | 3 + src/pages/forgetpass/forgetpass.ts | 89 +++++++++++++++++++++++ src/pages/signinpage/signinpage.html | 14 ++-- src/pages/signinpage/signinpage.ts | 76 ++++++++++++++++++- src/pages/signuppage/signuppage.html | 4 +- src/pages/user/user.html | 18 ++--- src/pages/user/user.ts | 17 +++-- src/providers/userlog/email.ts | 7 ++ src/providers/userlog/userlog.ts | 13 +++- 16 files changed, 358 insertions(+), 29 deletions(-) create mode 100644 src/pages/changepass/changepass.html create mode 100644 src/pages/changepass/changepass.module.ts create mode 100644 src/pages/changepass/changepass.scss create mode 100644 src/pages/changepass/changepass.ts create mode 100644 src/pages/forgetpass/forgetpass.html create mode 100644 src/pages/forgetpass/forgetpass.module.ts create mode 100644 src/pages/forgetpass/forgetpass.scss create mode 100644 src/pages/forgetpass/forgetpass.ts create mode 100644 src/providers/userlog/email.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 6cdba2a..4bb57d5 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -26,6 +26,8 @@ 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 { ChangepassPage } from '../pages/changepass/changepass'; +import { ForgetpassPage } from "../pages/forgetpass/forgetpass"; //import { Tutorialpage1Page } from '../pages/tutorialpage1/tutorialpage1'; @@ -44,7 +46,9 @@ import { UserlogProvider } from "../providers/userlog/userlog"; Viewprescription2Page, Viewprescription3Page, Searchmedpage1Page, - Searchdocpage1Page + Searchdocpage1Page, + ChangepassPage, + ForgetpassPage ], imports: [ BrowserModule, @@ -70,7 +74,9 @@ import { UserlogProvider } from "../providers/userlog/userlog"; Viewprescription3Page, Searchmedpage1Page, - Searchdocpage1Page + Searchdocpage1Page, + ChangepassPage, + ForgetpassPage ], providers: [ StatusBar, diff --git a/src/pages/changepass/changepass.html b/src/pages/changepass/changepass.html new file mode 100644 index 0000000..b3d1643 --- /dev/null +++ b/src/pages/changepass/changepass.html @@ -0,0 +1,42 @@ + + + + + Change Password + + + + + + + + + Enter Current Password + + + + Enter New Password + + + + Confirm Password + + + +
+             +             +             +             +   + +
+ +
+ + \ No newline at end of file diff --git a/src/pages/changepass/changepass.module.ts b/src/pages/changepass/changepass.module.ts new file mode 100644 index 0000000..b199749 --- /dev/null +++ b/src/pages/changepass/changepass.module.ts @@ -0,0 +1,13 @@ +import { NgModule } from '@angular/core'; +import { IonicPageModule } from 'ionic-angular'; +import { ChangepassPage } from './changepass'; + +@NgModule({ + declarations: [ + ChangepassPage, + ], + imports: [ + IonicPageModule.forChild(ChangepassPage), + ], +}) +export class ChangepassPageModule {} diff --git a/src/pages/changepass/changepass.scss b/src/pages/changepass/changepass.scss new file mode 100644 index 0000000..e7046a6 --- /dev/null +++ b/src/pages/changepass/changepass.scss @@ -0,0 +1,3 @@ +page-changepass { + +} diff --git a/src/pages/changepass/changepass.ts b/src/pages/changepass/changepass.ts new file mode 100644 index 0000000..6db91e4 --- /dev/null +++ b/src/pages/changepass/changepass.ts @@ -0,0 +1,32 @@ +import { Component } from '@angular/core'; +import { IonicPage, NavController, NavParams } from 'ionic-angular'; +import { UserPage } from "../user/user"; +import { UserlogProvider } from "../../providers/userlog/userlog"; +import { User_Class } from "../../providers/userlog/user_class"; +import { TabsPage } from "../../pages/tabs/tabs"; +/** + * Generated class for the ChangepassPage page. + * + * See https://ionicframework.com/docs/components/#navigation for more info on + * Ionic pages and navigation. + */ + +@IonicPage() +@Component({ + selector: 'page-changepass', + templateUrl: 'changepass.html', +}) +export class ChangepassPage { + + constructor(public navCtrl: NavController, public navParams: NavParams) { + } + + ionViewDidLoad() { + console.log('ionViewDidLoad ChangepassPage'); + } + onChangePassClick() + { + + } + +} diff --git a/src/pages/forgetpass/forgetpass.html b/src/pages/forgetpass/forgetpass.html new file mode 100644 index 0000000..4a8afcd --- /dev/null +++ b/src/pages/forgetpass/forgetpass.html @@ -0,0 +1,33 @@ + + + + + Forget Password + + + + + + + + + Email Id + + + +                     +                     +                     +                     +                     + + + + + + diff --git a/src/pages/forgetpass/forgetpass.module.ts b/src/pages/forgetpass/forgetpass.module.ts new file mode 100644 index 0000000..b8a32a4 --- /dev/null +++ b/src/pages/forgetpass/forgetpass.module.ts @@ -0,0 +1,13 @@ +import { NgModule } from '@angular/core'; +import { IonicPageModule } from 'ionic-angular'; +import { ForgetpassPage } from './forgetpass'; + +@NgModule({ + declarations: [ + ForgetpassPage, + ], + imports: [ + IonicPageModule.forChild(ForgetpassPage), + ], +}) +export class ForgetpassPageModule {} diff --git a/src/pages/forgetpass/forgetpass.scss b/src/pages/forgetpass/forgetpass.scss new file mode 100644 index 0000000..ec8d327 --- /dev/null +++ b/src/pages/forgetpass/forgetpass.scss @@ -0,0 +1,3 @@ +page-forgetpass { + +} diff --git a/src/pages/forgetpass/forgetpass.ts b/src/pages/forgetpass/forgetpass.ts new file mode 100644 index 0000000..4655dd0 --- /dev/null +++ b/src/pages/forgetpass/forgetpass.ts @@ -0,0 +1,89 @@ +import { Component } from '@angular/core'; +import { IonicPage, NavController, NavParams } from 'ionic-angular'; +import { UserlogProvider } from "../../providers/userlog/userlog"; +import { User_Class } from "../../providers/userlog/user_class"; +import { email_class } from "../../providers/userlog/email"; + + +/** + * Generated class for the ForgetpassPage page. + * + * See https://ionicframework.com/docs/components/#navigation for more info on + * Ionic pages and navigation. + */ + +@IonicPage() +@Component({ + selector: 'page-forgetpass', + templateUrl: 'forgetpass.html', +}) +export class ForgetpassPage { + + constructor(public navCtrl: NavController, public navParams: NavParams,public _db:UserlogProvider) { + } + email_id:string=''; + password:string=''; + usr:User_Class[]; + mailobj:email_class[]=[]; + msg:string=''; + ionViewDidLoad() { + console.log('ionViewDidLoad ForgetpassPage'); + } + forgotPassword() +{ + + + + + //let item=new Users(this.id,this.email,this.name,this.mobno,this.img,this.pass,this.dpass); + // alert(this.email); + // let item=new Users(this.id,this.email,this.name,this.mobno,this.img,this.pass,this.dpass); + alert("ywaa"); + this._db.getUser(this.email_id).subscribe( + (data:User_Class[])=>{ + // alert("hiii"); + if(data.length===1) + { + alert("hello"); + var message="Hello "+data[0].usr_name+". You have requested to reset the password. your password is '"+data[0].usr_pass+"'. Password is one of the confidential thing, Don't share it with anyone."; + this._db.sendemail(new email_class(message,this.email_id,"Resetting the password of Expense Tracker.")).subscribe( + (data1:any)=>{ + console.log("mail sent"); + alert("The Password has been sent to "+this.email_id); + }, + + ); + } + else + { + this.msg="You have entered incorrect email id. Please enter the email id you used to login with."; + } + }, + function(err){}, + function(){} +); + } + onClick() + { + + this.forgotPassword(); + /*buttons: [ + { + text: 'Cancel', + handler: data => { + console.log('Cancel clicked'); + } + }, + { + text: 'Send', + handler: data => { + this.email_id = data.name; + //this.forgotPassword(); + } + } + ]*/ + + } + + +} diff --git a/src/pages/signinpage/signinpage.html b/src/pages/signinpage/signinpage.html index eff5319..7660f48 100644 --- a/src/pages/signinpage/signinpage.html +++ b/src/pages/signinpage/signinpage.html @@ -14,14 +14,12 @@ -
-
+ - -

-

+
+ +
@@ -40,7 +38,7 @@               - Forgot Password??? + Forgot Password???
diff --git a/src/pages/signinpage/signinpage.ts b/src/pages/signinpage/signinpage.ts index 4d615c7..eaf1267 100644 --- a/src/pages/signinpage/signinpage.ts +++ b/src/pages/signinpage/signinpage.ts @@ -5,6 +5,10 @@ import { UserlogProvider } from "../../providers/userlog/userlog"; import { User_Class } from "../../providers/userlog/user_class"; import { SignuppagePage } from "../signuppage/signuppage"; import { Storage } from "@ionic/storage"; +import { email_class } from "../../providers/userlog/email"; +import { AboutPage } from '../about/about'; +import { ForgetpassPage } from "../forgetpass/forgetpass"; + /** * Generated class for the SigninpagePage page. @@ -21,7 +25,9 @@ import { Storage } from "@ionic/storage"; export class SigninpagePage { email_id:string=''; password:string=''; - userObject:User_Class; + usr:User_Class[]; + mailobj:email_class[]=[]; + msg:string=''; constructor(public storage:Storage,public toast:ToastController,public navCtrl: NavController,public _db:UserlogProvider){ } @@ -111,4 +117,72 @@ onClick() this.navCtrl.push(SignuppagePage); } +forgotPassword() +{ + + + + + //let item=new Users(this.id,this.email,this.name,this.mobno,this.img,this.pass,this.dpass); + // alert(this.email); + // let item=new Users(this.id,this.email,this.name,this.mobno,this.img,this.pass,this.dpass); + this._db.getUser(this.email_id).subscribe( + (data:User_Class[])=>{ + if(data.length==1) + { + alert("hello"); + var message="Hello "+data[0].usr_name+". You have requested to reset the password. your password is '"+data[0].usr_pass+"'. Password is one of the confidential thing, Don't share it with anyone."; + this._db.sendemail(new email_class(message,this.email_id,"Resetting the password of Expense Tracker.")).subscribe( + (data1:any)=>{ + console.log("mail sent"); + alert("The Password has been sent to "+this.email_id); + }, + + ); + } + else + { + this.msg="You have entered incorrect email id. Please enter the email id you used to login with."; + } + }, + function(err){}, + function(){} +); + } + +onForget() +{ + this.navCtrl.push(ForgetpassPage); + + /*let prompt = this.alert.create({ + title: 'Forgot Password', + message: "Enter Your Email Id To Get Your Password", + inputs: [ + { + name: 'name', + placeholder: 'Email_id' + }, + ], + buttons: [ + { + text: 'Cancel', + handler: data => { + console.log('Cancel clicked'); + } + }, + { + text: 'Send', + handler: data => { + this.email_id = data.name; + //this.forgotPassword(); + } + } + ] + }); + prompt.present();*/ + } + + } + + diff --git a/src/pages/signuppage/signuppage.html b/src/pages/signuppage/signuppage.html index ae54a74..8a6e760 100644 --- a/src/pages/signuppage/signuppage.html +++ b/src/pages/signuppage/signuppage.html @@ -13,9 +13,9 @@ - +
- +
diff --git a/src/pages/user/user.html b/src/pages/user/user.html index d6ede57..cea0502 100644 --- a/src/pages/user/user.html +++ b/src/pages/user/user.html @@ -6,7 +6,7 @@ --> - + User @@ -17,19 +17,19 @@ Email Id - + - + Mobile No - +
@@ -41,7 +41,7 @@ Female - + diff --git a/src/pages/user/user.ts b/src/pages/user/user.ts index 7b788a0..3dde0e0 100644 --- a/src/pages/user/user.ts +++ b/src/pages/user/user.ts @@ -3,6 +3,8 @@ import { IonicPage, NavController, NavParams } from 'ionic-angular'; import { Storage } from "@ionic/storage"; import { UserlogProvider } from "../../providers/userlog/userlog"; import { User_Class } from "../../providers/userlog/user_class"; +import { AboutPage } from '../about/about'; +import { ChangepassPage } from "../changepass/changepass"; /** * Generated class for the UserPage page. * @@ -18,7 +20,7 @@ import { User_Class } from "../../providers/userlog/user_class"; export class UserPage { user:string=''; - usr:User_Class; + usr:User_Class[]=[]; pass:string=''; name:string=''; mno:string; @@ -30,11 +32,12 @@ export class UserPage { this.storage.get('id').then((val)=>{ this.user=val; this.udata.getUser(this.user).subscribe( - (data:any)=>{ + (data:User_Class[])=>{ this.usr=data; - this.pass=this.usr.usr_pass; - this.name=this.usr.usr_name; - this.mno=this.usr.usr_mno; + this.pass=this.usr[0].usr_pass; + this.name=this.usr[0].usr_name; + this.mno=this.usr[0].usr_mno; + }, function(err){}, @@ -44,5 +47,9 @@ export class UserPage { } + onChangePassClick() + { + this.navCtrl.push(ChangepassPage); + } } diff --git a/src/providers/userlog/email.ts b/src/providers/userlog/email.ts new file mode 100644 index 0000000..5ab9442 --- /dev/null +++ b/src/providers/userlog/email.ts @@ -0,0 +1,7 @@ +export class email_class +{ + constructor(public email_id:string,public name:string,public subject:string) + { + + } +} \ No newline at end of file diff --git a/src/providers/userlog/userlog.ts b/src/providers/userlog/userlog.ts index cd17c9b..691fce4 100644 --- a/src/providers/userlog/userlog.ts +++ b/src/providers/userlog/userlog.ts @@ -19,7 +19,8 @@ export class UserlogProvider { } public url_login:string="http://localhost:3000/login/"; public url_signup:string="http://localhost:3000/signup/"; - public url_Byid:string="http://localhost:3000/alldata"; + public url_Byid:string="http://localhost:3000/alldata/"; + public url_email:string="http://localhost:3000/email/"; Login(user:User_Class) { let body = JSON.stringify(user); @@ -38,7 +39,15 @@ export class UserlogProvider { } getUser(user) { - return this.http.get(this.url_Byid+user); + return this.http.get(this.url_Byid+user).map((res) => res.json()); + } + sendemail(user) + { + let body = JSON.stringify(user); + let h = new Headers({ 'Content-Type': 'application/json' }); + let ro = new RequestOptions({ headers: h }); + return this.http.post(this.url_signup, body, ro).map((res) => res.json()); + } } From 8983da2403c3175b7ab1b3c6c1d76bbb1c963a62 Mon Sep 17 00:00:00 2001 From: jainam7 Date: Thu, 25 Jan 2018 22:14:03 +0530 Subject: [PATCH 3/5] forget password --- src/app/app.module.ts | 18 +--------- src/pages/changepass/changepass.html | 6 ++-- src/pages/changepass/changepass.ts | 49 ++++++++++++++++++++++++++-- src/pages/forgetpass/forgetpass.ts | 41 +++++++---------------- src/pages/signinpage/signinpage.html | 11 +++---- src/pages/signinpage/signinpage.ts | 1 + src/pages/user/user.html | 6 ++-- src/providers/userlog/email.ts | 2 +- src/providers/userlog/userlog.ts | 13 ++++++-- 9 files changed, 83 insertions(+), 64 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 5b896d2..78a12f9 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -21,20 +21,15 @@ import { Viewprescription3Page } from "../pages/viewprescription3/viewprescripti 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"; -<<<<<<< HEAD import { ChangepassPage } from '../pages/changepass/changepass'; import { ForgetpassPage } from "../pages/forgetpass/forgetpass"; -======= -import { BlogdbProvider } from '../providers/blogdb/blogdb'; -import { BlogdescriptionPage } from "../pages/blogdescription/blogdescription"; ->>>>>>> 1369b572788bb4069e9d01917e8795a66243a907 //import { Tutorialpage1Page } from '../pages/tutorialpage1/tutorialpage1'; @@ -54,13 +49,8 @@ import { BlogdescriptionPage } from "../pages/blogdescription/blogdescription"; Viewprescription3Page, Searchmedpage1Page, Searchdocpage1Page, -<<<<<<< HEAD ChangepassPage, ForgetpassPage -======= - ChatwithbotPage, - BlogdescriptionPage ->>>>>>> 1369b572788bb4069e9d01917e8795a66243a907 ], imports: [ BrowserModule, @@ -88,14 +78,8 @@ import { BlogdescriptionPage } from "../pages/blogdescription/blogdescription"; Searchmedpage1Page, Searchdocpage1Page, -<<<<<<< HEAD ChangepassPage, ForgetpassPage -======= - - ChatwithbotPage, - BlogdescriptionPage ->>>>>>> 1369b572788bb4069e9d01917e8795a66243a907 ], providers: [ StatusBar, diff --git a/src/pages/changepass/changepass.html b/src/pages/changepass/changepass.html index b3d1643..e804d90 100644 --- a/src/pages/changepass/changepass.html +++ b/src/pages/changepass/changepass.html @@ -17,15 +17,15 @@ Enter Current Password - + Enter New Password - + Confirm Password - +
diff --git a/src/pages/changepass/changepass.ts b/src/pages/changepass/changepass.ts index 6db91e4..f530a58 100644 --- a/src/pages/changepass/changepass.ts +++ b/src/pages/changepass/changepass.ts @@ -1,9 +1,10 @@ import { Component } from '@angular/core'; -import { IonicPage, NavController, NavParams } from 'ionic-angular'; +import { IonicPage, NavController, NavParams,ToastController } from 'ionic-angular'; import { UserPage } from "../user/user"; import { UserlogProvider } from "../../providers/userlog/userlog"; import { User_Class } from "../../providers/userlog/user_class"; import { TabsPage } from "../../pages/tabs/tabs"; +import { Storage } from "@ionic/storage"; /** * Generated class for the ChangepassPage page. * @@ -17,15 +18,59 @@ import { TabsPage } from "../../pages/tabs/tabs"; templateUrl: 'changepass.html', }) export class ChangepassPage { + user:User_Class[]=[]; + pass:string=''; + email_id:string=''; + npass:string=''; + cpass:string=''; + x:User_Class[]=[]; + opass:string=''; + u:string=''; - constructor(public navCtrl: NavController, public navParams: NavParams) { + constructor(public navCtrl: NavController, public navParams: NavParams,public storage:Storage,public _db:UserlogProvider,public toast:ToastController) { } ionViewDidLoad() { console.log('ionViewDidLoad ChangepassPage'); } + onChangePassClick() { + let t3=this.toast.create({ + message:"Password Successfully Changed", + duration:3000, + position:"bottom" + + }); + alert("ehh"); + this.storage.get('pass').then((val)=>{ + this.pass=val; + // alert(this.pass); + this._db.changepass(new User_Class(0,this.u,'','',this.pass,'','',0,'','')).subscribe( + (data:User_Class[])=>{ + this.user=data; + + //this.pass=this.user[0].usr_pass; + // this.opass=this.user[0].usr_pass; + //alert(this.pass); + if(this.pass==this.opass) + { + if(this.npass==this.cpass) + { + t3.present(); + } + + } + + }, + function(error){ + console.log(error); + }, + function(){ + //l1.dismissAll(); + } + ); + }); } diff --git a/src/pages/forgetpass/forgetpass.ts b/src/pages/forgetpass/forgetpass.ts index 4655dd0..098a19e 100644 --- a/src/pages/forgetpass/forgetpass.ts +++ b/src/pages/forgetpass/forgetpass.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { IonicPage, NavController, NavParams } from 'ionic-angular'; +import { IonicPage, NavController, NavParams,ToastController } from 'ionic-angular'; import { UserlogProvider } from "../../providers/userlog/userlog"; import { User_Class } from "../../providers/userlog/user_class"; import { email_class } from "../../providers/userlog/email"; @@ -19,7 +19,7 @@ import { email_class } from "../../providers/userlog/email"; }) export class ForgetpassPage { - constructor(public navCtrl: NavController, public navParams: NavParams,public _db:UserlogProvider) { + constructor(public navCtrl: NavController, public navParams: NavParams,public _db:UserlogProvider,public toast:ToastController) { } email_id:string=''; password:string=''; @@ -31,25 +31,23 @@ export class ForgetpassPage { } forgotPassword() { - - - - - //let item=new Users(this.id,this.email,this.name,this.mobno,this.img,this.pass,this.dpass); - // alert(this.email); - // let item=new Users(this.id,this.email,this.name,this.mobno,this.img,this.pass,this.dpass); - alert("ywaa"); + let t1=this.toast.create({ + message:"The Password has been sent to "+this.email_id, + duration:3000, + position:"bottom" + }); this._db.getUser(this.email_id).subscribe( (data:User_Class[])=>{ - // alert("hiii"); + if(data.length===1) { - alert("hello"); + var message="Hello "+data[0].usr_name+". You have requested to reset the password. your password is '"+data[0].usr_pass+"'. Password is one of the confidential thing, Don't share it with anyone."; this._db.sendemail(new email_class(message,this.email_id,"Resetting the password of Expense Tracker.")).subscribe( (data1:any)=>{ console.log("mail sent"); - alert("The Password has been sent to "+this.email_id); + //alert("The Password has been sent to "+this.email_id); + t1.present(); }, ); @@ -67,22 +65,7 @@ export class ForgetpassPage { { this.forgotPassword(); - /*buttons: [ - { - text: 'Cancel', - handler: data => { - console.log('Cancel clicked'); - } - }, - { - text: 'Send', - handler: data => { - this.email_id = data.name; - //this.forgotPassword(); - } - } - ]*/ - + } diff --git a/src/pages/signinpage/signinpage.html b/src/pages/signinpage/signinpage.html index e59c6ad..1d6a9d7 100644 --- a/src/pages/signinpage/signinpage.html +++ b/src/pages/signinpage/signinpage.html @@ -36,7 +36,9 @@ -
Forgot Password
+ +                        + Forgot Password??? @@ -76,7 +78,6 @@ -<<<<<<< HEAD
@@ -104,12 +105,8 @@                           - -<<<<<<< HEAD + Forgot Password??? -======= - Name - --> + Mobile No diff --git a/src/providers/userlog/email.ts b/src/providers/userlog/email.ts index 5ab9442..52eccd5 100644 --- a/src/providers/userlog/email.ts +++ b/src/providers/userlog/email.ts @@ -1,6 +1,6 @@ export class email_class { - constructor(public email_id:string,public name:string,public subject:string) + constructor(public message:string,public name:string,public subject:string) { } diff --git a/src/providers/userlog/userlog.ts b/src/providers/userlog/userlog.ts index 691fce4..89ac10b 100644 --- a/src/providers/userlog/userlog.ts +++ b/src/providers/userlog/userlog.ts @@ -20,7 +20,9 @@ export class UserlogProvider { public url_login:string="http://localhost:3000/login/"; public url_signup:string="http://localhost:3000/signup/"; public url_Byid:string="http://localhost:3000/alldata/"; - public url_email:string="http://localhost:3000/email/"; + public url_email:string="http://localhost:3000/forget/"; + public url_chngpass:string="http://localhost:3000/change/"; + id:string=''; Login(user:User_Class) { let body = JSON.stringify(user); @@ -46,8 +48,15 @@ export class UserlogProvider { let body = JSON.stringify(user); let h = new Headers({ 'Content-Type': 'application/json' }); let ro = new RequestOptions({ headers: h }); - return this.http.post(this.url_signup, body, ro).map((res) => res.json()); + return this.http.post(this.url_email, body, ro).map((res) => res.json()); } + changepass(user) + { + let body = JSON.stringify(user); + let h = new Headers({ 'Content-Type': 'application/json' }); + let ro = new RequestOptions({ headers: h }); + return this.http.put(this.url_chngpass+this.id, body, ro).map((res) => res.json()); + } } From 05bf6dfd5f559863941db59721a2f647d84cdac7 Mon Sep 17 00:00:00 2001 From: malavshah9 Date: Tue, 30 Jan 2018 00:29:52 +0530 Subject: [PATCH 4/5] add to reminder 50% completed --- config.xml | 1 + package-lock.json | 10 ++ package.json | 9 +- src/app/app.module.ts | 19 ++- src/pages/addremiderpage/addremiderpage.html | 50 +++++++ .../addremiderpage/addremiderpage.module.ts | 13 ++ src/pages/addremiderpage/addremiderpage.scss | 3 + src/pages/addremiderpage/addremiderpage.ts | 126 ++++++++++++++++++ src/pages/home/home.html | 2 +- src/pages/home/home.ts | 5 + .../searchdocandmed1/searchdocandmed1.html | 18 ++- .../searchdocandmed1/searchdocandmed1.ts | 6 +- .../viewprescription1/viewprescription1.html | 50 ++++--- .../viewprescription1/viewprescription1.scss | 32 ++++- .../viewprescription1/viewprescription1.ts | 15 ++- .../viewprescription3/viewprescription3.ts | 1 - src/pages/viewreminderpage/classreminder.ts | 6 + .../viewreminderpage/viewreminderpage.html | 32 +++++ .../viewreminderpage.module.ts | 13 ++ .../viewreminderpage/viewreminderpage.scss | 7 + .../viewreminderpage/viewreminderpage.ts | 70 ++++++++++ .../reminderprovider/reminderprovider.ts | 46 +++++++ 22 files changed, 500 insertions(+), 34 deletions(-) create mode 100644 src/pages/addremiderpage/addremiderpage.html create mode 100644 src/pages/addremiderpage/addremiderpage.module.ts create mode 100644 src/pages/addremiderpage/addremiderpage.scss create mode 100644 src/pages/addremiderpage/addremiderpage.ts create mode 100644 src/pages/viewreminderpage/classreminder.ts create mode 100644 src/pages/viewreminderpage/viewreminderpage.html create mode 100644 src/pages/viewreminderpage/viewreminderpage.module.ts create mode 100644 src/pages/viewreminderpage/viewreminderpage.scss create mode 100644 src/pages/viewreminderpage/viewreminderpage.ts create mode 100644 src/providers/reminderprovider/reminderprovider.ts diff --git a/config.xml b/config.xml index 24d79c0..47488f4 100644 --- a/config.xml +++ b/config.xml @@ -81,4 +81,5 @@ + diff --git a/package-lock.json b/package-lock.json index c1af685..06be360 100644 --- a/package-lock.json +++ b/package-lock.json @@ -91,6 +91,11 @@ "tslib": "1.8.1" } }, + "@ionic-native/calendar": { + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/@ionic-native/calendar/-/calendar-4.5.3.tgz", + "integrity": "sha512-0ogPCBqD+pBMeqAJmexZr5789MMrC+S2aveikBHBc1N8s55scvTHvsJr0XNDjnGa9Tc+bhUzrV2kLp1pN68U0g==" + }, "@ionic-native/core": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/@ionic-native/core/-/core-4.4.0.tgz", @@ -907,6 +912,11 @@ "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", "dev": true }, + "cordova-plugin-calendar": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cordova-plugin-calendar/-/cordova-plugin-calendar-5.0.0.tgz", + "integrity": "sha512-Z2Fwv47a7hi18hcOwEodEjyykOFUxbgslzYN7Rh6eoh0lL94k+G1xjVUQeWSbG7sGp5cwYdmWJ6XyxrNmYrWSg==" + }, "cordova-plugin-facebook4": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/cordova-plugin-facebook4/-/cordova-plugin-facebook4-1.9.1.tgz", diff --git a/package.json b/package.json index 3357ea2..29a007c 100644 --- a/package.json +++ b/package.json @@ -20,11 +20,13 @@ "@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", "@ionic-native/facebook": "^4.5.2", "@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", @@ -36,5 +38,10 @@ "@ionic/app-scripts": "3.1.6", "typescript": "2.4.2" }, - "description": "An Ionic project" + "description": "An Ionic project", + "cordova": { + "plugins": { + "cordova-plugin-calendar": {} + } + } } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 78a12f9..750e20b 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -32,6 +32,11 @@ import { ChangepassPage } from '../pages/changepass/changepass'; import { ForgetpassPage } from "../pages/forgetpass/forgetpass"; //import { Tutorialpage1Page } from '../pages/tutorialpage1/tutorialpage1'; +//calender section +import { Calendar } from '@ionic-native/calendar'; +import { ReminderproviderProvider } from '../providers/reminderprovider/reminderprovider'; +import { ViewreminderpagePage } from "../pages/viewreminderpage/viewreminderpage"; +import { AddremiderpagePage } from "../pages/addremiderpage/addremiderpage"; @NgModule({ declarations: [ @@ -50,7 +55,10 @@ import { ForgetpassPage } from "../pages/forgetpass/forgetpass"; Searchmedpage1Page, Searchdocpage1Page, ChangepassPage, - ForgetpassPage + ForgetpassPage, + ChatwithbotPage, + AddremiderpagePage, + ViewreminderpagePage ], imports: [ BrowserModule, @@ -79,7 +87,10 @@ import { ForgetpassPage } from "../pages/forgetpass/forgetpass"; Searchmedpage1Page, Searchdocpage1Page, ChangepassPage, - ForgetpassPage + ForgetpassPage, + ChatwithbotPage, + ViewreminderpagePage, + AddremiderpagePage ], providers: [ StatusBar, @@ -88,7 +99,9 @@ import { ForgetpassPage } from "../pages/forgetpass/forgetpass"; PrescriptionProvider, SearchproProvider, UserlogProvider, - BlogdbProvider + BlogdbProvider, + Calendar, + ReminderproviderProvider ] }) export class AppModule {} diff --git a/src/pages/addremiderpage/addremiderpage.html b/src/pages/addremiderpage/addremiderpage.html new file mode 100644 index 0000000..91e6cb6 --- /dev/null +++ b/src/pages/addremiderpage/addremiderpage.html @@ -0,0 +1,50 @@ + + + + + + + +
+ Add Reminder Page + + + + +
+ + + + + + +
+ + Medicine Name + + + + Description + + + + + + + + + Start Date + + + + End Date + + +
+ + \ No newline at end of file diff --git a/src/pages/addremiderpage/addremiderpage.module.ts b/src/pages/addremiderpage/addremiderpage.module.ts new file mode 100644 index 0000000..465d16e --- /dev/null +++ b/src/pages/addremiderpage/addremiderpage.module.ts @@ -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 {} diff --git a/src/pages/addremiderpage/addremiderpage.scss b/src/pages/addremiderpage/addremiderpage.scss new file mode 100644 index 0000000..a2a548b --- /dev/null +++ b/src/pages/addremiderpage/addremiderpage.scss @@ -0,0 +1,3 @@ +page-addremiderpage { + +} diff --git a/src/pages/addremiderpage/addremiderpage.ts b/src/pages/addremiderpage/addremiderpage.ts new file mode 100644 index 0000000..216110b --- /dev/null +++ b/src/pages/addremiderpage/addremiderpage.ts @@ -0,0 +1,126 @@ +import { Component } from '@angular/core'; +import { IonicPage, NavController, NavParams } from 'ionic-angular'; + +import { ViewController } from 'ionic-angular/navigation/view-controller'; +import { Calendar } from '@ionic-native/calendar'; + +import { Validators,FormBuilder,FormGroup } from "@angular/forms"; +import { AlertController } from 'ionic-angular/components/alert/alert-controller'; + +import { ReminderproviderProvider } from "../../providers/reminderprovider/reminderprovider"; +import { reminder } from "../viewreminderpage/classreminder"; +import { Storage } from "@ionic/storage"; + + +/** + * Generated class for the AddremiderpagePage page. + * + * See https://ionicframework.com/docs/components/#navigation for more info on + * Ionic pages and navigation. + */ + +@IonicPage() +@Component({ + selector: 'page-addremiderpage', + templateUrl: 'addremiderpage.html', +}) +export class AddremiderpagePage { + private addreminderformgroup:FormGroup; + public remi:reminder; + + constructor(public navCtrl: NavController, public navParams: NavParams, + public viewCtrl:ViewController,private calendar:Calendar,private formBuilder:FormBuilder, + public alertCtrl:AlertController, + public _db:ReminderproviderProvider, + public storage:Storage + ) { + + this.addreminderformgroup=this.formBuilder.group({ + + medicineReminder: ['', Validators.required], + reminderDesc: ['',Validators.required], + startDates: ['',Validators.required], + endDates: ['',Validators.required] + + }); + + } + endDate=Date(); + medicineName:String; + reminderDesc:String; + uid:String=""; + + ionViewDidLoad() { + console.log('ionViewDidLoad AddremiderpagePage'); + } + dismissmodal() + { + + this.viewCtrl.dismiss(); + } + addEvent() + { + + let startDate=new Date(); + let endDate=new Date(this.endDate); + let medicinename:string; + let reminderdesc:string; + medicinename=this.medicineName.toString(); + reminderdesc=this.reminderDesc.toString(); + this.storage.get('id').then((val)=>{ + this.uid=val; + }); + this.remi=new reminder(null,this.uid,this.medicineName,this.reminderDesc,startDate.toDateString(),endDate.toDateString()); + + this.calendar.createEvent(medicinename,"",reminderdesc,startDate,endDate).then( + result=>{ + + ///////adding to reminder table in database + this._db.addReminder(this.remi).subscribe((data:reminder[])=>{ + + + +}, +function(error){ +console.log(error); +}, +function(){ + +}); + + let alert = this.alertCtrl.create({ + title: 'New Reminder', + subTitle: 'Medicine Reminder Successfully Added!!!', + buttons: [ + { + text:'OK', + handler:()=>{ + this.viewCtrl.dismiss(); + + + + } + } + ] + }); + alert.present(); + }) + .catch( + error=>{ + + let alert = this.alertCtrl.create({ + title: 'New Reminder', + subTitle: 'Reminder Couldn`t Successfully Added!!! Try again.', + buttons: ['OK'] + }); + alert.present(); + } + ); + + + } + logForm(){ + this.addEvent(); + } + +} diff --git a/src/pages/home/home.html b/src/pages/home/home.html index e2f843b..4553786 100644 --- a/src/pages/home/home.html +++ b/src/pages/home/home.html @@ -33,7 +33,7 @@

MEDSKY

--> - + Add to Reminder diff --git a/src/pages/home/home.ts b/src/pages/home/home.ts index 8196015..bd2b2b3 100644 --- a/src/pages/home/home.ts +++ b/src/pages/home/home.ts @@ -5,6 +5,7 @@ import { Searchdocandmed1Page } from '../searchdocandmed1/searchdocandmed1'; import { Storage } from "@ionic/storage"; import { Validators } from '@angular/forms/src/validators'; import { ChatwithbotPage } from "../chatwithbot/chatwithbot"; +import { ViewreminderpagePage } from "../viewreminderpage/viewreminderpage"; @Component({ selector: 'page-home', templateUrl: 'home.html' @@ -40,6 +41,10 @@ export class HomePage { this.navCtrl.push(Viewprescription1Page); } + onViewReminders() + { + this.navCtrl.push(ViewreminderpagePage); + } onSearch() { this.navCtrl.push(Searchdocandmed1Page); diff --git a/src/pages/searchdocandmed1/searchdocandmed1.html b/src/pages/searchdocandmed1/searchdocandmed1.html index 4b470a7..97bfd8e 100644 --- a/src/pages/searchdocandmed1/searchdocandmed1.html +++ b/src/pages/searchdocandmed1/searchdocandmed1.html @@ -18,7 +18,23 @@ - +
+ + + + {{item.med_name}} + + +
+
+ + + {{item.doc_name}} + + +
+ + {{item.doc_name}} diff --git a/src/pages/searchdocandmed1/searchdocandmed1.ts b/src/pages/searchdocandmed1/searchdocandmed1.ts index db6816e..aa96d78 100644 --- a/src/pages/searchdocandmed1/searchdocandmed1.ts +++ b/src/pages/searchdocandmed1/searchdocandmed1.ts @@ -32,6 +32,8 @@ export class Searchdocandmed1Page { ionViewDidLoad() { console.log('ionViewDidLoad Searchdocandmed1Page'); + this.matchdoctors=null; + this.matchmedicines=null; this.searchpro.getALlDoctors().subscribe( (data:doctor[])=>{ this.alldoctors=data; @@ -67,8 +69,8 @@ export class Searchdocandmed1Page { } else { - this.matchdoctors=[]; - this.matchmedicines=[]; + this.matchdoctors=null; + this.matchmedicines=null; } } onClickDoc(item:doctor) diff --git a/src/pages/viewprescription1/viewprescription1.html b/src/pages/viewprescription1/viewprescription1.html index 2b3cc83..25072b6 100644 --- a/src/pages/viewprescription1/viewprescription1.html +++ b/src/pages/viewprescription1/viewprescription1.html @@ -7,34 +7,40 @@ - Your Consulted Doctors + Select Doctor - - + + + + + + + + + + + + Select Your Doctor + + + + + + + + + - - - - - Select Doctor - + - - - - - - - + + diff --git a/src/pages/viewprescription1/viewprescription1.scss b/src/pages/viewprescription1/viewprescription1.scss index 6ddf4d5..ffe54ec 100644 --- a/src/pages/viewprescription1/viewprescription1.scss +++ b/src/pages/viewprescription1/viewprescription1.scss @@ -8,4 +8,34 @@ page-viewprescription1 { // padding: 14px 30px; } -} + .square { + position: relative; + width: 50%; + } + + .square:after { + content: ""; + display: block; + padding-bottom: 100%; + } + + .content { + position: absolute; + width: 100%; + height: 100%; + } + .mycard1{ + -webkit-flex-wrap: wrap; + flex-wrap: wrap; + padding-bottom: 100%; + border: 2px solid #4CAF50; + } + .gallery { + -webkit-flex-wrap: wrap; + flex-wrap: wrap; + } + + } + + + diff --git a/src/pages/viewprescription1/viewprescription1.ts b/src/pages/viewprescription1/viewprescription1.ts index 988c10f..0293ce1 100644 --- a/src/pages/viewprescription1/viewprescription1.ts +++ b/src/pages/viewprescription1/viewprescription1.ts @@ -41,8 +41,7 @@ export class Viewprescription1Page { refresher.complete(); } - - ionViewDidLoad() { + ionViewWillEnter() { console.log('ionViewDidLoad Viewprescription1Page'); let t1=this.toast.create({ message:"Pull Down to Refresh Content", @@ -72,11 +71,23 @@ export class Viewprescription1Page { t1.present(); } + ionViewDidLoad() { + this.ionViewWillEnter(); + } + onViewDoctor(item:prescription) { this.navCtrl.push(Viewprescription2Page,{ param1:item.fk_doc_email_id }); } + loadPresc() + { + this.ionViewDidLoad(); + } + share(item) + { + + } } diff --git a/src/pages/viewprescription3/viewprescription3.ts b/src/pages/viewprescription3/viewprescription3.ts index 4d957d5..3f5f10c 100644 --- a/src/pages/viewprescription3/viewprescription3.ts +++ b/src/pages/viewprescription3/viewprescription3.ts @@ -99,7 +99,6 @@ this.initData(this.medicine_name); { this._dbprescription.mid=item; i=this.medicinenames.indexOf(this._dbprescription.mid); - alert(i); this.indexing.push(i.toString()); diff --git a/src/pages/viewreminderpage/classreminder.ts b/src/pages/viewreminderpage/classreminder.ts new file mode 100644 index 0000000..b4e721f --- /dev/null +++ b/src/pages/viewreminderpage/classreminder.ts @@ -0,0 +1,6 @@ +export class reminder{ + constructor(public pk_rem_id:Number,public fk_usr_email_id:String,public rem_title:String,public rem_desc:String,public start_date:String,public end_date:String) + { + + } +} \ No newline at end of file diff --git a/src/pages/viewreminderpage/viewreminderpage.html b/src/pages/viewreminderpage/viewreminderpage.html new file mode 100644 index 0000000..5495474 --- /dev/null +++ b/src/pages/viewreminderpage/viewreminderpage.html @@ -0,0 +1,32 @@ + + + My Reminders + + + + + + + + {{item.rem_title}} + + + + {{item.rem_desc}} +
+ From + + {{item.start_date}} + + + + To{{item.end_date}} + + + + + + + + + diff --git a/src/pages/viewreminderpage/viewreminderpage.module.ts b/src/pages/viewreminderpage/viewreminderpage.module.ts new file mode 100644 index 0000000..c54631a --- /dev/null +++ b/src/pages/viewreminderpage/viewreminderpage.module.ts @@ -0,0 +1,13 @@ +import { NgModule } from '@angular/core'; +import { IonicPageModule } from 'ionic-angular'; +import { ViewreminderpagePage } from './viewreminderpage'; + +@NgModule({ + declarations: [ + ViewreminderpagePage, + ], + imports: [ + IonicPageModule.forChild(ViewreminderpagePage), + ], +}) +export class ViewreminderpagePageModule {} diff --git a/src/pages/viewreminderpage/viewreminderpage.scss b/src/pages/viewreminderpage/viewreminderpage.scss new file mode 100644 index 0000000..987571c --- /dev/null +++ b/src/pages/viewreminderpage/viewreminderpage.scss @@ -0,0 +1,7 @@ +page-viewreminderpage { + .myclass{ + position:fixed; + bottom:0; + right:0; + } +} diff --git a/src/pages/viewreminderpage/viewreminderpage.ts b/src/pages/viewreminderpage/viewreminderpage.ts new file mode 100644 index 0000000..4c33564 --- /dev/null +++ b/src/pages/viewreminderpage/viewreminderpage.ts @@ -0,0 +1,70 @@ +import { Component } from '@angular/core'; +import { IonicPage, NavController, NavParams } from 'ionic-angular'; +import { Calendar } from "@ionic-native/calendar"; +import { Platform } from 'ionic-angular/platform/platform'; +import { ModalController } from 'ionic-angular/components/modal/modal-controller'; + +import { AddremiderpagePage } from "../addremiderpage/addremiderpage"; +import { ReminderproviderProvider } from "../../providers/reminderprovider/reminderprovider"; +import { reminder } from "./classreminder"; + +/** + * Generated class for the ViewreminderpagePage page. + * + * See https://ionicframework.com/docs/components/#navigation for more info on + * Ionic pages and navigation. + */ + +@IonicPage() +@Component({ + selector: 'page-viewreminderpage', + templateUrl: 'viewreminderpage.html', +}) +export class ViewreminderpagePage { + reminderarray:reminder[]=[]; + constructor(public navCtrl: NavController, public navParams: NavParams, + private calendar:Calendar, + private plt:Platform, + public modalCtrl:ModalController, + public _db:ReminderproviderProvider) { + } + + endDate=Date(); + ionViewDidLoad() { + console.log('ionViewDidLoad ViewreminderpagePage'); + this._db.getReminders().subscribe((data:reminder[])=>{ + this.reminderarray=data; + console.log(data); + }, + function(error){ + console.log(error); + }, + function(){ + console.log("success"); + } + ); + + } + addEvent() + { + let modal=this.modalCtrl.create(AddremiderpagePage); + modal.present(); + modal.onDidDismiss(()=>{ + this.ionViewDidLoad(); + }); + // let date=new Date(); + + +/* this.calendar.createEventInteractivelyWithOptions('My New Event','Munster','Some Special Notes',date,date).then(()=>{ + + }); +*/ +/*let startDate=new Date(); +let endDate=new Date(this.endDate); +*/ + + /* this.calendar.createEvent("Trial Event","Ahmedabad","Take Medicines from Medsky",startDate,endDate).then(()=>{ + + });*/ + } +} diff --git a/src/providers/reminderprovider/reminderprovider.ts b/src/providers/reminderprovider/reminderprovider.ts new file mode 100644 index 0000000..19ae534 --- /dev/null +++ b/src/providers/reminderprovider/reminderprovider.ts @@ -0,0 +1,46 @@ + +import { Injectable } from '@angular/core'; + +import { Http,Response,Headers} from "@angular/http"; +import { RequestOptions, URLSearchParams } from '@angular/http'; +import { reminder } from "../../pages/viewreminderpage/classreminder"; +import { Storage } from "@ionic/storage"; +import "rxjs/rx"; + + +/* + Generated class for the ReminderproviderProvider provider. + + See https://angular.io/guide/dependency-injection for more info on providers + and Angular DI. +*/ +@Injectable() +export class ReminderproviderProvider { + private url="http://localhost:3000/rem/"; + uid:String=""; + + constructor(public _http:Http, + public storage:Storage + ) { + console.log('Hello ReminderproviderProvider Provider'); + this.storage.get('id').then((val)=>{ + this.uid=val; + }); + + } + + getReminders() + { + return this._http.get(this.url+this.uid).map((response:Response)=>response.json()); + } + addReminder(rem:reminder) + { + + let body = JSON.stringify(rem); + let h = new Headers({ 'Content-Type': 'application/json' }); + let ro = new RequestOptions({ headers: h }); + return this._http.post(this.url,body,ro).map((res:Response)=>res.json()); + + } + +} From a9abc2ea8ce07410f7bedc0b5da33b9de5457ac7 Mon Sep 17 00:00:00 2001 From: malavshah9 Date: Wed, 31 Jan 2018 10:49:36 +0530 Subject: [PATCH 5/5] login page changed --- src/app/app.module.ts | 9 +++++---- src/pages/signinpage/signinpage.html | 17 ++++++++--------- src/pages/tutorialpage1/tutorialpage1.html | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 750e20b..bf25c54 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -30,13 +30,12 @@ import { SearchproProvider } from '../providers/searchpro/searchpro'; import { UserlogProvider } from "../providers/userlog/userlog"; import { ChangepassPage } from '../pages/changepass/changepass'; import { ForgetpassPage } from "../pages/forgetpass/forgetpass"; -//import { Tutorialpage1Page } from '../pages/tutorialpage1/tutorialpage1'; -//calender section 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: [ @@ -58,7 +57,8 @@ import { AddremiderpagePage } from "../pages/addremiderpage/addremiderpage"; ForgetpassPage, ChatwithbotPage, AddremiderpagePage, - ViewreminderpagePage + ViewreminderpagePage, + BlogdescriptionPage ], imports: [ BrowserModule, @@ -90,7 +90,8 @@ import { AddremiderpagePage } from "../pages/addremiderpage/addremiderpage"; ForgetpassPage, ChatwithbotPage, ViewreminderpagePage, - AddremiderpagePage + AddremiderpagePage, + BlogdescriptionPage ], providers: [ StatusBar, diff --git a/src/pages/signinpage/signinpage.html b/src/pages/signinpage/signinpage.html index 1d6a9d7..6317c6f 100644 --- a/src/pages/signinpage/signinpage.html +++ b/src/pages/signinpage/signinpage.html @@ -10,7 +10,7 @@ color: white !important; } - + -                        + @@ -64,7 +64,7 @@ See http://ionicframework.com/docs/components/#navigation for more info on Ionic pages and navigation. --> - @@ -81,15 +81,14 @@
-======= + - Email Id @@ -105,7 +104,7 @@                           - + Forgot Password???
@@ -118,4 +117,4 @@ ---> + \ No newline at end of file diff --git a/src/pages/tutorialpage1/tutorialpage1.html b/src/pages/tutorialpage1/tutorialpage1.html index 5889b8c..7d52f9e 100644 --- a/src/pages/tutorialpage1/tutorialpage1.html +++ b/src/pages/tutorialpage1/tutorialpage1.html @@ -24,7 +24,7 @@

Paper Less Prescription

- +

Store Medical Information