diff --git a/inc/dashboard.class.php b/inc/dashboard.class.php index cd2eacb..dac4e42 100644 --- a/inc/dashboard.class.php +++ b/inc/dashboard.class.php @@ -190,7 +190,10 @@ function satisfactionSurvey($widgetId, $opt = []) { // Recover survey associed to current entity $pluginSatisfactionSurvey = new PluginSatisfactionSurvey(); - if (!$pluginSatisfactionSurvey->getFromDBByCrit(['entities_id' => $_SESSION['glpiactive_entity']])) { + if (!$pluginSatisfactionSurvey->getFromDBByCrit([ + 'entities_id' => $_SESSION['glpiactive_entity'], + 'is_active' => 1 + ])) { $content.= '
'; $content.= '

'; $content.= '

'.__("There are no survey for current entity", "satisfaction").'

'; @@ -216,7 +219,7 @@ function addDateCriteria(&$query, $dateBegin, $dateEnd){ // Number of satisfaction survey $query = "SELECT count(*) as nb FROM " . TicketSatisfaction::getTable(); - $query .= " WHERE type = " . $pluginSatisfactionSurvey->getID(); + $query .= " WHERE 1=1"; addDateCriteria($query, $opt['begin'], $opt['end']); $result = $DB->query($query); @@ -229,7 +232,7 @@ function addDateCriteria(&$query, $dateBegin, $dateEnd){ // Number of concerned tickets $query = "SELECT count(DISTINCT tickets_id) as nb FROM " . TicketSatisfaction::getTable(); - $query .= " WHERE type = " . $pluginSatisfactionSurvey->getID(); + $query .= " WHERE 1=1"; addDateCriteria($query, $opt['begin'], $opt['end']); $result = $DB->query($query); @@ -242,7 +245,7 @@ function addDateCriteria(&$query, $dateBegin, $dateEnd){ // Survey not answered $query = "SELECT count(*) as nb FROM " . TicketSatisfaction::getTable(); - $query .= " WHERE type = " . $pluginSatisfactionSurvey->getID(); + $query .= " WHERE 1=1"; $query .= " AND date_answered IS NULL"; addDateCriteria($query, $opt['begin'], $opt['end']); @@ -256,7 +259,7 @@ function addDateCriteria(&$query, $dateBegin, $dateEnd){ // Survey answered $query = "SELECT count(DISTINCT tickets_id) as nb FROM " . TicketSatisfaction::getTable(); - $query .= " WHERE type = " . $pluginSatisfactionSurvey->getID(); + $query .= " WHERE 1=1"; $query .= " AND date_answered IS NOT NULL"; addDateCriteria($query, $opt['begin'], $opt['end']); @@ -270,7 +273,7 @@ function addDateCriteria(&$query, $dateBegin, $dateEnd){ // Global satisfaction $query = "SELECT AVG(satisfaction) as nb FROM " . TicketSatisfaction::getTable(); - $query .= " WHERE type = " . $pluginSatisfactionSurvey->getID(); + $query .= " WHERE 1=1"; $query .= " AND date_answered IS NOT NULL"; addDateCriteria($query, $opt['begin'], $opt['end']);