From dd8fbe1d61d0052b06b165498ac2a040c46250ab Mon Sep 17 00:00:00 2001
From: Ramakrishna Vellala <itsp.kadapa@yahoo.com>
Date: Fri, 21 Jul 2023 11:23:22 +0530
Subject: [PATCH 1/4] G2P-272removed welcome message from ssp

---
 .../views/g2p_self_service_dashboard.xml                  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/g2p_self_service_portal/views/g2p_self_service_dashboard.xml b/g2p_self_service_portal/views/g2p_self_service_dashboard.xml
index 8d794f3..5c54841 100644
--- a/g2p_self_service_portal/views/g2p_self_service_dashboard.xml
+++ b/g2p_self_service_portal/views/g2p_self_service_dashboard.xml
@@ -11,7 +11,7 @@
 
             <div class="main-container">
                 <div class="container-adjuster">
-                    <div class="alert" id="alertbox">
+                    <!-- <div class="alert" id="alertbox">
                         <div class="alertbox-adjuster">
                             <div class="alertbox-message">
                                 <span
@@ -24,7 +24,7 @@
                                 </span>
                             </div>
                         </div>
-                    </div>
+                    </div> -->
                     <div class="table-container">
                         <div class="table-head-container">
                             <p class="table-title">My Programs</p>
@@ -354,10 +354,10 @@
                                 type="text/javascript"
                                 src="/g2p_self_service_portal/static/src/js/self_service_pie_chart.js"
                             />
-                            <script
+                            <!-- <script
                                 type="text/javascript"
                                 src="/g2p_self_service_portal/static/src/js/self_service_welcome_alert.js"
-                            />
+                            /> -->
                         </div>
                     </div>
                 </div>

From c367fcf8f50c48ebe7b5a066bb8d9504c5cd492e Mon Sep 17 00:00:00 2001
From: Ramakrishna Vellala <itsp.kadapa@yahoo.com>
Date: Tue, 25 Jul 2023 12:23:54 +0530
Subject: [PATCH 2/4] G2P-277 Discard icon is not disappearing when clears the
 search values from search bar

---
 .../static/src/js/self_service_search_sort.js            | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/g2p_self_service_portal/static/src/js/self_service_search_sort.js b/g2p_self_service_portal/static/src/js/self_service_search_sort.js
index e0fea8d..4f0f6f7 100644
--- a/g2p_self_service_portal/static/src/js/self_service_search_sort.js
+++ b/g2p_self_service_portal/static/src/js/self_service_search_sort.js
@@ -78,18 +78,13 @@ searchInput.addEventListener("input", function (event) {
         const cells = row.cells;
         const cell = cells[1];
 
-        if (cell.innerText.toLowerCase().indexOf(searchValue) > -1) {
+        if (cell && cell.innerText.toLowerCase().indexOf(searchValue) > -1) {
             row.style.display = "";
         } else {
             row.style.display = "none";
         }
     }
-
-    if (searchValue || searchInput === document.activeElement) {
-        searchClear.style.display = "block";
-    } else {
-        searchClear.style.display = "none";
-    }
+    searchClear.style.display = searchValue ? "block" : "none";
 });
 
 searchInput.addEventListener("focusout", function () {

From 3e92103501cbc24270afbb74c2928d9f40c56916 Mon Sep 17 00:00:00 2001
From: Ramakrishna Vellala <itsp.kadapa@yahoo.com>
Date: Wed, 26 Jul 2023 09:45:19 +0530
Subject: [PATCH 3/4] G2P-925 Sorting issue rectified

---
 .../static/src/js/self_service_search_sort.js          |  8 ++++++--
 .../static/src/js/self_service_search_sort_all.js      | 10 +++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/g2p_self_service_portal/static/src/js/self_service_search_sort.js b/g2p_self_service_portal/static/src/js/self_service_search_sort.js
index 4f0f6f7..42fff20 100644
--- a/g2p_self_service_portal/static/src/js/self_service_search_sort.js
+++ b/g2p_self_service_portal/static/src/js/self_service_search_sort.js
@@ -20,8 +20,12 @@ headercells.forEach(function (th) {
     th.addEventListener("click", function () {
         const columnIndex = th.cellIndex;
         const rows = Array.from(table.rows).slice(1);
+        const firstColumn = rows.map((row) => row.cells[0]);
         // Determine the data type for this column
-
+        if (columnIndex === 0) {
+            return;
+        }
+        rows.forEach((row) => row.removeChild(row.cells[0]));
         let dataType = "text";
         const firstRow = rows[0];
         const firstCell = firstRow.cells[columnIndex];
@@ -59,7 +63,7 @@ headercells.forEach(function (th) {
 
             return comparison;
         });
-
+        rows.forEach((row, index) => row.insertBefore(firstColumn[index], row.cells[0]));
         sortOrder = sortOrder === "asc" ? "desc" : "asc";
 
         table.tBodies[0].append(...rows);
diff --git a/g2p_self_service_portal/static/src/js/self_service_search_sort_all.js b/g2p_self_service_portal/static/src/js/self_service_search_sort_all.js
index 0ca80f8..8d2dfb3 100644
--- a/g2p_self_service_portal/static/src/js/self_service_search_sort_all.js
+++ b/g2p_self_service_portal/static/src/js/self_service_search_sort_all.js
@@ -106,6 +106,14 @@ allheadercells.forEach(function (th) {
     let sortOrder = "asc";
     th.addEventListener("click", function () {
         const columnIndex = th.cellIndex;
+        const firstColumn = allRows.map((row) => row.cells[0]);
+
+        // Skip sorting if it's the first column
+        if (columnIndex === 0) {
+            return;
+        }
+        allRows.forEach((row) => row.removeChild(row.cells[0]));
+
         allRows.sort(function (a, b) {
             const aCellValue = a.cells[columnIndex].innerText;
             const bCellValue = b.cells[columnIndex].innerText;
@@ -122,7 +130,7 @@ allheadercells.forEach(function (th) {
             }
             return comparison;
         });
-
+        allRows.forEach((row, index) => row.insertBefore(firstColumn[index], row.cells[0]));
         sortOrder = sortOrder === "asc" ? "desc" : "asc";
         allRows.forEach(function (row) {
             alltable.tBodies[0].appendChild(row);

From 6ad07e8b8248a3020804078357a7b62f40b86752 Mon Sep 17 00:00:00 2001
From: Ramakrishna Vellala <itsp.kadapa@yahoo.com>
Date: Wed, 26 Jul 2023 17:13:43 +0530
Subject: [PATCH 4/4] G2P-753 changed my programs to my applications

---
 .../static/src/js/self_service_search_sort.js          |  8 +-------
 .../static/src/js/self_service_search_sort_all.js      | 10 +---------
 .../views/g2p_self_service_dashboard.xml               |  2 +-
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/g2p_self_service_portal/static/src/js/self_service_search_sort.js b/g2p_self_service_portal/static/src/js/self_service_search_sort.js
index 42fff20..907c017 100644
--- a/g2p_self_service_portal/static/src/js/self_service_search_sort.js
+++ b/g2p_self_service_portal/static/src/js/self_service_search_sort.js
@@ -20,12 +20,8 @@ headercells.forEach(function (th) {
     th.addEventListener("click", function () {
         const columnIndex = th.cellIndex;
         const rows = Array.from(table.rows).slice(1);
-        const firstColumn = rows.map((row) => row.cells[0]);
         // Determine the data type for this column
-        if (columnIndex === 0) {
-            return;
-        }
-        rows.forEach((row) => row.removeChild(row.cells[0]));
+
         let dataType = "text";
         const firstRow = rows[0];
         const firstCell = firstRow.cells[columnIndex];
@@ -63,9 +59,7 @@ headercells.forEach(function (th) {
 
             return comparison;
         });
-        rows.forEach((row, index) => row.insertBefore(firstColumn[index], row.cells[0]));
         sortOrder = sortOrder === "asc" ? "desc" : "asc";
-
         table.tBodies[0].append(...rows);
     });
 });
diff --git a/g2p_self_service_portal/static/src/js/self_service_search_sort_all.js b/g2p_self_service_portal/static/src/js/self_service_search_sort_all.js
index 8d2dfb3..0ca80f8 100644
--- a/g2p_self_service_portal/static/src/js/self_service_search_sort_all.js
+++ b/g2p_self_service_portal/static/src/js/self_service_search_sort_all.js
@@ -106,14 +106,6 @@ allheadercells.forEach(function (th) {
     let sortOrder = "asc";
     th.addEventListener("click", function () {
         const columnIndex = th.cellIndex;
-        const firstColumn = allRows.map((row) => row.cells[0]);
-
-        // Skip sorting if it's the first column
-        if (columnIndex === 0) {
-            return;
-        }
-        allRows.forEach((row) => row.removeChild(row.cells[0]));
-
         allRows.sort(function (a, b) {
             const aCellValue = a.cells[columnIndex].innerText;
             const bCellValue = b.cells[columnIndex].innerText;
@@ -130,7 +122,7 @@ allheadercells.forEach(function (th) {
             }
             return comparison;
         });
-        allRows.forEach((row, index) => row.insertBefore(firstColumn[index], row.cells[0]));
+
         sortOrder = sortOrder === "asc" ? "desc" : "asc";
         allRows.forEach(function (row) {
             alltable.tBodies[0].appendChild(row);
diff --git a/g2p_self_service_portal/views/g2p_self_service_dashboard.xml b/g2p_self_service_portal/views/g2p_self_service_dashboard.xml
index 5c54841..d63a465 100644
--- a/g2p_self_service_portal/views/g2p_self_service_dashboard.xml
+++ b/g2p_self_service_portal/views/g2p_self_service_dashboard.xml
@@ -27,7 +27,7 @@
                     </div> -->
                     <div class="table-container">
                         <div class="table-head-container">
-                            <p class="table-title">My Programs</p>
+                            <p class="table-title">My Applications</p>
                             <form class="form-inline my-2 my-lg-0" action="/selfservice/home">
                                 <div class="search-box">
                                     <svg