From 7fa8fc343fe628e226126fab7b5c307224c5515b Mon Sep 17 00:00:00 2001 From: NextGestion Date: Thu, 30 Jun 2022 12:28:02 +0000 Subject: [PATCH 1/6] Add input "Search" to multiSelectArrayWithCheckbox() function --- htdocs/core/class/html.form.class.php | 7 +++++++ htdocs/core/js/lib_foot.js.php | 1 + 2 files changed, 8 insertions(+) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index d30eb562feb..ab32b9658d2 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -8387,6 +8387,7 @@ class Form
    +
    • '.$listoffieldsforselection.'
@@ -8410,6 +8411,12 @@ class Form // Now, we submit page //$(this).parents(\'form:first\').submit(); }); + $("input.inputsearch_dropdownselectedfields").on("keyup", function() { + var value = $(this).val().toLowerCase(); + $(\'.multiselectcheckbox'.$htmlname.' li > label\').filter(function() { + $(this).parent().toggle($(this).text().toLowerCase().indexOf(value) > -1) + }); + }); }); diff --git a/htdocs/core/js/lib_foot.js.php b/htdocs/core/js/lib_foot.js.php index 9167e08e599..53ddabfce62 100644 --- a/htdocs/core/js/lib_foot.js.php +++ b/htdocs/core/js/lib_foot.js.php @@ -108,6 +108,7 @@ if (!defined('JS_JQUERY_DISABLE_DROPDOWN')) { // Click onto the link "link to" or "hamburger", toggle dropdown $(document).on(\'click\', \'.dropdown dt a\', function () { console.log("toggle dropdown dt a"); + setTimeout(() => { $(\'.inputsearch_dropdownselectedfields\').focus(); }, 200); //$(this).parent().parent().find(\'dd ul\').slideToggle(\'fast\'); $(this).parent().parent().find(\'dd ul\').toggleClass("open"); From e3f59dea49fdda5e13f41a9b3d6e2992b72d3558 Mon Sep 17 00:00:00 2001 From: NextGestion Date: Fri, 26 Aug 2022 17:42:47 +0000 Subject: [PATCH 2/6] Fix php warning --- htdocs/adherents/class/adherent.class.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 5ecf5069915..60a56efdb46 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -272,6 +272,10 @@ class Adherent extends CommonObject public $first_subscription_date; + public $first_subscription_date_start; + + public $first_subscription_date_end; + public $first_subscription_amount; public $last_subscription_date; From 69df4a74cecf08aa95be560c81b82728d6076c2d Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Fri, 26 Aug 2022 16:48:26 +0000 Subject: [PATCH 3/6] Fixing style errors. --- htdocs/adherents/class/adherent.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 60a56efdb46..cc7b59da750 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -273,7 +273,7 @@ class Adherent extends CommonObject public $first_subscription_date; public $first_subscription_date_start; - + public $first_subscription_date_end; public $first_subscription_amount; From 7c18830ffab83e0b9f1509bf806bf7a387b30105 Mon Sep 17 00:00:00 2001 From: NextGestion Date: Fri, 26 Aug 2022 18:29:30 +0000 Subject: [PATCH 4/6] Addapt file html.form.class.php to the latest version --- htdocs/core/class/html.form.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 4abb480af28..391462c98c0 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -8412,7 +8412,7 @@ class Form
-
    +
      • '.$listoffieldsforselection.'
    From 6b9214cf90762047b61b7f7f0bdec38bb6f8c9e3 Mon Sep 17 00:00:00 2001 From: NextGestion Date: Fri, 26 Aug 2022 19:05:55 +0000 Subject: [PATCH 5/6] Remove dol_escape_js from inputsearch_dropdownselectedfields input search --- htdocs/core/class/html.form.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 391462c98c0..582e0d4c20f 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -8413,7 +8413,7 @@ class Form
      -
      • +
      • '.$listoffieldsforselection.'
    From 97aae20edc9ce3fc74a3d25160244e85ae7901d3 Mon Sep 17 00:00:00 2001 From: NextGestion Date: Thu, 15 Sep 2022 18:34:26 +0000 Subject: [PATCH 6/6] =?UTF-8?q?Fixer=20erreur=20dans=20Liste=20des=20adh?= =?UTF-8?q?=C3=A9rents=20+=20erreur=20dans=20Temps=20consomm=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/adherents/list.php | 2 +- htdocs/projet/tasks/time.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php index b0e63098322..4b1857e1f8c 100644 --- a/htdocs/adherents/list.php +++ b/htdocs/adherents/list.php @@ -391,7 +391,7 @@ if ($search_status != '') { // Peut valoir un nombre ou liste de nombre separes par virgules $sql .= " AND d.statut in (".$db->sanitize($db->escape($search_status)).")"; } -if ($search_morphy != '') { +if ($search_morphy != '' && $search_morphy != '-1') { $sql .= natural_search("d.morphy", $search_morphy); } if ($search_ref) { diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php index 9e5e9c8618d..ab56a5a7f9c 100644 --- a/htdocs/projet/tasks/time.php +++ b/htdocs/projet/tasks/time.php @@ -1668,7 +1668,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser print ''; $durationtouse = (GETPOST('timespent_duration') ? GETPOST('timespent_duration') : ''); if (GETPOSTISSET('timespent_durationhour') || GETPOSTISSET('timespent_durationmin')) { - $durationtouse = (GETPOST('timespent_durationhour') * 3600 + GETPOST('timespent_durationmin') * 60); + $durationtouse = ((int) GETPOST('timespent_durationhour') * 3600 + (int) GETPOST('timespent_durationmin') * 60); } print $form->select_duration('timespent_duration', $durationtouse, 0, 'text'); print '';