diff --git a/main/models.py b/main/models.py index 4d05c0d..ba49dcd 100755 --- a/main/models.py +++ b/main/models.py @@ -36,10 +36,10 @@ class OrderLine(models.Model): unit_price = models.FloatField() def __unicode__(self): - return "{1} {0} ({2} kr per)".format(self.product, self.amount, self.unit_price) + return u"{1} {0} ({2} kr per)".format(self.product, self.amount, self.unit_price) class Meta: - unique_together = ('order', 'product') + unique_together = ('order', 'product') class Transaction(models.Model): user = models.ForeignKey(User) @@ -47,7 +47,7 @@ class Transaction(models.Model): created = models.DateTimeField(auto_now_add=True) def __unicode__(self): - return "{0}: {1}: {2}".format(self.id, self.user, self.amount) + return "{0}: {1}: {2}".format(self.id, self.user, self.amount) class UserProfile(models.Model): user = models.OneToOneField(User) diff --git a/main/urls.py b/main/urls.py index 4203ee6..5dc01bf 100644 --- a/main/urls.py +++ b/main/urls.py @@ -8,8 +8,10 @@ urlpatterns = patterns('main.views', url(r'^stats/$', 'stats', name='stats'), url(r'^stats/orders/$', 'stats_orders', name='stats-orders'), url(r'^stats/orders/hourly$', 'stats_orders_hourly', name='stats-orders-hourly'), + url(r'^stats/orders/products_realtime$', 'stats_products_realtime', name='stats-products-realtime'), url(r'^stats/products/$', 'stats_products', name='stats-products'), url(r'^stats/products/(?P[0-9]+)/$', 'stats_products', name='stats-product'), url(r'^products/(?P[0-9]+)/$', 'products', name='json-product'), url(r'^products/$', 'products', name='json-products'), + url("", include('django_socketio.urls')) ) diff --git a/main/views.py b/main/views.py index 9200a60..40f89e3 100755 --- a/main/views.py +++ b/main/views.py @@ -3,6 +3,7 @@ from datetime import datetime from datetime import timedelta from itertools import groupby import simplejson as json +import time from django.contrib.auth import login, logout as auth_logout from django.contrib.auth.decorators import login_required @@ -171,7 +172,7 @@ def stats_product(product): per_user = sales.values('order__customer__first_name','order__customer__last_name').annotate(num=Sum('amount')).order_by('num').reverse() f_per_user = [] for row in per_user: - who = row['order__customer__first_name'] + " " + row['order__customer__last_name'][0] + who = row['order__customer__first_name'] + " " + row['order__customer__last_name'] num = row['num'] f_per_user.append([who, num]) response = { @@ -206,7 +207,7 @@ def stats_orders(request): per_user = Order.objects.values('customer__first_name','customer__last_name').annotate(num=Count('customer')).order_by('num').reverse() f_per_user = [] for row in per_user: - who = row['customer__first_name'] + " " + row['customer__last_name'][0] + who = row['customer__first_name'] + " " + row['customer__last_name'] num = row['num'] f_per_user.append([who, num]) return HttpResponse(json.dumps(f_per_user), content_type='application/javascript; charset=utf8') @@ -225,6 +226,31 @@ def stats_orders_hourly(request): 'total' : sum(f_hourly.values()), } return HttpResponse(json.dumps(response), content_type='application/javascript; charset=utf8') + +def stats_products_realtime(request): + end_time = datetime.now() + start_time = datetime.now() - timedelta(hours=24) + + order_lines = OrderLine.objects.filter(order__created__range=(start_time, end_time)).order_by("order__created") + products = {} + for order_line in order_lines: + order_time_in_milliseconds = int(time.mktime(order_line.order.created.timetuple()) * 1000) + if order_line.product not in products: + products[order_line.product] = [[order_time_in_milliseconds, order_line.amount]] + else: + prev_entry = products[order_line.product][-1] + products[order_line.product].append([order_time_in_milliseconds, prev_entry[1] + order_line.amount]) + + serialized_products = {} + for product, value in products.iteritems(): + serialized_products[product.name] = value + + response = { + 'products': serialized_products + } + + return HttpResponse(json.dumps(response), content_type='application/javascript; charset=utf8') + def logout(request): auth_logout(request) diff --git a/static/js/stats.js b/static/js/stats.js index 1a3f15e..6dfb428 100644 --- a/static/js/stats.js +++ b/static/js/stats.js @@ -4,6 +4,7 @@ $(document).ready(function() { var products_url = '/stats/products/'; var order_url = '/stats/orders/'; var order_hourly_url = '/stats/orders/hourly'; + var products_realtime_url = '/stats/orders/products_realtime' /* orders */ $.getJSON(order_url, function(data) { @@ -99,7 +100,7 @@ $(document).ready(function() { charts.push(new Highcharts.Chart(options)); } }); - /* orders hourly */ + /* orders hourly */ $.getJSON(order_hourly_url, function(data) { var render_to = 'order_hourly_chart'; @@ -139,7 +140,7 @@ $(document).ready(function() { column: { minPointLength: 3, }, - series: { + series: { groupPadding: 0, pointPadding: 0.05, }, @@ -151,4 +152,85 @@ $(document).ready(function() { }; charts.push(new Highcharts.Chart(options)); }); + + var products_realtime_chart = new Highcharts.Chart({ + chart: { + renderTo: 'products_realtime_chart' + }, + title: { + text: "Produkter solgt over tid" + }, + xAxis: { + type: "datetime" + }, + yAxis: { + title: { + text: "Antall solgt" + } + }, + + plotOptions: { + series: { + marker: { + radius: 3 + } + } + }, + + series: {} + }); + charts.push(products_realtime_chart); + + function parse_products_realtime_data(data) { + var chart = products_realtime_chart; + + for (product in data.products) { + if (chart.get(product) === null) { + chart.addSeries({ + data: [], + id: product, + name: product + }); + + var series = chart.get(product); + _.each(data.products[product], function(point) { + series.addPoint({ + id: point[0], + x: point[0], + y: point[1] + }); + }); + } + else { + var series = chart.get(product); + _.each(data.products[product], function(point) { + if (chart.get(point[0]) === null) { + series.addPoint({ + id: point[0], + x: point[0], + y: point[1] + }); + } + }); + } + } + } + + function get_products_realtime_data() { + var that = this; + $.ajax( { + url: products_realtime_url, + dataType: "json", + success: function (data) { + parse_products_realtime_data(data); + + setTimeout(function () { + get_products_realtime_data(); + }, 15000); + }, + cache: false + }); + } + + get_products_realtime_data(); }); diff --git a/static/js/underscore-min.js b/static/js/underscore-min.js new file mode 100644 index 0000000..5a0cb3b --- /dev/null +++ b/static/js/underscore-min.js @@ -0,0 +1,32 @@ +// Underscore.js 1.3.3 +// (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc. +// Underscore is freely distributable under the MIT license. +// Portions of Underscore are inspired or borrowed from Prototype, +// Oliver Steele's Functional, and John Resig's Micro-Templating. +// For all details and documentation: +// http://documentcloud.github.com/underscore +(function(){function r(a,c,d){if(a===c)return 0!==a||1/a==1/c;if(null==a||null==c)return a===c;a._chain&&(a=a._wrapped);c._chain&&(c=c._wrapped);if(a.isEqual&&b.isFunction(a.isEqual))return a.isEqual(c);if(c.isEqual&&b.isFunction(c.isEqual))return c.isEqual(a);var e=l.call(a);if(e!=l.call(c))return!1;switch(e){case "[object String]":return a==""+c;case "[object Number]":return a!=+a?c!=+c:0==a?1/a==1/c:a==+c;case "[object Date]":case "[object Boolean]":return+a==+c;case "[object RegExp]":return a.source== +c.source&&a.global==c.global&&a.multiline==c.multiline&&a.ignoreCase==c.ignoreCase}if("object"!=typeof a||"object"!=typeof c)return!1;for(var f=d.length;f--;)if(d[f]==a)return!0;d.push(a);var f=0,g=!0;if("[object Array]"==e){if(f=a.length,g=f==c.length)for(;f--&&(g=f in a==f in c&&r(a[f],c[f],d)););}else{if("constructor"in a!="constructor"in c||a.constructor!=c.constructor)return!1;for(var h in a)if(b.has(a,h)&&(f++,!(g=b.has(c,h)&&r(a[h],c[h],d))))break;if(g){for(h in c)if(b.has(c,h)&&!f--)break; +g=!f}}d.pop();return g}var s=this,I=s._,o={},k=Array.prototype,p=Object.prototype,i=k.slice,J=k.unshift,l=p.toString,K=p.hasOwnProperty,y=k.forEach,z=k.map,A=k.reduce,B=k.reduceRight,C=k.filter,D=k.every,E=k.some,q=k.indexOf,F=k.lastIndexOf,p=Array.isArray,L=Object.keys,t=Function.prototype.bind,b=function(a){return new m(a)};"undefined"!==typeof exports?("undefined"!==typeof module&&module.exports&&(exports=module.exports=b),exports._=b):s._=b;b.VERSION="1.3.3";var j=b.each=b.forEach=function(a, +c,d){if(a!=null)if(y&&a.forEach===y)a.forEach(c,d);else if(a.length===+a.length)for(var e=0,f=a.length;e2;a==null&&(a=[]);if(A&& +a.reduce===A){e&&(c=b.bind(c,e));return f?a.reduce(c,d):a.reduce(c)}j(a,function(a,b,i){if(f)d=c.call(e,d,a,b,i);else{d=a;f=true}});if(!f)throw new TypeError("Reduce of empty array with no initial value");return d};b.reduceRight=b.foldr=function(a,c,d,e){var f=arguments.length>2;a==null&&(a=[]);if(B&&a.reduceRight===B){e&&(c=b.bind(c,e));return f?a.reduceRight(c,d):a.reduceRight(c)}var g=b.toArray(a).reverse();e&&!f&&(c=b.bind(c,e));return f?b.reduce(g,c,d,e):b.reduce(g,c)};b.find=b.detect=function(a, +c,b){var e;G(a,function(a,g,h){if(c.call(b,a,g,h)){e=a;return true}});return e};b.filter=b.select=function(a,c,b){var e=[];if(a==null)return e;if(C&&a.filter===C)return a.filter(c,b);j(a,function(a,g,h){c.call(b,a,g,h)&&(e[e.length]=a)});return e};b.reject=function(a,c,b){var e=[];if(a==null)return e;j(a,function(a,g,h){c.call(b,a,g,h)||(e[e.length]=a)});return e};b.every=b.all=function(a,c,b){var e=true;if(a==null)return e;if(D&&a.every===D)return a.every(c,b);j(a,function(a,g,h){if(!(e=e&&c.call(b, +a,g,h)))return o});return!!e};var G=b.some=b.any=function(a,c,d){c||(c=b.identity);var e=false;if(a==null)return e;if(E&&a.some===E)return a.some(c,d);j(a,function(a,b,h){if(e||(e=c.call(d,a,b,h)))return o});return!!e};b.include=b.contains=function(a,c){var b=false;if(a==null)return b;if(q&&a.indexOf===q)return a.indexOf(c)!=-1;return b=G(a,function(a){return a===c})};b.invoke=function(a,c){var d=i.call(arguments,2);return b.map(a,function(a){return(b.isFunction(c)?c||a:a[c]).apply(a,d)})};b.pluck= +function(a,c){return b.map(a,function(a){return a[c]})};b.max=function(a,c,d){if(!c&&b.isArray(a)&&a[0]===+a[0])return Math.max.apply(Math,a);if(!c&&b.isEmpty(a))return-Infinity;var e={computed:-Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b>=e.computed&&(e={value:a,computed:b})});return e.value};b.min=function(a,c,d){if(!c&&b.isArray(a)&&a[0]===+a[0])return Math.min.apply(Math,a);if(!c&&b.isEmpty(a))return Infinity;var e={computed:Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;bd?1:0}),"value")};b.groupBy=function(a,c){var d={},e=b.isFunction(c)?c:function(a){return a[c]}; +j(a,function(a,b){var c=e(a,b);(d[c]||(d[c]=[])).push(a)});return d};b.sortedIndex=function(a,c,d){d||(d=b.identity);for(var e=0,f=a.length;e>1;d(a[g])=0})})};b.difference=function(a){var c=b.flatten(i.call(arguments,1),true);return b.filter(a,function(a){return!b.include(c,a)})};b.zip=function(){for(var a= +i.call(arguments),c=b.max(b.pluck(a,"length")),d=Array(c),e=0;e=0;d--)b=[a[d].apply(this,b)];return b[0]}};b.after=function(a,b){return a<=0?b():function(){if(--a<1)return b.apply(this,arguments)}};b.keys=L||function(a){if(a!==Object(a))throw new TypeError("Invalid object");var c=[],d;for(d in a)b.has(a,d)&&(c[c.length]=d);return c};b.values=function(a){return b.map(a,b.identity)};b.functions=b.methods=function(a){var c=[],d;for(d in a)b.isFunction(a[d])&& +c.push(d);return c.sort()};b.extend=function(a){j(i.call(arguments,1),function(b){for(var d in b)a[d]=b[d]});return a};b.pick=function(a){var c={};j(b.flatten(i.call(arguments,1)),function(b){b in a&&(c[b]=a[b])});return c};b.defaults=function(a){j(i.call(arguments,1),function(b){for(var d in b)a[d]==null&&(a[d]=b[d])});return a};b.clone=function(a){return!b.isObject(a)?a:b.isArray(a)?a.slice():b.extend({},a)};b.tap=function(a,b){b(a);return a};b.isEqual=function(a,b){return r(a,b,[])};b.isEmpty= +function(a){if(a==null)return true;if(b.isArray(a)||b.isString(a))return a.length===0;for(var c in a)if(b.has(a,c))return false;return true};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=p||function(a){return l.call(a)=="[object Array]"};b.isObject=function(a){return a===Object(a)};b.isArguments=function(a){return l.call(a)=="[object Arguments]"};b.isArguments(arguments)||(b.isArguments=function(a){return!(!a||!b.has(a,"callee"))});b.isFunction=function(a){return l.call(a)=="[object Function]"}; +b.isString=function(a){return l.call(a)=="[object String]"};b.isNumber=function(a){return l.call(a)=="[object Number]"};b.isFinite=function(a){return b.isNumber(a)&&isFinite(a)};b.isNaN=function(a){return a!==a};b.isBoolean=function(a){return a===true||a===false||l.call(a)=="[object Boolean]"};b.isDate=function(a){return l.call(a)=="[object Date]"};b.isRegExp=function(a){return l.call(a)=="[object RegExp]"};b.isNull=function(a){return a===null};b.isUndefined=function(a){return a===void 0};b.has=function(a, +b){return K.call(a,b)};b.noConflict=function(){s._=I;return this};b.identity=function(a){return a};b.times=function(a,b,d){for(var e=0;e/g,">").replace(/"/g,""").replace(/'/g,"'").replace(/\//g,"/")};b.result=function(a,c){if(a==null)return null;var d=a[c];return b.isFunction(d)?d.call(a):d};b.mixin=function(a){j(b.functions(a),function(c){M(c,b[c]=a[c])})};var N=0;b.uniqueId= +function(a){var b=N++;return a?a+b:b};b.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var u=/.^/,n={"\\":"\\","'":"'",r:"\r",n:"\n",t:"\t",u2028:"\u2028",u2029:"\u2029"},v;for(v in n)n[n[v]]=v;var O=/\\|'|\r|\n|\t|\u2028|\u2029/g,P=/\\(\\|'|r|n|t|u2028|u2029)/g,w=function(a){return a.replace(P,function(a,b){return n[b]})};b.template=function(a,c,d){d=b.defaults(d||{},b.templateSettings);a="__p+='"+a.replace(O,function(a){return"\\"+n[a]}).replace(d.escape|| +u,function(a,b){return"'+\n_.escape("+w(b)+")+\n'"}).replace(d.interpolate||u,function(a,b){return"'+\n("+w(b)+")+\n'"}).replace(d.evaluate||u,function(a,b){return"';\n"+w(b)+"\n;__p+='"})+"';\n";d.variable||(a="with(obj||{}){\n"+a+"}\n");var a="var __p='';var print=function(){__p+=Array.prototype.join.call(arguments, '')};\n"+a+"return __p;\n",e=new Function(d.variable||"obj","_",a);if(c)return e(c,b);c=function(a){return e.call(this,a,b)};c.source="function("+(d.variable||"obj")+"){\n"+a+"}";return c}; +b.chain=function(a){return b(a).chain()};var m=function(a){this._wrapped=a};b.prototype=m.prototype;var x=function(a,c){return c?b(a).chain():a},M=function(a,c){m.prototype[a]=function(){var a=i.call(arguments);J.call(a,this._wrapped);return x(c.apply(b,a),this._chain)}};b.mixin(b);j("pop,push,reverse,shift,sort,splice,unshift".split(","),function(a){var b=k[a];m.prototype[a]=function(){var d=this._wrapped;b.apply(d,arguments);var e=d.length;(a=="shift"||a=="splice")&&e===0&&delete d[0];return x(d, +this._chain)}});j(["concat","join","slice"],function(a){var b=k[a];m.prototype[a]=function(){return x(b.apply(this._wrapped,arguments),this._chain)}});m.prototype.chain=function(){this._chain=true;return this};m.prototype.value=function(){return this._wrapped}}).call(this); diff --git a/templates/stats.html b/templates/stats.html index fb51f83..b255e39 100644 --- a/templates/stats.html +++ b/templates/stats.html @@ -5,6 +5,13 @@ {% block content %}
+
+
+

Realtime produkter

+
+
+
+

Produkter

{% for product in products %} @@ -28,6 +35,8 @@
+ +
{% endblock %} @@ -35,6 +44,7 @@ + {% endblock %}