Merge pull request tech-by-design#303 from megin1989/main

fix: fix date format changes and fhir count issues tech-by-design#239
megin1989 · Aug 13, 2024 · 7665ccd · 7665ccd
2 parents aef0e1c + 7869fae
commit 7665ccd
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/hub-prime/pom.xml b/hub-prime/pom.xml
@@ -11,7 +11,7 @@
 	</parent>
 	<groupId>org.techbd</groupId>
 	<artifactId>hub-prime</artifactId>
-	<version>0.159.0</version>
+	<version>0.160.0</version>
 	<packaging>war</packaging>
 	<name>TechBD Hub (Prime)</name>
 	<description>TechBD Hub (Primary)</description>

diff --git a/hub-prime/src/main/resources/templates/js/helpers.js b/hub-prime/src/main/resources/templates/js/helpers.js
@@ -6,7 +6,7 @@ export class Helpers {
         let month = String(date.getMonth() + 1).padStart(2, '0'); // Months are zero-based
         let year = date.getFullYear();
 
-        return `${day}-${month}-${year}`;
+        return `${month}/${day}/${year}`;
     }
 
     // Function to get date range, e.g., last 7 days

diff --git a/hub-prime/src/main/resources/templates/page/diagnostics/needs-attention.html b/hub-prime/src/main/resources/templates/page/diagnostics/needs-attention.html
@@ -53,7 +53,7 @@
                 arrow.style.cursor = 'pointer';
                 arrow.style.marginRight = '5px';
 
-                button.innerText = params.data.cross_roads_scn;
+                button.innerText = params.data.qe_total_submissions;
                 button.style.marginLeft = '5px';
 
                 container.appendChild(arrow);
@@ -78,7 +78,7 @@
                 arrow.style.cursor = 'pointer';
                 arrow.style.marginRight = '5px';
 
-                button.innerText = params.data.qe_total_submissions;
+                button.innerText = params.data.scoring_engine_submission_passed;
                 button.style.marginLeft = '5px';
 
                 container.appendChild(arrow);
@@ -94,6 +94,14 @@
                 return container;
             }
 
+            function qeNameCellRenderer(params) {
+                const qeName = params.data.qe_name;
+                const link = `/data-quality/needs-attention-details?qeName=${qeName}`;
+                //return `<a href="${link}">${qeName}</a>`;
+                return `${qeName}`;
+            }
+
+
 
             const detailGridOptions1 = {
                 columnDefs: [
@@ -143,7 +151,7 @@
             const gridOptions = {
                 columnDefs: [
                     { headerName: "CrossRoads SCN", field: "cross_roads_scn", filter: "agTextColumnFilter" },
-                    { headerName: "QE", field: "qe_name", filter: "agTextColumnFilter" },
+                    { headerName: "QE", field: "qe_name", filter: "agTextColumnFilter", cellRenderer: qeNameCellRenderer },
                     {
                         headerName: "QE FHIR File Count", field: "qe_total_submissions", filter: "agTextColumnFilter", cellRenderer: cellRenderer1, cellStyle: function (params) {
                             if (params.data.cross_roads_scn !== params.data.qe_total_submissions) {
@@ -176,8 +184,7 @@
                 detailCellRendererParams: (params) => {
 
                     if (params.data.buttonPressed === 'qe_total_submissions') {
-
-                        console.log("ddd");
+
                         return {
                             detailGridOptions: detailGridOptions1,
                             getDetailRowData: function (params) {
@@ -193,8 +200,7 @@
                             },
                         };
 
-                    } else if (params.data.buttonPressed === 'scoring_engine_submission_passed') {
-                        console.log("bbbb");
+                    } else if (params.data.buttonPressed === 'scoring_engine_submission_passed') { 
                         return {
                             detailGridOptions: detailGridOptions2,
                             getDetailRowData: function (params) {