Skip to content
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.

Sign up for GitHub

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

POC-538 #1673

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

POC-538 #1673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e7f0e4a
Add RDE validation on encounters filled before initial
Sep 29, 2023
dd5c7ce
Add error display for rde
Oct 2, 2023
b21d992
Merge branch 'master' into POC-538
sainingo Oct 2, 2023
01337a2
Fix eslints
Oct 3, 2023
f8271b0
Merge branch 'master' into POC-538
drizzentic Oct 5, 2023
3dcda23
Add requested changes
Oct 5, 2023
c6fd1c7
Add error checks
Oct 6, 2023
8205480
Modify error msg
Oct 6, 2023
0e83192
Merge branch 'master' into POC-538
sainingo Oct 6, 2023
7a17909
Fix linter errors
Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions src/app/patient-dashboard/common/visit/visit-details/visit-details.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,16 @@ <h3 *ngIf="confirmingCancelVisit || confirmingEndVisit">
(onEncounterEdit)="onEncounterSelected($event)"
></encounter-list>
<div *ngIf="visitWithNoEncounters">Patient yet to see provider</div>
<!-- <div
<div
class="alert alert-danger"
*ngIf="qualifiesForCovidScreening"
style="margin-top: 10px"
>
<strong
>To access clinical forms kindly fill Covid 19 Assessment Form</strong
>
</div>
<div
class="alert alert-danger"
*ngIf="isViremicHighVL"
style="margin-top: 10px"
Expand All @@ -164,7 +173,17 @@ <h3 *ngIf="confirmingCancelVisit || confirmingEndVisit">
>To access clinical forms kindly fill Enhanced Adherence Encounter
Form</strong
>
</div> -->
</div>
<div
class="alert alert-danger"
*ngIf="isAdultReturnVisitBeforeInitialVisit"
style="margin-top: 10px"
>
<strong
>You cannot fill a return visit form for a date earlier than the
initial visit!</strong
>
</div>
</div>
</div>
<span style="padding: 10px"></span>
Expand Down
14 changes: 12 additions & 2 deletions src/app/patient-dashboard/common/visit/visit-details/visit-details.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export class VisitDetailsComponent implements OnInit {
public qualifiesForCovidScreening = false;
public isViremicHighVL = false;
public isRetrospectiveVisit = false;
public isAdultReturnVisitBeforeInitialVisit = false;

public get visitEncounters(): any[] {
const mappedEncounters: Encounter[] = new Array<Encounter>();
Expand Down Expand Up @@ -230,10 +231,18 @@ export class VisitDetailsComponent implements OnInit {
if (
e.errors &&
e.errors.covidError &&
e.errors.covidError != null
e.errors.covidError != null &&
!this.isRetrospectiveVisit
) {
this.qualifiesForCovidScreening = true;
}
if (
e.errors &&
e.errors.isAdultReturnVisitBeforeInitialVisit != null &&
this.isRetrospectiveVisit
) {
this.isAdultReturnVisitBeforeInitialVisit = true;
}
});
}
// Check if their are allowed Viremia clinical encounters already capture in the allowed visits.
Expand All @@ -249,7 +258,8 @@ export class VisitDetailsComponent implements OnInit {

if (
Array.isArray(viremiaEncounterFilter) &&
viremiaEncounterFilter.length === 0
viremiaEncounterFilter.length === 0 &&
!this.isRetrospectiveVisit
) {
this.isViremicHighVL = true;
}
Expand Down
Loading