summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2012-10-31 01:23:50 +0100
committerLeif Johansson <leifj@sunet.se>2012-10-31 01:23:50 +0100
commit09b5b8ddcf892eb689f32a271fba11e142e82441 (patch)
tree3d9ddf21bbcfec79bceafec2871d066f22261377
parentea0442b4797fdc34414d1b0c3153298e214766f6 (diff)
remove old api calls
-rw-r--r--meetingtools/apps/stats/views.py236
1 files changed, 0 insertions, 236 deletions
diff --git a/meetingtools/apps/stats/views.py b/meetingtools/apps/stats/views.py
index 60628a2..72efc41 100644
--- a/meetingtools/apps/stats/views.py
+++ b/meetingtools/apps/stats/views.py
@@ -9,7 +9,6 @@ from django.contrib.auth.decorators import login_required
from django.contrib.humanize.templatetags.humanize import naturalday
from django.http import HttpResponseForbidden, HttpResponseBadRequest
from meetingtools.apps.stats.models import UserMeetingTransaction
-from meetingtools.ac import ac_api_client
from iso8601 import iso8601
from time import mktime
from meetingtools.multiresponse import json_response, respond_to
@@ -58,87 +57,6 @@ def room(request,rid):
return respond_to(request,{'text/html': 'apps/stats/room.html'},{'room': room})
@login_required
-def user_minutes_api(request,username=None):
- #if username and username != request.user.username:
- # return HttpResponseForbidden("You can't spy on others!")
-
- if username is None:
- username = request.user.username
-
- with ac_api_client(request) as api:
- p = {'sort1-type': 'asc','sort2-type': 'asc','sort1': 'date-created','sort2': 'date-closed','filter-type': 'meeting','filter-login':username}
-
- form = StatCaledarForm(request.GET)
- if not form.is_valid():
- return HttpResponseBadRequest()
-
- begin = form.cleaned_data['begin']
- end = form.cleaned_data['end']
-
- if begin is not None:
- p['filter-gte-date-created'] = begin.isoformat()
- if end is not None:
- p['filter-lt-date-created'] = end.isoformat()
- r = api.request('report-bulk-consolidated-transactions',p)
-
- series = []
- d_created = None
- d_closed = None
- ms = 0
- curdate = None
- t_ms = 0
- rc = {}
- for row in r.et.xpath("//row"):
- rc[row.get('sco-id')] = True
- date_created_str = row.findtext("date-created")
- ts_created = _iso2ts(date_created_str)
- date_closed_str = row.findtext("date-closed")
- ts_closed = _iso2ts(date_closed_str)
-
- d1 = _iso2datesimple(date_created_str)
- if d_created is None:
- d_created = d1
-
- d2 = _iso2datesimple(date_closed_str)
- if d_closed is None:
- d_closed = d2
-
- #duration = _iso2dt(date_closed_str) - _iso2dt(date_created_str)
- #sdiff = duration.total_seconds()
-
- if curdate is None:
- curdate = d1
-
- if curdate != d1:
- #logging.debug(" %s: %s - %s = %d %d" % (row.findtext("name"),date_created_str,date_closed_str,ms,sdiff*1000))
- series.append([_date_ts(curdate),int(ms/60000)])
- ms = 0
- curdate = d1
-
- if d1 == d2: #same date
- diff = (ts_closed - ts_created)
- #logging.debug("ms:: %d + %d" % (ms,diff))
- ms += diff
- t_ms += diff
- else: # meeting spanned midnight
- ts_date_ts = _date_ts(d2)
- #logging.debug("ms: %d + %d" % (ms,(ts_date_ts - ts_created)))
- ms += ts_date_ts - ts_created
- series.append([_date_ts(d1),int(ms/60000)])
- #logging.debug("* %s: %s - %s = %d %d" % (row.findtext("name"),date_created_str,date_closed_str,ms,sdiff*1000))
- t_ms += ms
- curdate = d2
- #logging.debug("midnight: %d (%d)" % (ts_date_ts,ts_closed))
- ms = (ts_closed - ts_date_ts)
- #logging.debug("nms: %d" % ms)
-
-
- if curdate is not None and ms > 0:
- series.append([_date_ts(curdate),int(ms/60000)])
-
- return json_response({'data': sorted(series,key=lambda x: x[0]), 'rooms': len(rc.keys()), 'minutes': int(t_ms/60000)},request)
-
-@login_required
def tagged_minutes_api(request):
form = StatCaledarForm(request.GET) # convenient way to parse dates
if not form.is_valid():
@@ -216,157 +134,3 @@ def tagged_minutes_api(request):
'end': naturalday(end),
'users': len(uc.keys()),
'minutes': int(t_ms/60)},request)
-
-@login_required
-def domain_minutes_api(request,domain):
- with ac_api_client(request) as api:
- p = {'sort': 'asc','sort1': 'date-created','filter-type': 'meeting'}
-
- form = StatCaledarForm(request.GET)
- if not form.is_valid():
- return HttpResponseBadRequest()
-
- begin = form.cleaned_data['begin']
- end = form.cleaned_data['end']
-
- if begin is None:
- from datetime import datetime,timedelta
- begin = datetime.now()-timedelta(seconds=72*3600)
- begin = begin.replace(microsecond=0)
-
- if begin is not None:
- p['filter-gte-date-created'] = begin.isoformat()
- if end is not None:
- p['filter-lt-date-created'] = end.isoformat()
- else:
- end = datetime.now().replace(microsecond=0) # for display only
-
- r = api.request('report-bulk-consolidated-transactions',p)
-
- series = []
- d_created = None
- d_closed = None
- ms = 0
- curdate = None
- t_ms = 0
- rc = {}
- uc = {}
- for row in r.et.xpath("//row"):
- login = row.findtext("login")
- if not login.endswith("@%s" % domain):
- continue
-
- rc[row.get('sco-id')] = True
- uc[row.get('principal-id')] = True
- date_created_str = row.findtext("date-created")
- ts_created = _iso2ts(date_created_str)
- date_closed_str = row.findtext("date-closed")
- ts_closed = _iso2ts(date_closed_str)
-
- d1 = _iso2datesimple(date_created_str)
- if d_created is None:
- d_created = d1
-
- d2 = _iso2datesimple(date_closed_str)
- if d_closed is None:
- d_closed = d2
-
- if curdate is None:
- curdate = d1
-
- if curdate != d1:
- series.append([_date_ts(curdate),int(ms/60000)])
- ms = 0
- curdate = d1
-
- if d1 == d2: #same date
- diff = (ts_closed - ts_created)
- ms += diff
- t_ms += diff
- else: # meeting spanned midnight
- ts_date_ts = _date_ts(d2)
- ms += ts_date_ts - ts_created
- series.append([_date_ts(d1),int(ms/60000)])
- t_ms += ms
- curdate = d2
- ms = (ts_closed - ts_date_ts)
-
- if curdate is not None and ms > 0:
- series.append([_date_ts(curdate),int(ms/60000)])
-
- return json_response({'data': sorted(series,key=lambda x: x[0]),
- 'rooms': len(rc.keys()),
- 'begin': naturalday(begin),
- 'end': naturalday(end),
- 'users': len(uc.keys()),
- 'minutes': int(t_ms/60000)},request)
-
-
-@login_required
-def room_minutes_api(request,rid):
- room = get_object_or_404(Room,pk=rid)
- if not room.creator == request.user:
- return HttpResponseForbidden("You can only look at statistics for your own rooms!")
-
- with ac_api_client(request) as api:
- p = {'sort': 'asc','sort1': 'date-created','filter-type': 'meeting','filter-sco-id': room.sco.sco_id}
-
- form = StatCaledarForm(request.GET)
- if not form.is_valid():
- return HttpResponseBadRequest()
-
- begin = form.cleaned_data['begin']
- end = form.cleaned_data['end']
-
- if begin is not None:
- p['filter-gte-date-created'] = begin.isoformat()
- if end is not None:
- p['filter-lt-date-created'] = end.isoformat()
- r = api.request('report-bulk-consolidated-transactions',p)
-
- series = []
- d_created = None
- d_closed = None
- ms = 0
- curdate = None
- t_ms = 0
- uc = {}
- for row in r.et.xpath("//row"):
- uc[row.get('principal-id')] = True
- date_created_str = row.findtext("date-created")
- ts_created = _iso2ts(date_created_str)
- date_closed_str = row.findtext("date-closed")
- ts_closed = _iso2ts(date_closed_str)
-
- d1 = _iso2datesimple(date_created_str)
- if d_created is None:
- d_created = d1
-
- d2 = _iso2datesimple(date_closed_str)
- if d_closed is None:
- d_closed = d2
-
- if curdate is None:
- curdate = d1
-
- if curdate != d1:
- series.append([_date_ts(curdate),int(ms/60000)])
- ms = 0
- curdate = d1
-
- if d1 == d2: #same date
- diff = (ts_closed - ts_created)
- ms += diff
- t_ms += diff
- else: # meeting spanned midnight
- ts_date_ts = _date_ts(d2)
- ms += ts_date_ts - ts_created
- series.append([_date_ts(d1),int(ms/60000)])
- t_ms += ms
- curdate = d2
- ms = (ts_closed - ts_date_ts)
-
- if curdate is not None and ms > 0:
- series.append([_date_ts(curdate),int(ms/60000)])
-
- return json_response({'data': sorted(series,key=lambda x: x[0]), 'users': len(uc.keys()), 'minutes': int(t_ms/60000)},request) \ No newline at end of file