-
Notifications
You must be signed in to change notification settings - Fork 98
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add mnch department and initial clinic dashboard #1569
Merged
Merged
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
33f5e4e
Add mnch department and initial clinic dashboar
drizzentic 8ef58fc
Merge branch 'master' into feat-mnch-hackaton
drizzentic 1e474f0
Update src/app/patient-dashboard/patient-dashboard.routes.ts
corneliouzbett 92f8d98
Merge branch 'master' into feat-mnch-hackaton
corneliouzbett File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
src/app/clinic-dashboard/mnch/clinic-flow/daily-schedule-clinic-flow.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
<clinic-flow [date]="selectedDate"></clinic-flow> |
34 changes: 34 additions & 0 deletions
34
src/app/clinic-dashboard/mnch/clinic-flow/daily-schedule-clinic-flow.component.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
import { ComponentFixture, async, TestBed } from '@angular/core/testing'; | ||
|
||
import { DateTimePickerModule } from '@ampath-kenya/ngx-openmrs-formentry'; | ||
import { CalendarModule } from 'angular-calendar'; | ||
import { NgxMyDatePickerModule } from 'ngx-mydatepicker'; | ||
|
||
import { DailyScheduleClinicFlowComponent } from './daily-schedule-clinic-flow.component'; | ||
import { ClinicFlowCacheService } from '../../../hiv-care-lib/clinic-flow/clinic-flow-cache.service'; | ||
import { ClinicDashboardCacheService } from '../../services/clinic-dashboard-cache.service'; | ||
|
||
describe('Daily-schedule-clinic-flow Tests', () => { | ||
let comp: DailyScheduleClinicFlowComponent; | ||
let fixture: ComponentFixture<DailyScheduleClinicFlowComponent>; | ||
beforeEach(async(() => { | ||
TestBed.configureTestingModule({ | ||
imports: [ | ||
DateTimePickerModule, | ||
NgxMyDatePickerModule.forRoot(), | ||
CalendarModule.forRoot() | ||
], | ||
declarations: [DailyScheduleClinicFlowComponent], | ||
providers: [ClinicFlowCacheService, ClinicDashboardCacheService] | ||
}) | ||
.compileComponents() | ||
.then(() => { | ||
fixture = TestBed.createComponent(DailyScheduleClinicFlowComponent); | ||
comp = fixture.componentInstance; | ||
}); | ||
})); | ||
|
||
/*it('should be defined', () => { | ||
expect(comp).toBeDefined(); | ||
});*/ | ||
}); |
44 changes: 44 additions & 0 deletions
44
src/app/clinic-dashboard/mnch/clinic-flow/daily-schedule-clinic-flow.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
import { Component, OnInit, OnDestroy } from '@angular/core'; | ||
import { DatePipe } from '@angular/common'; | ||
|
||
import { ClinicFlowCacheService } from '../../../hiv-care-lib/clinic-flow/clinic-flow-cache.service'; | ||
import { ClinicDashboardCacheService } from '../../services/clinic-dashboard-cache.service'; | ||
import { Subscription } from 'rxjs'; | ||
|
||
@Component({ | ||
selector: 'daily-schedule-clinic-flow-component', | ||
templateUrl: './daily-schedule-clinic-flow.component.html' | ||
}) | ||
export class DailyScheduleClinicFlowComponent implements OnInit, OnDestroy { | ||
public selectedDate: any; | ||
private _datePipe: DatePipe; | ||
private subs: Subscription[] = []; | ||
constructor( | ||
private clinicFlowCache: ClinicFlowCacheService, | ||
private clinicDashboardCacheService: ClinicDashboardCacheService | ||
) { | ||
this._datePipe = new DatePipe('en-US'); | ||
} | ||
|
||
public ngOnInit() { | ||
if (this.clinicFlowCache.lastClinicFlowSelectedDate) { | ||
this.selectedDate = this.clinicFlowCache.lastClinicFlowSelectedDate; | ||
} else { | ||
this.selectedDate = this._datePipe.transform(new Date(), 'yyyy-MM-dd'); | ||
this.clinicFlowCache.setSelectedDate(this.selectedDate); | ||
} | ||
const routeSub = this.clinicDashboardCacheService | ||
.getCurrentClinic() | ||
.subscribe((clinic) => { | ||
this.clinicFlowCache.setSelectedLocation(clinic); | ||
}); | ||
|
||
this.subs.push(routeSub); | ||
} | ||
|
||
public ngOnDestroy() { | ||
this.subs.forEach((sub) => { | ||
sub.unsubscribe(); | ||
}); | ||
} | ||
} |
78 changes: 78 additions & 0 deletions
78
src/app/clinic-dashboard/mnch/daily-schedule/daily-schedule.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
import { Component, OnInit, OnDestroy } from '@angular/core'; | ||
import { Subscription } from 'rxjs'; | ||
import { ClinicDashboardCacheService } from '../../services/clinic-dashboard-cache.service'; | ||
import { Router, ActivatedRoute } from '@angular/router'; | ||
import { DatePipe } from '@angular/common'; | ||
import { DailyScheduleBaseComponent } from '../../../clinic-schedule-lib/daily-schedule/daily-schedule.component'; | ||
import { ClinicFlowCacheService } from '../../../hiv-care-lib/clinic-flow/clinic-flow-cache.service'; | ||
import { SelectDepartmentService } from './../../../shared/services/select-department.service'; | ||
import * as Moment from 'moment'; | ||
@Component({ | ||
selector: 'mnch-daily-schedule', | ||
templateUrl: | ||
'../../../clinic-schedule-lib/daily-schedule/daily-schedule.component.html' | ||
}) | ||
export class MNCHDailyScheduleComponent | ||
extends DailyScheduleBaseComponent | ||
implements OnInit, OnDestroy { | ||
public routeSub: Subscription = new Subscription(); | ||
public myDepartment = 'MNCH'; | ||
public _datePipe: DatePipe; | ||
public selectedDate: any; | ||
public paramsSub: Subscription; | ||
public activeLinkIndex = 0; | ||
public tabLinks = [ | ||
{ label: 'Appointments', link: 'daily-appointments' }, | ||
{ label: 'Visits', link: 'daily-visits' }, | ||
{ label: 'Clinic Flow', link: 'clinic-flow' }, | ||
{ label: 'Has not returned', link: 'daily-not-returned' } | ||
]; | ||
|
||
constructor( | ||
public clinicDashboardCacheService: ClinicDashboardCacheService, | ||
public router: Router, | ||
public route: ActivatedRoute, | ||
public clinicFlowCache: ClinicFlowCacheService, | ||
private selectDepartmentService: SelectDepartmentService | ||
) { | ||
super(clinicDashboardCacheService, router, route, clinicFlowCache); | ||
this._datePipe = new DatePipe('en-US'); | ||
} | ||
|
||
public ngOnInit() { | ||
this.setActiveTab(); | ||
this.paramsSub = this.route.queryParams.subscribe((params) => { | ||
if (params.startDate) { | ||
this.selectedDate = Moment(params.startDate).format('MMM D , YYYY '); | ||
this.clinicFlowCache.setSelectedDate(this.selectedDate); | ||
} | ||
}); | ||
this.selectDepartmentService.setDepartment(this.myDepartment); | ||
this.routeSub = this.route.parent.parent.params.subscribe((params) => { | ||
this.clinicDashboardCacheService.setCurrentClinic( | ||
params['location_uuid'] | ||
); | ||
}); | ||
if (this.clinicFlowCache.lastClinicFlowSelectedDate) { | ||
this.selectedDate = this.clinicFlowCache.lastClinicFlowSelectedDate; | ||
} else { | ||
this.selectedDate = Moment().format('MMM D , YYYY '); | ||
this.clinicFlowCache.setSelectedDate(this.selectedDate); | ||
} | ||
} | ||
|
||
public ngOnDestroy() { | ||
this.routeSub.unsubscribe(); | ||
this.paramsSub.unsubscribe(); | ||
} | ||
|
||
public setActiveTab() { | ||
if (this.router.url) { | ||
let path = this.router.url; | ||
const n = this.router.url.indexOf('?'); | ||
path = this.router.url.substring(0, n !== -1 ? n : path.length); | ||
path = path.substr(this.router.url.lastIndexOf('/') + 1); | ||
this.activeLinkIndex = this.tabLinks.findIndex((x) => x.link === path); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
import { NgModule } from '@angular/core'; | ||
import { CommonModule } from '@angular/common'; | ||
import { FormsModule } from '@angular/forms'; | ||
import { | ||
MatProgressSpinnerModule, | ||
MatProgressBarModule, | ||
MatTabsModule | ||
} from '@angular/material'; | ||
import { ClinicScheduleLibModule } from '../../clinic-schedule-lib/clinic-schedule-lib.module'; | ||
import { CalendarModule } from 'angular-calendar'; | ||
import { mnchProgramRouting } from './mnch-program.routes'; | ||
import { DateTimePickerModule } from '@ampath-kenya/ngx-openmrs-formentry'; | ||
import { EtlApi } from '../../etl-api/etl-api.module'; | ||
import { HivCareLibModule } from '../../hiv-care-lib/hiv-care-lib.module'; | ||
import { DataListsModule } from '../../shared/data-lists/data-lists.module'; | ||
import { MNCHDailyScheduleComponent } from './daily-schedule/daily-schedule.component'; | ||
import { DailyScheduleClinicFlowComponent } from './clinic-flow/daily-schedule-clinic-flow.component'; | ||
import { ProgramVisitEncounterSearchModule } from '../../program-visit-encounter-search/program-visit-encounter-search.module'; | ||
import { GeneralModule } from '../general/general.module'; | ||
import { ChangeDepartmentModule } from '../change-department/change-department.module'; | ||
|
||
@NgModule({ | ||
imports: [ | ||
mnchProgramRouting, | ||
HivCareLibModule, | ||
ClinicScheduleLibModule, | ||
DateTimePickerModule, | ||
CalendarModule, | ||
EtlApi, | ||
DataListsModule, | ||
CommonModule, | ||
FormsModule, | ||
MatTabsModule, | ||
MatProgressSpinnerModule, | ||
MatProgressBarModule, | ||
ProgramVisitEncounterSearchModule, | ||
GeneralModule, | ||
ChangeDepartmentModule | ||
], | ||
exports: [], | ||
declarations: [MNCHDailyScheduleComponent, DailyScheduleClinicFlowComponent], | ||
providers: [] | ||
}) | ||
export class MNCHModule {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
import { ModuleWithProviders } from '@angular/core'; | ||
import { Routes, RouterModule } from '@angular/router'; | ||
import { MNCHDailyScheduleComponent } from './daily-schedule/daily-schedule.component'; | ||
import { DailyScheduleVisitsComponent } from '../../clinic-schedule-lib/daily-schedule/daily-schedule-visits.component'; | ||
import { DailyScheduleAppointmentsComponent } from '../../clinic-schedule-lib/daily-schedule/daily-schedule-appointments.component'; | ||
import { DailyScheduleNotReturnedComponent } from '../../clinic-schedule-lib/daily-schedule/daily-schedule-not-returned.component'; | ||
import { DailyScheduleClinicFlowComponent } from './clinic-flow/daily-schedule-clinic-flow.component'; | ||
import { ClinicFlowVisitsComponent } from '../../hiv-care-lib/clinic-flow/clinic-flow-visits.component'; | ||
import { ClinicFlowLocationStatsComponent } from '../../hiv-care-lib/clinic-flow/clinic-flow-location-stats.component'; | ||
import { ClinicFlowProviderStatsComponent } from '../../hiv-care-lib/clinic-flow/clinic-flow-provider-stats.component'; | ||
import { ClinicFlowSummaryComponent } from '../../hiv-care-lib/clinic-flow/clinic-flow-summary.component'; | ||
import { ChangeDepartmentComponent } from '../change-department/change-department.component'; | ||
const routes: Routes = [ | ||
{ | ||
path: 'daily-schedule', | ||
component: MNCHDailyScheduleComponent, | ||
children: [ | ||
{ path: '', redirectTo: 'daily-appointments', pathMatch: 'prefix' }, | ||
{ path: 'daily-visits', component: DailyScheduleVisitsComponent }, | ||
{ | ||
path: 'daily-appointments', | ||
component: DailyScheduleAppointmentsComponent | ||
}, | ||
{ | ||
path: 'daily-not-returned', | ||
component: DailyScheduleNotReturnedComponent | ||
}, | ||
{ | ||
path: 'clinic-flow', | ||
component: DailyScheduleClinicFlowComponent, | ||
children: [ | ||
{ path: 'visits', component: ClinicFlowVisitsComponent }, | ||
{ path: 'summary', component: ClinicFlowSummaryComponent }, | ||
{ | ||
path: 'provider-stats', | ||
component: ClinicFlowProviderStatsComponent | ||
}, | ||
{ path: 'location', component: ClinicFlowLocationStatsComponent }, | ||
{ path: '', redirectTo: 'summary', pathMatch: 'prefix' } | ||
] | ||
} | ||
] | ||
}, | ||
{ | ||
path: 'department-select', | ||
component: ChangeDepartmentComponent | ||
} | ||
]; | ||
|
||
export const mnchProgramRouting: ModuleWithProviders = RouterModule.forChild( | ||
routes | ||
); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add some test case 🙂