Skip to content

Patient Homepage Update #435

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Patient Homepage Update #435

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 24 additions & 1 deletion web_patient/src/stores/PatientStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,22 @@ export class PatientStore implements IPatientStore {
// );
}

// TODO: Delete commented code after testing new assessmentsToComplete()
// @computed public get assessmentsToComplete() {
// const scheduledAssessments = this.config?.assignedScheduledAssessments || [];
// // Returns deduped list of assessments to complete
// const latestAssessments: IScheduledAssessment[] = [];
// const assessmentGroups = _.groupBy(scheduledAssessments, (a) => a.assessmentId);

// for (var assessmentId in assessmentGroups) {
// const group = assessmentGroups[assessmentId];
// group.sort((a, b) => compareDesc(a.dueDateTime, b.dueDateTime));
// latestAssessments.push(group[0]);
// }

// return latestAssessments;
// }

@computed public get assessmentsToComplete() {
const scheduledAssessments = this.config?.assignedScheduledAssessments || [];
// Returns deduped list of assessments to complete
Expand All @@ -190,7 +206,14 @@ export class PatientStore implements IPatientStore {
for (var assessmentId in assessmentGroups) {
const group = assessmentGroups[assessmentId];
group.sort((a, b) => compareDesc(a.dueDateTime, b.dueDateTime));
latestAssessments.push(group[0]);
const latestAssessment = group[0];

const logs = this.assessmentLogs
.filter((a) => a.assessmentId.toLowerCase() == latestAssessment.assessmentId.toLowerCase())
.filter((a) => isAfter(a.recordedDateTime, latestAssessment.dueDateTime));
if (logs.length === 0) {
latestAssessments.push(latestAssessment);
}
}

return latestAssessments;
Expand Down