Changeset bd72d5c for asadb/forms

Timestamp:

Sep 15, 2011, 3:34:54 PM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage, test-hooks

Children:

5c68184

Parents:

ceaf3bd (diff), fbb362a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Alex Dehnert <adehnert@…> (09/15/11 15:34:54)

git-committer:

Alex Dehnert <adehnert@…> (09/15/11 15:34:54)

Message:

Merge remote branch 'remotes/origin/new-db'

Location:

asadb/forms

Files:

• views.py (modified) (1 diff)
• admin.py (modified) (1 diff)
• migrations/0005_group_membership_update.py (added)
• migrations/0006_person_membership_update.py (added)
• migrations/0007_fix_fields_community.py (added)
• models.py (modified) (1 diff)

asadb/forms/views.py

@@ -121 +121 @@
 def select_group_fysm(request, ):
     qobj = Q(activity_category__isnull = True) | ~(Q(activity_category__name='Dorm') | Q(activity_category__name='FSILG'))
-    queryset = groups.models.Group.objects.filter(qobj)
+    queryset = groups.models.Group.active_groups.filter(qobj)
     return select_group(
         request,

asadb/forms/admin.py

@@ -22 +22 @@
 admin.site.register(forms.models.FYSM, FYSMAdmin)
 admin.site.register(forms.models.FYSMCategory, FYSMCategoryAdmin)
+
+class Admin_GroupMembershipUpdate(admin.ModelAdmin):
+    list_display = (
+        'pk',
+        'group',
+        'update_time',
+        'updater_name',
+        'updater_title',
+        'num_undergrads',
+        'num_grads',
+        'num_alum',
+        'num_other_affiliate',
+        'num_other',
+    )
+    list_display_links = ('pk', 'group', )
+admin.site.register(forms.models.GroupMembershipUpdate, Admin_GroupMembershipUpdate)
+
+class Admin_PersonMembershipUpdate(admin.ModelAdmin):
+    list_display = (
+        'pk',
+        'username',
+        'update_time',
+    )
+    list_display_links = ('pk', 'username', )
+admin.site.register(forms.models.PersonMembershipUpdate, Admin_PersonMembershipUpdate)

asadb/forms/models.py

@@ -135 +135 @@
             preview.update_time = cls.never_updated
             preview.save()
+
+
+class GroupMembershipUpdate(models.Model):
+    update_time = models.DateTimeField(default=datetime.datetime.utcfromtimestamp(0))
+    updater_name = models.CharField(max_length=30)
+    updater_title = models.CharField(max_length=30, help_text="You need not hold any particular title in the group, but we like to know who is completing the form.")
+    
+    group = models.ForeignKey(groups.models.Group, help_text="If your group does not appear in the list above, then please email asa-exec@mit.edu.")
+    group_email = models.EmailField(help_text="The text of the law will be automatically distributed to your members via this list, in order to comply with the law.")
+    officer_email = models.EmailField()
+
+    membership_definition = models.TextField()
+    num_undergrads = models.IntegerField()
+    num_grads = models.IntegerField()
+    num_alum = models.IntegerField()
+    num_other_affiliate = models.IntegerField()
+    num_other = models.IntegerField()
+
+    membership_list = models.TextField(help_text="Member emails on separate lines (Athena usernames where applicable)")
+
+    compliance_statement = "By checking this, I hereby affirm that I have read and understand Chapter 269: Sections 17, 18, and 19 of Massachusetts Law. I furthermore attest that I will distribute to group members, pledges, and/or applicants, copies of Massachusetts Law 269: 17, 18, 19 and that our organization, group, or team agrees to comply with the provisions of that law. (See below for text.)"
+    no_hazing = models.BooleanField(help_text=compliance_statement)
+
+
+class PersonMembershipUpdate(models.Model):
+    update_time = models.DateTimeField(default=datetime.datetime.utcfromtimestamp(0))
+    username = models.CharField(max_length=30)
+    groups = models.ManyToManyField(groups.models.Group, help_text="By selecting a group here, you indicate that you are an active member of the group in question.<br>If your group does not appear in the list above, then please email asa-exec@mit.edu.<br>")