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

[Alan Elkner]

[lp:~aelkner/schooltool/schooltool.zambia]

59. By Alan Elkner <aelkner@ubuntu> on 2010-09-26

cosmetic changes to timetable pdfs

=== modified file 'src/schooltool/zambia/app/browser/app.py'
--- src/schooltool/zambia/app/browser/app.py	2010-08-08 18:28:59 +0000
+++ src/schooltool/zambia/app/browser/app.py	2010-09-26 22:01:04 +0000
@@ -19,14 +19,19 @@
 """
 SchoolTool Zambia application views.
 """
+from reportlab.lib import pagesizes
 
+from zope.browserpage.viewpagetemplatefile import ViewPageTemplateFile
 from zope.publisher.browser import BrowserView
 from zope.security.proxy import removeSecurityProxy
 from zope.traversing.browser.absoluteurl import absoluteURL
 
+from schooltool.app.browser.report import ReportPDFView
 from schooltool.app.interfaces import ISchoolToolApplication
-from schooltool.course.interfaces import IInstructor
+from schooltool.course.interfaces import IInstructor, ISectionContainer
+from schooltool.group.interfaces import IGroupContainer
 from schooltool.schoolyear.interfaces import ISchoolYearContainer
+from schooltool.schoolyear.interfaces import ISchoolYear
 from schooltool.skin.skin import NavigationViewlet
 from schooltool.term.interfaces import ITerm
 from schooltool.timetable.interfaces import ITimetables
@@ -38,6 +43,10 @@
 ERROR_INVALID_MODEL = _('Timetable model must be WeeklyTimetableModel.')
 ERROR_TIMETABLE_MISMATCH = _('Timetables must be consistent for the term.')
 
+TEACHER_HEADING =  _('Teacher')
+TOTAL_HEADING =  _('Total')
+SUBGROUP_HEADING =  _('Sub-\ngroup')
+
 
 class ManageYearlyViewlet(NavigationViewlet):
     @property
@@ -193,3 +202,300 @@
             results.append(result)
         return results
 
+
+class SubgroupsTimetableView(BrowserView):
+    """A view for the term's subgroup-based timetable"""
+
+    def __init__(self, context, request):
+        super(SubgroupsTimetableView, self).__init__(context, request)
+        self.term = removeSecurityProxy(self.context)
+        self.schoolyear = ISchoolYear(self.term)
+        self.groups = IGroupContainer(self.schoolyear)
+
+    def error(self, error_message):
+        self.error_message = error_message
+
+    def update(self):
+        self.error_message = ''
+        self.data = {
+            'days': [],
+            'rows': [],
+            }
+
+        subgroup_sections = {}
+        for section in ISectionContainer(self.context).values():
+            title = section.title.upper()
+            subgroup_sections.setdefault(title, []).append(section)
+
+        for subgroup_title, sections in sorted(subgroup_sections.items()):
+            subgroup_dict = {}
+
+            teacher = ''
+            if subgroup_title in self.groups:
+                leaders = [l for l in self.groups[subgroup_title].leaders]
+                if leaders:
+                    teacher = leaders[0].title
+
+            for section in sections:
+                titles = [course.title.lower()
+                          for course in section.courses]
+                course_title = ', '.join(titles)
+
+                timetables = ITimetables(section).timetables
+                if len(timetables.keys()) != 1:
+                    return self.error(ERROR_TOO_COMPLEX)
+                timetable = timetables[timetables.keys()[0]]
+                if timetable.model.factory_id != 'WeeklyTimetableModel':
+                    return self.error(ERROR_INVALID_MODEL)
+
+                days = [[day_id, timetable[day_id].periods]
+                        for day_id in timetable.day_ids]
+                if not self.data['days']:
+                    self.data['days'] = days
+                elif days != self.data['days']:
+                    return self.error(ERROR_TIMETABLE_MISMATCH)
+
+                for day_id, periods in days:
+                    subgroup_day = subgroup_dict.setdefault(day_id, {})
+                    for period in periods:
+                        if timetable[day_id].activities[period]:
+                            cell = subgroup_day.setdefault(period, {})
+                            cell[course_title] = 0
+
+            if subgroup_dict:
+                row = {
+                    'name': subgroup_title,
+                    'teacher': teacher,
+                    'days': subgroup_dict,
+                    }
+                self.data['rows'].append(row)
+
+        used_days = {}
+        for row in self.data['rows']:
+            for day_id in row['days']:
+                used_day = used_days.setdefault(day_id, set())
+                for period in row['days'][day_id]:
+                    used_day.add(period)
+
+        adjusted_days = []
+        for day_id, periods in days:
+            if day_id not in used_days:
+                continue
+            adjusted_periods = []
+            for period in periods:
+                if period in used_days[day_id]:
+                    adjusted_periods.append(period)
+            if adjusted_periods:
+                adjusted_days.append([day_id, adjusted_periods])
+        self.data['days'] = adjusted_days
+
+    def days(self):
+        dayNames = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday']
+        results = []
+        for day_id, day_periods in self.data['days']:
+            periods = []
+            for period_index, value in enumerate(day_periods):
+                if period_index == 0:
+                    cell = ' heading_left'
+                else:
+                    cell = ' heading'
+                cls = 'odd border_top period' + cell
+                period = {
+                    'class': cls,
+                    'value': unicode(value)[:3],
+                    }
+                periods.append(period)
+            result = {
+                'text': dayNames[day_id],
+                'span': len(periods),
+                'periods': periods,
+                }
+            results.append(result)
+        return results
+
+    def rows(self):
+        results = []
+        for index, row in enumerate(self.data['rows']):
+            if index % 2 == 0:
+                even_odd = ' even'
+            else:
+                even_odd = ' odd'
+            days = []
+            for day_id, day_periods in self.data['days']:
+                if day_id not in row['days']:
+                    continue
+                periods = []
+                for period_index, period in enumerate(day_periods):
+                    if period_index == 0:
+                        cell = ' sg_cell_left'
+                    else:
+                        cell = ' sg_cell'
+
+                    value = ''
+                    if day_id in row['days']:
+                        values = row['days'][day_id].get(period, {})
+                        value = '\n'.join([unicode(value)[:4] 
+                                               for value in sorted(values)])
+
+                    cls = 'period' + even_odd + cell
+
+                    period_cell = {
+                        'class': cls,
+                        'value': value,
+                        }
+                    periods.append(period_cell)
+                days.append(periods)
+
+            result = {
+                'name': row['name'],
+                'teacher': row['teacher'],
+                'days': days,
+                'class': 'cell' + even_odd,
+                'class_left': 'cell_left' + even_odd,
+                }
+            results.append(result)
+        return results
+
+
+class TeachersTimetablePDFView(ReportPDFView, TeachersTimetableView):
+    """A view for the term's teacher-based timetable pdf"""
+
+    template=ViewPageTemplateFile('templates/teachers_timetable_pdf.pt')
+    pageSize = pagesizes.landscape(ReportPDFView.pageSize)
+    rotation = 90
+    name_width = '2.5cm'
+    period_width = 0.55
+    empty_width = 0.03
+    total_width = ',1cm'
+
+    def __call__(self):
+        self.term = removeSecurityProxy(self.context)
+        self.update()
+        return super(TeachersTimetablePDFView, self).__call__()
+
+    def heading_widths1(self):
+        results = self.name_width
+        for day in self.days():
+            day_width = self.empty_width + day['span'] * self.period_width
+            results += ',%fcm' % day_width
+        results += ',%fcm' % self.empty_width
+        results += self.total_width
+        return results
+
+    def heading_widths2(self):
+        results = self.name_width
+        for day in self.days():
+            results += ',%fcm' % self.empty_width
+            for period in day['periods']:
+                results += ',%fcm' % self.period_width
+        results += ',%fcm' % self.empty_width
+        results += self.total_width
+        return results
+
+    def headings1(self):
+        results = ['']
+        for day in self.days():
+            results.append(day['text'])
+        results.extend(['', ''])
+        return results
+
+    def headings2(self):
+        results = [TEACHER_HEADING]
+        for day in self.days():
+            results.append('')
+            for period in day['periods']:
+                results.append(period['value'])
+        results.extend(['', TOTAL_HEADING])
+        return results
+
+    def row_heights(self):
+        result = 1
+        rows = self.rows()
+        for row in rows:
+            for day in row['days']:
+                for period in day:
+                    size = len(period['value'].split('\n'))
+                    if size > result:
+                        result = size
+        if result == 1:
+            height = 0.65
+        else:
+            height = 0.28 * result
+        return ','.join(['%fcm' % height] * len(rows))
+
+    def pdf_rows(self):
+        results = []
+        for row in self.rows():
+            result_row = [row['name']]
+            for day in row['days']:
+                result_row.append('')
+                for period in day:
+                    value = period['value']
+                    result_row.append(value)
+            result_row.extend(['', row['total']])
+            results.append(result_row)
+        return results
+
+
+class SubgroupsTimetablePDFView(ReportPDFView, SubgroupsTimetableView):
+    """A view for the term's subgroup-based timetable pdf"""
+
+    template=ViewPageTemplateFile('templates/subgroups_timetable_pdf.pt')
+    pageSize = pagesizes.landscape(ReportPDFView.pageSize)
+    rotation = 90
+    name_width = '1.2cm'
+    teacher_width = ',1.7cm'
+    period_width = 0.56
+    empty_width = 0.03
+
+    def __call__(self):
+        self.term = removeSecurityProxy(self.context)
+        self.schoolyear = ISchoolYear(self.term)
+        self.groups = IGroupContainer(self.schoolyear)
+        self.update()
+        return super(SubgroupsTimetablePDFView, self).__call__()
+
+    def heading_widths1(self):
+        results = self.name_width + self.teacher_width
+        for day in self.days():
+            day_width = self.empty_width + day['span'] * self.period_width
+            results += ',%fcm' % day_width
+        return results
+
+    def heading_widths2(self):
+        results = self.name_width + self.teacher_width
+        for day in self.days():
+            results += ',%fcm' % self.empty_width
+            for period in day['periods']:
+                results += ',%fcm' % self.period_width
+        return results
+
+    def headings1(self):
+        results = ['', '']
+        for day in self.days():
+            results.append(day['text'])
+        return results
+
+    def headings2(self):
+        results = [SUBGROUP_HEADING, TEACHER_HEADING]
+        for day in self.days():
+            results.append('')
+            for period in day['periods']:
+                results.append(period['value'])
+        return results
+
+    def row_heights(self):
+        return ','.join(['0.65cm'] * len(self.rows()))
+
+    def pdf_rows(self):
+        results = []
+        for row in self.rows():
+            result_row = [row['name'], row['teacher']]
+            for day in row['days']:
+                result_row.append('')
+                for period in day:
+                    value = period['value']
+                    result_row.append(value)
+            results.append(result_row)
+        return results
+

=== modified file 'src/schooltool/zambia/app/browser/configure.zcml'
--- src/schooltool/zambia/app/browser/configure.zcml	2010-08-08 18:28:59 +0000
+++ src/schooltool/zambia/app/browser/configure.zcml	2010-09-26 22:01:04 +0000
@@ -52,6 +52,36 @@
         title="Teachers Timetable"
         order="50"
         />
+    <navigationViewlet
+        name="subgroups_timetable.html"
+        for="schooltool.term.interfaces.ITerm"
+        manager="schooltool.skin.IActionMenuManager"
+        template="templates/actionsViewlet.pt"
+        permission="schooltool.edit"
+        link="subgroups_timetable.html"
+        title="Subgroups Timetable"
+        order="60"
+        />
+    <navigationViewlet
+        name="teachers_timetable.pdf"
+        for="schooltool.term.interfaces.ITerm"
+        manager="schooltool.skin.IActionMenuManager"
+        template="templates/actionsViewlet.pt"
+        permission="schooltool.edit"
+        link="teachers_timetable.pdf"
+        title="Teachers PDF"
+        order="50"
+        />
+    <navigationViewlet
+        name="subgroups_timetable.pdf"
+        for="schooltool.term.interfaces.ITerm"
+        manager="schooltool.skin.IActionMenuManager"
+        template="templates/actionsViewlet.pt"
+        permission="schooltool.edit"
+        link="subgroups_timetable.pdf"
+        title="Subgroups PDF"
+        order="60"
+        />
   </configure>
 
   <page
@@ -70,5 +100,27 @@
       permission="schooltool.edit"
       layer="schooltool.zambia.app.skin.ISchoolToolZambiaLayer"
       />
+  <page
+      name="subgroups_timetable.html"
+      for="schooltool.term.interfaces.ITerm"
+      class="schooltool.zambia.app.browser.app.SubgroupsTimetableView"
+      template="templates/subgroups_timetable.pt"
+      permission="schooltool.edit"
+      layer="schooltool.zambia.app.skin.ISchoolToolZambiaLayer"
+      />
+  <page
+      name="teachers_timetable.pdf"
+      for="schooltool.term.interfaces.ITerm"
+      class="schooltool.zambia.app.browser.app.TeachersTimetablePDFView"
+      permission="schooltool.edit"
+      layer="schooltool.zambia.app.skin.ISchoolToolZambiaLayer"
+      />
+  <page
+      name="subgroups_timetable.pdf"
+      for="schooltool.term.interfaces.ITerm"
+      class="schooltool.zambia.app.browser.app.SubgroupsTimetablePDFView"
+      permission="schooltool.edit"
+      layer="schooltool.zambia.app.skin.ISchoolToolZambiaLayer"
+      />
 
 </configure>

=== modified file 'src/schooltool/zambia/app/browser/resources/zambia.css'
--- src/schooltool/zambia/app/browser/resources/zambia.css	2010-08-08 18:28:59 +0000
+++ src/schooltool/zambia/app/browser/resources/zambia.css	2010-09-26 22:01:04 +0000
@@ -51,6 +51,26 @@
     text-align: center;
 }
 
+.sg_cell {
+    height: 3.5em;
+    padding: .2em;
+    margin: 0em;
+    border-left:  thin solid gray;
+    border-right: thin solid gray;
+    color: black;
+    text-align: center;
+}
+
+.sg_cell_left {
+    height: 3.5em;
+    padding: .2em;
+    margin: 0em;
+    border-left:  3px solid gray;
+    border-right: thin solid gray;
+    color: black;
+    text-align: center;
+}
+
 .border_top {
     border-top:  thin solid gray;
 }

=== added file 'src/schooltool/zambia/app/browser/templates/subgroups_timetable.pt'
--- src/schooltool/zambia/app/browser/templates/subgroups_timetable.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/zambia/app/browser/templates/subgroups_timetable.pt	2010-09-26 22:01:04 +0000
@@ -0,0 +1,55 @@
+<tal:tag condition="view/update" />
+<html metal:use-macro="view/@@standard_macros/page" i18n:domain="schooltool.gradebook">
+<head>
+  <title metal:fill-slot="title" i18n:translate="">Subgroups Timetable</title>
+</head>
+<body>
+
+<h1 metal:fill-slot="content-header"
+    i18n:translate="">Subgroups Timetable</h1>
+
+<metal:block metal:fill-slot="body">
+
+  <h1 tal:condition="view/error_message"
+      tal:content="view/error_message" />
+  
+  <table tal:condition="not: view/error_message" class="teachers_timetable">
+    <tr>
+      <th class="heading odd"></th>
+      <th class="heading odd"></th>
+      <th tal:repeat="day view/days" class="heading_left odd"
+          tal:content="day/text"
+          tal:attributes="colspan day/span" />
+    </tr>
+
+    <tr>
+      <th class="heading odd" i18n:translate="">Subgroup</th>
+      <th class="heading odd" i18n:translate="">Teacher</th>
+      <tal:block repeat="day view/days">
+        <th tal:repeat="period day/periods"
+            tal:attributes="class period/class"
+            tal:content="period/value" />
+      </tal:block>
+    </tr>
+
+    <tal:block repeat="row view/rows">
+      <tr>
+        <td tal:attributes="class row/class">
+          <span tal:content="row/name" />
+        </td>
+        <td tal:attributes="class row/class">
+          <span tal:content="row/teacher" />
+        </td>
+        <tal:block repeat="day row/days">
+          <td tal:repeat="period day"
+              tal:attributes="class period/class"
+              tal:content="period/value" />
+        </tal:block>
+      </tr>
+    </tal:block>
+
+  </table>
+
+</metal:block>
+</body>
+</html>

=== added file 'src/schooltool/zambia/app/browser/templates/subgroups_timetable_pdf.pt'
--- src/schooltool/zambia/app/browser/templates/subgroups_timetable_pdf.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/zambia/app/browser/templates/subgroups_timetable_pdf.pt	2010-09-26 22:01:04 +0000
@@ -0,0 +1,88 @@
+<?xml version="1.0" standalone="no" ?>
+<!DOCTYPE document SYSTEM "rml_1_0.dtd" [
+  <!ENTITY pound   "&#xA3;">
+  <!ENTITY nbsp    "&#160;">
+]>
+
+<document
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  metal:use-macro="context/@@rml_macros/report"
+  i18n:domain="schooltool.zambia">
+
+<metal:block fill-slot="page_templates">
+  <tal:block content="structure view/use_template/default" />
+</metal:block>
+
+<stylesheet>
+  <metal:block fill-slot="extra_initialize">
+  </metal:block>
+  <metal:block fill-slot="stylesheet">
+
+    <paraStyle
+      name="heading"
+      fontName="Arial_Bold"
+      fontSize="9"
+      alignment="center"
+      leading="12"/>
+
+    <paraStyle
+      name="cell"
+      fontName="Arial_Normal"
+      fontSize="6"
+      alignment="center"
+      leading="7"/>
+
+    <blockTableStyle id="headings_table">
+        <blockValign value="middle" start="0,0" stop="0,-1"/>
+    </blockTableStyle>
+
+    <blockTableStyle id="grid">
+    	<lineStyle kind="OUTLINE"
+          colorName="black" thickness="0.25"
+          start="0,0" stop="-1,-1" />
+    	<lineStyle kind="INNERGRID"
+          colorName="black" thickness="0.25"
+          start="0,0" stop="-1,-1" />
+        <blockValign value="middle" start="0,0" stop="0,-1"/>
+    </blockTableStyle>
+  </metal:block>
+</stylesheet>
+
+<story metal:fill-slot="story">
+
+  <blockTable style="headings_table"
+              tal:attributes="colWidths view/heading_widths1"
+              alignment="left">
+    <tr>
+      <td tal:repeat="heading view/headings1">
+        <para style="heading" tal:content="heading" />
+      </td>
+    </tr>
+  </blockTable>
+
+  <blockTable style="grid"
+              tal:attributes="colWidths view/heading_widths2"
+              alignment="left">
+    <tr>
+      <td tal:repeat="heading view/headings2" vAlign="middle">
+        <para style="heading" tal:content="heading" />
+      </td>
+    </tr>
+  </blockTable>
+
+  <blockTable style="grid"
+              tal:attributes="colWidths view/heading_widths2;
+                              rowHeights view/row_heights"
+              alignment="left">
+    <tr tal:repeat="row view/pdf_rows">
+      <td tal:repeat="cell row" vAlign="middle">
+        <para style="cell" tal:content="cell" />
+      </td>
+    </tr>
+  </blockTable>
+
+</story>
+
+</document>

=== modified file 'src/schooltool/zambia/app/browser/templates/teachers_timetable.pt'
--- src/schooltool/zambia/app/browser/templates/teachers_timetable.pt	2010-08-08 18:28:59 +0000
+++ src/schooltool/zambia/app/browser/templates/teachers_timetable.pt	2010-09-26 22:01:04 +0000
@@ -23,13 +23,13 @@
     </tr>
 
     <tr>
-      <th class="heading odd">Teacher</th>
+      <th class="heading odd" i18n:translate="">Teacher</th>
       <tal:block repeat="day view/days">
         <th tal:repeat="period day/periods"
             tal:attributes="class period/class"
             tal:content="period/value" />
       </tal:block>
-      <th class="heading_left odd">Periods</th>
+      <th class="heading_left odd" i18n:translate="">Periods</th>
     </tr>
 
     <tal:block repeat="row view/rows">

=== added file 'src/schooltool/zambia/app/browser/templates/teachers_timetable_pdf.pt'
--- src/schooltool/zambia/app/browser/templates/teachers_timetable_pdf.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/zambia/app/browser/templates/teachers_timetable_pdf.pt	2010-09-26 22:01:04 +0000
@@ -0,0 +1,88 @@
+<?xml version="1.0" standalone="no" ?>
+<!DOCTYPE document SYSTEM "rml_1_0.dtd" [
+  <!ENTITY pound   "&#xA3;">
+  <!ENTITY nbsp    "&#160;">
+]>
+
+<document
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  metal:use-macro="context/@@rml_macros/report"
+  i18n:domain="schooltool.zambia">
+
+<metal:block fill-slot="page_templates">
+  <tal:block content="structure view/use_template/default" />
+</metal:block>
+
+<stylesheet>
+  <metal:block fill-slot="extra_initialize">
+  </metal:block>
+  <metal:block fill-slot="stylesheet">
+
+    <paraStyle
+      name="heading"
+      fontName="Arial_Bold"
+      fontSize="9"
+      alignment="center"
+      leading="12"/>
+
+    <paraStyle
+      name="cell"
+      fontName="Arial_Normal"
+      fontSize="6"
+      alignment="center"
+      leading="7"/>
+
+    <blockTableStyle id="headings_table">
+        <blockValign value="top" start="0,0" stop="0,-1"/>
+    </blockTableStyle>
+
+    <blockTableStyle id="grid">
+    	<lineStyle kind="OUTLINE"
+          colorName="black" thickness="0.25"
+          start="0,0" stop="-1,-1" />
+    	<lineStyle kind="INNERGRID"
+          colorName="black" thickness="0.25"
+          start="0,0" stop="-1,-1" />
+        <blockValign value="top" start="0,0" stop="0,-1"/>
+    </blockTableStyle>
+  </metal:block>
+</stylesheet>
+
+<story metal:fill-slot="story">
+
+  <blockTable style="headings_table"
+              tal:attributes="colWidths view/heading_widths1"
+              alignment="left">
+    <tr>
+      <td tal:repeat="heading view/headings1">
+        <para style="heading" tal:content="heading" />
+      </td>
+    </tr>
+  </blockTable>
+
+  <blockTable style="grid"
+              tal:attributes="colWidths view/heading_widths2"
+              alignment="left">
+    <tr>
+      <td tal:repeat="heading view/headings2">
+        <para style="heading" tal:content="heading" />
+      </td>
+    </tr>
+  </blockTable>
+
+  <blockTable style="grid"
+              tal:attributes="colWidths view/heading_widths2;
+                              rowHeights view/row_heights"
+              alignment="left">
+    <tr tal:repeat="row view/pdf_rows">
+      <td tal:repeat="cell row" vAlign="middle">
+        <para style="cell" tal:content="cell" />
+      </td>
+    </tr>
+  </blockTable>
+
+</story>
+
+</document>