Merge lp:~aelkner/schooltool/schooltool.zambia into lp:~schooltool-owners/schooltool/schooltool.zambia

[Alan Elkner]

Added consecutive periods handling.

I noticed that the journal change for consecutive periods is in trunk but didn't come down with the egg. Is that a dependency thing?

=== modified file 'src/schooltool/zambia/app/browser/fet_import.py'
--- src/schooltool/zambia/app/browser/fet_import.py	2010-07-12 13:31:51 +0000
+++ src/schooltool/zambia/app/browser/fet_import.py	2010-07-13 04:46:38 +0000
@@ -62,6 +62,14 @@
 
 class FETImportView(BrowserView):
 
+    @property
+    def consecutive_label(self):
+        return _('Show consecutive periods as one period')
+
+    @property
+    def consecutive_value(self):
+        return self.request.get('consecutive') == 'on'
+
     def update(self):
         self.errors = []
         if 'form-submitted' not in self.request:
@@ -209,6 +217,7 @@
                     section.instructors.add(self.getTeacher(teacher))
 
                 timetable = schema.createTimetable(term)
+                timetable.consecutive_periods_as_one = self.consecutive_value
                 self.addTimetable(section, timetable)
 
                 for day_id, period_id in periods:

=== modified file 'src/schooltool/zambia/app/browser/templates/fet_import.pt'
--- src/schooltool/zambia/app/browser/templates/fet_import.pt	2010-05-30 23:11:22 +0000
+++ src/schooltool/zambia/app/browser/templates/fet_import.pt	2010-07-13 04:46:38 +0000
@@ -22,6 +22,11 @@
         <div class="controls" style="color:red"
              tal:repeat="error view/displayErrors"
              tal:content="error" />
+        <div class="controls">
+          <input type="checkbox" id="consecutive" name="consecutive"
+                 tal:attributes="checked view/consecutive_value " />
+          <span tal:content="view/consecutive_label" />
+        </div>
 
         <div class="controls">
           <input name="UPDATE_SUBMIT" class="button-ok" type="submit"