Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Events #34

Open
wants to merge 1,417 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1417 commits
Select commit Hold shift + click to select a range
b6d7607
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
varshaan Dec 20, 2012
dda873d
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Dec 20, 2012
2f23981
minor corrections
webopsShaastra Dec 20, 2012
fb20bc7
contact info changed
Dec 21, 2012
f3155ee
added shows tab
srmanikandasriram Dec 21, 2012
966c705
envisage and grand finale added to shows
srmanikandasriram Dec 21, 2012
95aafb2
more images added in shows tab
Dec 24, 2012
064f00c
minor changes
webopsShaastra Dec 24, 2012
eef1544
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Dec 24, 2012
f0a5665
images in slideshow adjusted
Dec 24, 2012
d6e9598
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Dec 24, 2012
23cb402
Fix next redirect issue.
anantgirdhar Dec 25, 2012
9355c8c
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Dec 25, 2012
45b4dd0
Team Check-In bug fix
varshaan Dec 25, 2012
2867466
Condition to check if team member is already checked in added
varshaan Dec 25, 2012
fcdbae5
Hospi changes
varshaan Dec 25, 2012
1596dd3
Correct error message: Shaastra 2013 not 2011.
webopsShaastra Dec 26, 2012
5f50e98
Add Participant PDF Gen and Mailing.
anantgirdhar Dec 26, 2012
46156de
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
anantgirdhar Dec 26, 2012
07856e5
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Dec 26, 2012
546a3f6
Participant PDF: Fix bugs.
webopsShaastra Dec 26, 2012
318c8bd
Add Core Dashboard link in Admin Dashboard. (All Cores are now Admins.)
anantgirdhar Dec 26, 2012
c5838ac
Participant PDF: Add account instruction.
anantgirdhar Dec 26, 2012
0b9313a
Participant PDF: Fix minor formatting issue.
anantgirdhar Dec 26, 2012
f38be72
contacts added
Dec 26, 2012
a5788d5
Shaastra ID creation script added
varshaan Dec 26, 2012
258b4f2
DTVP: Add blocks BSB and MSB to BLOCK_CHOICES
anantgirdhar Dec 27, 2012
764a6d0
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
varshaan Dec 27, 2012
7430f4c
Give team creation rights to hospi.
anantgirdhar Dec 27, 2012
d995f23
Fix template errors in hospi team creation rights.
anantgirdhar Dec 27, 2012
27cc802
Give delete team members permission to hospi.
anantgirdhar Dec 27, 2012
37e5ef7
Give leader access to hospi.
anantgirdhar Dec 27, 2012
4f3953a
Fix leader removal allowed bug.
anantgirdhar Dec 27, 2012
93144f9
Give team editing link to hospi.
anantgirdhar Dec 27, 2012
2a1660d
Fix hospi home template formatting.
anantgirdhar Dec 27, 2012
78f2386
Add hospi home button in team home.
anantgirdhar Dec 27, 2012
5eef34d
Fix template syntx error in team home.
anantgirdhar Dec 27, 2012
0531866
contact update
webopsShaastra Dec 28, 2012
ee83adc
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
varshaan Dec 28, 2012
bdcb7c2
Bill generation for hospi
varshaan Dec 28, 2012
8dcbfc0
Search with email added to hospi
varshaan Dec 28, 2012
c950186
Participant PDFs: Save PDF to server.
anantgirdhar Dec 28, 2012
f512c75
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
anantgirdhar Dec 28, 2012
2888e0a
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Dec 28, 2012
c262123
Participant PDFs: PDF write issue fixed.
anantgirdhar Dec 28, 2012
dc91917
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Dec 28, 2012
5d241b7
Participant PDFs: Change linespacing.
anantgirdhar Dec 28, 2012
c652bcd
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Dec 28, 2012
f2ddbaa
Participant PDFs: Test - Change drawString to Paragraph.
anantgirdhar Dec 28, 2012
19eab2d
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
anantgirdhar Dec 28, 2012
b0ab1e3
Fix minor bug.
anantgirdhar Dec 28, 2012
bba39fc
Add image, QMS instructions.
anantgirdhar Dec 28, 2012
692f9a0
Import Image
anantgirdhar Dec 28, 2012
4b1ab7c
Import inch
anantgirdhar Dec 28, 2012
99121d8
Fix pdf format.
anantgirdhar Dec 28, 2012
b7924ed
Fix image path.
webopsShaastra Dec 28, 2012
f1daa5a
Merge conflict resolved.
webopsShaastra Dec 28, 2012
d8528d8
Fix bug.
anantgirdhar Dec 28, 2012
602f8eb
Fix variable error.
anantgirdhar Dec 28, 2012
8ffa693
Fix attribute align name.
anantgirdhar Dec 28, 2012
8e97441
Fix align.
anantgirdhar Dec 28, 2012
d256c6a
Fix formatting.
anantgirdhar Dec 28, 2012
bd6ec06
Fix formatting.
anantgirdhar Dec 28, 2012
579981b
Fix formatting.
anantgirdhar Dec 28, 2012
42a258f
Fix formatting.
anantgirdhar Dec 28, 2012
f2b1725
All pdfs.
anantgirdhar Dec 28, 2012
805c2c1
Fix query.
anantgirdhar Dec 28, 2012
2c8a180
Fix query.
anantgirdhar Dec 28, 2012
843abd5
Fix profile errors.
anantgirdhar Dec 28, 2012
0a00348
Fix profile errors.
anantgirdhar Dec 28, 2012
49644ac
Fix profile errors.
anantgirdhar Dec 28, 2012
aa7d4f0
Final cleanup.
anantgirdhar Dec 28, 2012
bd20a70
Fix formatting.
anantgirdhar Dec 28, 2012
71e3e93
Final formatting change.
webopsShaastra Dec 28, 2012
488bfe9
Fix list out of range error.
webopsShaastra Dec 29, 2012
4e09ade
Account creation modified
varshaan Dec 29, 2012
950b23f
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
varshaan Dec 29, 2012
d3167ea
creating teams script added
srmanikandasriram Dec 29, 2012
9bd9cef
team creation minor change
srmanikandasriram Dec 30, 2012
e26fa03
team creation final changes
srmanikandasriram Dec 30, 2012
66d2eaa
Participant PDFs: Add mailer.
anantgirdhar Dec 30, 2012
814f3a9
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
anantgirdhar Dec 30, 2012
cb05f13
Participant PDFs: Fix mail content.
anantgirdhar Dec 30, 2012
5389712
Participant PDFs: Fix log message.
anantgirdhar Dec 30, 2012
d71455f
Participant PDFs: Fix log message.
anantgirdhar Dec 30, 2012
ecada0f
Participant PDFs: Title case name.
anantgirdhar Dec 30, 2012
3cf9e10
Participant PDFs: Final test.
anantgirdhar Dec 30, 2012
112bc43
Participant PDFs: Change filename to shaastra id.
anantgirdhar Dec 30, 2012
b2c874e
Participant PDFs: Add email check.
anantgirdhar Dec 30, 2012
e81fc73
Participant PDFs: Code cleanup.
anantgirdhar Dec 30, 2012
476df9f
Participant PDFs: Add log feature.
anantgirdhar Dec 30, 2012
c20edce
Particpant PDFs: Fix log error.
anantgirdhar Dec 30, 2012
4bbf56d
Participant PDFs: Finale.
anantgirdhar Dec 30, 2012
b4d5ca2
Participant PDFs: Disable main function.
webopsShaastra Dec 30, 2012
f634420
team creation completed
webopsShaastra Dec 30, 2012
a89de9f
removing event registration link from announcements
srmanikandasriram Dec 30, 2012
e706130
updated ticker
webopsShaastra Dec 31, 2012
6caa4d6
ticker copied to events.html
srmanikandasriram Dec 31, 2012
0e1a32f
Participant PDFs: Arrangements to mail rws and ssq participants.
anantgirdhar Dec 31, 2012
8af866d
Participant PDFs: Remaining PDFs finale.
webopsShaastra Dec 31, 2012
84ecb23
adding marquee hover effect
Dec 31, 2012
ac55c65
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
Dec 31, 2012
596c26f
minor changes
webopsShaastra Dec 31, 2012
d5c8c29
PDF changes
varshaan Jan 1, 2013
702dc65
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
varshaan Jan 1, 2013
c5b3435
Fix hospi bill pdf generation.
anantgirdhar Jan 1, 2013
e9594bd
Bill Generation
varshaan Jan 1, 2013
6d7e2f3
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Jan 1, 2013
5730821
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Jan 1, 2013
af83e36
Url correction
webopsShaastra Jan 1, 2013
26ca9a7
Redirect Add Room to home
varshaan Jan 1, 2013
0b8e554
ControllRoom changes
varshaan Jan 2, 2013
0eb470a
Added table in team bill
varshaan Jan 2, 2013
addf1a0
URL reset
varshaan Jan 2, 2013
6b2d33b
Participant PDFs: Round two.
anantgirdhar Jan 2, 2013
f5bd12f
Participant PDFs: Fix Attribute Error.
anantgirdhar Jan 2, 2013
cf0febc
Participant PDFs: Update QMS instructions.
anantgirdhar Jan 2, 2013
2507937
Participant PDFs: Data checker added.
anantgirdhar Jan 2, 2013
79910e2
Participant PDFs: Fix TypeError.
anantgirdhar Jan 2, 2013
7c1e475
Participant PDFs: Add event details listing.
anantgirdhar Jan 2, 2013
6ff253d
Participant PDFs: Fix type.
anantgirdhar Jan 2, 2013
0a1bf47
hospi create shaatra id modified
srmanikandasriram Jan 2, 2013
1e3774b
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
srmanikandasriram Jan 2, 2013
780aa28
Fix team leader not member issue.
anantgirdhar Jan 2, 2013
04d10ab
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
anantgirdhar Jan 2, 2013
3e7eeb6
search by barcode
srmanikandasriram Jan 2, 2013
fa82284
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
srmanikandasriram Jan 2, 2013
fba0745
prizes app added for barcode
srmanikandasriram Jan 2, 2013
5e120b8
Participant PDFs: Round 2 Finale.
anantgirdhar Jan 2, 2013
16914f4
barcode minor changes
webopsShaastra Jan 2, 2013
5486269
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Jan 2, 2013
04c6ed8
barcode model changed
srmanikandasriram Jan 2, 2013
f1ce904
admin user profile editing feature added
srmanikandasriram Jan 2, 2013
710044a
Participant PDFs: Round two final test.
anantgirdhar Jan 3, 2013
f6b7ea1
Participant PDFs: Fix TypeError.
anantgirdhar Jan 3, 2013
fdd9f68
Participant PDFs: Round 2 Finale.
anantgirdhar Jan 3, 2013
ec692f7
error messages added to edit profile searching
srmanikandasriram Jan 3, 2013
cb3cf21
team barcode searching
srmanikandasriram Jan 3, 2013
d5e65a7
Add CSV On spot regn.
anantgirdhar Jan 3, 2013
dc90f6d
CSV Table formatting.
anantgirdhar Jan 3, 2013
f541ef7
Fix merge conflicts.
anantgirdhar Jan 3, 2013
b4313b3
CSV: Fix barcode db writing.
anantgirdhar Jan 3, 2013
396a951
Hospi Completion
varshaan Jan 3, 2013
38f94e7
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
varshaan Jan 3, 2013
47f3cab
Fix hospi home link formatting.
webopsShaastra Jan 3, 2013
5a38992
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Jan 3, 2013
6f848d9
Room upload correction
varshaan Jan 3, 2013
d8a5fc4
comment link
varshaan Jan 3, 2013
20c693b
CSV: Write to erp Participant.
anantgirdhar Jan 3, 2013
bcb5f9b
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
anantgirdhar Jan 3, 2013
8e333d9
CSV: Fix field name error.
anantgirdhar Jan 3, 2013
1cb7958
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
varshaan Jan 3, 2013
ac935c2
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
srmanikandasriram Jan 3, 2013
f5d4499
CSV: Add barcode check.
anantgirdhar Jan 3, 2013
8780c0d
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
anantgirdhar Jan 3, 2013
235f150
unknown action solved and college added to check in form
srmanikandasriram Jan 3, 2013
ca8d655
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
srmanikandasriram Jan 3, 2013
4b533f2
team registration duplicate updated
srmanikandasriram Jan 3, 2013
92a21e9
team re registration checked
srmanikandasriram Jan 3, 2013
7d5db93
DTVP: Change venue unavailable error message to include event name.
anantgirdhar Jan 3, 2013
d4a4b60
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
anantgirdhar Jan 3, 2013
b8c797f
DTVP: Fix variable name typo.
anantgirdhar Jan 3, 2013
648e0c5
DTVP: Change clash error message.
anantgirdhar Jan 3, 2013
47ddf19
hospi minor changes
srmanikandasriram Jan 3, 2013
325d237
Dajax error fixed
varshaan Jan 3, 2013
3f83671
Merge errors fixed
webopsShaastra Jan 3, 2013
90d9e71
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Jan 3, 2013
1dba917
URL
varshaan Jan 3, 2013
395267c
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
varshaan Jan 3, 2013
285b3b5
Multiple instances of same team member removed
varshaan Jan 3, 2013
de4f7c4
create team in hospi autopopulate
srmanikandasriram Jan 3, 2013
5d8ad12
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
srmanikandasriram Jan 3, 2013
84de266
member repeating error fixed
srmanikandasriram Jan 3, 2013
19d111b
hospi vols
srmanikandasriram Jan 4, 2013
c8e58e8
last minute changes
webopsShaastra Jan 4, 2013
b7d3ac0
participant userprofile sync
srmanikandasriram Jan 4, 2013
2ac55f9
userprofile
webopsShaastra Jan 4, 2013
961c305
userprofile editing
srmanikandasriram Jan 4, 2013
241ccf5
Participant PDFs: Check participants registered CSV.
anantgirdhar Jan 4, 2013
9a1c675
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
anantgirdhar Jan 4, 2013
e4dc4ef
PPDFs: Fix integrity error issue.
anantgirdhar Jan 4, 2013
b95b591
PPDFs: Fix name error issue.
anantgirdhar Jan 4, 2013
7fa56e2
PPDFs: Fix College issue.
anantgirdhar Jan 4, 2013
cc1d306
Fix NameError in events models.
anantgirdhar Jan 4, 2013
754bfa1
PPDFs: cleanEmail function.
anantgirdhar Jan 4, 2013
79e8cbd
PPDFs: Add email present check.
anantgirdhar Jan 4, 2013
b8ef293
edit profile
srmanikandasriram Jan 4, 2013
ce2c0d4
room no added to message in already checked in
srmanikandasriram Jan 4, 2013
d9b1ffa
individual re-allot
srmanikandasriram Jan 4, 2013
ae10868
unmerged changes
webopsShaastra Jan 4, 2013
75cb204
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Jan 4, 2013
c952857
room field autofill
srmanikandasriram Jan 4, 2013
69b0f1e
Edit checked in person
varshaan Jan 4, 2013
20d57a0
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
varshaan Jan 4, 2013
8694404
URL resolved
varshaan Jan 4, 2013
a23b003
room editing if already filled
srmanikandasriram Jan 4, 2013
53b02f5
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
srmanikandasriram Jan 4, 2013
4639edb
Auto complete for team added
varshaan Jan 4, 2013
d15cd28
Undone changes
varshaan Jan 4, 2013
1c92643
re-allot
srmanikandasriram Jan 4, 2013
44ae0af
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
srmanikandasriram Jan 4, 2013
e2159c2
unmerged
webopsShaastra Jan 4, 2013
6883bb8
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Jan 4, 2013
9b5a8d0
PPDFs: Add specific participant pdf mailer.
anantgirdhar Jan 4, 2013
da671b1
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
anantgirdhar Jan 4, 2013
be293ac
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Jan 4, 2013
f979be0
Tejas Removed
varshaan Jan 5, 2013
e36e5c7
Tejas removed again
varshaan Jan 5, 2013
8dade62
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Jan 5, 2013
214e60d
Spons removed
varshaan Jan 5, 2013
c60b677
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Jan 5, 2013
33a9dba
CSV changes
varshaan Jan 6, 2013
9c0147d
CSV
webopsShaastra Jan 6, 2013
218fca5
Merge branch 'events' of
webopsShaastra Jan 6, 2013
eba4c9b
College filter added
varshaan Jan 6, 2013
c813740
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Jan 6, 2013
67ad9c8
Username error corrected
varshaan Jan 6, 2013
8126541
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Jan 6, 2013
8f1beab
Edits
varshaan Jan 6, 2013
ead6be4
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Jan 6, 2013
2e69427
Edits1
varshaan Jan 6, 2013
3fcd3c3
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Jan 6, 2013
574b878
Edits again
varshaan Jan 6, 2013
9df298a
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Jan 6, 2013
7e6f4b5
Userprofile error
varshaan Jan 6, 2013
ccfa917
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Jan 6, 2013
a6931cb
Profile does not exist
varshaan Jan 6, 2013
fa385af
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Jan 6, 2013
4d61a6a
Fixing CSV
varshaan Jan 6, 2013
20aea21
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Jan 6, 2013
407c236
CSV
varshaan Jan 6, 2013
6b0ed53
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Jan 6, 2013
bc46194
CSV
varshaan Jan 6, 2013
0ed37cb
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Jan 6, 2013
37add45
CSv
varshaan Jan 6, 2013
c0e5700
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Jan 6, 2013
a606904
CSV
varshaan Jan 6, 2013
07bd494
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Jan 6, 2013
ed78f72
CSV
varshaan Jan 6, 2013
8a5cc9b
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Jan 6, 2013
2dcd082
CSV
varshaan Jan 6, 2013
7a01d02
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Jan 6, 2013
2415e45
CSV
varshaan Jan 6, 2013
23138aa
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Jan 6, 2013
8ea0151
CSV
varshaan Jan 6, 2013
543dbe8
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Jan 6, 2013
036915c
Create Participant Certificate Generator.
anantgirdhar Jan 26, 2013
c04baa4
Merge branch 'events' of github.com:ShaastraWebops/Shaastra-2013-Webs…
anantgirdhar Jan 26, 2013
658062a
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-20…
webopsShaastra Jan 26, 2013
c342955
Make changes for final certificate mailing.
webopsShaastra Jan 26, 2013
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
*.pyc
local_settings.py
*~
*.sw*
*.sw*
19 changes: 1 addition & 18 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
91 changes: 64 additions & 27 deletions admin/ajax.py
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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()
19 changes: 16 additions & 3 deletions admin/forms.py
Original file line number Diff line number Diff line change
@@ -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}


2 changes: 2 additions & 0 deletions admin/models.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 7 additions & 0 deletions admin/tests.py
Original file line number Diff line number Diff line change
@@ -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".
Expand All @@ -9,8 +12,12 @@


class SimpleTest(TestCase):

def test_basic_addition(self):
"""
Tests that 1 + 1 always equals 2.
"""

self.assertEqual(1 + 1, 2)


10 changes: 7 additions & 3 deletions admin/urls.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
#!/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 = 'adminhome'),
)
url(r'^$', home, name='home'),
)

50 changes: 34 additions & 16 deletions admin/views.py
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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))

Empty file added controlroom/__init__.py
Empty file.
Loading