+ + All records loaded + {{ '[ ' + preAppointmentOutreachList.length + ']' }} +
diff --git a/src/app/clinic-dashboard/general/pre-appointment-outreach/pre-appointment-outreach.component.spec.ts b/src/app/clinic-dashboard/general/pre-appointment-outreach/pre-appointment-outreach.component.spec.ts new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/clinic-dashboard/general/pre-appointment-outreach/pre-appointment-outreach.component.ts b/src/app/clinic-dashboard/general/pre-appointment-outreach/pre-appointment-outreach.component.ts new file mode 100644 index 000000000..d81010b4a --- /dev/null +++ b/src/app/clinic-dashboard/general/pre-appointment-outreach/pre-appointment-outreach.component.ts @@ -0,0 +1,363 @@ +import { Component, OnInit } from '@angular/core'; +import { ClinicDashboardCacheService } from '../../services/clinic-dashboard-cache.service'; +import { ActivatedRoute, Router } from '@angular/router'; +import * as _ from 'lodash'; +import { Subscription } from 'rxjs'; +import { PreAppointmentOutreachResourceService } from 'src/app/etl-api/pre-appointment-outreach-resource.service'; + +interface ReportParams { + locationUuids: string; + yearWeek: string; + processOutcome: number; +} + +@Component({ + selector: 'app-pre-appointment-outreach', + templateUrl: './pre-appointment-outreach.component.html', + styleUrls: ['./pre-appointment-outreach.component.css'] +}) +export class PreAppointmentOutreachComponent implements OnInit { + public errors: any[] = []; + public preAppointmentOutreachList: any[] = []; + public locationUuids: string; + public params: any; + public routeSub: Subscription = new Subscription(); + public loadingpreAppointmentOutreachList = false; + + public weeks: any[] = []; + public selectedWeek: string; + public selectedFormattedWeek: string; + + // constants + private ALL = 'All'; + private FOLLOW_UP_SUCCESSFUL = 'Follow-up Successful'; + private FAILED_FOLLOW_UP_ATTEMPT = 'Failed Follow-up Attempt'; + private NO_FOLLOW_UP_ATTEMPT = 'Follow-up Not Attempted'; + + public filterTypeOptions: any[] = [ + this.ALL, + this.FOLLOW_UP_SUCCESSFUL, + this.FAILED_FOLLOW_UP_ATTEMPT, + this.NO_FOLLOW_UP_ATTEMPT + ]; + public selectedFilterType = 'All'; // defaults to All + // TODO refactor this later + public mappedSelectedFilterType = -1; + public explainedFilterType = + 'All patients predicted to be at either a high or medium risk.'; + + constructor( + private clinicDashboardCacheService: ClinicDashboardCacheService, + private preAppointmentResourceService: PreAppointmentOutreachResourceService, + private router: Router, + private route: ActivatedRoute + ) { + const today = new Date(); + const currentYear = today.getFullYear(); + const numberOfWeeks = 52; // Set the maximum number of weeks to 52 + + for (let weekNumber = 1; weekNumber <= numberOfWeeks; weekNumber++) { + const weekString = `${currentYear}-W${weekNumber + .toString() + .padStart(2, '0')}`; + this.weeks.push({ + label: `${currentYear}-W${weekNumber} - From ${this.getStartDate( + weekString + )} to ${this.getEndDate(weekString)}`, + value: weekString + }); + } + + const currentWeek = this.getISOWeek(today); + this.selectedWeek = `${currentYear}-W${currentWeek + .toString() + .padStart(2, '0')}`; + this.setSelectedWeek(); + } + + public ngOnInit() { + this.subScribeToClinicLocationChange(); + this.subscribeToRouteParamsChange(); + } + + public setSelectedWeek() { + this.selectedFormattedWeek = this.weeks.find( + (week) => week.value === this.selectedWeek + ).label; + } + + public setSelectedFilterType() { + switch (this.selectedFilterType) { + case this.ALL: + // TODO refactor this later + this.mappedSelectedFilterType = -1; + this.explainedFilterType = + 'All patients predicted to be at either a high or medium risk.'; + break; + case this.FOLLOW_UP_SUCCESSFUL: + this.mappedSelectedFilterType = 1; + this.explainedFilterType = + 'Patients who have successfully been contacted/reached'; + break; + case this.FAILED_FOLLOW_UP_ATTEMPT: + this.mappedSelectedFilterType = 0; + this.explainedFilterType = + 'Patient for whom follow-up attempts have been unsuccessful.'; + break; + case this.NO_FOLLOW_UP_ATTEMPT: + this.mappedSelectedFilterType = 2; + this.explainedFilterType = + 'Patients for whom there has been no follow-up attempt.'; + break; + default: + this.explainedFilterType = ''; + } + } + + public extraColumns() { + return [ + { + headerName: 'Program', + field: 'program', + width: 100, + cellStyle: { + 'white-space': 'normal' + } + }, + { + headerName: 'Phone Number', + field: 'phone_number', + width: 120, + cellStyle: { + 'white-space': 'normal' + } + }, + { + headerName: 'Predicted Risk', + width: 120, + field: 'predicted_risk' + }, + { + headerName: 'Predicted Score (%)', + width: 120, + field: 'predicted_prob_disengage', + cellRenderer: (column: any) => { + return (column.value * 100).toFixed(2); + } + }, + { + headerName: 'Prediction Generated Date', + width: 200, + field: 'prediction_generated_date' + }, + { + headerName: 'Latest Appointment', + width: 150, + field: 'last_appointment' + }, + { + headerName: 'Rtc Date', + field: 'rtc_date', + width: 100, + cellStyle: { + 'white-space': 'normal' + } + }, + { + headerName: 'Latest RTC Date', + width: 150, + field: 'latest_rtc_date' + }, + { + headerName: 'Current Regimen', + width: 200, + field: 'cur_meds' + }, + { + headerName: 'Latest VL', + width: 100, + field: 'latest_vl' + }, + { + headerName: 'Latest VL Date', + width: 150, + field: 'latest_vl_date' + }, + { + headerName: 'VL Category', + width: 150, + field: 'vl_category' + }, + { + headerName: 'Follow-up Type', + width: 150, + field: 'follow_up_type' + }, + { + headerName: 'Follow-up Reason', + width: 150, + field: 'follow_up_reason' + }, + { + headerName: 'Follow-up Success', + width: 100, + field: 'was_follow_up_successful', + cellRenderer: (column: any) => { + if (column.value === 1) { + return 'YES'; + } else { + return 'NO'; + } + } + }, + { + headerName: 'Rescheduled Date', + width: 100, + field: 'rescheduled_date' + }, + { + headerName: 'Contact Reached', + width: 100, + field: 'contact_reached' + }, + { + headerName: 'Attempted Home Visit', + width: 100, + field: 'attempted_home_visit' + }, + { + headerName: 'Reason Not Attempted Home Visit', + width: 100, + field: 'reason_not_attempted_home_visit' + }, + { + headerName: 'Client Found', + width: 100, + field: 'was_client_found' + }, + { + headerName: 'Reason Client Not Found', + width: 100, + field: 'reason_client_not_found' + }, + { + headerName: 'Home Visit Personnel', + width: 100, + field: 'home_visit_personnel' + }, + { + headerName: 'COVID-19 Vaccination Status', + width: 150, + field: 'covid_19_vaccination_status' + }, + { + headerName: 'Nearest Center', + width: 150, + field: 'nearest_center' + } + ]; + } + + public getReportParams(): ReportParams { + return { + locationUuids: this.locationUuids, + yearWeek: this.selectedWeek, + processOutcome: this.mappedSelectedFilterType + }; + } + + public generateReport(): void { + if (this.locationUuids && this.selectedWeek) { + this.loadingpreAppointmentOutreachList = true; + this.preAppointmentResourceService + .getWeeklyPredictionsPatientList(this.getReportParams()) + .subscribe( + (result: any) => { + this.loadingpreAppointmentOutreachList = false; + if (result) { + this.preAppointmentOutreachList = result; + this.router.navigate([], { + relativeTo: this.route, + queryParams: { + locationUuids: this.locationUuids, + yearWeek: this.selectedWeek, + processOutcome: this.mappedSelectedFilterType + } + }); + } + }, + (error: any) => { + this.loadingpreAppointmentOutreachList = false; + } + ); + } + } + + public subScribeToClinicLocationChange(): void { + this.clinicDashboardCacheService + .getCurrentClinic() + .subscribe((currentClinic) => { + this.locationUuids = currentClinic; + this.generateReport(); + }); + } + + public subscribeToRouteParamsChange(): void { + this.routeSub = this.route.parent.parent.params.subscribe((params) => { + this.locationUuids = params['location_uuid']; + this.clinicDashboardCacheService.setCurrentClinic( + params['location_uuid'] + ); + }); + } + + public resetFilter($event: Boolean): void { + if ($event) { + this.preAppointmentOutreachList = []; + } + } + + private getStartDate(week: string): string { + const year = Number(week.substring(0, 4)); + const weekNumber = Number(week.substring(6)); + const startDate = this.getDateOfISOWeek(year, weekNumber, 1); + + return startDate.toDateString(); + } + + private getEndDate(week: string): string { + const year = Number(week.substring(0, 4)); + const weekNumber = Number(week.substring(6)); + const endDate = this.getDateOfISOWeek(year, weekNumber, 7); + + return endDate.toDateString(); + } + + private getDateOfISOWeek(year: number, week: number, day: number): Date { + const januaryFourth = new Date(year, 0, 4); + const daysToFirstMonday = 1 - januaryFourth.getDay(); + const firstMonday = new Date(year, 0, 4 + daysToFirstMonday); + return new Date( + firstMonday.getTime() + + (week - 1) * 7 * 24 * 60 * 60 * 1000 + + (day - 1) * 24 * 60 * 60 * 1000 + ); + } + + private getISOWeek(date: Date): number { + const firstDayOfYear = new Date(date.getFullYear(), 0, 1); + const daysOffset = firstDayOfYear.getDay() - 1; + const firstMondayOfYear = new Date( + firstDayOfYear.getFullYear(), + 0, + 1 + (daysOffset > 0 ? 7 - daysOffset : 0) + ); + + const daysPassed = Math.floor( + (date.getTime() - firstMondayOfYear.getTime()) / 86400000 + ); + const weeksPassed = Math.floor(daysPassed / 7) + 1; + + return weeksPassed; + } +} diff --git a/src/app/clinic-dashboard/hiv/hiv-differentiated-care-program/hiv-differentiated-care-program.component.ts b/src/app/clinic-dashboard/hiv/hiv-differentiated-care-program/hiv-differentiated-care-program.component.ts index 53a22b129..757b7ad52 100644 --- a/src/app/clinic-dashboard/hiv/hiv-differentiated-care-program/hiv-differentiated-care-program.component.ts +++ b/src/app/clinic-dashboard/hiv/hiv-differentiated-care-program/hiv-differentiated-care-program.component.ts @@ -117,6 +117,11 @@ export class HivDifferentiatedCareComponent implements OnInit { width: 100, field: 'latest_vl' }, + { + headerName: 'VL Category', + width: 100, + field: 'vl_category' + }, { headerName: 'Latest VL Date', width: 150, diff --git a/src/app/clinic-dashboard/hiv/hiv-program.module.ts b/src/app/clinic-dashboard/hiv/hiv-program.module.ts index 24e5ae9e3..5923f61ce 100644 --- a/src/app/clinic-dashboard/hiv/hiv-program.module.ts +++ b/src/app/clinic-dashboard/hiv/hiv-program.module.ts @@ -7,8 +7,7 @@ import { MatTabsModule, MatSlideToggleModule, MatDatepickerModule, - MatNativeDateModule, - MatDatepickerToggle + MatNativeDateModule } from '@angular/material'; import { TabViewModule, @@ -26,7 +25,6 @@ import { Moh731ReportComponent } from './moh-731/moh-731-report.component'; import { clinicDashboardHivRouting } from './hiv-program.routes'; import { HivCareLibModule } from '../../hiv-care-lib/hiv-care-lib.module'; import { EtlApi } from '../../etl-api/etl-api.module'; -import { HivModuleComponent } from './hiv-program.component'; import { DepartmentProgramFilterModule } from './../../department-program-filter/department-program-filter.module'; import { PatientStatusChangeVisualizationContainerComponent } from './patient-status-change-visualization/patient-status-change-visualization.container.component'; import { PatientStatusChangeVisualizationComponent } from './patient-status-change-visualization/patient-status-change-visualization.component'; @@ -82,6 +80,8 @@ import { OncologyProgramModule } from './../../oncology-care-lib/oncology-care-l import { IptReportComponent } from './ipt-report/ipt-report.component'; import { DefaulterListFilterComponent } from './../general/defaulter-list/defaulter-list-filter-component'; import { ClinicDashboardCovid19ReportComponent } from './covid-19-report/clinic-dashboard-covid-19-report.component'; +import { PreAppointmentOutreachResourceService } from 'src/app/etl-api/pre-appointment-outreach-resource.service'; +import { PreAppointmentOutreachComponent } from '../general/pre-appointment-outreach/pre-appointment-outreach.component'; @NgModule({ imports: [ @@ -182,9 +182,13 @@ import { ClinicDashboardCovid19ReportComponent } from './covid-19-report/clinic- MOH412ClinicDashboardPatientListComponent, IptReportComponent, DefaulterListFilterComponent, - ClinicDashboardCovid19ReportComponent + ClinicDashboardCovid19ReportComponent, + PreAppointmentOutreachComponent + ], + providers: [ + ClinicalSummaryVisualizationService, + PreAppointmentOutreachResourceService ], - providers: [ClinicalSummaryVisualizationService], entryComponents: [PatientStatusDatalistCellComponent] }) export class HivProgramModule {} diff --git a/src/app/clinic-dashboard/hiv/hiv-program.routes.ts b/src/app/clinic-dashboard/hiv/hiv-program.routes.ts index 3e869c7d1..7071527a3 100644 --- a/src/app/clinic-dashboard/hiv/hiv-program.routes.ts +++ b/src/app/clinic-dashboard/hiv/hiv-program.routes.ts @@ -1,7 +1,5 @@ -import { Covid19ReportComponent } from './../../hiv-care-lib/covid-19-report/covid-19-report.component'; import { ModuleWithProviders } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { HivModuleComponent } from './hiv-program.component'; import { Moh731ReportComponent } from './moh-731/moh-731-report.component'; import { HivSummaryIndicatorComponent } from './hiv-summary-indicators/hiv-summary-indicator.component'; import { HivSummaryIndicatorsPatientListComponent } from '../../hiv-care-lib/hiv-summary-indicators/patient-list.component'; @@ -52,7 +50,6 @@ import { IptReportPatientListComponent } from 'src/app/hiv-care-lib/ipt-report/i import { ClinicDashboardHeiReportComponent } from './clinic-dashboard-hei-indicators-report/clinic-dashboard-hei-report.component'; import { HeiIndicatorsPatientListComponent } from './../../hiv-care-lib/hei-indicators-report/hei-indicators-patient-list.component'; import { HIVListsMicroFrontendComponent } from './hiv-lists-microfrontend-report/hiv-lists-microfrontend.component'; -import { FamilyTestingComponent } from './family-testing/family-testing.component'; import { FamilyTestingBaseComponent } from 'src/app/hiv-care-lib/family-testing/family-testing-base.component'; import { FamilyTestingContactComponent } from 'src/app/hiv-care-lib/family-testing/family-testing-contact-list.component'; import { AddContactTraceComponent } from 'src/app/hiv-care-lib/family-testing/contact-trace/add-contact-trace.component'; @@ -61,6 +58,7 @@ import { MOH412ClinicDashboardComponent } from './moh-412-report/moh-412-clinic- import { MOH412ClinicDashboardPatientListComponent } from './moh-412-report/moh-412-clinic-dashboard-patient-list.component'; import { ClinicDashboardCovid19ReportComponent } from './covid-19-report/clinic-dashboard-covid-19-report.component'; import { Covid19ReportPatientListComponent } from './../../hiv-care-lib/covid-19-report/covid-19-report-patient-list/covid-19-report-patient-list.component'; +import { PreAppointmentOutreachComponent } from '../general/pre-appointment-outreach/pre-appointment-outreach.component'; const routes: Routes = [ { @@ -472,6 +470,10 @@ const routes: Routes = [ } ] }, + { + path: 'pre-appoinment-outreach', + component: PreAppointmentOutreachComponent + }, { path: 'family-testing', children: [ diff --git a/src/app/clinic-schedule-lib/daily-schedule/daily-schedule-appointments.component.html b/src/app/clinic-schedule-lib/daily-schedule/daily-schedule-appointments.component.html index a1063cfec..5d743ed71 100644 --- a/src/app/clinic-schedule-lib/daily-schedule/daily-schedule-appointments.component.html +++ b/src/app/clinic-schedule-lib/daily-schedule/daily-schedule-appointments.component.html @@ -20,6 +20,7 @@ [data]="dailyAppointmentsPatientList" [extraColumns]="extraColumns" [hivColumns]="true" + [excludecolumns]="true" >diff --git a/src/app/hiv-care-lib/patients-requiring-vl/patients-requiring-vl-base.component.ts b/src/app/hiv-care-lib/patients-requiring-vl/patients-requiring-vl-base.component.ts index ee07e65b0..bb9d7f408 100644 --- a/src/app/hiv-care-lib/patients-requiring-vl/patients-requiring-vl-base.component.ts +++ b/src/app/hiv-care-lib/patients-requiring-vl/patients-requiring-vl-base.component.ts @@ -62,7 +62,7 @@ export class PatientsRequiringVLBaseComponent implements OnInit { public extraColumns() { return [ { - headerName: 'Most Recent VL', + headerName: 'Latest VL', field: 'current_vl', width: 110, cellStyle: { @@ -73,7 +73,7 @@ export class PatientsRequiringVLBaseComponent implements OnInit { } }, { - headerName: 'Most Recent VL Date', + headerName: 'Latest VL Date', field: 'current_vl_date', width: 140, cellStyle: { @@ -95,14 +95,6 @@ export class PatientsRequiringVLBaseComponent implements OnInit { cellStyle: { 'white-space': 'normal' } - }, - { - headerName: 'VL Category', - field: 'vl_category', - width: 170, - cellStyle: { - 'white-space': 'normal' - } } ]; } diff --git a/src/app/hiv-care-lib/prep-report/prep-report-patient-list/prep-report-patient-list.component.ts b/src/app/hiv-care-lib/prep-report/prep-report-patient-list/prep-report-patient-list.component.ts index c0e705396..61fab8482 100644 --- a/src/app/hiv-care-lib/prep-report/prep-report-patient-list/prep-report-patient-list.component.ts +++ b/src/app/hiv-care-lib/prep-report/prep-report-patient-list/prep-report-patient-list.component.ts @@ -62,9 +62,11 @@ export class PrepReportPatientListComponent implements OnInit { latest_rtc_date: 'RTC Date', days_since_rtc_date: 'Days missed since RTC', cur_prep_meds_names: 'Current prEp Regimen', + initiation_reason: 'Reason for Initiation', hiv_rapid_test: 'HIV Rapid test result', rapid_test_date: 'HIV Rapid test date', population_type: 'Population Type', + discontinue_reason: 'Reason for Discontinued', ovcid_id: 'OVCID', population_type_category: 'Population Type Category', nearest_center: 'Estate/Nearest Center' diff --git a/src/app/hiv-care-lib/tx-curr-report/tx-curr-report-base/tx-curr-report-base.component.css b/src/app/hiv-care-lib/tx-curr-report/tx-curr-report-base/tx-curr-report-base.component.css new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/hiv-care-lib/tx-curr-report/tx-curr-report-base/tx-curr-report-base.component.html b/src/app/hiv-care-lib/tx-curr-report/tx-curr-report-base/tx-curr-report-base.component.html new file mode 100644 index 000000000..43e11b6f6 --- /dev/null +++ b/src/app/hiv-care-lib/tx-curr-report/tx-curr-report-base/tx-curr-report-base.component.html @@ -0,0 +1,54 @@ +
+ {{ errorMessage }} +
++ + All records loaded {{ '[ ' + patientData.length + ' ]' }} +
+ + +Error loading patient list.
++ {{ errorMessage }} +
++ + All records loaded {{ '[ ' + patientData.length + ' ]' }} +
+ + +Error loading patient list.
+| + {{ grid.headerName }} + | +|||
|---|---|---|---|
| Location | ++ {{ val.value[0] }} + | ++ Total + | +|
| + | F | +M | ++ |
| + + {{ col.headerName }} + | ++ {{ val.value[0] }} + | ++ {{ val.value[1] }} + | ++ {{ col.total.value }} + | +
| Sub Total | ++ {{ val.value[0] }} + | ++ {{ val.value[1] }} + | ++ |
| Facility Total | ++ {{ val.value[0] }} + | ++ {{ col.total.value }} + | +|
+ {{ errorMessage }} +
++ + All records loaded {{ '[ ' + patientData.length + ' ]' }} +
+ + +Error loading patient list.
++ {{ errorMessage }} +
++ + All records loaded {{ '[ ' + patientData.length + ' ]' }} +
+ + +Error loading patient list.
++ {{ errorMessage }} +
++ + All records loaded {{ '[ ' + patientData.length + ' ]' }} +
+ + +Error loading patient list.
++ Appointment No-show Risk : + {{ (prediction.predicted_prob_disengage * 100).toFixed(2) }}%({{ + prediction.predicted_risk + }}) +
+VL Category: {{ this.viralLoadCategory }}Last Encounter
Location: {{ latestEncounterLocation?.name }}
++ Location: + {{ + latestEncounterLocation?.name + ? latestEncounterLocation?.name + : patientData.clinic + }} +
ARV Regimen: {{ patientData?.cur_arv_meds }}
- Last Viral Load: {{ patientData?.vl_1 | zeroVl }}
-
+ Age PCR Done: {{ age_of_ped_on_last_pcr }} +
Last Encounter
RTC Date: {{ patientData?.rtc_date | date: 'dd-MM-yyyy' }}
++ RTC Date: {{ patientData?.rtc_date | date: 'dd-MM-yyyy' }} +
++ Infant Feeding Method: {{ infant_feeding_method }} +
+ ++ Disclosure Status: + + {{ hivDisclosureStatus }} + +
++ COVID-19 Vaccination Status: + + {{ covid19VaccinationSummary?.vaccination_status }} + + + ({{ + covid19VaccinationSummary.first_dose_vaccine_administered + }} + : {{ covid19VaccinationSummary.date_given_first_dose }}) + + + ({{ + covid19VaccinationSummary.second_dose_vaccine_administered + }} + : {{ covid19VaccinationSummary.date_given_second_dose }}) + + + {{ + covid19VaccinationSummary.vaccination_status_code_message + }} + +
+- Care Status: + PCR Results: - {{ resolvedCareStatus }} + {{ last_pcr_status }}
- Medication Pickup Date: - {{ patientData?.med_pickup_rtc_date | date: 'dd-MM-yyyy' }} -
-- Disclosure Status: + Care Status: - {{ hivDisclosureStatus }} + {{ resolvedCareStatus }}
++ + Date Started Cryptococcal Treatment: + {{ cm_treatment_start_date | date: 'dd-MM-yyyy' }} + +
++ + Cryptococcal Status: {{ cm_treatment_status }}, (Phase : + {{ cm_treatment_phase }}) + +
++ + Date completed cryptococcal treatment: + {{ cm_treatment_end_date | date: 'dd-MM-yyyy' }} + +
+- COVID-19 Vaccination Status: - - {{ covid19VaccinationSummary?.vaccination_status }} - - - ({{ - covid19VaccinationSummary.first_dose_vaccine_administered - }} - : {{ covid19VaccinationSummary.date_given_first_dose }}) - - - ({{ - covid19VaccinationSummary.second_dose_vaccine_administered - }} - : {{ covid19VaccinationSummary.date_given_second_dose }}) - - - {{ covid19VaccinationSummary.vaccination_status_code_message }} - + Medication Pickup Date: + {{ patientData?.med_pickup_rtc_date | date: 'dd-MM-yyyy' }}
@@ -211,32 +280,45 @@
- Morisky Score: - - {{ moriskyScore }}{{ moriskyDenominator }} - - {{ moriskyRating }} -
++ Morisky Score: + + {{ moriskyScore }}{{ moriskyDenominator }} - + {{ moriskyRating }} +
++ Morisky Score: + + {{ moriskyScore }}{{ moriskyDenominator }} - + {{ moriskyRating }} +
+- Morisky Score: - - {{ moriskyScore }}{{ moriskyDenominator }} - - {{ moriskyRating }} -
+RTC Date: {{ patientData?.rtc_date | date: 'dd-MM-yyyy' }}
+Date of PCR: {{ last_pcr_date | date: 'dd-MM-yyyy' }}