From 5ca10bbfaeddd7b8b6c5243c2f4bd84354947e5b Mon Sep 17 00:00:00 2001
From: Matthieu Leproux <leproux.matthieu@gmail.com>
Date: Mon, 20 Sep 2021 15:06:21 +0200
Subject: [PATCH] related to #1465 added hover on ip and user name +
 adjustments for labels and translation

---
 admin/themes/default/js/history.js        | 26 +++++++++++++++++++----
 admin/themes/default/template/history.tpl | 14 ++++++++++--
 include/ws_functions/pwg.php              |  3 ---
 language/en_UK/admin.lang.php             |  3 ++-
 language/fr_FR/admin.lang.php             |  3 ++-
 5 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/admin/themes/default/js/history.js b/admin/themes/default/js/history.js
index 5b0f71204..f73365a92 100644
--- a/admin/themes/default/js/history.js
+++ b/admin/themes/default/js/history.js
@@ -1,6 +1,7 @@
 $(document).ready(() => {
 
   activateLineOptions();
+  checkFilters();
 
   $(".elem-type-select").on("change", function (e) {
     console.log($(".elem-type-select option:selected").attr("value"));
@@ -71,6 +72,11 @@ $(document).ready(() => {
     current_param.pageNumber -= 1;
     fillHistoryResult(current_param);
   });
+
+  $(".refresh-results").on("click", function () {
+    $(this).addClass("animate-spin")
+    fillHistoryResult(current_param);
+  })
 })
 
 function activateLineOptions() {
@@ -130,6 +136,7 @@ function fillHistoryResult(ajaxParam) {
     activateLineOptions();
     $(".loading").addClass("hide");
     updatePagination(maxPage);
+    $(".refresh-results").removeClass("animate-spin")
   })
 }
 
@@ -303,10 +310,11 @@ function addUserFilter(username) {
     current_param.user = "-1";
     current_param.pageNumber = 0;
     fillHistoryResult(current_param);
-
+    checkFilters();
   })
 
   $(".filter-container").append(newFilter);
+  checkFilters();
 }
 
 function addIpFilter(ip) {
@@ -322,16 +330,17 @@ function addIpFilter(ip) {
     current_param.ip = "";
     current_param.pageNumber = 0;
     fillHistoryResult(current_param);
-
+    checkFilters();
   })
 
   $(".filter-container").append(newFilter);
+  checkFilters();
 }
 
 function addImageFilter(img_id) {
   var newFilter = $("#default-filter").clone();
   newFilter.removeClass("hide");
-
+  
   newFilter.find(".filter-title").html("Image #" + img_id);
   newFilter.find(".filter-icon").addClass("icon-picture");
 
@@ -341,10 +350,11 @@ function addImageFilter(img_id) {
     current_param.image_id = "";
     current_param.pageNumber = 0;
     fillHistoryResult(current_param);
-
+    checkFilters();
   })
 
   $(".filter-container").append(newFilter);
+  checkFilters();
 }
 
 function updateArrows(actualPage, maxPage) {
@@ -369,3 +379,11 @@ function updatePagination(maxPage) {
     "<a class='actual'>"+ (current_param.pageNumber+1) +"</a>"
   )
 }
+
+function checkFilters() {
+  if ($(".filter-container")[0].childElementCount - 1 > 0) { //Check if there are filters
+    $(".filter-tags label").show();
+  } else {
+    $(".filter-tags label").hide();
+  }
+}
\ No newline at end of file
diff --git a/admin/themes/default/template/history.tpl b/admin/themes/default/template/history.tpl
index 0acec9f88..d514bba8c 100644
--- a/admin/themes/default/template/history.tpl
+++ b/admin/themes/default/template/history.tpl
@@ -73,7 +73,7 @@ const str_recent_pics = "{'Recent photos'|translate}";
     </div>
     <div class="filter-part elem-type advanced-filter-select-container">
       <label>
-        {'Element type'|@translate}
+        {'Action'|@translate}
         <select name="types[]" class="elem-type-select user-action-select advanced-filter-select">
           {* {html_options values=$type_option_values output=$type_option_values|translate selected=$type_option_selected} *}
           <option value=""></option>
@@ -92,6 +92,8 @@ const str_recent_pics = "{'Recent photos'|translate}";
       </div>
     </div>
   </div>
+  <div class="refresh-results icon-arrows-cw tiptip" title="{'Refresh'|translate}">
+  </div>
 </fieldset>
 </form>
 
@@ -123,7 +125,7 @@ const str_recent_pics = "{'Recent photos'|translate}";
         {'User'|translate}
     </div>
     <div class="type-title">
-        {'Type'|translate}
+        {'Object'|translate}
     </div>
     <div class="detail-title">
         {'Details'|translate}
@@ -265,6 +267,14 @@ jQuery(document).ready( function() {
   font-weight: bold;
 }
 
+.refresh-results {
+  margin-left: auto;
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  font-size: 17px;
+}
+
 .history-filter {
   background: #f3f3f3;
   display: flex;
diff --git a/include/ws_functions/pwg.php b/include/ws_functions/pwg.php
index 55697879d..77d54865a 100644
--- a/include/ws_functions/pwg.php
+++ b/include/ws_functions/pwg.php
@@ -971,13 +971,10 @@ SELECT
   $result = array_reverse($result, true);
   $result = array_slice($result, $param['pageNumber']*100, 100);
 
-  /* Tableau associatif here cf ws_images_search*/
   return array(
     'lines' => $result,
     'params'  => $param,
     'maxPage' => $max_page
   );
-  
-  // [$result, $param, $max_page];
 }
 ?>
\ No newline at end of file
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 17aa7ad7d..3fbd4d56f 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -1262,4 +1262,5 @@ $lang['Tag name'] = 'Tag name';
 
 $lang['Visited'] = 'Visited';
 $lang['Downloaded'] = 'Downloaded';
-$lang['Personnalized filters'] = 'Personnalized filters';
\ No newline at end of file
+$lang['Personnalized filters'] = 'Personnalized filters';
+$lang['Object'] = 'Object';
\ No newline at end of file
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 030ce69d3..4d0a3fc9c 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -1264,4 +1264,5 @@ $lang['Tag name'] = 'Nom du tag';
 
 $lang['Visited'] = 'Visité';
 $lang['Downloaded'] = 'Téléchargé';
-$lang['Personnalized filters'] = 'Filtres personnalisés';
\ No newline at end of file
+$lang['Personnalized filters'] = 'Filtres personnalisés';
+$lang['Object'] = 'Objet';
\ No newline at end of file