Skip to content

Commit eb9aa9c

Browse files
committed
Bump version
1 parent 288ab05 commit eb9aa9c

3 files changed

Lines changed: 9 additions & 7 deletions

File tree

inc/dashboard.class.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,7 @@ function addDateCriteria(&$query, $dateBegin, $dateEnd){
242242

243243
// Survey not answered
244244
$query = "SELECT count(*) as nb FROM " . TicketSatisfaction::getTable();
245-
$query .= " WHERE 1=1";
246-
$query .= " AND date_answered IS NULL";
245+
$query .= " WHERE date_answered IS NULL";
247246
addDateCriteria($query, $opt['begin'], $opt['end']);
248247

249248
$result = $DB->query($query);
@@ -256,8 +255,7 @@ function addDateCriteria(&$query, $dateBegin, $dateEnd){
256255

257256
// Survey answered
258257
$query = "SELECT count(DISTINCT tickets_id) as nb FROM " . TicketSatisfaction::getTable();
259-
$query .= " WHERE 1=1";
260-
$query .= " AND date_answered IS NOT NULL";
258+
$query .= " WHERE date_answered IS NOT NULL";
261259
addDateCriteria($query, $opt['begin'], $opt['end']);
262260

263261
$result = $DB->query($query);
@@ -270,8 +268,7 @@ function addDateCriteria(&$query, $dateBegin, $dateEnd){
270268

271269
// Global satisfaction
272270
$query = "SELECT AVG(satisfaction) as nb FROM " . TicketSatisfaction::getTable();
273-
$query .= " WHERE 1=1";
274-
$query .= " AND date_answered IS NOT NULL";
271+
$query .= " WHERE date_answered IS NOT NULL";
275272
addDateCriteria($query, $opt['begin'], $opt['end']);
276273

277274
$result = $DB->query($query);

satisfaction.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,11 @@
8888
<author>Infotel</author>
8989
</authors>
9090
<versions>
91+
<version>
92+
<num>1.6.0</num>
93+
<compatibility>~10.0</compatibility>
94+
<download_url>https://github.com/pluginsGLPI/satisfaction/releases/download/1.6.0/glpi-satisfaction-1.6.0.tar.bz2</download_url>
95+
</version>
9196
<version>
9297
<num>1.6.0-rc1</num>
9398
<compatibility>~10.0</compatibility>

setup.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* Init the hooks of the plugins -Needed
3232
*/
3333

34-
define ("PLUGIN_SATISFACTION_VERSION", "1.6.0-rc1");
34+
define ("PLUGIN_SATISFACTION_VERSION", "1.6.0");
3535

3636
// Minimal GLPI version, inclusive
3737
define('PLUGIN_SATISFACTION_MIN_GLPI', '10.0');

0 commit comments

Comments
 (0)