forgot password page added

master
Sultan Khan 7 years ago
parent 8aef27a8f7
commit 7a58598b2c

@ -29,8 +29,6 @@ const routes: Routes = [
path: 'login',
component: LoginComponent
},
{
path: 'forgot',
component: ForgotComponent

@ -1,29 +1,32 @@
<ion-header>
<ion-toolbar>
<nav-buttons ></nav-buttons>
<ion-title>{{'login,forgot-id' | translate}}</ion-title>
</ion-toolbar>
<nav-buttons ></nav-buttons>
<ion-title>{{'login,forgot-password' | translate}}</ion-title>
</ion-header>
<ion-content padding>
<scroll-content>
<ion-grid>
<ion-row class="ion-justify-content-center">
<ion-col center [size]="11">
<p> {{ 'login,forgot-desc'| translate}}</p>
</ion-col>
</ion-row>
<!-- international mobile number-->
<ion-row class="ion-justify-content-center">
<ion-col [size]="11">
<international-mobile (changed)="countryCodeChanged($event)"></international-mobile>
</ion-col>
</ion-row>
<ion-item>
<img class="item-icon" src="assets/imgs/password.png" item-start />
<ion-label>{{'changePassword.newPassword' | translate}}</ion-label>
<ion-input required type="password"
[(ngModel)]="P_NEW_PASSWORD">
</ion-input>
</ion-item>
<ion-item>
<img class="item-icon" src="assets/imgs/password.png" item-start />
<ion-label>{{'changePassword.confirmPassword' | translate}}</ion-label>
<ion-input required type="password"
[(ngModel)]="P_Confirm_NEW_PASSWORD">
</ion-input>
</ion-item>
</ion-grid>
<page-trailer [small]="true"></page-trailer>
</scroll-content>
<footer>
<ion-grid>
<ion-row class="ion-justify-content-center">

@ -38,7 +38,7 @@
</ion-content>
<ion-footer>
<div class="centerDiv">
<ion-button color="customnavy" (click)="http_call()">{{ts.trPK('login','login')}}</ion-button>
<ion-button color="customnavy" (click)="http_call()">{{ts.trPK('login','login')}}</ion-button>
</div>
<br/>
<div class="centerDiv">

@ -100,3 +100,4 @@ ion-img {
}
}
.centerDiv .button{width:200px;}

@ -56,7 +56,7 @@ export class LoginComponent implements OnInit, OnDestroy {
ngOnDestroy(): void {
this.backClicked();
}
changeLanguage(){
public changeLanguage(){
this.ts.switchLanguage();
}
private checkIfLoggedInBefore() {
@ -70,7 +70,9 @@ export class LoginComponent implements OnInit, OnDestroy {
}
});
}
private forgetPasswordPage(){
this.cs.openUserForgot();
}
private hideSplashScreen(stopLoading = false) {
// this.splash.hide();
if (stopLoading) {

@ -233,7 +233,7 @@ export class CommonService {
public userNeedToReLogin() {
this.presentConfirmDialog(this.ts.trPK("general", "relogin"), () => {
this.openUserLogin();
//this.openUserLogin();
});
}
@ -362,7 +362,7 @@ export class CommonService {
{
text: acceptLabel,
handler: () => {
this.openUserLogin();
// this.openUserLogin();
this.alertControllerIonic.dismiss();
}
}
@ -851,18 +851,6 @@ export class CommonService {
open calls
*/
public static APPOINTMENTS_URLS = ["/eservices/appointments/home", "/eservices/appointments/home-page"];
public openAppointments() {
this.alternateNavigate(CommonService.APPOINTMENTS_URLS, "appointments-home");
}
public openAppointmentsRoot() {
this.alternateNavigate(
["/eservices/appointments/home", "/eservices/appointments/home-page"],
"appo-home",
true
);
}
public static HOME_URL = ["/home", "/home-page"];
public openHome() {
@ -890,23 +878,7 @@ export class CommonService {
public navigateBack(url: string) {
this.nav.navigateBack([url]);
}
public static ESERVICES_URL = "/eservices/home";
public openEservices() {
this.nav.navigateForward([CommonService.ESERVICES_URL]);
// this.router.navigateByUrl('/eservices/home');
}
public openBookings() {
this.nav.navigateForward(["/eservices/doctors/search"]);
}
public static APPOINTMENTS_DETAILS = ["/eservices/appointments/details", "/eservices/appointments/details-page"];
public openAppointmentDetails() {
this.alternateNavigate(CommonService.APPOINTMENTS_DETAILS, 'appointment-details');
}
public openCheckInAppointments() {
this.nav.navigateForward('/eservices/appointments/check-in');
}
private alternateNavigate(paths: string[], key: string, root = false) {
let url: string;
if (localStorage.getItem(key) === "yes") {
@ -923,269 +895,11 @@ export class CommonService {
}
}
public openConference() {
// alert("openConference");
this.alternateNavigate(
["/video-conference/call", "/video-conference/call-push"],
"conference-push"
);
}
public openCamera() {
this.nav.navigateForward(["/video-conference/camera"]);
}
public openVitalSigns() {
this.nav.navigateForward(["/eservices/vital-signs/home"]);
}
public openVitalSignsDetails() {
this.nav.navigateForward(["/eservices/vital-signs/details"]);
}
public openWeatherForcast() {
this.nav.navigateForward(["/weather-forecast"]);
}
public openApprovals() {
this.nav.navigateForward(["/eservices/approvals"]);
// this.router.navigateByUrl('/eservices/approvals');
}
public openPrescriptions() {
this.nav.navigateForward(["/eservices/prescriptions/home"]);
// this.router.navigateByUrl('/eservices/prescriptions');
}
public openPrescriptionReports() {
this.nav.navigateForward(["/eservices/prescriptions/reports"]);
// this.router.navigateByUrl('/eservices/prescriptions/reports');
}
public openPrescriptionPharmaciesList() {
this.nav.navigateForward(["/eservices/prescriptions/reports/pharmacies"]);
// this.router.navigateByUrl('/eservices/prescriptions/reports/pharmacies');
}
public openConverterCalculationPage() {
console.log("opening page");
this.nav.navigateForward(["/converters/converters-calculation/home"]);
}
public openDoctorSchedule() {
this.nav.navigateForward(["/eservices/doctors/schedule"]);
// this.router.navigateByUrl('/eservices/appointments/doctor-schedule');
}
public openRadiologyExaminations() {
this.nav.navigateForward(["/eservices/radiology/examinations"]);
// this.router.navigateByUrl('/eservices/radiology');
}
public openAllergies() {
this.nav.navigateForward(["/eservices/allergies"]);
}
public openRadiologyReport() {
this.nav.navigateForward(["/eservices/radiology/report"]);
// this.router.navigateByUrl('/eservices/radiology/report');
}
public openRadiologyReports() {
this.nav.navigateForward(["/eservices/radiology/reports"]);
// this.router.navigateByUrl('/eservices/radiology/report');
}
public openMyDoctors() {
this.nav.navigateForward(["/eservices/doctors"]);
}
public openDoctorProfile() {
this.nav.navigateForward(["/eservices/doctors/profile"]);
}
public openBookingCalendar() {
this.nav.navigateForward(["/eservices/doctors/calendar"]);
}
public openLabOrders() {
this.nav.navigateForward(["/eservices/lab/orders"]);
// this.router.navigateByUrl('/eservices/lab');
}
public openLabResult() {
this.nav.navigateForward(["/eservices/lab/result"]);
// this.router.navigateByUrl('/eservices/lab/result');
}
public openEyePrescriptions() {
this.nav.navigateForward(["/eservices/eye"]);
}
public openEyeMeasurments() {
this.nav.navigateForward(["/eservices/eye/measurments"]);
}
public openBloodSugarGraph() {
this.nav.navigateForward(["/eservices/tracker/blood-sugar/graph"]);
}
public openBloodSugarAdd() {
this.nav.navigateForward(["/eservices/tracker/blood-sugar/add"]);
}
public openBloodPressureAdd() {
this.nav.navigateForward(["/eservices/tracker/blood-pressure/add"]);
}
public static BLOOD_PRESSURE = ["/eservices/tracker/blood-pressure", "/eservices/tracker/blood-pressure-home"];
public openBloodPressure() {
// this.alternateNavigate( CommonService.BLOOD_PRESSURE , 'blood-pressure-home');
this.nav.navigateForward(["/eservices/tracker/blood-pressure"]);
}
public openBloodSugar() {
// this.alternateNavigate( CommonService.BLOOD_PRESSURE , 'blood-pressure-home');
this.nav.navigateForward(["/eservices/tracker/blood-sugar"]);
}
public openBloodSugarRHMD() {
this.nav.navigateForward(["/eservices/tracker/blood-sugar/rhmd"]);
}
public openBloodSugarRHMDBL() {
this.nav.navigateForward(["/eservices/tracker/blood-sugar/rhmd-bl"]);
}
public openBloodSugarRHMDBLE() {
this.nav.navigateForward(["/eservices/tracker/blood-sugar/rhmd-ble"]);
}
public openBloodPressureGraph() {
this.nav.navigateForward(["/eservices/tracker/blood-pressure/graph"]);
}
public openWeightAdd() {
this.nav.navigateForward(["/eservices/tracker/weight/add"]);
}
public openWeightGraph() {
this.nav.navigateForward(["/eservices/tracker/weight/graph"]);
}
public openDoctorsList() {
this.nav.navigateForward(["/eservices/doctors/doctors-list"]);
}
public openBookingDentalComplains() {
this.nav.navigateForward(["/eservices/doctors/dental-complains"]);
}
public openDocResponseDetail() {
this.nav.navigateForward(["/eservices/doc-response/response-detail"]);
}
public openInsurCardDetail() {
this.nav.navigateForward(["/eservices/insur-cards/card-detail"]);
}
public openUserAgreement() {
this.nav.navigateForward(["/eservices/month-report/user-agreement"]);
}
public openChildVaccineHome() {
this.nav.navigateForward(["/eservices/child-vaccine/home"]);
}
public openChildVaccineVaccineList() {
this.nav.navigateForward(["/eservices/child-vaccine/vaccine-list"]);
}
public openChildVaccineAddChild() {
this.nav.navigateForward(["/eservices/child-vaccine/add-child"]);
}
public openChildVaccineChildList() {
this.alternateNavigate(["/eservices/child-vaccine/child-list",
"/eservices/child-vaccine/child-vacc-list"], 'child-vaccine-child-list');
// this.nav.navigateForward(["/eservices/child-vaccine/child-list"]);
}
public openChildVaccineLogin() {
this.nav.navigateForward(["/eservices/child-vaccine/login"]);
}
public openAskDocRequest() {
this.nav.navigateForward(["/eservices/ask-doc/ask-doc-request"]);
}
public openNewMedReport() {
this.nav.navigateForward(["/eservices/med-report/new-med-report"]);
}
public openUserLogin() {
// this.nav.navigateForward(['/authentication/login']);
this.nav.navigateRoot(["/authentication/home"]);
}
public openAgreement() {
this.nav.navigateForward(["/authentication/agreement"]);
}
public openUserRegister() {
this.nav.navigateForward(["/authentication/register"]);
}
public openUserRegisterInformation() {
this.nav.navigateForward(["/authentication/register-information"]);
}
public openUserForgot() {
this.nav.navigateForward(["/authentication/forgot"]);
}
public openFeedback() {
this.nav.navigateForward(["/feedback/home"]);
}
public openFeedbackStatusDetails() {
this.nav.navigateForward(["/feedback/status-details"]);
}
public openReferralDetails() {
this.nav.navigateForward(["/ereferral/referral-details"]);
}
public loadReferralHome() {
this.nav.navigateForward(["/home"]);
}
public openH2OUpdateUser() {
this.nav.navigateForward(["/h2o/register"]);
}
public openH2OHome() {
this.nav.navigateForward(["/h2o/home"]);
}
public openH2OSMS() {
this.nav.navigateForward(["/h2o/sms"]);
}
public openH2oLogin() {
this.nav.navigateForward(["/h2o/login"]);
}
public openBloodDonationRegister() {
this.nav.navigateForward(["/blood-donation/home"]);
}
public openBloodDonationLogin() {
this.nav.navigateForward(["/blood-donation/blood-donation-login"]);
}
public openNews() {
this.nav.navigateForward(["/news"]);
}
public openLocations() {
this.nav.navigateForward(["/locations"]);
}
public openNotificationDetails() {
this.alternateNavigate(
[
"/eservices/notifications/detail",
"/eservices/notifications/detail-push"
],
"notification-push"
);
}
public static NOTIFICATIONS_URL = "/eservices/notifications/center";
public openNotifications() {
this.navigateForward(CommonService.NOTIFICATIONS_URL);
}
public static FAMILY_FILES = "/eservices/family-files/home";
public openFamilyFiles() {
this.nav.navigateForward([CommonService.FAMILY_FILES]);
}
public openPatientProfile() {
this.nav.navigateForward(["/eservices/patient-profile"]);
}
public navigateTo(url: string) {
this.nav.navigateForward([url]);

@ -115,12 +115,12 @@ export class PushService {
const type = Number(data.additionalData.NotificationType);
if (type === NotificationModel.TYPE_APPOINTMENT) {
this.sharedService.setSharedData(notification, NotificationModel.SHARED_DATA);
this.ngZone.run(() => this.cs.openAppointmentDetails());
// this.ngZone.run(() => this.cs.openAppointmentDetails());
} else if (type === NotificationModel.TYPE_CONFERENCE) {
const session = data.additionalData.sessionId;
// console.log('session Id Recieved>>>>>'+ session);
this.sharedService.setSharedData( new SessionModel(session) , SessionModel.SHARED_DATA);
this.ngZone.run( () => this.cs.openConference() );
// this.ngZone.run( () => this.cs.openConference() );
} else {
if (type === NotificationModel.TYPE_VIDEO) {
notification.MessageType = 'video';
@ -132,7 +132,7 @@ export class PushService {
notification.MessageType = 'text';
}
this.sharedService.setSharedData(notification, NotificationModel.SHARED_DATA);
this.ngZone.run(async () => this.cs.openNotificationDetails());
//this.ngZone.run(async () => this.cs.openNotificationDetails());
}
}

@ -47,7 +47,7 @@ export class RateService {
callbacks: {
handleNegativeFeedback: () => {
this.setAsRated(featureKey);
this.cs.openFeedback();
//this.cs.openFeedback();
},
onButtonClicked: (buttonIndex) => {
// when user click rate

@ -127,12 +127,6 @@ export class TabsBarComponent implements OnInit {
if (val instanceof NavigationEnd) {
if (this.matchesURL(val, CommonService.HOME_URL, TabsBarComponent.home)) {
this.cs.openHome();
} else if (this.matchesURL(val, [CommonService.NOTIFICATIONS_URL], TabsBarComponent.notifications)) {
this.cs.openNotifications();
} else if (this.matchesURL(val, [CommonService.ESERVICES_URL], TabsBarComponent.file)) {
this.cs.openEservices();
} else if (this.matchesURL(val, [CommonService.FAMILY_FILES], TabsBarComponent.family)) {
this.cs.openFamilyFiles();
}
}
});
@ -201,15 +195,6 @@ export class TabsBarComponent implements OnInit {
case TabsBarComponent.home:
this.cs.openHome();
break;
case TabsBarComponent.family:
this.cs.openFamilyFiles();
break;
case TabsBarComponent.notifications:
this.cs.openNotifications();
break;
case TabsBarComponent.file:
this.cs.openEservices();
break;
case TabsBarComponent.language:
this.switchLanguage();
break;

@ -159,7 +159,7 @@ a{
// filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='$primary', endColorstr='$customnavy',GradientType=1 );
color:var(--light);
text-transform: capitalize;
min-width: 200px;
// min-width: 200px;
min-height: 45px;
}
.iconButton{
@ -185,9 +185,9 @@ ion-item.item.item-block.item-ios.item-datetime.ng-touched.input-has-value.item-
margin:auto;
text-align: center;
display: block;
.button,.button-md, button-ios{
min-width: 200px;
}
// .button,.button-md, button-ios{
// min-width: 200px;
// }
.iconButton{
min-width: auto;
min-height: auto;

Loading…
Cancel
Save