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-610: Updated DQA Date Formatting #1700

Closed
wants to merge 10 commits into from
Closed

POC-610: Updated DQA Date Formatting #1700

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d6e0821
POC-610: Fixed DQA filter to be a ALL by default
henrykorir Jan 12, 2024
2e6f851
POC-610: Updated DQA Indicators
henrykorir Jan 15, 2024
1070ad3
POC-610: Updated DQA columns as per request from Mosoriot
henrykorir Jan 15, 2024
3d3fcd2
POC-610: Updated DQA Indicators
henrykorir Jan 15, 2024
eb670c5
POC-610: Updated DQA columns as per request from Mosoriot
henrykorir Jan 15, 2024
b9ded31
Merge branch 'master' into POC-610
henrykorir Jan 15, 2024
16142b1
POC-610: Fixed documentation of TB Screening
henrykorir Jan 16, 2024
e49dd7b
POC-610: Updated date formatting
henrykorir Jan 17, 2024
82ecc22
Merge branch 'AMPATH:master' into POC-610
henrykorir Jan 17, 2024
689a4b9
POC-610: Updated date formatting
henrykorir Jan 17, 2024
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
115 changes: 62 additions & 53 deletions ...-lib/dqa-reports/chart-abstraction-patientlist/chart-abstraction-patientlist.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,11 @@ export class ChartAbstractionPatientlistComponent implements OnInit {
const extraColumns = {
NUPI: 'NUPI',
sex_gender: 'Sex',
birthdate: 'Date of Birth',
hiv_start_date: 'Date Confirmed HIV Positive',
arv_first_regimen_start_date: 'Date of ART Initiation',
arv_start_date: 'Date of Current ART Initiation',
birthdate: 'Date of Birth (DD/MM/YYYY)',
age: 'Age',
hiv_start_date: 'Date Confirmed HIV Positive (DD/MM/YYYY)',
arv_first_regimen_start_date: 'Date of ART Initiation (DD/MM/YYYY)',
arv_start_date: 'Date of Current ART Initiation (DD/MM/YYYY)',
drugs_given: 'Current ART Regimen',
cur_arv_med_basis: 'Current ART Regimen',
drugs_duration: 'Drug dosage given (duration)',
Expand All @@ -94,7 +95,7 @@ export class ChartAbstractionPatientlistComponent implements OnInit {
cd4_1: 'Baseline screening for CD4',
has_cd4_1: 'Does this client have Baseline screening for CD4',
is_crag_screened: 'Does this client have Baseline screening for CrAG',
last_clinical_encounter: 'Last clinical encounter date',
last_clinical_encounter: 'Last clinical encounter date (DD/MM/YYYY)',
sysBP: 'Systolic BP',
dysBP: 'Diastolic BP',
nutrition: 'Nutrition Assessment Done',
Expand All @@ -103,10 +104,10 @@ export class ChartAbstractionPatientlistComponent implements OnInit {
// vl_1: 'Latest Valid VL',
vl_1: 'Does the client have a Valid viral load result',
ovcid_id: 'OVCID',
ipt_stop_date: 'IPT Stop Date',
ipt_stop_date: 'IPT Stop Date (DD/MM/YYYY)',
// last_clinical_encounter: 'Last Clinical Encounter',
// last_appointment_date: 'Date of Last Appointment',
next_appointment: 'Next appointment date',
next_appointment: 'Next appointment date (DD/MM/YYYY)',
// next_appointment: 'Date of Next Appointment ',
visit_type: 'Visit Type',
status: 'Status',
Expand All @@ -123,79 +124,78 @@ export class ChartAbstractionPatientlistComponent implements OnInit {
}
}
this.overrideColumns.push(
{ field: 'ccc_number', hide: true, pinned: true },
{ field: 'ccc_number', hide: true, pinned: true },
{
field: 'birthdate',
field: 'birthdate'
// cellRenderer: (column) => {
// if (column.value != null) {
// if (column.value != null && column.value !== '') {
// // return moment(column.value).format('YYYY-MM-DD');
// return moment(column.value).format('DD-MMM-YYYY');
// return moment(column.value).format('DD/MM/YYYY');
// }
// return 'missing';
// },
pinned: false
// pinned: false
},
{
field: 'last_appointment_date'
// cellRenderer: (column) => {
// if (column.value != null) {
// return moment(column.value).format('DD-MM-YYYY');
// if (column.value != null && column.value !== '') {
// return moment(column.value).format('DD/MM/YYYY');
// }
// }
},
{
field: 'arv_first_regimen_start_date'
// cellRenderer: (column) => {
// if (column.value != null) {
// if (moment(column.value).isBefore('1900-01-01', 'year')){
// return column.value;
// }
// return ''
// if (column.value != null && column.value !== '') {
// return moment(column.value).format('DD/MM/YYYY');
// }
// }
},
{
field: 'arv_start_date',
// cellRenderer: (column) => {
// if (column.value != null) {
// return moment(column.value).format('DD-MM-YYYY');
// }
// },
cellRenderer: (column) => {
if (column.value != null && column.value !== '') {
return moment(column.value).format('DD/MM/YYYY');
}
},
hide: true
},
{
field: 'hiv_start_date'
// cellRenderer: (column) => {
// if (column.value != null) {
// return moment(column.value).format('DD-MM-YYYY');
// if (column.value != null && column.value !== '') {
// return moment(column.value)..format('DD/MM/YYYY');;
// }
// }
},
{
field: 'last_clinical_encounter'
// cellRenderer: (column) => {
// if (column.value != null) {
// return moment(column.value).format('DD-MM-YYYY');
// if (column.value != null && column.value !== '') {
// return moment(column.value)..format('DD/MM/YYYY');;
// }
// }
},
{
field: 'next_appointment'
// cellRenderer: (column) => {
// if (column.value != null) {
// return moment(column.value).format('DD-MM-YYYY');
// if (column.value != null && column.value !== '') {
// return moment(column.value)..format('DD/MM/YYYY');;
// }
// }
},
{
field: 'tb_screened_this_visit',
width: 150,
cellRenderer: (column) => {
if (column.value === 0) {
return 'No';
}
return 'Yes';
}
field: 'tb_screened_this_visit'
// width: 150,
// cellRenderer: (column) => {
// if (column.value === 1) {
// return 'Yes';
// } else if (column.value === 0) {
// return 'No';
// }
// return 'Not Documented';
// }
},
{
field: 'vl_1',
Expand All @@ -218,30 +218,30 @@ export class ChartAbstractionPatientlistComponent implements OnInit {
}
},
{
field: 'last_ipt_start_date',
field: 'last_ipt_start_date'
// cellRenderer: (column) => {
// if (column.value != null) {
// return moment(column.value).format('DD-MM-YYYY');
// if (column.value != null && column.value !== '') {
// return moment(column.value)..format('DD/MM/YYYY');;
// }
// },
hide: false
// hide: false
},
{
field: 'ipt_completion_date',
field: 'ipt_completion_date'
// cellRenderer: (column) => {
// if (column.value != null) {
// return moment(column.value).format('DD-MM-YYYY');
// if (column.value != null && column.value !== '') {
// return moment(column.value)..format('DD/MM/YYYY');;
// }
// },
hide: false
// hide: false
},
{
field: 'ipt_stop_date',
// cellRenderer: (column) => {
// if (column.value != null) {
// return moment(column.value).format('DD-MM-YYYY');
// }
// },
cellRenderer: (column) => {
if (column.value != null && column.value !== '') {
return moment(column.value).format('DD/MM/YYYY');
}
},
hide: true,
suppressToolPanel: true
},
Expand Down Expand Up @@ -283,6 +283,11 @@ export class ChartAbstractionPatientlistComponent implements OnInit {
width: 150
// pinned: true
},
{
field: 'upi_number',
width: 150
// pinned: true
},
{
field: 'upi_number',
width: 150,
Expand All @@ -295,6 +300,11 @@ export class ChartAbstractionPatientlistComponent implements OnInit {
width: 280,
hide: true
},
{
field: 'cur_arv_med_basis',
width: 280,
hide: true
},
{
field: 'cur_arv_med_basis',
width: 280
Expand Down Expand Up @@ -330,8 +340,7 @@ export class ChartAbstractionPatientlistComponent implements OnInit {
{
field: 'age',
width: 150,
hide: true,
suppressToolPanel: true
hide: true
},
{
field: 'sex_gender',
Expand Down
Loading