Patch 2

.gitignore

@@ -3,4 +3,4 @@
 *.pyc
 local_settings.py
 *~
-*.sw*
+*.sw*

README.md

@@ -1,18 +1 @@
-6th June, 12
-Basic Tabs done. 
-Please take care of the different settings that need for dajax to run.
-Dont use 'shaastra' as your project folder's name. Dajax was not accepting hyphens for some reason. My folder's name is 'shaastra'.
-If you have a different name please change 'Dajaxice.shaastra.events.<some_func>' to 'Dajaxice.<your_project_folder>.events.<some_func>' in all the templates. 
-Dont forget to add AUTH_PROFILE_MODULE = 'events.UserProfile' to your local settings.
-
-9th June, 12
-Tab files added. they have add, delete functionality.
-sending file uses ajax. rest can be done by dajax.
-Renaming files has to be done.
-
-15th June, 12 Renaming of files done
-
-16th June, Chosen-JQuery plugin implemented in the form for adding events. 'Tags' for events can now be added in a more presentable way.
-
-25th June, Coords can now add questionnares. He/She can choose to add an mcq or a subjective. After adding an mcq, he/she can add choices for it. editing/deleting of options/questions can be done.
-As suggested by Suraj, I have made some changes so that you dont need to name your project folder as 'shaastra'. I have added some lines to global_settings.py and added a file called context_processors.py. So in templates just use {{pro_dir}} instead of 'shaastra' now, and your folder name will get rendered there. Just add the following line as it is in your TEMPLATE_CONTEXT_PROCESSORS - "events.context_processors.project_dir_name".
+Shaastra 2013 Events 

admin/ajax.py

@@ -1,5 +1,7 @@
-#The variable Summary refers to the div where a table consisting group name and its cores is displayed
-#The variable space refers to the div where different forms like add/edit group/core are displayed
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+# The variable Summary refers to the div where a table consisting group name and its cores is displayed
+# The variable space refers to the div where different forms like add/edit group/core are displayed
 
 from dajaxice.decorators import dajaxice_register
 from django.utils import simplejson
@@ -9,95 +11,130 @@
 from django.contrib.auth.models import Group, User
 from users.models import UserProfile
 
+
 @dajaxice_register
-def add_edit_group(request,form="",id=0):
+def add_edit_group(request, form='', id=0):
     """
     This function calls the AddGroupForm from forms.py
     If a new group is being created, a blank form is displayed and the super user can fill in necessary details.
     If an existing group's details is being edited, the same form is displayed populated with current group details for all fields
 
     """
+
     dajax = Dajax()
     if id:
-        group_form = AddGroupForm(form, instance=Group.objects.get(id=id))
+        group_form = AddGroupForm(form,
+                                  instance=Group.objects.get(id=id))
     else:
         group_form = AddGroupForm(form)
     if group_form.is_valid():
         group_form.save()
-    dajax.script("updateSummary();")
+    dajax.script('updateSummary();')
     return dajax.json()
 
+
 @dajaxice_register
 def updateSummary(request):
     """
     This function updates the table in summary div whenever a new group/core is added or when an existing group/core is edited or deleted
 
     """
+
     dajax = Dajax()
-    dajax.assign("#summary",'innerHTML',"<table border='1'><thead><tr><th>S.No</th><th>Group Name</th><th>Cores</th></tr></thead><tbody id='groups'>")
-    groups=Group.objects.order_by('id').all()[1:]
+    dajax.assign('#summary', 'innerHTML',
+                 "<table border='1' class='table table-striped table-bordered table-condensed'><thead><tr><th>S.No</th><th>Group Name</th><th>Cores</th></tr></thead><tbody id='groups'>"
+                 )
+    groups = Group.objects.order_by('id').all()
     for g in groups:
-        dajax.append("#groups",'innerHTML',"<tr><td>"+str(g.id-1)+"</td><td class='grps' id="+g.name+"><a href="+'#editgroup/'+str(g.id)+'/'+">"+g.name+"</a></td><td id="+str(g.id)+"></td></tr>")
-        cores=User.objects.filter(groups__name=g.name)
+        dajax.append('#groups', 'innerHTML', '<tr><td>' + str(g.id)
+                     + "</td><td class='grps' id=" + g.name
+                     + "><a class='tablelinks' href=" + '#editgroup/'
+                     + str(g.id) + '/' + '>' + g.name
+                     + '</a></td><td id=' + str(g.id) + '></td></tr>')
+        cores = User.objects.filter(groups__name=g.name)
         for c in cores:
             if c.get_profile().is_core:
-	        dajax.append("#"+str(g.id),'innerHTML',"<li class='cores' id="+str(c.username)+"><a href="+'#editcore/'+str(c.id)+'/'+">"+str(c)+"</a>")
-    dajax.assign(".bbq-item","innerHTML","<i>Space for displaying forms</i>");
+                dajax.append('#' + str(g.id), 'innerHTML',
+                             "<li class='cores' id=" + str(c.username)
+                             + "><a class='tablelinks' href="
+                             + '#editcore/' + str(c.id) + '/' + '>'
+                             + str(c) + '</a>')
+    dajax.script("window.location.hash=''")
     return dajax.json()
 
+
 @dajaxice_register
-def del_group(request,id):
+def del_group(request, id):
     """
     This function is called when the super user wants to delete a group
 
     """
+
     dajax = Dajax()
-    group=Group.objects.get(id=id)
+    group = Group.objects.get(id=id)
     group.delete()
-    dajax.script("updateSummary();")
+    dajax.script('updateSummary();')
     return dajax.json()
 
+
 @dajaxice_register
-def add_edit_core(request,form="",id=0):
+def add_edit_core(request, form='', id=0):
     """
     This function calls the AddCoreForm from forms.py
     If a new core is being created, a blank form is displayed and the super user can fill in necessary details.
     If an existing core's details is being edited, the same form is displayed populated with current core details for all fields
 
     """
+
     dajax = Dajax()
     if id:
+
+        # groups field is a Many-to-Many field and requires a list of values
+
+        grps = []
+        grps.append(form['groups'])
+        form['groups'] = grps
         core_form = AddCoreForm(form, instance=User.objects.get(id=id))
         if core_form.is_valid():
             core_form.save()
-            dajax.script("updateSummary();")
+            dajax.script('updateSummary();')
         else:
             template = loader.get_template('ajax/admin/editcore.html')
-            html=template.render(RequestContext(request,locals()))
-            dajax.assign(".bbq-item",'innerHTML',html)
+            html = template.render(RequestContext(request, locals()))
+            dajax.assign('.bbq-item', 'innerHTML', html)
     else:
+
+        # groups field is a Many-to-Many field and requires a list of values
+
+        grps = []
+        grps.append(form['groups'])
+        form['groups'] = grps
         core_form = AddCoreForm(form)
         if core_form.is_valid():
-            core=core_form.save()
-            core.set_password("default")
+            core = core_form.save()
+            core.set_password('default')
             core.save()
-            core_profile = UserProfile( user=core, is_core=True)
+            core_profile = UserProfile(user=core, is_core=True)
             core_profile.save()
-            dajax.script("updateSummary();")
+            dajax.script('updateSummary();')
         else:
+            form['groups'] = grps[0]
             template = loader.get_template('ajax/admin/addcore.html')
-            html=template.render(RequestContext(request,locals()))
-            dajax.assign(".bbq-item",'innerHTML',html)
+            html = template.render(RequestContext(request, locals()))
+            dajax.assign('.bbq-item', 'innerHTML', html)
+            dajax.script("$('.chzn-select').chosen();")
     return dajax.json()
 
+
 @dajaxice_register
-def del_core(request,id):
+def del_core(request, id):
     """
     This function is called when the super user wants to delete a core
 
     """
+
     dajax = Dajax()
-    core=User.objects.get(id=id)
+    core = User.objects.get(id=id)
     core.delete()
-    dajax.script("updateSummary();")
+    dajax.script('updateSummary();')
     return dajax.json()

admin/forms.py

@@ -1,22 +1,35 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
 from django import forms
 from django.contrib.auth.models import Group, User
 from users.models import UserProfile
+from chosen import widgets as chosenwidgets
+
 
 class AddGroupForm(forms.ModelForm):
+
     """
     This form is used to add/edit groups
 
     """
+
     class Meta:
+
         model = Group
-        fields=('name',)
+        fields = ('name', )
+
 
 class AddCoreForm(forms.ModelForm):
+
     """
     This form is used to add/edit cores
 
     """
+
     class Meta:
+
         model = User
-        fields=('groups','username','email')
-#        widgets={'password':forms.widgets.HiddenInput,}
+        fields = ('groups', 'username', 'email')
+        widgets = {'groups': chosenwidgets.ChosenSelect}
+
+

admin/models.py

@@ -1,3 +1,5 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
 from django.db import models
 from django.contrib.auth.models import Group
 from django.contrib.auth.models import User

admin/tests.py

@@ -1,3 +1,6 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
 """
 This file demonstrates writing tests using the unittest module. These will pass
 when you run "manage.py test".
@@ -9,8 +12,12 @@
 
 
 class SimpleTest(TestCase):
+
     def test_basic_addition(self):
         """
         Tests that 1 + 1 always equals 2.
         """
+
         self.assertEqual(1 + 1, 2)
+
+

admin/urls.py

@@ -1,12 +1,15 @@
+#!/usr/bin/python
 # -*- coding: utf-8 -*-
+
 from django.conf import settings
 from django.conf.urls.defaults import *
 from admin.views import *
 
-urlpatterns = patterns('',
+urlpatterns = patterns(
+    '',
     url(r'^addgroup/', addgroup, name='addgroup'),
     url(r'^editgroup/(?P<id>\d+)', editgroup, name='editgroup'),
     url(r'^addcore/', addcore, name='addcore'),
     url(r'^editcore/(?P<id>\d+)', editcore, name='editcore'),
-    url(r'^$', home, name = 'home'),
-)
+    url(r'^$', home, name='home'),
+    )

admin/views.py

@@ -1,3 +1,5 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
 from django.http import HttpResponse, HttpResponseRedirect, Http404
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import render_to_response
@@ -6,52 +8,68 @@
 from admin.forms import *
 from django.contrib.auth.models import Group
 
+
 @login_required(login_url=settings.SITE_URL + 'user/login/')
 def home(request):
     """
         This is the home page view of the superuser
     """
-    if request.user.is_superuser is False :
+
+    if request.user.is_superuser is False:
         return HttpResponseRedirect(settings.SITE_URL)
-    return render_to_response('admin/home.html', locals(), context_instance = RequestContext(request))
+    return render_to_response('admin/home.html', locals(),
+                              context_instance=RequestContext(request))
+
 
 @login_required(login_url=settings.SITE_URL + 'user/login/')
 def addgroup(request):
     """
         This is the home page view of the superuser
     """
-    if request.user.is_superuser is False :
+
+    if request.user.is_superuser is False:
         return HttpResponseRedirect(settings.SITE_URL)
-    group_form=AddGroupForm()
-    return render_to_response('ajax/admin/addgroup.html', locals(), context_instance = RequestContext(request))
+    group_form = AddGroupForm()
+    return render_to_response('ajax/admin/addgroup.html', locals(),
+                              context_instance=RequestContext(request))
+
 
 @login_required(login_url=settings.SITE_URL + 'user/login/')
-def editgroup(request,id=0):
+def editgroup(request, id=0):
     """
         This is the home page view of the superuser
     """
-    if request.user.is_superuser is False :
+
+    if request.user.is_superuser is False:
         return HttpResponseRedirect(settings.SITE_URL)
-    group_form=AddGroupForm(instance=Group.objects.get(id=id))
-    return render_to_response('ajax/admin/editgroup.html', locals(), context_instance = RequestContext(request))
+    group_form = AddGroupForm(instance=Group.objects.get(id=id))
+    return render_to_response('ajax/admin/editgroup.html', locals(),
+                              context_instance=RequestContext(request))
+
 
 @login_required(login_url=settings.SITE_URL + 'user/login/')
 def addcore(request):
     """
         This is the home page view of the superuser
     """
-    if request.user.is_superuser is False :
+
+    if request.user.is_superuser is False:
         return HttpResponseRedirect(settings.SITE_URL)
-    core_form=AddCoreForm()
-    return render_to_response('ajax/admin/addcore.html', locals(), context_instance = RequestContext(request))
+    core_form = AddCoreForm()
+    return render_to_response('ajax/admin/addcore.html', locals(),
+                              context_instance=RequestContext(request))
+
 
 @login_required(login_url=settings.SITE_URL + 'user/login/')
-def editcore(request,id=0):
+def editcore(request, id=0):
     """
         This is the home page view of the superuser
     """
-    if request.user.is_superuser is False :
+
+    if request.user.is_superuser is False:
         return HttpResponseRedirect(settings.SITE_URL)
-    core_form=AddCoreForm(instance=User.objects.get(id=id))
-    return render_to_response('ajax/admin/editcore.html', locals(), context_instance = RequestContext(request))
+    core_form = AddCoreForm(instance=User.objects.get(id=id),
+                            initial={'groups': User.objects.get(id=id).groups.get_query_set()[0]})
+    return render_to_response('ajax/admin/editcore.html', locals(),
+                              context_instance=RequestContext(request))