Merge pull request #74 from RamakrishnaVellala/15.0-develop-pilot001

G2P-272, G2P-277,G2P-753 Bugs
OpenG2P · Jul 26, 2023 · 727785d · 727785d
2 parents b08053c + 6ad07e8
commit 727785d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 14 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
@@ -59,9 +59,7 @@ headercells.forEach(function (th) {
 
  return comparison;
  });
-
  sortOrder = sortOrder === "asc" ? "desc" : "asc";
-
  table.tBodies[0].append(...rows);
  });
 });
@@ -78,18 +76,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 () {

diff --git 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,10 +24,10 @@
  </span>
  </div>
  </div>
- </div>
+ </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
@@ -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>