Skip to content

Commit

Permalink
Merge pull request #44 from BhavanaVanjani/master
Browse files Browse the repository at this point in the history
Updated Email Template to add additional content with Preview Option Added
  • Loading branch information
opensource-emr authored Oct 5, 2020
2 parents 009fbd0 + b5a1825 commit fac5016
Show file tree
Hide file tree
Showing 43 changed files with 4,510 additions and 1,380 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export class NotificationService {
this._hubConnection = new HubConnectionBuilder()
.withUrl(window.location.origin + '/NotificationHub?token=' + this.global.token)
.build();
this._hubConnection.serverTimeoutInMilliseconds = 500000; // 100 second
this._hubConnection.serverTimeoutInMilliseconds = 50000000; // 100 second

}

Expand Down
83 changes: 67 additions & 16 deletions FewaTelemedicine/ClientApp/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
@@ -1,38 +1,89 @@
/* #43 Added by Bhavana 28/09/2020 : Smart phone compatibility - Updated Route for Mobile View. */
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { LoginComponent } from './security/login/login.component';
import { DoctorHomeComponent } from './doctor/doctor-home/doctor-home.component';
import { ForgotPasswordComponent } from './security/forgot-password/forgot-password.component';
import { PatientInvitationComponent } from './patient/patient-invitation/patient-invitation.component';
import { PatientWaitingRoomComponent } from './patient/patient-waiting-room/patient-waiting-room.component';
import { PatientWaitingRoomMobileComponent } from './patient/patient-waiting-room/patient-waiting-room-mobile.component';
import { DoctorRoomComponent } from './doctor/doctor-room/doctor-room.component';
import { PatientRoomComponent } from './patient/patient-room/patient-room.component';
import { PatientRoomMobileComponent } from './patient/patient-room/patient-room-mobile.component';
import { PatientReportSummaryComponent } from './patient/patient-report-summary/patient-report-summary.component';
import { PatientReportSummaryMobileComponent } from './patient/patient-report-summary/patient-report-summary-mobile.component';
import { PatientRegistrationComponent } from './patient/patient-registation/patient-registration.component';
import { PatientRegistrationMobileComponent } from './patient/patient-registation/patient-registration-mobile.component';
import { PatientUploadFilesComponent } from './patient/patient-upload-files/patient-upload-files.component';
import { PatientUploadFilesMobileComponent } from './patient/patient-upload-files/patient-upload-files-mobile.component';
import { DoctorRoomTokboxComponent } from './doctor/doctor-room-tokbox/doctor-room-tokbox.component';
import { PatientRoomTokboxComponent } from './patient/patient-room-tokbox/patient-room-tokbox.component';
import { PatientRoomTokboxMobileComponent } from './patient/patient-room-tokbox/patient-room-tokbox-mobile.component';

var isMobile = /iPhone|webOS|mobile|CriOS|iPad|iPod|BlackBerry|IEMobile|'Android' + 'Chrome'|Opera Mini|Android/i.test(window.navigator.userAgent);
let routes: Routes = [];
if (isMobile) {
/* your code here */
routes = [
{ path: '', pathMatch: 'full', redirectTo: 'Login' },
{ path: 'Login', component: LoginComponent },
{ path: 'ForgotPassword', component: ForgotPasswordComponent },
{ path: 'Home', component: DoctorHomeComponent },
//{path:'Join',component:PatientRegistrationComponent},
// #43 Added by Bhavana : Smart phone compatibility - Patient Room for Mobile.
{path:'Join',component:PatientRegistrationMobileComponent},
//{path:'Waiting',component:PatientWaitingRoomComponent},
// #43 Added by Bhavana : Smart phone compatibility - Waiting Room for Mobile.
{path:'Waiting',component:PatientWaitingRoomMobileComponent},
{path:'DoctorRoom',component:DoctorRoomComponent},
//{path:'ReportSummary',component:PatientReportSummaryComponent},
// #43 Added by Bhavana : Smart phone compatibility - Patient Report Summary for Mobile.
{path:'ReportSummary',component:PatientReportSummaryMobileComponent},
//{path:'PatientRoom',component:PatientRoomComponent},
// #43 Added by Bhavana : Smart phone compatibility - Patient Room for Mobile.
{path:'PatientRoom',component:PatientRoomMobileComponent},
//{path:'Upload',component:PatientUploadFilesComponent},
// #43 Added by Bhavana : Smart phone compatibility - Patient File Upload for Mobile.
{path:'Upload',component:PatientUploadFilesMobileComponent},
{path:'DoctorRoomTokbox',component:DoctorRoomTokboxComponent},
//{path:'PatientRoomTokbox',component:PatientRoomTokboxComponent},
{path:'PatientRoomTokbox',component:PatientRoomTokboxMobileComponent}
];

}

else {
routes = [
{ path: '', pathMatch: 'full', redirectTo: 'Login' },
{ path: 'Login', component: LoginComponent },
{ path: 'ForgotPassword', component: ForgotPasswordComponent },
{ path: 'Home', component: DoctorHomeComponent },
{path:'Join',component:PatientRegistrationComponent},
// #43 Added by Bhavana : Smart phone compatibility - Patient Room for Mobile.
{path:'Join-Mobile',component:PatientRegistrationMobileComponent},
{path:'Waiting',component:PatientWaitingRoomComponent},
// #43 Added by Bhavana : Smart phone compatibility - Waiting Room for Mobile.
{path:'Waiting-Mobile',component:PatientWaitingRoomMobileComponent},
{path:'DoctorRoom',component:DoctorRoomComponent},
{path:'ReportSummary',component:PatientReportSummaryComponent},
// #43 Added by Bhavana : Smart phone compatibility - Patient Report Summary for Mobile.
{path:'ReportSummary-Mobile',component:PatientReportSummaryMobileComponent},
{path:'PatientRoom',component:PatientRoomComponent},
// #43 Added by Bhavana : Smart phone compatibility - Patient Room for Mobile.
{path:'PatientRoom-Mobile',component:PatientRoomMobileComponent},
{path:'Upload',component:PatientUploadFilesComponent},
// #43 Added by Bhavana : Smart phone compatibility - Patient File Upload for Mobile.
{path:'Upload-Mobile',component:PatientUploadFilesMobileComponent},
{path:'DoctorRoomTokbox',component:DoctorRoomTokboxComponent},
{path:'PatientRoomTokbox',component:PatientRoomTokboxComponent},
{path:'PatientRoomTokbox-Mobile',component:PatientRoomTokboxMobileComponent}
];

}

const routes: Routes = [
{ path: '', pathMatch: 'full', redirectTo: 'Login' },
{ path: 'Login', component: LoginComponent },
{ path: 'ForgotPassword', component: ForgotPasswordComponent },
{ path: 'Home', component: DoctorHomeComponent },
{path:'Invitation',component:PatientInvitationComponent},
{path:'Join',component:PatientRegistrationComponent},
{path:'Waiting',component:PatientWaitingRoomComponent},
{path:'DoctorRoom',component:DoctorRoomComponent},
{path:'ReportSummary',component:PatientReportSummaryComponent},
{path:'PatientRoom',component:PatientRoomComponent},
{path:'Upload',component:PatientUploadFilesComponent},
{path:'DoctorRoomTokbox',component:DoctorRoomTokboxComponent},
{path:'PatientRoomTokbox',component:PatientRoomTokboxComponent}
];

@NgModule({
imports: [RouterModule.forRoot(routes, { useHash: true })],
exports: [RouterModule]
})
export class AppRoutingModule { }

20 changes: 17 additions & 3 deletions FewaTelemedicine/ClientApp/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { HttpInterceptorService } from 'src/Common/http-interceptor.service';
import { DoctorHomeComponent } from './doctor/doctor-home/doctor-home.component';
import { ForgotPasswordComponent } from './security/forgot-password/forgot-password.component';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { PatientInvitationComponent } from './patient/patient-invitation/patient-invitation.component';
// import { PatientInvitationComponent } from './patient/patient-invitation/patient-invitation.component';
import { DoctorRoomComponent } from './doctor/doctor-room/doctor-room.component';
import { PatientRoomComponent } from './patient/patient-room/patient-room.component';
import { PatientRegistrationComponent } from './patient/patient-registation/patient-registration.component';
Expand All @@ -22,13 +22,21 @@ import { PatientReportSummaryComponent } from './patient/patient-report-summary/
import { SafePipe } from 'src/Common/safe.pipe';
import { PatientWaitingRoomComponent } from './patient/patient-waiting-room/patient-waiting-room.component';
import { PatientUploadFilesComponent } from './patient/patient-upload-files/patient-upload-files.component';
import { PatientUploadFilesMobileComponent } from './patient/patient-upload-files/patient-upload-files-mobile.component';
import { UploadDownloadService } from 'src/Common/upload-download.service';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { ToastrModule } from 'ngx-toastr';
import {NgxPrintModule} from 'ngx-print';
import { CKEditorModule } from 'ckeditor4-angular';
import { DoctorRoomTokboxComponent } from './doctor/doctor-room-tokbox/doctor-room-tokbox.component';
import { PatientRoomTokboxComponent } from './patient/patient-room-tokbox/patient-room-tokbox.component';
import { PatientRoomTokboxMobileComponent } from './patient/patient-room-tokbox/patient-room-tokbox-mobile.component';
import { PatientReportSummaryMobileComponent } from './patient/patient-report-summary/patient-report-summary-mobile.component';
import { PatientRegistrationMobileComponent } from './patient/patient-registation/patient-registration-mobile.component';
import { PatientWaitingRoomMobileComponent } from './patient/patient-waiting-room/patient-waiting-room-mobile.component';
import { PatientRoomMobileComponent } from './patient/patient-room/patient-room-mobile.component';


const initializerConfigFn = (config: ConfigService) => {
return () => {
var ret: any = config.loadAppConfig();
Expand All @@ -42,17 +50,23 @@ const initializerConfigFn = (config: ConfigService) => {
LoginComponent,
ForgotPasswordComponent,
DoctorHomeComponent,
PatientInvitationComponent,
// PatientInvitationComponent,
DoctorHomeComponent,
DoctorRoomComponent,
PatientInvitationComponent,
// PatientInvitationComponent,
PatientRegistrationComponent,
PatientRegistrationMobileComponent,
PatientRoomComponent,
PatientRoomMobileComponent,
PatientReportSummaryComponent,
PatientReportSummaryMobileComponent,
PatientWaitingRoomComponent,
PatientWaitingRoomMobileComponent,
PatientUploadFilesComponent,
DoctorRoomTokboxComponent,
PatientRoomTokboxComponent,
PatientRoomTokboxMobileComponent,
PatientUploadFilesMobileComponent,
YesNoPipe ,
SafePipe
],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<head>
<!-- Log History -->
<!-- #49 11/9/2020 - Added by Bhavana => Changes in Update Parameter. -->
<!-- #38 13/9/2020 - Added by Bhavana => Changes in Email Template to display email parameters. -->
<!-- #19 8/9/2020 - Added by Bhavana => Changes Send Invitation to display message in page. -->

<head>
<link href="//cdn.syncfusion.com/ej2/ej2-notifications/styles/material.css" rel="stylesheet" />
<script src="../../../vendor/ckeditor/ckeditor.js"></script>

</head>

<body id="page-top">
Expand Down Expand Up @@ -140,6 +143,7 @@ <h6 class="m-0 font-weight-bold">Send Invitation Link</h6>
Send
</button>
</div>
<!-- Start: #19 8/9/2020 - Added by Bhavana -->
<div class="col-md-2" *ngIf="!(this.InvitationButton)">
Sending Invitation...
</div>
Expand All @@ -149,6 +153,7 @@ <h6 class="m-0 font-weight-bold">Send Invitation Link</h6>
<div class="col-md-2" *ngIf="this.InvitationFailure">
Sending Failed.
</div>
<!-- End: #19 8/9/2020 - Added by Bhavana -->
</div>
</form>
</div>
Expand Down Expand Up @@ -334,11 +339,11 @@ <h6 class="m-0 font-weight-bold"><i class="fa fa-user"></i>Update Profile</h6>
</div>
<div *ngIf="ParamsUpdate"><br>
<div class="card-header py-3 d-flex flex-row align-items-center justify-content-between">
<h6 class="m-0 font-weight-bold">Update Parameters</h6>
<h6 class="m-0 font-weight-bold">Update Configuration</h6>
</div>
<div class="card-body">
<form action="" class="user">
<h6 class="m-0 font-weight-bold">Hospital Parameters :</h6><br>
<h6 class="m-0 font-weight-bold">Hospital Configuration :</h6><br>
<div class="row form-group">
<label for="" class="col-md-3 control-label">Hospital Name</label>
<div class="col-md-9">
Expand Down Expand Up @@ -386,36 +391,17 @@ <h6 class="m-0 font-weight-bold">Hospital Parameters :</h6><br>
</div>
<div class="col-md-6">
<label *ngIf="LogoToUpload"> {{LogoToUpload.name}}</label>
<span class="upload" *ngIf="progress > 0">
{{progress}}%
<span class="upload" *ngIf="logoUploadProgress > 0">
{{logoUploadProgress}}%
</span>
<span class="upload" *ngIf="message">
{{message}}
<span class="upload" *ngIf="logoUploadMessage">
{{logoUploadMessage}}
</span>
</div>

</div>
<h6 class="m-0 font-weight-bold">Email Parameters :</h6><br>
<div class="row form-group">
<label for="" class="col-md-3 control-label">Email Subject</label>
<div class="col-md-9">
<input type="email" placeholder="Email Subject" class="form-control" name="EmailSubject"
[(ngModel)]="EmailSubject">
</div>
</div>

<div class="row form-group">
<label for="" class="col-md-3 control-label">Email Plain Body</label>
<div class="col-md-9">
<input type="text" class="form-control" name="EmailPlainBody" [(ngModel)]="EmailPlainBody"
placeholder="Email Plain Body">
</div>
</div>



</div>
</div>

<div class="row form-group">
<label for="" class="col-md-3 control-label">video call platform</label>
<label for="" class="col-md-3 control-label">Video call platform</label>
<div class="col-md-9">
<input type="radio" name="VideoCallPlatform" value="Jitsi" [(ngModel)]="this.global.doctorObj.VideoCallPlatform" checked>Jitsi
<input type="radio" name="VideoCallPlatform" value="Tokbox" [(ngModel)]="this.global.doctorObj.VideoCallPlatform">Tokbox
Expand All @@ -435,23 +421,65 @@ <h6 class="m-0 font-weight-bold">Email Parameters :</h6><br>
</div>
<div *ngIf="EmailTemplateUpdate"><br>
<div class="card-header py-3 d-flex flex-row align-items-center justify-content-between">
<h6 class="m-0 font-weight-bold">Update Email Template: </h6>
<h6 class="m-0 font-weight-bold">Update Email Configuration : </h6>
</div>
<div class="card-body">
<form action="" class="user">
<h6 class="m-0 font-weight-bold">Email Parameters :</h6><br>
<div class="row form-group">
<!-- <label for="" class="col-md-3 control-label">Email Template </label> -->
<div class="col-md-12">
<ckeditor [(ngModel)]="EmailHTMLBody" name="EmailHTMLBody" [config]="{extraPlugins:'stylesheetparser', height:'700px',fullPage: true,allowedContent: true}"></ckeditor>
<label for="" class="col-md-3 control-label">Email Subject</label>
<div class="col-md-9">
<input type="email" placeholder="Email Subject" class="form-control" name="EmailSubject"
[(ngModel)]="EmailSubject">
</div>
</div>

<div class="row form-group">
<label for="" class="col-md-3 control-label">Email Plain Body</label>
<div class="col-md-9">
<input type="text" class="form-control" name="EmailPlainBody" [(ngModel)]="EmailPlainBody"
placeholder="Email Plain Body">
</div>
</div>

<div class="row form-group">
<label for="" class="col-md-3 control-label">Email Additional Content</label>
<div class="col-md-9">
<textarea style="overflow:hidden;min-height:80px;" class="form-control" name="EmailAdditionalContent" [(ngModel)]="EmailAdditionalContent"
placeholder="Email Additional Content"></textarea>
</div>
</div>

<div class="row form-group" *ngIf="showPreview">
<label for="" class="col-md-3 control-label">Preview Template</label>
<div class="col-md-9">
<p style="height:600px;pointer-events: none;" id="content" [innerHTML]="EmailTemplateUrl()"></p>
<!-- <iframe [srcdoc]='EmailHTMLBody'
marginheight="0"
marginwidth="0"
width="100%"
height="100%"
scrolling="auto" allowfullscreen></iframe> -->
</div>
</div>

<div class="row mt-4">
<div class="col-md-5"></div>
<div class="col-md-3">
<div class="col-md-2">
<input type="button" name="Submit" (click)="UpdateEmailTemplate()" value="Submit"
class="btn btn-sm btn-primary">
</div>
<div class="col-md-2">
<input type="button" name="Preview" (click)="PreviewEmailTemplate()" value="Preview"
class="btn btn-sm btn-primary">
</div>
</div>


<!-- <div class="row mt-4">
<div class="col-md-5"></div>
</div> -->
</form>
</div>
</div>
Expand Down Expand Up @@ -826,4 +854,4 @@ <h5 class="modal-title">Send Message</h5>
$('#dataTable').DataTable();
});
</script>
</body>
</body>
Loading

0 comments on commit fac5016

Please sign in to comment.