diff --git a/Matomat/Model/History.cs b/Matomat/Model/History.cs index 0afe532..27cab24 100644 --- a/Matomat/Model/History.cs +++ b/Matomat/Model/History.cs @@ -119,7 +119,7 @@ namespace Matomat.Model return ret; } - public static Tuple GetDrunkProductsSum(User u, Product item, bool lastMonth) + public static Tuple GetDrunkProductsSum(User u, Product p, bool lastMonth) { DBQuery query = Factory.getDBO().getQuery(true); query.select("COUNT(*) AS " + Factory.getDBO().quoteName("boddles")); @@ -127,6 +127,7 @@ namespace Matomat.Model query.from(Factory.getDBO().quoteName("history", "h")); query.leftJoin(Factory.getDBO().quoteName("product", "p") + " ON " + Factory.getDBO().quoteName("p.id") + " = " + Factory.getDBO().quoteName("h.prod")); query.where(Factory.getDBO().quoteName("h.user") + " = " + Factory.getDBO().quote(u.GetId().ToString())); + query.where(Factory.getDBO().quoteName("h.prod") + " = " + Factory.getDBO().quote(p.GetId().ToString())); if (lastMonth) { query.where(Factory.getDBO().quoteName("h.time") + " >= DATE_SUB(NOW(),INTERVAL 30 DAY)"); @@ -142,7 +143,7 @@ namespace Matomat.Model return new Tuple(int.Parse(row[0].ToString()), double.Parse(row[1].ToString()) / 1000); } - public static List GetDrunkProductsChart(User u, Product item, bool lastMonth, int days = 30) + public static List GetDrunkProductsChart(User u, Product p, bool lastMonth, int days = 30) { DBQuery query = Factory.getDBO().getQuery(true); query.select(Factory.getDBO().quoteName("h.prod", "product")); @@ -150,6 +151,7 @@ namespace Matomat.Model query.from(Factory.getDBO().quoteName("history", "h")); query.order(Factory.getDBO().quoteName("h.time")+" ASC"); query.where(Factory.getDBO().quoteName("h.user") + " = " + Factory.getDBO().quote(u.GetId().ToString())); + query.where(Factory.getDBO().quoteName("h.prod") + " = " + Factory.getDBO().quote(p.GetId().ToString())); if (lastMonth) { query.where(Factory.getDBO().quoteName("h.time") + " >= DATE_SUB(NOW(),INTERVAL 30 DAY)"); diff --git a/Matomat/Program.cs b/Matomat/Program.cs index 744eea0..6f32bf6 100644 --- a/Matomat/Program.cs +++ b/Matomat/Program.cs @@ -17,7 +17,7 @@ namespace Matomat public static void Main(string[] args) { - test(); + //test(); InitMainThread(); Thread t = new Thread(MainThread); t.Start();