diff options
author | ankitjavalkar | 2019-10-10 14:37:01 +0530 |
---|---|---|
committer | GitHub | 2019-10-10 14:37:01 +0530 |
commit | 0e9cfea9d3c631b8eb1a77e1123f0d021f6ca63a (patch) | |
tree | 051adb248ce665eb908e3f3762dfee7cf1598cf4 /statistics_app | |
parent | c85e06d3327300aae159165c8338e07d8875f51b (diff) | |
parent | 74a32aff8aaea326ee6de769b59057c5ef3fe7bf (diff) | |
download | workshop_booking-0e9cfea9d3c631b8eb1a77e1123f0d021f6ca63a.tar.gz workshop_booking-0e9cfea9d3c631b8eb1a77e1123f0d021f6ca63a.tar.bz2 workshop_booking-0e9cfea9d3c631b8eb1a77e1123f0d021f6ca63a.zip |
Merge pull request #103 from FOSSEE/remove-pandas
Remove the usage of pandas and unused monthly average workshop calculation
Diffstat (limited to 'statistics_app')
-rw-r--r-- | statistics_app/views.py | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/statistics_app/views.py b/statistics_app/views.py index 954af17..784f30d 100644 --- a/statistics_app/views.py +++ b/statistics_app/views.py @@ -27,7 +27,6 @@ from os import listdir, path, sep from zipfile import ZipFile from django.contrib import messages from operator import itemgetter -from pandas import DataFrame import datetime as dt import csv try: @@ -163,51 +162,15 @@ def monthly_accepted_chart(): return workshop_count - -def monthly_avg(): - '''This function returns monthly mean of workshops from the - beginning to current year''' - current_year = datetime.today().year - start_year = 2017 - total_monthly_workshop = {} - for i in range(start_year, current_year+1): - total_monthly_workshop[i] = [] - - years = total_monthly_workshop.keys() - - for i in years: - for j in range(12): - data = RequestedWorkshop.objects.filter( - requested_workshop_date__year=str(i), - requested_workshop_date__month=str(j+1), - status='ACCEPTED').count() - - data += ProposeWorkshopDate.objects.filter( - proposed_workshop_date__year=str(i), - proposed_workshop_date__month=str(j+1), - status='ACCEPTED').count() - total_monthly_workshop[i].append(data) - - df = DataFrame.from_dict(total_monthly_workshop) - monthly_workshop_mean = df.mean(axis=1) - - return list(monthly_workshop_mean) - - - @login_required def workshop_stats(request): user = request.user today = datetime.now() upto = today + dt.timedelta(days=15) - #For Monthly Chart workshop_count = monthly_accepted_chart() - #For Monthly Workshop Mean - workshop_mean = monthly_avg() - # For Pie Chart workshoptype_count = pie_chart() @@ -296,7 +259,6 @@ def workshop_stats(request): {"upcoming_workshops": upcoming_workshops, "show_workshop_stats": settings.SHOW_WORKSHOP_STATS, "workshop_count": workshop_count, - "workshop_mean": workshop_mean, "workshoptype_count": workshoptype_count, "india_map": states}) except BaseException: @@ -347,7 +309,6 @@ def workshop_stats(request): "upcoming_workshops": upcoming_workshops, "show_workshop_stats": settings.SHOW_WORKSHOP_STATS, "workshop_count": workshop_count, - "workshop_mean": workshop_mean, "workshoptype_count": workshoptype_count, "india_map": states }) |