Merge branch 'dev' into 128-remove-reason-col

NASA-IMPACT · Jun 10, 2024 · 67de664 · 67de664
2 parents 2485ffc + 2f07efb
commit 67de664
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 41 deletions.
diff --git a/sde_indexing_helper/static/css/project.css b/sde_indexing_helper/static/css/project.css
@@ -522,7 +522,9 @@ box-shadow: 0px 8px 16px 0px #0037FA4D;
 
 .footer {
   width: 93%;
-  height: 6rem;
+  font-weight: 500;
+  padding: 0;
+  padding-top: 40px;
 }
 
 .footer-container {
@@ -532,6 +534,8 @@ box-shadow: 0px 8px 16px 0px #0037FA4D;
     justify-content: space-between;
     align-items: center;
     padding: 0;
+    padding-top: 25px;
+    padding-bottom: 65px;
 }
 
 .footer-right-side-links {

diff --git a/sde_indexing_helper/static/js/candidate_url_list.js b/sde_indexing_helper/static/js/candidate_url_list.js
@@ -373,19 +373,13 @@ function initializeDataTable() {
     ],
   });
 
-  $("#candidateMatchPatternFilter").on(
-    "keyup",
-    DataTable.util.debounce(function (val) {
-      exclude_patterns_table.columns(0).search(this.value).draw();
-    }, 1000)
-  );
+  $("#candidateMatchPatternFilter").on("keyup", function () {
+    exclude_patterns_table.columns(0).search(this.value).draw();
+  });
 
-  $("#candidateReasonFilter").on(
-    "keyup",
-    DataTable.util.debounce(function (val) {
-      exclude_patterns_table.columns(2).search(this.value).draw();
-    }, 1000)
-  );
+  $("#candidateReasonFilter").on("keyup", function () {
+    exclude_patterns_table.columns(2).search(this.value).draw();
+  });
 
   var include_patterns_table = $("#include_patterns_table").DataTable({
     // scrollY: true,
@@ -459,12 +453,9 @@ function initializeDataTable() {
     ],
   });
 
-  $("#candidateIncludeMatchPatternFilter").on(
-    "keyup",
-    DataTable.util.debounce(function (val) {
-      include_patterns_table.columns(0).search(this.value).draw();
-    }, 1000)
-  );
+  $("#candidateIncludeMatchPatternFilter").on("keyup", function () {
+    include_patterns_table.columns(0).search(this.value).draw();
+  });
 
   var title_patterns_table = $("#title_patterns_table").DataTable({
     // scrollY: true,
@@ -540,19 +531,13 @@ function initializeDataTable() {
     ],
   });
 
-  $("#candidateTitleMatchPatternFilter").on(
-    "keyup",
-    DataTable.util.debounce(function (val) {
-      title_patterns_table.columns(0).search(this.value).draw();
-    }, 1000)
-  );
+  $("#candidateTitleMatchPatternFilter").on("keyup", function (val) {
+    title_patterns_table.columns(0).search(this.value).draw();
+  });
 
-  $("#candidateTitlePatternTypeFilter").on(
-    "keyup",
-    DataTable.util.debounce(function (val) {
-      title_patterns_table.columns(2).search(this.value).draw();
-    }, 1000)
-  );
+  $("#candidateTitlePatternTypeFilter").on("keyup", function (val) {
+    title_patterns_table.columns(2).search(this.value).draw();
+  });
 
   var document_type_patterns_table = $(
     "#document_type_patterns_table"
@@ -660,12 +645,9 @@ function initializeDataTable() {
     ],
   });
 
-  $("#candidateDocTypeMatchPatternFilter").on(
-    "keyup",
-    DataTable.util.debounce(function (val) {
-      document_type_patterns_table.columns(0).search(this.value).draw();
-    }, 1000)
-  );
+  $("#candidateDocTypeMatchPatternFilter").on("keyup", function (val) {
+    document_type_patterns_table.columns(0).search(this.value).draw();
+  });
 }
 
 function handleTabsClick() {

diff --git a/sde_indexing_helper/templates/sde_collections/collection_detail.html b/sde_indexing_helper/templates/sde_collections/collection_detail.html
@@ -125,7 +125,7 @@ <h1 class="nameWrapper"><div class="collectionName" id="collectionName">{{ colle
                     <tr>
                         <th class="detailsHeader">Sinequa Configuration</th>
                         <td>
-                            <a class="urlStyle underline" href="{{ collection.sinequa_configuration }}" target="_blank">{{collection.sinequa_configuration }}</a>
+                            <a class="urlStyle underline"  href="{{ collection.sinequa_configuration }}" target="_blank">{{collection.sinequa_configuration }}</a>
                         </td>
                     </tr>
                     <tr>
@@ -167,7 +167,7 @@ <h1 class="nameWrapper"><div class="collectionName" id="collectionName">{{ colle
                                     <i class="material-icons">delete</i>
                                 </button>
                             </form>
-                            <a class="urlStyle" href="{{ required_url.url }}">&nbsp;{{ required_url.url }}</a>
+                            <a class="urlStyle" target="_blank" href="{{ required_url.url }}">&nbsp;{{ required_url.url }}</a>
                             </div>
                             {% empty %}
                             <p class="greyText">No required URLs yet</p>
@@ -200,9 +200,9 @@ <h1 class="nameWrapper"><div class="collectionName" id="collectionName">{{ colle
                         <td>
                             <div id="comment-form-container">
                                 {% if user.is_authenticated %}
-                                <form method="post" action="{% url 'sde_collections:detail' collection.pk %}">
+                                <form method="post" action="{% url 'sde_collections:detail' collection.pk %}" >
                                     {% csrf_token %}
-                                    <textarea name="text" class="form-control formBackground">{{ comment_form.text.value }}</textarea>
+                                    <textarea name="text" class="form-control formBackground" required>{{ comment_form.text.value }}</textarea>
                                     <button type="submit" name="comment_button" class="btn buttonColor">Submit</button>
                                 </form>
                                 {% else %}