Changeset 1608:bb54faf30816 in peach3-core

Timestamp:

01/24/2012 03:48:38 PM (4 months ago)

Author:

eriks

Branch:

core-split

Message:

Changed Cluster to use TimeRanges? the same way Period does

Location:

src/peach3

Files:

• admin/cluster.py (modified) (3 diffs)
• migrations/0005_convert_cluster_ranges.py (added)
• migrations/0006_auto__del_field_cluster_joinable__del_field_cluster_active.py (added)
• models/cluster.py (modified) (3 diffs)

src/peach3/admin/cluster.py

@@ -7 +7 @@
 from django.forms.formsets import DELETION_FIELD_NAME
 from django.forms.models import BaseInlineFormSet
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ugettext_lazy, ugettext as _
 
 from peach3.admin.course import CourseEditionListFilter
 from peach3.admin.forms import AdminImmutableUserModelForm, BaseInlineFormSetWithParentInstance, I18NModelForm
+from peach3.admin.forms.widgets import AdminTimeRange
 from peach3.admin.news import NewsItemInline
 from peach3.admin.realm import CourseEditionRealmsListFilter
+
+from peach3.forms import TimeRangeField
 
 from peach3.models.cluster import * #@UnusedWildImport
@@ -75 +78 @@
     # TODO: Figure out a way to completely hide the realms field for admin clusters
 
+    active_range = TimeRangeField(widget=AdminTimeRange, label=ugettext_lazy("Active"))
+    joinable_range = TimeRangeField(widget=AdminTimeRange, label=ugettext_lazy("Joinable"))
+
     def __init__(self, *arg, **kwargs):
         super(ClusterAdminModelForm, self).__init__(*arg, **kwargs)
         self.fields['realms'].required = not self.instance.admin_cluster
+        self.fields['active_range'].initial = self.instance.active_range
+        self.fields['joinable_range'].initial = self.instance.joinable_range
+
+    def _post_clean(self):
+        if 'active_range' in self.cleaned_data:
+            self.instance.active_range = self.cleaned_data['active_range']
+        if 'joinable_range' in self.cleaned_data:
+            self.instance.joinable_range = self.cleaned_data['joinable_range']
+        super(ClusterAdminModelForm, self)._post_clean()
 
     def clean_realms(self):
@@ -91 +106 @@
 class ClusterAdmin(admin.ModelAdmin):
     form = ClusterAdminModelForm
-    fieldsets = (
-        (None, {
-            'fields' : ('courseedition', 'i18n_names', 'admin_cluster',
-                        'realms',)
-        }),
-        (_("Availability"), {
-            'classes' : ('collapse',),
-            'fields' : ( 'order',
-                        'joinable', 'joinable_from', 'joinable_until',
-                        'active', 'active_from', 'active_until',)
-        })
-
-    )
     readonly_fields = 'admin_cluster', 'courseedition',
+    fields = ('courseedition', 'i18n_names', 'admin_cluster',
+              'realms', 'order', 'joinable_range', 'active_range',)
     filter_horizontal = 'realms',
-    inlines = ClusterMembersInline, ClusterStaffInline, NewsItemInline,
+    inlines = ClusterMembersInline, ClusterStaffInline#, NewsItemInline,
 
     list_display = 'courseedition', 'default_name', 'admin_cluster', 'order',

src/peach3/models/cluster.py

@@ -25 +25 @@
     courseedition = models.ForeignKey("CourseEdition")
 
-    joinable = models.NullBooleanField(default=False,
-                                       help_text=ugettext_lazy("Unknown means to use the from and until fields"))
-    joinable_from = models.DateTimeField(null=True, blank=True)
-    joinable_until = models.DateTimeField(null=True, blank=True)
-
-    active = models.NullBooleanField(default=False,
-                                       help_text=ugettext_lazy("Unknown means to use the from and until fields"))
-    active_from = models.DateTimeField(null=True, blank=True)
-    active_until = models.DateTimeField(null=True, blank=True)
+    _joinable_from = models.DateTimeField(null=True, blank=True, db_column='joinable_from')
+    _joinable_until = models.DateTimeField(null=True, blank=True, db_column='joinable_until')
+
+    _active_from = models.DateTimeField(null=True, blank=True, db_column='active_from')
+    _active_until = models.DateTimeField(null=True, blank=True, db_column='active_until')
 
     realms = models.ManyToManyField(Realm, null=True, blank=True)
@@ -108 +104 @@
     ### Model methods
     def set_joinable_range(self, range=None): #@ReservedAssignment
-        if range is None or range.is_closed():
-            self.joinable = False
-            self.joinable_from = None
-            self.joinable_until = None
-        elif range.is_open():
-            self.joinable = True
-            self.joinable_from = None
-            self.joinable_until = None
-        else:
-            self.joinable = None
-            self.joinable_from = range.begin if range.has_begin() else None
-            self.joinable_until = range.end if range.has_end() else None
+        self._joinable_from = range.begin
+        self._joinable_until = range.end
 
     def get_joinable_range(self):
-        return TimeRange(open=self.joinable is not None and self.joinable,
-                         closed=self.joinable is not None and not self.joinable,
-                         begin=self.joinable_from,
-                         end=self.joinable_until)
+        return TimeRange(begin=self._joinable_from, end=self._joinable_until)
 
     joinable_range = property(get_joinable_range, set_joinable_range, set_joinable_range)
@@ -133 +116 @@
 
     def set_active_range(self, range=None): #@ReservedAssignment
-        if range is None or range.is_closed():
-            self.active = False
-            self.active_from = None
-            self.active_until = None
-        elif range.is_open():
-            self.active = True
-            self.active_from = None
-            self.active_until = None
-        else:
-            self.active = None
-            self.active_from = range.begin if range.has_begin() else None
-            self.active_until = range.end if range.has_end() else None
-
+        self._active_from = range.begin
+        self._active_until = range.end
         self._active_updated = True
 
     def get_active_range(self):
-        return TimeRange(open=self.active is not None and self.active,
-                         closed=self.active is not None and not self.active,
-                         begin=self.active_from,
-                         end=self.active_until)
+        return TimeRange(begin=self._active_from, end=self._active_until)
 
     active_range = property(get_active_range, set_active_range, set_active_range)