@kenyaemr/esm-care-panel-app 5.4.1-pre.1874 → 5.4.1-pre.1880

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[],"extensions":[{"name":"care-panel-patient-summary","component":"carePanelPatientSummary","slot":"patient-chart-care-panel-dashboard-slot","order":10,"meta":{"columnSpan":4}},{"name":"care-panel-summary-dashboard-link","component":"carePanelSummaryDashboardLink","slot":"patient-chart-dashboard-slot","order":3,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-care-panel-dashboard-slot","layoutMode":"anchored","path":"Care panel"}},{"name":"delete-regimen-confirmation-dialog","component":"deleteRegimenConfirmationDialog"},{"name":"hiv-patient-visit-summary-dashboard-link","component":"hivPatientSummaryDashboardLink","slot":"hiv-care-and-treatment-slot","meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-hiv-patient-summary-slot","path":"HIV Patient Summary","layoutMode":"anchored"}},{"name":"hiv-patient-visit-summary","slot":"patient-chart-hiv-patient-summary-slot","component":"hivPatientSummary","order":3,"online":true,"offline":false}],"workspaces":[{"name":"patient-regimen-workspace","title":"Patient Regimen","component":"regimenFormWorkspace","type":"form","canMaximize":true,"canHide":true,"width":"wider"}],"version":"5.4.1-pre.1874"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[],"extensions":[{"name":"care-panel-patient-summary","component":"carePanelPatientSummary","slot":"patient-chart-care-panel-dashboard-slot","order":10,"meta":{"columnSpan":4}},{"name":"care-panel-summary-dashboard-link","component":"carePanelSummaryDashboardLink","slot":"patient-chart-dashboard-slot","order":3,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-care-panel-dashboard-slot","layoutMode":"anchored","path":"Care panel"}},{"name":"delete-regimen-confirmation-dialog","component":"deleteRegimenConfirmationDialog"},{"name":"hiv-patient-visit-summary-dashboard-link","component":"hivPatientSummaryDashboardLink","slot":"hiv-care-and-treatment-slot","meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-hiv-patient-summary-slot","path":"HIV Patient Summary","layoutMode":"anchored"}},{"name":"hiv-patient-visit-summary","slot":"patient-chart-hiv-patient-summary-slot","component":"hivPatientSummary","order":3,"online":true,"offline":false}],"workspaces":[{"name":"patient-regimen-workspace","title":"Patient Regimen","component":"regimenFormWorkspace","type":"form","canMaximize":true,"canHide":true,"width":"wider"}],"version":"5.4.1-pre.1880"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-care-panel-app",
-  "version": "5.4.1-pre.1874",
+  "version": "5.4.1-pre.1880",
   "description": "Patient care panels microfrontend for the OpenMRS SPA",
   "browser": "dist/kenyaemr-esm-care-panel-app.js",
   "main": "src/index.ts",

package/src/iit-risk-score/iit-risk-score.component.tsx

@@ -41,9 +41,10 @@ const CarePanellIITRiskScore: React.FC<CarePanellIITRiskScoreProps> = ({ patient
     );
   }
 
-  const evaluationDate = dayjs(riskScore?.evaluationDate).isValid()
-    ? formatDate(parseDate(riskScore.evaluationDate))
-    : '--';
+  const evaluationDate =
+    riskScore?.evaluationDate && dayjs(riskScore.evaluationDate).isValid()
+      ? formatDate(parseDate(riskScore?.evaluationDate))
+      : '--';
 
   if (error) {
     return <ErrorState error={error} headerTitle={t('iitRiscScore', 'IIT Risk Score')} />;

package/src/patient-summary/patient-summary.component.tsx

@@ -631,32 +631,14 @@ const PatientSummary: React.FC<PatientSummaryProps> = ({ patientUuid }) => {
               <p className={styles.label}>{t('cd4Trends', 'CD4 Trends')}</p>
               {data?.allCd4CountResults?.length > 0
                 ? data?.allCd4CountResults?.map((cd4, index) => {
-                    let formattedDate: Date | null = null;
-
-                    if (dayjs(cd4.cd4CountDate, 'DD/MM/YYYY', true).isValid()) {
-                      const parts = cd4.cd4CountDate?.split('/');
-                      if (parts && parts.length === 3) {
-                        const day = parseInt(parts[0], 10);
-                        const month = parseInt(parts[1], 10) - 1; // Subtract 1 since months are zero-based
-                        const year = parseInt(parts[2], 10);
-
-                        if (!isNaN(day) && !isNaN(month) && !isNaN(year)) {
-                          formattedDate = new Date(year, month, day);
-
-                          // Check if the date is valid
-                          if (isNaN(formattedDate.getTime())) {
-                            formattedDate = null;
-                          }
-                        }
-                      }
-                    }
-
                     return (
-                      <div key={`cd4Trend-${cd4}-${index}`}>
-                        <span className={styles.value}> {cd4.cd4Count} </span>
-                        <span className={styles.label}>
-                          {formattedDate ? formatDate(formattedDate) : 'Invalid date'}
-                        </span>
+                      <div key={`cd4Trend-${cd4?.cd4Count}-${index}`}>
+                        <span className={styles.value}>{cd4?.cd4Count}</span>
+                        {cd4?.cd4Count === 'N/A' || cd4?.cd4Count === '' ? (
+                          <span>None</span>
+                        ) : (
+                          <span>( {cd4?.cd4CountDate ? cd4?.cd4CountDate : '--'})</span>
+                        )}
                         <br />
                       </div>
                     );