##// END OF EJS Templates
Fixed: open/closed issue counts are always 0 on reports view (postgresql)...
Jean-Philippe Lang -
r548:515caa8f3732
parent child
Show More
@@ -1,32 +1,32
1 # redMine - project management software
1 # redMine - project management software
2 # Copyright (C) 2006 Jean-Philippe Lang
2 # Copyright (C) 2006 Jean-Philippe Lang
3 #
3 #
4 # This program is free software; you can redistribute it and/or
4 # This program is free software; you can redistribute it and/or
5 # modify it under the terms of the GNU General Public License
5 # modify it under the terms of the GNU General Public License
6 # as published by the Free Software Foundation; either version 2
6 # as published by the Free Software Foundation; either version 2
7 # of the License, or (at your option) any later version.
7 # of the License, or (at your option) any later version.
8 #
8 #
9 # This program is distributed in the hope that it will be useful,
9 # This program is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details.
12 # GNU General Public License for more details.
13 #
13 #
14 # You should have received a copy of the GNU General Public License
14 # You should have received a copy of the GNU General Public License
15 # along with this program; if not, write to the Free Software
15 # along with this program; if not, write to the Free Software
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17
17
18 module ReportsHelper
18 module ReportsHelper
19
19
20 def aggregate(data, criteria)
20 def aggregate(data, criteria)
21 a = 0
21 a = 0
22 data.each { |row|
22 data.each { |row|
23 match = 1
23 match = 1
24 criteria.each { |k, v|
24 criteria.each { |k, v|
25 match = 0 unless row[k].to_s == v.to_s
25 match = 0 unless (row[k].to_s == v.to_s) || (k == 'closed' && row[k] == (v == 0 ? "f" : "t"))
26 } unless criteria.nil?
26 } unless criteria.nil?
27 a = a + row["total"].to_i if match == 1
27 a = a + row["total"].to_i if match == 1
28 } unless data.nil?
28 } unless data.nil?
29 a
29 a
30 end
30 end
31
31
32 end
32 end
General Comments 0
You need to be logged in to leave comments. Login now