shane/rockviewer
1
0
Fork 0
Code Issues 1 Pull Requests Releases 2 Wiki Activity

Fixing pep8 recommendations

Browse Source
This commit is contained in:
Shane Frischkorn
2013-08-25 19:43:19 +10:00
parent e4b18d98c2
commit 423101e829
4 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
three_d_viewer/ajax.py
View File

@@ -3,11 +3,13 @@ from dajaxice.decorators import dajaxice_register
from three_d_viewer.models import Question from three_d_viewer.models import Question
@dajaxice_register @dajaxice_register
def dajaxice_example(request): def dajaxice_example(request):
test = check_answer(request, 3, 1) test = check_answer(request, 3, 1)
print test print test
return simplejson.dumps({'message':'Hello from Python!'}) return simplejson.dumps({'message': 'Hello from Python!'})
@dajaxice_register @dajaxice_register
def check_answer(request, answerid, questionid): def check_answer(request, answerid, questionid):
@@ -20,4 +22,3 @@ def check_answer(request, answerid, questionid):
result = True result = True
print simplejson.dumps({'result': result}) print simplejson.dumps({'result': result})
return simplejson.dumps({'result': result}) return simplejson.dumps({'result': result})

6
three_d_viewer/models.py
View File

@@ -20,7 +20,8 @@ class Category(CommonInfo):
class Sample(CommonInfo): class Sample(CommonInfo):
model_filename = models.CharField(max_length=1000) model_filename = models.CharField(max_length=1000)
description = models.CharField(max_length=2000, default='', blank=True, null=True) description = models.CharField(max_length=2000, default='', blank=True,
null=True)
parent = models.ForeignKey(Category, blank=True, null=True, parent = models.ForeignKey(Category, blank=True, null=True,
on_delete=models.SET_NULL) on_delete=models.SET_NULL)
@@ -30,11 +31,12 @@ class Question(models.Model):
sample = models.ForeignKey(Sample, related_name='questions') sample = models.ForeignKey(Sample, related_name='questions')
def correct_answers(self): def correct_answers(self):
return self.answers.filter(correct = True) return self.answers.filter(correct=True)
def __unicode__(self): def __unicode__(self):
return self.text return self.text
class Answer(models.Model): class Answer(models.Model):
text = models.CharField(max_length=2000) text = models.CharField(max_length=2000)
correct = models.BooleanField(default=False) correct = models.BooleanField(default=False)

7
three_d_viewer/urls.py
View File

@@ -2,11 +2,10 @@ from django.conf import settings
from django.conf.urls import patterns, url from django.conf.urls import patterns, url
from three_d_viewer import views from three_d_viewer import views
urlpatterns = patterns('', urlpatterns = patterns(
'',
url(r'^$', views.IndexView.as_view(), name='index'), url(r'^$', views.IndexView.as_view(), name='index'),
url(r'^(?P<pk>\d+)/$', views.DetailView.as_view(), name='detail'), url(r'^(?P<pk>\d+)/$', views.DetailView.as_view(), name='detail'),
url(r'^media/(?P<path>.*)$', 'django.views.static.serve', url(r'^media/(?P<path>.*)$', 'django.views.static.serve',
{'document_root': settings.MEDIA_ROOT}), {'document_root': settings.MEDIA_ROOT}),
) )