From 5ecdb4f2f42e100cfb45cef3beeada79ff0eab77 Mon Sep 17 00:00:00 2001
From: Henri Queneau <henri.queneau@maarch.org>
Date: Fri, 5 May 2017 18:18:03 +0200
Subject: [PATCH] FEAT #5487 add tooltipster
---
.../reports/report_by_period.php | 1 +
modules/entities/entity_late_mail.php | 3 ++-
modules/entities/entity_process_delay.php | 3 ++-
modules/entities/entity_response_rate_stat.php | 3 ++-
modules/reports/js/functions.js | 15 ++++++++-------
5 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/apps/maarch_entreprise/reports/report_by_period.php b/apps/maarch_entreprise/reports/report_by_period.php
index d0e1c930d57..b492b2fe5e2 100644
--- a/apps/maarch_entreprise/reports/report_by_period.php
+++ b/apps/maarch_entreprise/reports/report_by_period.php
@@ -110,6 +110,7 @@ $content .='<div id="params">';
$content.=$entities[$i]['LABEL']."</option>";
}
$content.='</select><input type="checkbox" title="'._INCLUDE_SUB_ENTITIES.'" name="sub_entities" id="sub_entities" />';
+ $content .= '<script>$j(document).ready(function() {$j("#sub_entities").tooltipster();});</script>';
$js .= 'new Chosen($(\'entities_chosen\'),{width: "95%", disable_search_threshold: 10, search_contains: true});';
$content.= '<br/><br/>';
}
diff --git a/modules/entities/entity_late_mail.php b/modules/entities/entity_late_mail.php
index 386e90ab074..4bdc7d0446a 100755
--- a/modules/entities/entity_late_mail.php
+++ b/modules/entities/entity_late_mail.php
@@ -84,7 +84,8 @@ $content .='<div id="params">';
$content.=$entities[$i]['LABEL']."</option>";
}
$content.='</select>';
- $content .='<input type="checkbox" title="'._INCLUDE_SUB_ENTITIES.'" name="sub_entities" id="sub_entities" />';
+ $content .='<input type="checkbox" title="'._INCLUDE_SUB_ENTITIES.'" name="sub_entities" id="sub_entities" />';
+ $content .= '<script>$j(document).ready(function() {$j("#sub_entities").tooltipster();});</script>';
$js .= 'new Chosen($(\'entities_chosen\'),{width: "95%", disable_search_threshold: 10, search_contains: true});';
$content.= '<br/><br/>';
$status_obj = new manage_status();
diff --git a/modules/entities/entity_process_delay.php b/modules/entities/entity_process_delay.php
index 436eb001a64..a8b903962f8 100755
--- a/modules/entities/entity_process_delay.php
+++ b/modules/entities/entity_process_delay.php
@@ -84,7 +84,8 @@ $content .='<div id="params">';
$content.=$entities[$i]['LABEL']."</option>";
}
$content.='</select>';
- $content .='<input type="checkbox" title="'._INCLUDE_SUB_ENTITIES.'" name="sub_entities" id="sub_entities" />';
+ $content .='<input type="checkbox" title="'._INCLUDE_SUB_ENTITIES.'" name="sub_entities" id="sub_entities" />';
+ $content .= '<script>$j(document).ready(function() {$j("#sub_entities").tooltipster();});</script>';
$js .= 'new Chosen($(\'entities_chosen\'),{width: "95%", disable_search_threshold: 10, search_contains: true});';
$content.= '<br/><br/>';
$status_obj = new manage_status();
diff --git a/modules/entities/entity_response_rate_stat.php b/modules/entities/entity_response_rate_stat.php
index 63e7d5f44a5..5f70201f0e8 100755
--- a/modules/entities/entity_response_rate_stat.php
+++ b/modules/entities/entity_response_rate_stat.php
@@ -84,7 +84,8 @@ $content .='<div id="params">';
$content .= $entities[$i]['LABEL']."</option>";
}
$content.='</select>';
- $content .='<input type="checkbox" title="'._INCLUDE_SUB_ENTITIES.'" name="sub_entities" id="sub_entities" />';
+ $content .='<input type="checkbox" title="'._INCLUDE_SUB_ENTITIES.'" name="sub_entities" id="sub_entities" />';
+ $content .= '<script>$j(document).ready(function() {$j("#sub_entities").tooltipster();});</script>';
$js .= 'new Chosen($(\'entities_chosen\'),{width: "95%", disable_search_threshold: 10, search_contains: true});';
$content.= '<br/><br/>';
$status_obj = new manage_status();
diff --git a/modules/reports/js/functions.js b/modules/reports/js/functions.js
index 3c3bdd3bbda..94806c32cf0 100644
--- a/modules/reports/js/functions.js
+++ b/modules/reports/js/functions.js
@@ -17,16 +17,17 @@ function fill_report_result(url_report)
}
}
//console.log(fct_args);
- new Ajax.Request(url_report,
+ $j.ajax(
{
- method:'post',
- parameters: { arguments : fct_args
+ url : url_report,
+ type : 'POST',
+ data: { arguments : fct_args
},
- onSuccess: function(answer){
+ success: function(answer){
//alert(answer.responseText);
- eval("response = "+answer.responseText);
- var div_to_fill = $('result_report');
- div_to_fill.innerHTML = response.content;
+ eval("response = "+answer);
+ var div_to_fill = $j('#result_report');
+ div_to_fill.html(response.content);
eval(response.exec_js);
}
});
--
GitLab