Making survey more confugurable

.gitignore

@@ -7,3 +7,4 @@ media/data
 local_settings.py
 survey.db
 
+survey.egg-info

readme.md

@@ -1,8 +1,10 @@
+# Django survey
+
 install requirements using `pip install -r requirements.txt`
 
-then run using `./manage.py runserver`
+then run using `./survey_test/manage.py runserver`
 
-## about
+## About
 
 Using the admin interface you can create surveys, add questions, give questions
 categories, and mark them as required or not. the front-end survey view then
@@ -11,7 +13,8 @@ admin interface.
 
 Submitted responses can also be viewed via the admin backend. 
 
-## credits 
+## Credits 
+
 some inspiration came from an older
 [django-survey](https://github.com/flynnguy/django-survey) app, but this app
 uses a different model architecture and different mechanism for dynamic form
@@ -21,6 +24,4 @@ generation.
 
 this code is licensed under the [affero general public license](http://www.gnu.org/licenses/agpl-3.0.html). 
 
-    The GNU General Public License permits making a modified version and letting the public access it on a server without     ever releasing its source code to the public... The GNU Affero General Public License is designed specifically to     
-    ensure that, in such cases, the modified source code becomes available to the community. It requires the operator of a
-    network server to provide the source code of the modified version running there to the users of that server. 
+The GNU General Public License permits making a modified version and letting the public access it on a server without ever releasing its source code to the public... The GNU Affero General Public License is designed specifically to ensure that, in such cases, the modified source code becomes available to the community. It requires the operator of a network server to provide the source code of the modified version running there to the users of that server. 

setup.py

@@ -0,0 +1,21 @@
+from setuptools import setup, find_packages
+
+setup(
+    name="survey",
+    version="0.1.1",
+    author="Jessy Kate Schingler",
+    author_email="[email protected]",
+    license="AGPL",
+    url="https://github.com/jessykate/django-survey",
+    packages=find_packages(exclude=[]),
+    include_package_data=True,
+    classifiers=[
+        "Development Status :: 3 - Alpha",
+        "Environment :: Web Environment",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: GNU Affero General Public License v3",
+        "Operating System :: OS Independent",
+        "Programming Language :: Python",
+        "Framework :: Django",
+    ]
+)

survey/actions.py

@@ -0,0 +1,14 @@
+from django.utils.translation import ungettext, ugettext_lazy
+
+# Actions
+def make_published(modeladmin, request, queryset):
+	"""
+	Mark the given survey as published
+	"""
+	count = queryset.update(is_published=True)
+	message = ungettext(
+			u'%(count)d survey was successfully marked as published.',
+			u'%(count)d surveys were successfully marked as published',
+			count) % {'count': count,}
+	modeladmin.message_user(request, message)
+make_published.short_description = ugettext_lazy(u"Mark selected surveys as published")

survey/admin.py

@@ -1,48 +1,70 @@
-from survey.models import Question, Category, Survey, Response, AnswerText, AnswerRadio, AnswerSelect, AnswerInteger, AnswerSelectMultiple
 from django.contrib import admin
-from django.contrib.auth.admin import UserAdmin
-from django.contrib.auth.models import User
+
+from .models import Question, Category, Survey, Response, AnswerText
+from .models import AnswerRadio, AnswerSelect
+from .models import AnswerInteger, AnswerSelectMultiple
+from .actions import make_published
+
 
 class QuestionInline(admin.TabularInline):
-	model = Question
-	ordering = ('category',)
-	extra = 0
+    model = Question
+    ordering = ('category', 'order',)
+    extra = 1
+
 
 class CategoryInline(admin.TabularInline):
-	model = Category
-	extra = 0
+    model = Category
+    extra = 0
+
 
 class SurveyAdmin(admin.ModelAdmin):
-	inlines = [CategoryInline, QuestionInline]
+    list_display = ('name', 'is_published', 'need_logged_user', 'template')
+    list_filter = ('is_published', 'need_logged_user')
+    inlines = [CategoryInline, QuestionInline]
+    actions = [make_published]
+
 
 class AnswerBaseInline(admin.StackedInline):
-	fields = ('question', 'body')
-	readonly_fields = ('question',)
-	extra = 0
+    fields = ('question', 'body')
+    readonly_fields = ('question',)
+    extra = 0
+
 
 class AnswerTextInline(AnswerBaseInline):
-	model= AnswerText  
+    model = AnswerText
+
 
 class AnswerRadioInline(AnswerBaseInline):
-	model= AnswerRadio 
+    model = AnswerRadio
+
 
 class AnswerSelectInline(AnswerBaseInline):
-	model= AnswerSelect 
+    model = AnswerSelect
+
 
 class AnswerSelectMultipleInline(AnswerBaseInline):
-	model= AnswerSelectMultiple
+    model = AnswerSelectMultiple
+
 
 class AnswerIntegerInline(AnswerBaseInline):
-	model= AnswerInteger 
+    model = AnswerInteger
+
 
 class ResponseAdmin(admin.ModelAdmin):
-	list_display = ('interview_uuid', 'interviewer', 'created') 
-	inlines = [AnswerTextInline, AnswerRadioInline, AnswerSelectInline, AnswerSelectMultipleInline, AnswerIntegerInline]
-	# specifies the order as well as which fields to act on 
-	readonly_fields = ('survey', 'created', 'updated', 'interview_uuid')
+    list_display = ('interview_uuid', 'survey', 'created', 'user')
+    list_filter = ('survey', 'created')
+    date_hierarchy = 'created'
+    inlines = [
+        AnswerTextInline, AnswerRadioInline, AnswerSelectInline,
+        AnswerSelectMultipleInline, AnswerIntegerInline
+    ]
+    # specifies the order as well as which fields to act on
+    readonly_fields = (
+        'survey', 'created', 'updated', 'interview_uuid', 'user'
+    )
 
-#admin.site.register(Question, QuestionInline)
-#admin.site.register(Category, CategoryInline)
-admin.site.register(Survey, SurveyAdmin)
 
+# admin.site.register(Question, QuestionInline)
+# admin.site.register(Category, CategoryInline)
+admin.site.register(Survey, SurveyAdmin)
 admin.site.register(Response, ResponseAdmin)