Merge lp:~aelkner/schooltool.gradebook/flourish into lp:schooltool.gradebook/flourish

[Gediminas Paulauskas]

Don't you think such a new big feature, that no one understands until they see it, implies a need for a merge request?

+ At a time when I have said I am making a 2.0.1 release
+ 3 test failures!
+ Behavior has changed, as evidenced by broken tests

[Gediminas Paulauskas (menesis)]

I have removed your merge from flourish branch.

# Your local branch will conflict. Push it aside
# $ bzr branch . ../flourish-rejected
# and get the real trunk
# $ bzr pull --overwrite lp:schooltool.gradebook

review: Disapprove

[Gediminas Paulauskas (menesis)]

Tests have to be looked at, and something needs fixing.

I don't see any tests or documentation on this feature.
Except a few lines in src/schooltool/gradebook/README.txt

No "What's this?" description of a new feature.

review: Needs Fixing

[Tom Hoffman (tom-hoffman)]

This doesn't need to be merged right now -- we'll be returning to these issues after the holidays.

[lp:~aelkner/schooltool.gradebook/flourish]

415. By Gediminas Paulauskas on 2011-12-22

Preparing release 2.0.1

416. By Gediminas Paulauskas on 2011-12-22

Back to development: 2.0.2

Unmerged revisions

476. By Alan Elkner on 2012-10-28

merged with trunk

=== modified file 'CHANGES.txt'
--- CHANGES.txt	2011-12-22 15:15:53 +0000
+++ CHANGES.txt	2011-12-22 16:21:13 +0000
@@ -6,7 +6,11 @@
 ------------------
 
 - Allow scoresystem point value be equal to the previous grade (https://launchpad.net/bugs/899228)
+<<<<<<< TREE
 - Updated translations
+=======
+- Added course worksheets feature
+>>>>>>> MERGE-SOURCE
 
 
 2.0.0 (2011-11-22)

=== modified file 'src/schooltool/gradebook/README.txt'
--- src/schooltool/gradebook/README.txt	2011-08-30 17:24:02 +0000
+++ src/schooltool/gradebook/README.txt	2011-12-22 16:21:13 +0000
@@ -661,3 +661,22 @@
     >>> linked_activity.scoresystem.max
     Decimal("20")
 
+Course Activities
+-----------------
+
+Course leaders can create a set of worksheets that they can later choose to
+deploy to all the sections of that course for specific terms or the whole
+school year.  There is an adapter that returns this set, which it locates
+in the course's annotations.
+
+    >>> alg1_act = interfaces.ICourseActivities(alg1)
+    >>> alg1_act
+    CourseActivities(u'Course Activities')
+
+There is also an adapter that returns the deployed worksheets for the course,
+also stored as annotations.
+
+    >>> alg1_deployed = interfaces.ICourseDeployedWorksheets(alg1)
+    >>> alg1_deployed
+    CourseDeployedWorksheets(u'Deployed Worksheets')
+

=== modified file 'src/schooltool/gradebook/activity.py'
--- src/schooltool/gradebook/activity.py	2011-09-01 13:46:58 +0000
+++ src/schooltool/gradebook/activity.py	2011-12-22 16:21:13 +0000
@@ -37,6 +37,7 @@
 from schooltool.app.interfaces import ISchoolToolApplication
 from schooltool.gradebook import GradebookMessage as _
 from schooltool.requirement import requirement, scoresystem
+from schooltool.requirement.interfaces import IRangedValuesScoreSystem
 from schooltool.gradebook import interfaces
 from schooltool.term.interfaces import IDateManager
 from schooltool.course.interfaces import ISection
@@ -44,6 +45,8 @@
 ACTIVITIES_KEY = 'schooltool.gradebook.activities'
 CURRENT_WORKSHEET_KEY = 'schooltool.gradebook.currentworksheet'
 CATEGORY_WEIGHTS_KEY = 'schooltool.gradebook.categoryweights'
+COURSE_ACTIVITIES_KEY = 'schooltool.gradebook.course_activities'
+COURSE_DEPLOYED_WORKSHEETS_KEY = 'schooltool.gradebook.course_deployed'
 
 
 def ensureAtLeastOneWorksheet(activities):
@@ -170,6 +173,14 @@
             return []
 
 
+class CourseActivities(requirement.Requirement):
+    zope.interface.implements(interfaces.ICourseActivities)
+
+
+class CourseDeployedWorksheets(requirement.Requirement):
+    zope.interface.implements(interfaces.ICourseDeployedWorksheets)
+
+
 class Worksheet(requirement.Requirement):
     zope.interface.implements(interfaces.IWorksheet, 
                               annotation.interfaces.IAttributeAnnotatable)
@@ -198,6 +209,12 @@
             ann[CATEGORY_WEIGHTS_KEY] = persistent.dict.PersistentDict()
         ann[CATEGORY_WEIGHTS_KEY][category] = weight
 
+    def canAverage(self):
+        for activity in self.values():
+            if IRangedValuesScoreSystem(activity.scoresystem, None) is None:
+                return False
+        return True
+
 
 class ReportWorksheet(requirement.Requirement):
     zope.interface.implements(interfaces.IReportWorksheet)
@@ -205,6 +222,12 @@
     deployed = False
 
 
+class CourseWorksheet(requirement.Requirement):
+    zope.interface.implements(interfaces.ICourseWorksheet)
+
+    deployed = False
+
+
 class Activity(requirement.Requirement):
     zope.interface.implements(interfaces.IActivity)
 
@@ -237,8 +260,6 @@
         return annotations[ACTIVITIES_KEY]
     except KeyError:
         activities = Activities(_('Activities'))
-        # Make sure that the sections activities include all the activities of
-        # the courses as well
         annotations[ACTIVITIES_KEY] = activities
         zope.container.contained.contained(
             activities, context, 'activities')
@@ -248,6 +269,38 @@
 getSectionActivities.factory = Activities
 
 
+def getCourseActivities(context):
+    '''IAttributeAnnotatable object to ICourseActivities adapter.'''
+    annotations = annotation.interfaces.IAnnotations(context)
+    try:
+        return annotations[COURSE_ACTIVITIES_KEY]
+    except KeyError:
+        activities = CourseActivities(_('Course Activities'))
+        annotations[COURSE_ACTIVITIES_KEY] = activities
+        zope.container.contained.contained(
+            activities, context, 'activities')
+        return activities
+
+# Convention to make adapter introspectable
+getCourseActivities.factory = CourseActivities
+
+
+def getCourseDeployedWorksheets(context):
+    '''IAttributeAnnotatable object to ICourseDeployedWorksheets adapter.'''
+    annotations = annotation.interfaces.IAnnotations(context)
+    try:
+        return annotations[COURSE_DEPLOYED_WORKSHEETS_KEY]
+    except KeyError:
+        worksheets = CourseDeployedWorksheets(_('Deployed Worksheets'))
+        annotations[COURSE_DEPLOYED_WORKSHEETS_KEY] = worksheets
+        zope.container.contained.contained(
+            worksheets, context, 'deployed_worksheets')
+        return worksheets
+
+# Convention to make adapter introspectable
+getCourseDeployedWorksheets.factory = CourseDeployedWorksheets
+
+
 class LinkedActivity(Activity):
     zope.interface.implements(interfaces.ILinkedActivity)
 

=== added file 'src/schooltool/gradebook/browser/course_worksheets.py'
--- src/schooltool/gradebook/browser/course_worksheets.py	1970-01-01 00:00:00 +0000
+++ src/schooltool/gradebook/browser/course_worksheets.py	2011-12-22 16:21:13 +0000
@@ -0,0 +1,452 @@
+#
+# SchoolTool - common information systems platform for school administration
+# Copyright (c) 2005 Shuttleworth Foundation
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+"""
+Course Worksheet Views
+"""
+
+from zope.container.interfaces import INameChooser
+from zope.browserpage.viewpagetemplatefile import ViewPageTemplateFile
+from zope.security.checker import canWrite
+from zope.security.interfaces import Unauthorized
+from zope.security.proxy import removeSecurityProxy
+from zope.traversing.api import getName
+from zope.traversing.browser.absoluteurl import absoluteURL
+from zope.i18n import translate
+
+from z3c.form import form, field, button
+
+from schooltool.app.interfaces import ISchoolToolApplication
+from schooltool.gradebook import GradebookMessage as _
+from schooltool.common.inlinept import InheritTemplate
+from schooltool.common.inlinept import InlineViewPageTemplate
+from schooltool.course.interfaces import ISectionContainer, ISection
+from schooltool.person.interfaces import IPerson
+from schooltool.schoolyear.interfaces import ISchoolYear
+from schooltool.schoolyear.interfaces import ISchoolYearContainer
+from schooltool.skin import flourish
+from schooltool.skin.flourish.page import TertiaryNavigationManager
+from schooltool.term.interfaces import ITerm
+
+from schooltool.gradebook.interfaces import (IActivities, ICourseActivities,
+     ICourseWorksheet, ICourseDeployedWorksheets, IGradebookRoot)
+from schooltool.gradebook.activity import CourseWorksheet, Activity, Worksheet
+from schooltool.gradebook.browser.activity import (FlourishActivityAddView,
+    FlourishActivityEditView)
+from schooltool.gradebook.browser.report_card import copyActivities
+
+
+class FlourishCourseTemplatesView(flourish.page.Page):
+    """A flourish view for managing course worksheet templates"""
+
+    @property
+    def title(self):
+        return self.context.__parent__.title
+
+    @property
+    def worksheets(self):
+        return tuple(removeSecurityProxy(self.context).values())
+
+
+class FlourishCourseWorksheetsLinks(flourish.page.RefineLinksViewlet):
+    """flourish course worksheet templates add links viewlet."""
+
+
+class FlourishCourseWorksheetAddView(flourish.form.AddForm):
+    """flourish view for adding a course worksheet."""
+
+    fields = field.Fields(ICourseWorksheet).select('title')
+    template = InheritTemplate(flourish.page.Page.template)
+    label = None
+    legend = _('Course Worksheet Details')
+
+    @property
+    def title(self):
+        return self.context.__parent__.title
+
+    @button.buttonAndHandler(_('Submit'), name='add')
+    def handleAdd(self, action):
+        super(FlourishCourseWorksheetAddView, self).handleAdd.func(self, action)
+
+    @button.buttonAndHandler(_("Cancel"))
+    def handle_cancel_action(self, action):
+        url = absoluteURL(self.context, self.request)
+        self.request.response.redirect(url)
+
+    def create(self, data):
+        worksheet = CourseWorksheet(data['title'])
+        return worksheet
+
+    def add(self, worksheet):
+        chooser = INameChooser(self.context)
+        name = chooser.chooseName(worksheet.title, worksheet)
+        self.context[name] = worksheet
+        self._worksheet = worksheet
+        return worksheet
+
+    def nextURL(self):
+        return absoluteURL(self.context, self.request)
+
+    def updateActions(self):
+        super(FlourishCourseWorksheetAddView, self).updateActions()
+        self.actions['add'].addClass('button-ok')
+        self.actions['cancel'].addClass('button-cancel')
+
+
+class FlourishCourseWorksheetEditView(flourish.form.Form, form.EditForm):
+
+    template = InheritTemplate(flourish.page.Page.template)
+    label = None
+    legend = _('Course Worksheet Template Information')
+    fields = field.Fields(ICourseWorksheet).select('title')
+
+    @property
+    def title(self):
+        return self.context.title
+
+    def update(self):
+        if 'form-submitted' in self.request:
+            for activity in self.context.values():
+                name = 'delete.%s' % activity.__name__
+                if name in self.request:
+                    del self.context[activity.__name__]
+                    break
+        return form.EditForm.update(self)
+
+    @button.buttonAndHandler(_('Submit'), name='apply')
+    def handleApply(self, action):
+        super(FlourishCourseWorksheetEditView, self).handleApply.func(self, action)
+        # XXX: hacky sucessful submit check
+        if (self.status == self.successMessage or
+            self.status == self.noChangesMessage):
+            self.request.response.redirect(self.nextURL())
+
+    @button.buttonAndHandler(_("Cancel"))
+    def handle_cancel_action(self, action):
+        self.request.response.redirect(self.nextURL())
+
+    def nextURL(self):
+        return absoluteURL(self.context.__parent__, self.request)
+
+    def updateActions(self):
+        super(FlourishCourseWorksheetEditView, self).updateActions()
+        self.actions['apply'].addClass('button-ok')
+        self.actions['cancel'].addClass('button-cancel')
+
+
+class CourseWorksheetAddLinks(flourish.page.RefineLinksViewlet):
+    """Course worksheet add links viewlet."""
+
+
+class FlourishCourseActivityAddView(FlourishActivityAddView):
+    legend = _('Course Activity Details')
+
+
+class CourseActivityAddTertiaryNavigationManager(
+    flourish.page.TertiaryNavigationManager):
+
+    template = InlineViewPageTemplate("")
+
+
+class FlourishCourseActivityEditView(FlourishActivityEditView):
+    legend = _('Course Activity Details')
+
+    def nextURL(self):
+        return absoluteURL(self.context.__parent__, self.request)
+
+
+class FlourishCourseWorksheetsBase(object):
+
+    @property
+    def course(self):
+        return self.context
+
+    @property
+    def schoolyear(self):
+        return ISchoolYear(self.course)
+
+    @property
+    def deployed(self):
+        return ICourseDeployedWorksheets(self.course)
+
+    @property
+    def activities(self):
+        return ICourseActivities(self.course)
+
+    def sheets(self):
+        return [sheet for sheet in self.all_sheets() if not sheet['checked']]
+
+    def all_sheets(self):
+        schoolyear = self.schoolyear
+        deployments = {}
+        for nm, sheet in self.deployed.items():
+            sheet = removeSecurityProxy(sheet)
+            index = int(sheet.__name__[sheet.__name__.rfind('_') + 1:])
+            deployment = deployments.setdefault(index, {
+                'obj': sheet,
+                'index': str(index),
+                'checked': sheet.hidden,
+                'terms': [False] * len(schoolyear),
+                })
+            for index, term in enumerate(schoolyear.values()):
+                prefix = 'course_%s_%s' % (self.course.__name__, term.__name__)
+                if sheet.__name__.startswith(prefix):
+                    deployment['terms'][index] = True
+        sheets = [v for k, v in sorted(deployments.items())]
+        return ([sheet for sheet in sheets if not sheet['checked']] +
+                [sheet for sheet in sheets if sheet['checked']])
+
+    @property
+    def terms(self):
+        result = [{
+            'name': '',
+            'title': _('-- Entire year --'),
+            'selected': 'selected',
+            }]
+        for term in self.schoolyear.values():
+            result.append({
+                'name': term.__name__,
+                'title': term.title,
+                'selected': '',
+                })
+        return result
+
+    def getNewIndex(self, sheet, template_title):
+        if sheet.title.startswith(template_title):
+            rest = sheet.title[len(template_title):]
+            if not rest:
+                return 1
+            elif len(rest) > 1 and rest[0] == '-' and rest[1:].isdigit():
+                return int(rest[1:])
+        return 0
+
+    def deploy(self, term, template):
+        # get the next index and title
+        highest, title_index = 0, 0
+        template_title = self.alternate_title
+        for sheet in self.deployed.values():
+            index = int(sheet.__name__[sheet.__name__.rfind('_') + 1:])
+            if index > highest:
+                highest = index
+            new_index = self.getNewIndex(sheet, template_title)
+            if new_index > title_index:
+                title_index = new_index
+        root = IGradebookRoot(ISchoolToolApplication(None))
+        prefix = self.schoolyear.__name__ + '_'
+        for sheet in root.deployed.values():
+            if sheet.__name__.startswith(prefix):
+                new_index = self.getNewIndex(sheet, template_title)
+                if new_index > title_index:
+                    title_index = new_index
+        title = template_title
+        if title_index:
+            title += '-%s' % (title_index + 1)
+
+        # copy worksheet template to the term or whole year
+        if term:
+            terms = [term]
+        else:
+            terms = self.schoolyear.values()
+        for term in terms:
+            deployedKey = 'course_%s_%s_%s' % (self.course.__name__,
+                                               term.__name__, highest + 1)
+            deployedWorksheet = Worksheet(title)
+            self.deployed[deployedKey] = deployedWorksheet
+            copyActivities(removeSecurityProxy(template), deployedWorksheet)
+
+            # now copy the template to all sections in the term
+            sections = ISectionContainer(term)
+            for section in sections.values():
+                if self.course not in section.courses:
+                    continue
+                worksheetCopy = Worksheet(deployedWorksheet.title)
+                worksheetCopy.deployed = True
+                IActivities(section)[deployedWorksheet.__name__] = worksheetCopy
+                copyActivities(deployedWorksheet, worksheetCopy)
+
+
+class FlourishManageCourseWorksheetTemplatesOverview(flourish.page.Content):
+    """A flourish viewlet for showing worksheet templates in course view"""
+
+    body_template = ViewPageTemplateFile(
+        'templates/f_manage_course_worksheet_templates.pt')
+
+
+class FlourishManageCourseSheetsOverview(FlourishCourseWorksheetsBase,
+                                         flourish.page.Content):
+    """A flourish viewlet for showing deployed worksheets in course view"""
+
+    body_template = ViewPageTemplateFile(
+        'templates/f_manage_course_worksheets.pt')
+
+
+class FlourishCourseWorksheetsView(FlourishCourseWorksheetsBase,
+                                   flourish.page.Page):
+    """A flourish view for managing corse worksheet deployment"""
+
+    def __init__(self, context, request):
+        super(FlourishCourseWorksheetsView, self).__init__(context, request)
+        self.alternate_title = self.request.get('alternate_title')
+
+    @property
+    def subtitle(self):
+        subtitle = _(u'Worksheets for ${year}',
+                  mapping={'year': self.schoolyear.title})
+        return translate(subtitle, context=self.request)
+
+    @property
+    def has_error(self):
+        return self.no_template or self.no_title
+
+    @property
+    def no_template(self):
+        return 'SUBMIT' in self.request and not self.request.get('template')
+
+    @property
+    def no_title(self):
+        return ('SUBMIT' in self.request and
+                not self.request.get('alternate_title'))
+
+    @property
+    def templates(self):
+        result = [{
+            'name': '',
+            'title': _('-- Select a template --'),
+            'selected': 'selected',
+            }]
+        for template in self.activities.values():
+            result.append({
+                'name': template.__name__,
+                'title': template.title,
+                'selected': '',
+                })
+        return result
+
+    def update(self):
+        if 'CANCEL' in self.request:
+            self.request.response.redirect(self.nextURL())
+        if 'SUBMIT' in self.request:
+            if self.request.get('template') and self.alternate_title:
+                template = self.activities[self.request['template']]
+                term = self.request.get('term')
+                if term:
+                    term = self.schoolyear[term]
+                self.deploy(term, template)
+                self.alternate_title = ''
+
+    def nextURL(self):
+        return absoluteURL(self.context, self.request)
+
+
+class CourseWorksheetsActionLinks(flourish.page.RefineLinksViewlet):
+    """Course worksheets view action links viewlet."""
+
+
+class FlourishHideUnhideCourseWorkheetsView(FlourishCourseWorksheetsBase,
+                                            flourish.page.Page):
+    """A flourish view for hiding/unhiding course worksheet deployments"""
+
+    @property
+    def subtitle(self):
+        title = _(u'Hide/unhide Deployed Worksheets for ${year}',
+                  mapping={'year': self.schoolyear.title})
+        return translate(title, context=self.request)
+
+    def update(self):
+        if 'CANCEL' in self.request:
+            self.request.response.redirect(self.nextURL())
+        elif 'SUBMIT' in self.request:
+            hidden = self.request.get('hidden', [])
+            schoolyear = self.schoolyear
+            for nm, sheet in self.deployed.items():
+                sheet = removeSecurityProxy(sheet)
+                index = sheet.__name__[sheet.__name__.rfind('_') + 1:]
+                self.handleSheet(sheet, index, hidden)
+            self.request.response.redirect(self.nextURL())
+
+    def handleSheet(self, sheet, index, hidden):
+        if index in hidden and not sheet.hidden:
+            sheet.hidden = True
+        elif index not in hidden and sheet.hidden:
+            sheet.hidden = False
+        else:
+            return
+        schoolyear = self.schoolyear
+        for term in schoolyear.values():
+            deployedKey = 'course_%s_%s_%s' % (self.context.__name__,
+                                               term.__name__, index)
+            if sheet.__name__ == deployedKey:
+                for section in ISectionContainer(term).values():
+                    if self.context not in section.courses:
+                        continue
+                    activities = IActivities(section)
+                    activities[deployedKey].hidden = sheet.hidden
+                return
+
+    def nextURL(self):
+        url = absoluteURL(self.context, self.request)
+        return url + '/deployed_worksheets.html'
+
+
+class FlourishDeployAsCourseWorksheetView(FlourishCourseWorksheetsBase,
+                                          flourish.page.Page):
+    """A flourish view for deploying current gradebook worksheet as a
+       course worksheet.  If form data is valid, it creates a course
+       worksheet template as a copy of the context and then deploys that
+       to the course for the given term.."""
+
+    @property
+    def course(self):
+        courses = list(ISection(self.context).courses)
+        if not courses:
+            return None
+        return courses[0]
+
+    @property
+    def has_error(self):
+        return self.no_title
+
+    @property
+    def no_title(self):
+        return 'SUBMIT' in self.request and not self.alternate_title
+
+    @property
+    def alternate_title(self):
+        if 'alternate_title' in self.request:
+            return self.request['alternate_title']
+        return self.context.title
+
+    def update(self):
+        if 'CANCEL' in self.request:
+            self.request.response.redirect(self.nextURL())
+        if 'SUBMIT' in self.request:
+            if not self.has_error:
+                template = Worksheet(self.alternate_title)
+                chooser = INameChooser(self.activities)
+                name = chooser.chooseName(template.title, template)
+                self.activities[name] = template
+                copyActivities(removeSecurityProxy(self.context), template)
+                term = self.request.get('term')
+                if term:
+                    term = self.schoolyear[term]
+                self.deploy(term, template)
+                self.request.response.redirect(self.nextURL())
+
+    def nextURL(self):
+        return absoluteURL(self.context, self.request) + '/gradebook'
+

=== modified file 'src/schooltool/gradebook/browser/flourish.zcml'
--- src/schooltool/gradebook/browser/flourish.zcml	2011-11-07 06:19:05 +0000
+++ src/schooltool/gradebook/browser/flourish.zcml	2011-12-22 16:21:13 +0000
@@ -140,6 +140,17 @@
       />
 
   <flourish:viewlet
+      name="gradebook_actions"
+      after="gradebook_settings"
+      manager="schooltool.skin.flourish.page.IPageRefineManager"
+      class=".gradebook.FlourishGradebookActionsLinks"
+      for="..interfaces.IGradebook"
+      title="Actions"
+      permission="schooltool.edit"
+      view=".gradebook.FlourishGradebookOverview"
+      />
+
+  <flourish:viewlet
       name="select_year"
       class=".gradebook.FlourishGradebookYearNavigationViewlet"
       manager=".gradebook.FlourishGradebookYearNavigation"
@@ -372,8 +383,17 @@
 
   <!-- Report Sheets -->
   <flourish:viewlet
+      name="manage-report-sheet-templates-overview"
+      after="manage-resources-overview"
+      view="schooltool.app.browser.app.ManageSchool"
+      permission="schooltool.edit"
+      manager="schooltool.skin.flourish.page.IPageContentManager"
+      class=".report_card.FlourishManageReportSheetTemplatesOverview"
+      />
+
+  <flourish:viewlet
       name="manage-report-sheets-overview"
-      after="manage-resources-overview"
+      after="manage-report-sheet-templates-overview"
       view="schooltool.app.browser.app.ManageSchool"
       permission="schooltool.edit"
       manager="schooltool.skin.flourish.page.IPageContentManager"
@@ -518,15 +538,6 @@
         />
   </configure>
 
-  <flourish:viewlet
-      name="gradebook/templates"
-      before="report_card_layout"
-      title="Report Sheet Templates"
-      class="schooltool.skin.flourish.page.LinkViewlet"
-      manager="schooltool.app.browser.app.CustomizeSchoolLinks"
-      permission="schooltool.edit"
-      />
-
   <flourish:page
       name="report_sheets"
       for="schooltool.app.interfaces.ISchoolToolApplication"
@@ -958,4 +969,163 @@
         />
   </configure>
 
+  <!-- Course Worksheets -->
+  <flourish:viewlet
+      name="manage-course-worksheet-templates"
+      before="manage-course-worksheets"
+      view="schooltool.course.browser.course.FlourishCourseView"
+      permission="schooltool.edit"
+      manager="schooltool.skin.flourish.page.IPageContentManager"
+      class=".course_worksheets.FlourishManageCourseWorksheetTemplatesOverview"
+      />
+
+  <flourish:viewlet
+      name="manage-course-worksheets"
+      view="schooltool.course.browser.course.FlourishCourseView"
+      permission="schooltool.edit"
+      manager="schooltool.skin.flourish.page.IPageContentManager"
+      class=".course_worksheets.FlourishManageCourseSheetsOverview"
+      />
+
+  <flourish:page
+      name="index.html"
+      for="schooltool.gradebook.interfaces.ICourseActivities"
+      class=".course_worksheets.FlourishCourseTemplatesView"
+      content_template="templates/f_course_worksheet_templates.pt"
+      permission="schooltool.edit"
+      subtitle="Worksheet Templates"
+      />
+
+  <flourish:viewlet
+      name="course-worksheets"
+      manager="schooltool.skin.flourish.page.IPageRefineManager"
+      class=".course_worksheets.FlourishCourseWorksheetsLinks"
+      for="schooltool.gradebook.interfaces.ICourseActivities"
+      title="Add"
+      permission="schooltool.edit"
+      view=".course_worksheets.FlourishCourseTemplatesView"
+      />
+
+  <flourish:viewlet
+      name="addCourseWorksheet.html"
+      title="Course Worksheet"
+      class="schooltool.skin.flourish.page.LinkViewlet"
+      manager=".course_worksheets.FlourishCourseWorksheetsLinks"
+      permission="schooltool.edit"
+      />
+
+  <configure package="schooltool.skin.flourish">
+    <flourish:page
+        name="addCourseWorksheet.html"
+        for="schooltool.gradebook.interfaces.ICourseActivities"
+        subtitle="New Course Worksheet"
+        class="schooltool.gradebook.browser.course_worksheets.FlourishCourseWorksheetAddView"
+        content_template="templates/z3c-schooltool-form.pt"
+        permission="schooltool.edit"
+        />
+
+    <flourish:page
+        name="addCourseActivity.html"
+        for="schooltool.gradebook.interfaces.ICourseWorksheet"
+        subtitle="New Course Activity"
+        class="schooltool.gradebook.browser.course_worksheets.FlourishCourseActivityAddView"
+        content_template="templates/z3c-schooltool-form.pt"
+        permission="schooltool.edit"
+        />
+  </configure>
+
+  <flourish:page
+      name="index.html"
+      for="schooltool.gradebook.interfaces.ICourseWorksheet"
+      subtitle="Edit"
+      class=".course_worksheets.FlourishCourseWorksheetEditView"
+      content_template="templates/f_course_worksheet_edit.pt"
+      permission="schooltool.edit"
+      />
+
+  <flourish:viewlet
+      name="course-worksheet-add-links"
+      manager="schooltool.skin.flourish.page.IPageRefineManager"
+      class=".course_worksheets.CourseWorksheetAddLinks"
+      view=".course_worksheets.FlourishCourseWorksheetEditView"
+      title="Add"
+      permission="schooltool.edit"
+      />
+
+  <flourish:viewlet
+      name="addCourseActivity.html"
+      title="Course Activity"
+      class="schooltool.skin.flourish.page.LinkViewlet"
+      manager=".course_worksheets.CourseWorksheetAddLinks"
+      permission="schooltool.edit"
+      />
+
+  <flourish:viewletManager
+      name="tertiary_navigation"
+      provides="schooltool.skin.flourish.page.ITertiaryNavigationManager"
+      class=".course_worksheets.CourseActivityAddTertiaryNavigationManager"
+      view=".course_worksheets.FlourishCourseActivityAddView"
+      permission="zope.Public"
+      />
+
+  <flourish:page
+      name="editCourseActivity.html"
+      for="..interfaces.IActivity"
+      subtitle="Edit"
+      content_template="templates/f_add_edit_activity.pt"
+      class=".course_worksheets.FlourishCourseActivityEditView"
+      permission="schooltool.edit"
+      />
+
+  <flourish:page
+      name="deployed_worksheets.html"
+      for="schooltool.course.interfaces.ICourse"
+      class=".course_worksheets.FlourishCourseWorksheetsView"
+      content_template="templates/f_course_worksheets.pt"
+      permission="schooltool.edit"
+      />
+
+  <flourish:viewlet
+      name="course-worksheets-action-links"
+      manager="schooltool.skin.flourish.page.IPageRefineManager"
+      class=".course_worksheets.CourseWorksheetsActionLinks"
+      view=".course_worksheets.FlourishCourseWorksheetsView"
+      title="Action"
+      permission="schooltool.edit"
+      />
+
+  <flourish:viewlet
+      name="hide_unhide_worksheets.html"
+      title="Hide/unhide Worksheets"
+      class="schooltool.skin.flourish.page.LinkViewlet"
+      manager=".course_worksheets.CourseWorksheetsActionLinks"
+      permission="schooltool.edit"
+      />
+
+  <flourish:page
+      name="hide_unhide_worksheets.html"
+      for="schooltool.course.interfaces.ICourse"
+      class=".course_worksheets.FlourishHideUnhideCourseWorkheetsView"
+      content_template="templates/f_hide_unhide_course_worksheets.pt"
+      permission="schooltool.edit"
+      />
+
+  <flourish:viewlet
+      name="../deploy_as_course_worksheet.html"
+      title="Deploy as Course Worksheet"
+      class="schooltool.skin.flourish.page.LinkViewlet"
+      manager=".gradebook.FlourishGradebookActionsLinks"
+      permission="schooltool.edit"
+      />
+
+  <flourish:page
+      name="deploy_as_course_worksheet.html"
+      for="..interfaces.IWorksheet"
+      subtitle="Deploy as Course Worksheet"
+      class=".course_worksheets.FlourishDeployAsCourseWorksheetView"
+      content_template="templates/f_deploy_as_course_worksheet.pt"
+      permission="schooltool.edit"
+      />
+
 </configure>
+

=== modified file 'src/schooltool/gradebook/browser/gradebook.py'
--- src/schooltool/gradebook/browser/gradebook.py	2011-12-20 19:41:39 +0000
+++ src/schooltool/gradebook/browser/gradebook.py	2011-12-22 16:21:13 +0000
@@ -415,7 +415,7 @@
         self.due_date_hide = prefs.get('hide', False)
 
         self.apply_all_colspan = 1
-        if gradebook.context.deployed:
+        if not gradebook.context.canAverage():
             self.total_hide = True
             self.average_hide = True
         if not self.absences_hide:
@@ -1057,6 +1057,10 @@
     """flourish Gradebook Settings links viewlet."""
 
 
+class FlourishGradebookActionsLinks(flourish.page.RefineLinksViewlet):
+    """flourish Gradebook Actions links viewlet."""
+
+
 class GradebookTertiaryNavigationManager(flourish.page.TertiaryNavigationManager):
 
     template = InlineViewPageTemplate("""
@@ -1075,8 +1079,11 @@
         current = gradebook.context.__name__
         for worksheet in gradebook.worksheets:
             url = '%s/gradebook' % absoluteURL(worksheet, self.request)
+            classes = worksheet.__name__ == current and ['active'] or []
+            if worksheet.deployed:
+                classes.append('deployed')
             result.append({
-                'class': worksheet.__name__ == current and 'active' or None,
+                'class': classes and ' '.join(classes) or None,
                 'viewlet': u'<a href="%s">%s</a>' % (url, worksheet.title[:15]),
                 })
         return result
@@ -1902,3 +1909,4 @@
             return None
         can_view = flourish.canView(self.gradebook)
         return can_view
+

=== modified file 'src/schooltool/gradebook/browser/report_card.py'
--- src/schooltool/gradebook/browser/report_card.py	2011-11-12 04:02:28 +0000
+++ src/schooltool/gradebook/browser/report_card.py	2011-12-22 16:21:13 +0000
@@ -221,6 +221,14 @@
             return []
 
 
+class FlourishManageReportSheetTemplatesOverview(FlourishReportSheetsBase,
+                                                 flourish.page.Content):
+    """A flourish viewlet for showing report sheet templates in school view"""
+
+    body_template = ViewPageTemplateFile(
+        'templates/f_manage_report_sheet_templates_overview.pt')
+
+
 class FlourishManageReportSheetsOverview(FlourishReportSheetsBase,
                                          flourish.page.Content):
     """A flourish viewlet for showing deployed report sheets in school view"""
@@ -500,6 +508,12 @@
     def title(self):
         return self.context.title
 
+    def display_scoresystem(self, activity):
+        ss = activity.scoresystem
+        if IRangedValuesScoreSystem.providedBy(ss):
+            return '%s - %s' % (ss.min, ss.max)
+        return ss.title
+
     def update(self):
         if 'form-submitted' in self.request:
             for activity in self.context.values():

=== modified file 'src/schooltool/gradebook/browser/resources/f_gradebook.css'
--- src/schooltool/gradebook/browser/resources/f_gradebook.css	2011-08-31 20:16:11 +0000
+++ src/schooltool/gradebook/browser/resources/f_gradebook.css	2011-12-22 16:21:13 +0000
@@ -33,3 +33,8 @@
     height: 18px;
     width: 104px;
 }
+
+li.deployed a {
+    font-style: italic;
+}
+

=== added file 'src/schooltool/gradebook/browser/templates/f_course_worksheet_edit.pt'
--- src/schooltool/gradebook/browser/templates/f_course_worksheet_edit.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/gradebook/browser/templates/f_course_worksheet_edit.pt	2011-12-22 16:21:13 +0000
@@ -0,0 +1,45 @@
+<div i18n:domain="schooltool.gradebook">
+  <div metal:use-macro="macro:form">
+    <metal:block fill-slot="bottom">
+    <input type="hidden" name="form-submitted" value="" />
+    <h2 i18n:translate="">Course Activities</h2>
+    <table>
+      <thead>
+        <tr>
+          <th i18n:translate="">Title</th>
+          <th i18n:translate="">Score System</th>
+          <th i18n:translate="">Delete?</th>
+        </tr>
+      </thead>
+      <tal:block repeat="activity context/values">
+        <tr>
+          <td>
+            <span tal:content="activity/title" />
+            <a class="modify" href="" title="Edit"
+               tal:attributes="href string:${activity/@@absolute_url}/editCourseActivity.html"
+               i18n:attributes="title">
+              <img tal:attributes="src context/++resource++schooltool.skin.flourish/edit-icon.png"
+                   alt="Edit"
+                   i18n:attributes="alt" />
+            </a>
+          </td>
+          <td tal:content="string: ${activity/scoresystem/min} - ${activity/scoresystem/max}"/>
+          <td>
+            <button class="image" type="submit" title="Delete" value="1"
+                    tal:attributes="name string:delete.${activity/__name__};"
+                    i18n:attributes="title">
+              <img alt="Delete" i18n:attributes="alt"
+                   tal:attributes="src context/++resource++schooltool.skin.flourish/remove-icon.png" />
+            </button>
+          </td>
+        </tr>
+      </tal:block>
+    </table>
+    <h3>
+      <a tal:attributes="href view/nextURL"
+         i18n:translate="">Done</a>
+    </h3>
+    </metal:block>
+  </div>
+</div>
+

=== added file 'src/schooltool/gradebook/browser/templates/f_course_worksheet_templates.pt'
--- src/schooltool/gradebook/browser/templates/f_course_worksheet_templates.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/gradebook/browser/templates/f_course_worksheet_templates.pt	2011-12-22 16:21:13 +0000
@@ -0,0 +1,26 @@
+<div tal:define="worksheets view/worksheets" i18n:domain="schooltool.gradebook">
+  <form method="post"
+        tal:attributes="action string:${context/@@absolute_url}/worksheet_templates.html">
+    <input type="hidden" name="form-submitted" value="" />
+    <table>
+      <thead>
+        <tr>
+          <th i18n:translate="">Title</th>
+        </tr>
+      </thead>
+      <tr tal:repeat="worksheet worksheets">
+        <td>
+          <tal:block replace="structure worksheet/@@link" />
+        </td>
+      </tr>
+      <tr tal:condition="python: len(worksheets) == 0">
+        <td i18n:translate="">This year has no course worksheets set up.</td>
+      </tr>
+    </table>
+  </form>
+  <h3>
+    <a tal:attributes="href string:${context/__parent__/@@absolute_url}"
+       i18n:translate="">Done</a>
+  </h3>
+</div>
+

=== added file 'src/schooltool/gradebook/browser/templates/f_course_worksheets.pt'
--- src/schooltool/gradebook/browser/templates/f_course_worksheets.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/gradebook/browser/templates/f_course_worksheets.pt	2011-12-22 16:21:13 +0000
@@ -0,0 +1,111 @@
+<div i18n:domain="schooltool.gradebook"
+     tal:define="sheets view/sheets; terms view/terms; schoolyear view/schoolyear">
+  <script type="text/javascript">
+    $(document).ready(function() {
+        $('#template').change(function(e) {
+            index = e.target.selectedIndex
+            $('#alternate_title').val(e.target.options[index].text);
+        });
+    });
+  </script>
+  <h3 i18n:translate="">Currently Deployed Worksheets</h3>
+  <table>
+    <thead>
+      <tr>
+        <th i18n:translate="">Workheet</th>
+        <tal:block repeat="term schoolyear/values">
+          <th tal:content="term/title" />
+        </tal:block>
+      </tr>
+    </thead>
+    <tr tal:repeat="sheet sheets">
+      <td tal:content="sheet/obj/title" />
+      <tal:block repeat="term sheet/terms">
+        <td>
+          <span tal:condition="term" class="ui-icon ui-icon-check ui-icon-center"></span>
+        </td>
+      </tal:block>
+    </tr>
+    <tr tal:condition="not: sheets">
+      <td tal:attributes="colspan python:len(schoolyear)+1" i18n:translate="">
+        This year has no worksheets deployed.
+      </td>
+        </tr>
+  </table>
+  <form method="post" class="standalone"
+        tal:attributes="action request/getURL">
+    <div class="viewspace">
+        <div class="status" tal:condition="view/has_error">
+          <div class="summary ui-state-error ui-corner-all">
+            <span class="ui-icon ui-icon-alert">icon</span>
+            <span i18n:domain="schooltool" i18n:translate="">Please correct the marked fields below.</span>
+          </div>
+        </div>
+      <fieldset>
+        <legend>
+          <span i18n:translate="">Select worksheet to deploy</span>
+        </legend>
+        <div class="row">
+          <div class="label">
+            <label for="term">
+              <span i18n:translate="">Term or Year</span>
+            </label>
+          </div>
+          <p class="hint" i18n:translate="">
+            Select a term or deploy to the entire year.
+          </p>
+          <div class="widget">
+            <select id="term" name="term">
+              <tal:block repeat="term terms">
+                <option tal:attributes="value term/name; selected term/selected"
+                        tal:content="term/title" />
+              </tal:block>
+            </select>
+          </div>
+        </div>
+        <div class="row">
+          <div class="label">
+            <label for="template">
+              <span i18n:translate="">Worksheet Template</span>
+            </label>
+          </div>
+          <div class="error" tal:condition="view/no_template">
+            <div class="error" i18n:translate="">Required input is missing.</div>
+          </div>
+          <div class="widget">
+            <select id="template" name="template">
+              <tal:block repeat="template view/templates">
+                <option tal:attributes="value template/name; selected template/selected"
+                        tal:content="template/title" />
+              </tal:block>
+            </select>
+          </div>
+        </div>
+        <div class="row">
+          <div class="label">
+            <label for="term">
+              <span i18n:translate="">Title</span>
+            </label>
+          </div>
+          <p class="hint" i18n:translate="">
+            If you deploy the same template multiple times, give each deployment
+            an easily distinguishable name.
+          </p>
+          <div class="error" tal:condition="view/no_title">
+            <div class="error" i18n:translate="">Required input is missing.</div>
+          </div>
+          <div class="widget">
+            <input type="text" name="alternate_title" id="alternate_title"
+                   tal:attributes="value view/alternate_title" />
+          </div>
+        </div>
+      </fieldset>
+    </div>
+    <div class="buttons controls">
+      <input type="submit" class="button-ok" name="SUBMIT" value="Submit"
+             i18n:attributes="value" />
+      <tal:block metal:use-macro="view/@@standard_macros/cancel-button" />
+    </div>
+  </form>
+</div>
+

=== added file 'src/schooltool/gradebook/browser/templates/f_deploy_as_course_worksheet.pt'
--- src/schooltool/gradebook/browser/templates/f_deploy_as_course_worksheet.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/gradebook/browser/templates/f_deploy_as_course_worksheet.pt	2011-12-22 16:21:13 +0000
@@ -0,0 +1,61 @@
+<div i18n:domain="schooltool.gradebook"
+     tal:define="terms view/terms">
+  <form method="post" class="standalone"
+        tal:attributes="action request/getURL">
+    <div class="viewspace">
+        <div class="status" tal:condition="view/has_error">
+          <div class="summary ui-state-error ui-corner-all">
+            <span class="ui-icon ui-icon-alert">icon</span>
+            <span i18n:domain="schooltool" i18n:translate="">Please correct the marked fields below.</span>
+          </div>
+        </div>
+      <fieldset>
+        <legend>
+          <span i18n:translate="">Select term or year to deploy</span>
+        </legend>
+        <div class="row">
+          <div class="label">
+            <label for="term">
+              <span i18n:translate="">Term or Year</span>
+            </label>
+          </div>
+          <p class="hint" i18n:translate="">
+            Select a term or deploy to the entire year.
+          </p>
+          <div class="widget">
+            <select id="term" name="term">
+              <tal:block repeat="term terms">
+                <option tal:attributes="value term/name; selected term/selected"
+                        tal:content="term/title" />
+              </tal:block>
+            </select>
+          </div>
+        </div>
+        <div class="row">
+          <div class="label">
+            <label for="term">
+              <span i18n:translate="">Title</span>
+            </label>
+          </div>
+          <p class="hint" i18n:translate="">
+            If you deploy the same template multiple times, give each deployment
+            an easily distinguishable name.
+          </p>
+          <div class="error" tal:condition="view/no_title">
+            <div class="error" i18n:translate="">Required input is missing.</div>
+          </div>
+          <div class="widget">
+            <input type="text" name="alternate_title" id="alternate_title"
+                   tal:attributes="value view/alternate_title" />
+          </div>
+        </div>
+      </fieldset>
+    </div>
+    <div class="buttons controls">
+      <input type="submit" class="button-ok" name="SUBMIT" value="Submit"
+             i18n:attributes="value" />
+      <tal:block metal:use-macro="view/@@standard_macros/cancel-button" />
+    </div>
+  </form>
+</div>
+

=== added file 'src/schooltool/gradebook/browser/templates/f_hide_unhide_course_worksheets.pt'
--- src/schooltool/gradebook/browser/templates/f_hide_unhide_course_worksheets.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/gradebook/browser/templates/f_hide_unhide_course_worksheets.pt	2011-12-22 16:21:13 +0000
@@ -0,0 +1,44 @@
+<div i18n:domain="schooltool.gradebook"
+     tal:define="sheets view/all_sheets; schoolyear view/schoolyear">
+  <h3 i18n:translate="">Currently Deployed WorkSheets</h3>
+  <form method="post" class="standalone"
+        tal:attributes="action request/getURL">
+    <table>
+      <thead>
+        <tr>
+          <th i18n:translate="">Deployed Worksheet</th>
+          <th i18n:translate="">Index</th>
+          <tal:block repeat="term schoolyear/values">
+            <th tal:content="term/title" />
+          </tal:block>
+          <th i18n:translate="">Hidden?</th>
+        </tr>
+      </thead>
+      <tr tal:repeat="sheet sheets">
+        <td tal:content="sheet/obj/title" />
+        <td tal:content="sheet/index" />
+        <tal:block repeat="term sheet/terms">
+          <td>
+            <span tal:condition="term" class="ui-icon ui-icon-check ui-icon-center"></span>
+          </td>
+        </tal:block>
+        <td>
+          <input type="checkbox" name="hidden:list"
+                 tal:attributes="value sheet/index;
+                                 checked sheet/checked" />
+        </td>
+      </tr>
+      <tr tal:condition="not: sheets">
+        <td tal:attributes="colspan python:len(schoolyear)+3" i18n:translate="">
+          This year has no worksheets deployed.
+        </td>
+      </tr>
+    </table>
+    <div class="buttons controls">
+      <input type="submit" class="button-ok" name="SUBMIT" value="Submit"
+             i18n:attributes="value" />
+      <tal:block metal:use-macro="view/@@standard_macros/cancel-button" />
+    </div>
+  </form>
+</div>
+

=== added file 'src/schooltool/gradebook/browser/templates/f_manage_course_worksheet_templates.pt'
--- src/schooltool/gradebook/browser/templates/f_manage_course_worksheet_templates.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/gradebook/browser/templates/f_manage_course_worksheet_templates.pt	2011-12-22 16:21:13 +0000
@@ -0,0 +1,10 @@
+<div class="manage-view" i18n:domain="schooltool">
+  <h3>
+    <a title="Manage Worksheet Templates"
+       tal:attributes="href string:${context/@@absolute_url}/activities"
+       i18n:attributes="title"
+       i18n:translate="">
+      Worksheet Templates
+    </a>
+  </h3>
+</div>

=== added file 'src/schooltool/gradebook/browser/templates/f_manage_course_worksheets.pt'
--- src/schooltool/gradebook/browser/templates/f_manage_course_worksheets.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/gradebook/browser/templates/f_manage_course_worksheets.pt	2011-12-22 16:21:13 +0000
@@ -0,0 +1,21 @@
+<div class="manage-view" i18n:domain="schooltool"
+     tal:define="sheets view/sheets">
+  <h3>
+    <a title="Manage Deployed Worksheets"
+       tal:attributes="href string:${context/@@absolute_url}/deployed_worksheets.html"
+       i18n:attributes="title"
+       i18n:translate="">
+      Deployed Worksheets
+    </a>
+  </h3>
+  <p i18n:translate="" tal:condition="sheets">
+    There are
+    <metal:block tal:replace="python:len(sheets)" i18n:name="count"/>
+    worksheets deployed in
+    <metal:block tal:replace="view/schoolyear/title" i18n:name="schoolyear"/>
+  </p>
+  <p i18n:translate="" tal:condition="not: sheets">
+    There are no worksheets deployed in
+    <metal:block tal:replace="view/schoolyear/title" i18n:name="schoolyear"/>
+  </p>
+</div>

=== added file 'src/schooltool/gradebook/browser/templates/f_manage_report_sheet_templates_overview.pt'
--- src/schooltool/gradebook/browser/templates/f_manage_report_sheet_templates_overview.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/gradebook/browser/templates/f_manage_report_sheet_templates_overview.pt	2011-12-22 16:21:13 +0000
@@ -0,0 +1,12 @@
+<div class="manage-view" i18n:domain="schooltool"
+     tal:condition="view/has_schoolyear"
+     tal:define="sheets view/sheets">
+  <h3>
+    <a title="Manage Report Sheet Templates"
+       tal:attributes="href string:${context/@@absolute_url}/gradebook/templates"
+       i18n:attributes="title"
+       i18n:translate="">
+      Report Sheet Templates
+    </a>
+  </h3>
+</div>

=== modified file 'src/schooltool/gradebook/browser/templates/f_manage_report_sheets_overview.pt'
--- src/schooltool/gradebook/browser/templates/f_manage_report_sheets_overview.pt	2011-08-29 01:25:08 +0000
+++ src/schooltool/gradebook/browser/templates/f_manage_report_sheets_overview.pt	2011-12-22 16:21:13 +0000
@@ -2,11 +2,11 @@
      tal:condition="view/has_schoolyear"
      tal:define="sheets view/sheets">
   <h3>
-    <a title="Manage Report Sheets"
+    <a title="Manage Deployed Report Sheets"
        tal:attributes="href string:${context/@@absolute_url}/report_sheets"
        i18n:attributes="title"
        i18n:translate="">
-      Report Sheets
+      Deployed Report Sheets
     </a>
   </h3>
   <p i18n:translate="" tal:condition="sheets">

=== modified file 'src/schooltool/gradebook/browser/templates/f_template_manage.pt'
--- src/schooltool/gradebook/browser/templates/f_template_manage.pt	2011-10-01 07:08:33 +0000
+++ src/schooltool/gradebook/browser/templates/f_template_manage.pt	2011-12-22 16:21:13 +0000
@@ -23,7 +23,7 @@
                    i18n:attributes="alt" />
             </a>
           </td>
-          <td tal:content="activity/scoresystem/title "/>
+          <td tal:content="python: view.display_scoresystem(activity)" />
           <td>
             <button class="image" type="submit" title="Delete" value="1"
                     tal:attributes="name string:delete.${activity/__name__};"

=== modified file 'src/schooltool/gradebook/browser/templates/f_templates_overview.pt'
--- src/schooltool/gradebook/browser/templates/f_templates_overview.pt	2011-09-26 18:30:13 +0000
+++ src/schooltool/gradebook/browser/templates/f_templates_overview.pt	2011-12-22 16:21:13 +0000
@@ -15,5 +15,9 @@
       </tr>
     </table>
   </form>
+  <h3>
+    <a tal:attributes="href string:${context/schooltool:app/@@absolute_url}/manage"
+       i18n:translate="">Done</a>
+  </h3>
 </div>
 

=== modified file 'src/schooltool/gradebook/configure.zcml'
--- src/schooltool/gradebook/configure.zcml	2011-11-22 17:30:59 +0000
+++ src/schooltool/gradebook/configure.zcml	2011-12-22 16:21:13 +0000
@@ -57,6 +57,18 @@
       factory=".activity.getSectionActivities"
       trusted="true"
       />
+  <adapter
+      for="schooltool.course.interfaces.ICourse"
+      provides=".interfaces.ICourseActivities"
+      factory=".activity.getCourseActivities"
+      trusted="true"
+      />
+  <adapter
+      for="schooltool.course.interfaces.ICourse"
+      provides=".interfaces.ICourseDeployedWorksheets"
+      factory=".activity.getCourseDeployedWorksheets"
+      trusted="true"
+      />
 
   <!-- Activity Content and Security -->
   <class class=".gradebook_init.GradebookRoot">
@@ -109,6 +121,26 @@
         set_schema=".interfaces.IActivities"
         />
   </class>
+  <class class=".activity.CourseActivities">
+    <require
+        permission="schooltool.view"
+        interface=".interfaces.ICourseActivities"
+        />
+    <require
+        permission="schooltool.edit"
+        set_schema=".interfaces.ICourseActivities"
+        />
+  </class>
+  <class class=".activity.CourseDeployedWorksheets">
+    <require
+        permission="schooltool.view"
+        interface=".interfaces.ICourseDeployedWorksheets"
+        />
+    <require
+        permission="schooltool.edit"
+        set_schema=".interfaces.ICourseDeployedWorksheets"
+        />
+  </class>
   <class class=".activity.Worksheet">
     <allow interface="zope.interface.common.mapping.IReadMapping" />
     <require
@@ -136,6 +168,19 @@
         attributes="changePosition"
         />
   </class>
+  <class class=".activity.CourseWorksheet">
+    <allow interface="zope.interface.common.mapping.IReadMapping" />
+    <require
+        permission="schooltool.view"
+        attributes="keys __iter__ values items __len__ title deployed"
+        />
+    <require
+        permission="schooltool.edit"
+        interface="zope.interface.common.mapping.IWriteMapping"
+        set_schema=".interfaces.ICourseWorksheet"
+        attributes="changePosition"
+        />
+  </class>
   <class class=".activity.Activity">
     <allow interface="zope.interface.common.mapping.IReadMapping" />
     <require
@@ -304,6 +349,12 @@
       name="activities"
       adapter="schooltool.gradebook.interfaces.IActivities"
       />
+  <adapterTraverserPlugin
+      for="schooltool.course.interfaces.ICourse"
+      layer="zope.publisher.interfaces.http.IHTTPRequest"
+      name="activities"
+      adapter="schooltool.gradebook.interfaces.ICourseActivities"
+      />
 
   <!-- special traversal adapter for traversing from worksheet to gradebook -->
   <adapter

=== modified file 'src/schooltool/gradebook/interfaces.py'
--- src/schooltool/gradebook/interfaces.py	2011-08-30 16:15:01 +0000
+++ src/schooltool/gradebook/interfaces.py	2011-12-22 16:21:13 +0000
@@ -89,6 +89,18 @@
     contains('.IWorksheet')
 
 
+class ICourseActivities(interfaces.IRequirement):
+    """Container of Course Worksheet Templates that can be deployed"""
+
+    contains('.ICourseWorksheet')
+
+
+class ICourseDeployedWorksheets(interfaces.IRequirement):
+    """Container of Deployed Course Worksheets (by term)"""
+
+    contains('.IWorksheet')
+
+
 class IWorksheet(interfaces.IRequirement):
     '''A list of activities that must be fulfilled in a course or section.'''
 
@@ -111,12 +123,15 @@
         """Set the weight for the given category.  Any numeric type is
            acceptable"""
 
+    def canAverage():
+        """return True if activities have scoresystems that can be averaged"""
+
     containers(IActivities)
     contains('.IActivity')
 
 
 class IReportWorksheet(interfaces.IRequirement):
-    '''A list of report card activities that get copied into sections.'''
+    '''A worksheet template to get copied into section gradebooks.'''
 
     containers(IGradebookTemplates, IGradebookDeployed)
     contains('.IReportActivity')
@@ -126,13 +141,23 @@
         description=_(u'Identifies the report sheet in teacher gradebooks.'))
 
 
+class ICourseWorksheet(interfaces.IRequirement):
+    '''A worksheet template to get copied into section gradebooks.'''
+
+    contains('.IActivity')
+
+    title = zope.schema.TextLine(
+        title=_(u'Title'),
+        description=_(u'Identifies the course worksheet in gradebooks.'))
+
+
 class IActivity(interfaces.IRequirement):
     '''An activity to be graded'''
 
     due_date = zope.schema.Date(
         title=_("Due Date"),
         description=_("The date the activity is due to be graded."),
-        required=True)
+        required=False)
 
     label = zope.schema.TextLine(
         title=_(u"Label"),
@@ -164,7 +189,7 @@
 
 
 class IReportActivity(IActivity):
-    '''An activity to be deployed to section activities'''
+    '''A report card activity to be deployed to section activities'''
 
     containers(IReportWorksheet)
 

=== modified file 'src/schooltool/gradebook/tests/test_gradebook.py'
--- src/schooltool/gradebook/tests/test_gradebook.py	2011-08-30 16:15:01 +0000
+++ src/schooltool/gradebook/tests/test_gradebook.py	2011-12-22 16:21:13 +0000
@@ -28,7 +28,7 @@
 from zope.component import provideAdapter, provideUtility
 from zope.interface import classImplements
 
-from schooltool.course.interfaces import ISection
+from schooltool.course.interfaces import ICourse, ISection
 from schooltool.relationship.tests import setUpRelationships
 from schooltool.person.person import Person
 from schooltool.requirement import testing
@@ -48,6 +48,12 @@
     provideAdapter(
         activity.getSectionActivities,
         (ISection,), interfaces.IActivities)
+    provideAdapter(
+        activity.getCourseActivities,
+        (ICourse,), interfaces.ICourseActivities)
+    provideAdapter(
+        activity.getCourseDeployedWorksheets,
+        (ICourse,), interfaces.ICourseDeployedWorksheets)
 
     provideAdapter(gradebook.Gradebook)