Skip to content

Commit

Permalink
pep8
Browse files Browse the repository at this point in the history
  • Loading branch information
carlosp420 committed May 28, 2017
1 parent 4884fd9 commit 2c6dfb2
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 29 deletions.
2 changes: 2 additions & 0 deletions manolo/apps/visitors/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@

from visitors.models import Subscriber, Visitor


# Define an inline admin descriptor for Subscriber model
# which acts a bit like a singleton
class SubscriberInline(admin.StackedInline):
model = Subscriber
can_delete = False
verbose_name_plural = 'subscribers'


# Define a new User admin
class UserAdmin(BaseUserAdmin):
inlines = (SubscriberInline, )
Expand Down
44 changes: 19 additions & 25 deletions manolo/apps/visitors/management/commands/run_statistics.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
import json

from django.core.management.base import BaseCommand, CommandError
from django.core.management.base import BaseCommand
from django.db.models import Count
from visitors.models import Visitor, Statistic, Statistic_detail


class Command(BaseCommand):
help = 'calculates the five people that visited the most'

def handle(self, *args, **options):

print("Doing calculations")
run_statistics()



def run_statistics():
all_visitor_names = Visitor.objects.all().values_list(
"full_name", flat=True,
Expand All @@ -31,41 +32,35 @@ def run_statistics():
Statistic_detail.objects.all().delete()
names_and_visits = []
for visitor in visitors:
visit = Statistic_detail(name=visitor[0],
number_of_visits=visitor[1])
visit = Statistic_detail(name=visitor[0], number_of_visits=visitor[1])
names_and_visits.append(visit)
Statistic_detail.objects.bulk_create(names_and_visits)

count= 0
ls = []
data_dict = {"name":"Statistics", "children": ls}
data_dict = {"name": "Statistics", "children": ls}


for i in visitors :
dic = {"name":i[0], "children":[]}
for i in visitors:
dic = {"name": i[0], "children": []}
ls.append(dic)
institution = Visitor.objects.filter(
full_name=i[0],
).values_list("institution",
).annotate(the_count=Count("institution",
))
full_name=i[0],
).values_list("institution").annotate(the_count=Count("institution"))
for j in institution:
dic_2= {"name":j[0], "children":[] }
dic_2 = {"name": j[0], "children": []}
dic["children"].append(dic_2)

nombre=[d for d in ls if d['name'] == i[0]]
nombre = [d for d in ls if d['name'] == i[0]]

cuenta = 0
while (cuenta<len(institution)):
while cuenta < len(institution):
reason = Visitor.objects.filter(
full_name=i[0], institution=institution[cuenta][0],
).values_list("reason",
).annotate(the_count=Count("reason",
))
full_name=i[0],
institution=institution[cuenta][0],
).values_list("reason").annotate(the_count=Count("reason"))
for l in reason:
dic_3 = {"name":l[0], "size":l[1]}
dic_3 = {"name": l[0], "size": l[1]}
nombre[0]['children'][cuenta]['children'].append(dic_3)
cuenta+=1
cuenta += 1
print(data_dict)
print("Deleting data in Statistics")
Statistic.objects.all().delete()
Expand All @@ -75,4 +70,3 @@ def run_statistics():

number_of_rows = Statistic.objects.all().count()
print("Currently have {} rows in Statistics".format(number_of_rows))

1 change: 0 additions & 1 deletion manolo/apps/visitors/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ class Subscriber(models.Model):
)



class Statistic(models.Model):
data = models.TextField(null=True)

Expand Down
3 changes: 1 addition & 2 deletions manolo/apps/visitors/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,10 @@ def about(request):
{'user_profile': user_profile},
)


def statistics(request):
user_profile = get_user_profile(request)
visitors = Statistic_detail.objects.all()


return render(
request,
"statistics.html",
Expand Down
2 changes: 1 addition & 1 deletion manolo/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
'django.contrib.messages',
'django.contrib.staticfiles',
'django.contrib.admin',

'django.contrib.humanize',
'bootstrap3',
'bootstrap_themes',
Expand Down

0 comments on commit 2c6dfb2

Please sign in to comment.