Merge lp:~aelkner/schooltool.gradebook/flourish into lp:schooltool.gradebook/flourish
- flourish
- Merge into flourish
Proposed by
Gediminas Paulauskas
Status: | Rejected |
---|---|
Rejected by: | Alan Elkner |
Proposed branch: | lp:~aelkner/schooltool.gradebook/flourish |
Merge into: | lp:schooltool.gradebook/flourish |
Diff against target: |
1514 lines (+1162/-21) (has conflicts) 22 files modified
CHANGES.txt (+4/-0) src/schooltool/gradebook/README.txt (+19/-0) src/schooltool/gradebook/activity.py (+55/-2) src/schooltool/gradebook/browser/course_worksheets.py (+452/-0) src/schooltool/gradebook/browser/flourish.zcml (+180/-10) src/schooltool/gradebook/browser/gradebook.py (+10/-2) src/schooltool/gradebook/browser/report_card.py (+14/-0) src/schooltool/gradebook/browser/resources/f_gradebook.css (+5/-0) src/schooltool/gradebook/browser/templates/f_course_worksheet_edit.pt (+45/-0) src/schooltool/gradebook/browser/templates/f_course_worksheet_templates.pt (+26/-0) src/schooltool/gradebook/browser/templates/f_course_worksheets.pt (+111/-0) src/schooltool/gradebook/browser/templates/f_deploy_as_course_worksheet.pt (+61/-0) src/schooltool/gradebook/browser/templates/f_hide_unhide_course_worksheets.pt (+44/-0) src/schooltool/gradebook/browser/templates/f_manage_course_worksheet_templates.pt (+10/-0) src/schooltool/gradebook/browser/templates/f_manage_course_worksheets.pt (+21/-0) src/schooltool/gradebook/browser/templates/f_manage_report_sheet_templates_overview.pt (+12/-0) src/schooltool/gradebook/browser/templates/f_manage_report_sheets_overview.pt (+2/-2) src/schooltool/gradebook/browser/templates/f_template_manage.pt (+1/-1) src/schooltool/gradebook/browser/templates/f_templates_overview.pt (+4/-0) src/schooltool/gradebook/configure.zcml (+51/-0) src/schooltool/gradebook/interfaces.py (+28/-3) src/schooltool/gradebook/tests/test_gradebook.py (+7/-1) Text conflict in CHANGES.txt |
To merge this branch: | bzr merge lp:~aelkner/schooltool.gradebook/flourish |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gediminas Paulauskas (community) | Needs Fixing | ||
Review via email: mp+86728@code.launchpad.net |
Commit message
Description of the change
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
To post a comment you must log in.
Revision history for this message
Gediminas Paulauskas (menesis) wrote : | # |
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/
No "What's this?" description of a new feature.
review:
Needs Fixing
Revision history for this message
Tom Hoffman (tom-hoffman) wrote : | # |
This doesn't need to be merged right now -- we'll be returning to these issues after the holidays.
- 415. By Gediminas Paulauskas
-
Preparing release 2.0.1
- 416. By Gediminas Paulauskas
-
Back to development: 2.0.2
Unmerged revisions
- 476. By Alan Elkner
-
merged with trunk
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'CHANGES.txt' | |||
2 | --- CHANGES.txt 2011-12-22 15:15:53 +0000 | |||
3 | +++ CHANGES.txt 2011-12-22 16:21:13 +0000 | |||
4 | @@ -6,7 +6,11 @@ | |||
5 | 6 | ------------------ | 6 | ------------------ |
6 | 7 | 7 | ||
7 | 8 | - Allow scoresystem point value be equal to the previous grade (https://launchpad.net/bugs/899228) | 8 | - Allow scoresystem point value be equal to the previous grade (https://launchpad.net/bugs/899228) |
8 | 9 | <<<<<<< TREE | ||
9 | 9 | - Updated translations | 10 | - Updated translations |
10 | 11 | ======= | ||
11 | 12 | - Added course worksheets feature | ||
12 | 13 | >>>>>>> MERGE-SOURCE | ||
13 | 10 | 14 | ||
14 | 11 | 15 | ||
15 | 12 | 2.0.0 (2011-11-22) | 16 | 2.0.0 (2011-11-22) |
16 | 13 | 17 | ||
17 | === modified file 'src/schooltool/gradebook/README.txt' | |||
18 | --- src/schooltool/gradebook/README.txt 2011-08-30 17:24:02 +0000 | |||
19 | +++ src/schooltool/gradebook/README.txt 2011-12-22 16:21:13 +0000 | |||
20 | @@ -661,3 +661,22 @@ | |||
21 | 661 | >>> linked_activity.scoresystem.max | 661 | >>> linked_activity.scoresystem.max |
22 | 662 | Decimal("20") | 662 | Decimal("20") |
23 | 663 | 663 | ||
24 | 664 | Course Activities | ||
25 | 665 | ----------------- | ||
26 | 666 | |||
27 | 667 | Course leaders can create a set of worksheets that they can later choose to | ||
28 | 668 | deploy to all the sections of that course for specific terms or the whole | ||
29 | 669 | school year. There is an adapter that returns this set, which it locates | ||
30 | 670 | in the course's annotations. | ||
31 | 671 | |||
32 | 672 | >>> alg1_act = interfaces.ICourseActivities(alg1) | ||
33 | 673 | >>> alg1_act | ||
34 | 674 | CourseActivities(u'Course Activities') | ||
35 | 675 | |||
36 | 676 | There is also an adapter that returns the deployed worksheets for the course, | ||
37 | 677 | also stored as annotations. | ||
38 | 678 | |||
39 | 679 | >>> alg1_deployed = interfaces.ICourseDeployedWorksheets(alg1) | ||
40 | 680 | >>> alg1_deployed | ||
41 | 681 | CourseDeployedWorksheets(u'Deployed Worksheets') | ||
42 | 682 | |||
43 | 664 | 683 | ||
44 | === modified file 'src/schooltool/gradebook/activity.py' | |||
45 | --- src/schooltool/gradebook/activity.py 2011-09-01 13:46:58 +0000 | |||
46 | +++ src/schooltool/gradebook/activity.py 2011-12-22 16:21:13 +0000 | |||
47 | @@ -37,6 +37,7 @@ | |||
48 | 37 | from schooltool.app.interfaces import ISchoolToolApplication | 37 | from schooltool.app.interfaces import ISchoolToolApplication |
49 | 38 | from schooltool.gradebook import GradebookMessage as _ | 38 | from schooltool.gradebook import GradebookMessage as _ |
50 | 39 | from schooltool.requirement import requirement, scoresystem | 39 | from schooltool.requirement import requirement, scoresystem |
51 | 40 | from schooltool.requirement.interfaces import IRangedValuesScoreSystem | ||
52 | 40 | from schooltool.gradebook import interfaces | 41 | from schooltool.gradebook import interfaces |
53 | 41 | from schooltool.term.interfaces import IDateManager | 42 | from schooltool.term.interfaces import IDateManager |
54 | 42 | from schooltool.course.interfaces import ISection | 43 | from schooltool.course.interfaces import ISection |
55 | @@ -44,6 +45,8 @@ | |||
56 | 44 | ACTIVITIES_KEY = 'schooltool.gradebook.activities' | 45 | ACTIVITIES_KEY = 'schooltool.gradebook.activities' |
57 | 45 | CURRENT_WORKSHEET_KEY = 'schooltool.gradebook.currentworksheet' | 46 | CURRENT_WORKSHEET_KEY = 'schooltool.gradebook.currentworksheet' |
58 | 46 | CATEGORY_WEIGHTS_KEY = 'schooltool.gradebook.categoryweights' | 47 | CATEGORY_WEIGHTS_KEY = 'schooltool.gradebook.categoryweights' |
59 | 48 | COURSE_ACTIVITIES_KEY = 'schooltool.gradebook.course_activities' | ||
60 | 49 | COURSE_DEPLOYED_WORKSHEETS_KEY = 'schooltool.gradebook.course_deployed' | ||
61 | 47 | 50 | ||
62 | 48 | 51 | ||
63 | 49 | def ensureAtLeastOneWorksheet(activities): | 52 | def ensureAtLeastOneWorksheet(activities): |
64 | @@ -170,6 +173,14 @@ | |||
65 | 170 | return [] | 173 | return [] |
66 | 171 | 174 | ||
67 | 172 | 175 | ||
68 | 176 | class CourseActivities(requirement.Requirement): | ||
69 | 177 | zope.interface.implements(interfaces.ICourseActivities) | ||
70 | 178 | |||
71 | 179 | |||
72 | 180 | class CourseDeployedWorksheets(requirement.Requirement): | ||
73 | 181 | zope.interface.implements(interfaces.ICourseDeployedWorksheets) | ||
74 | 182 | |||
75 | 183 | |||
76 | 173 | class Worksheet(requirement.Requirement): | 184 | class Worksheet(requirement.Requirement): |
77 | 174 | zope.interface.implements(interfaces.IWorksheet, | 185 | zope.interface.implements(interfaces.IWorksheet, |
78 | 175 | annotation.interfaces.IAttributeAnnotatable) | 186 | annotation.interfaces.IAttributeAnnotatable) |
79 | @@ -198,6 +209,12 @@ | |||
80 | 198 | ann[CATEGORY_WEIGHTS_KEY] = persistent.dict.PersistentDict() | 209 | ann[CATEGORY_WEIGHTS_KEY] = persistent.dict.PersistentDict() |
81 | 199 | ann[CATEGORY_WEIGHTS_KEY][category] = weight | 210 | ann[CATEGORY_WEIGHTS_KEY][category] = weight |
82 | 200 | 211 | ||
83 | 212 | def canAverage(self): | ||
84 | 213 | for activity in self.values(): | ||
85 | 214 | if IRangedValuesScoreSystem(activity.scoresystem, None) is None: | ||
86 | 215 | return False | ||
87 | 216 | return True | ||
88 | 217 | |||
89 | 201 | 218 | ||
90 | 202 | class ReportWorksheet(requirement.Requirement): | 219 | class ReportWorksheet(requirement.Requirement): |
91 | 203 | zope.interface.implements(interfaces.IReportWorksheet) | 220 | zope.interface.implements(interfaces.IReportWorksheet) |
92 | @@ -205,6 +222,12 @@ | |||
93 | 205 | deployed = False | 222 | deployed = False |
94 | 206 | 223 | ||
95 | 207 | 224 | ||
96 | 225 | class CourseWorksheet(requirement.Requirement): | ||
97 | 226 | zope.interface.implements(interfaces.ICourseWorksheet) | ||
98 | 227 | |||
99 | 228 | deployed = False | ||
100 | 229 | |||
101 | 230 | |||
102 | 208 | class Activity(requirement.Requirement): | 231 | class Activity(requirement.Requirement): |
103 | 209 | zope.interface.implements(interfaces.IActivity) | 232 | zope.interface.implements(interfaces.IActivity) |
104 | 210 | 233 | ||
105 | @@ -237,8 +260,6 @@ | |||
106 | 237 | return annotations[ACTIVITIES_KEY] | 260 | return annotations[ACTIVITIES_KEY] |
107 | 238 | except KeyError: | 261 | except KeyError: |
108 | 239 | activities = Activities(_('Activities')) | 262 | activities = Activities(_('Activities')) |
109 | 240 | # Make sure that the sections activities include all the activities of | ||
110 | 241 | # the courses as well | ||
111 | 242 | annotations[ACTIVITIES_KEY] = activities | 263 | annotations[ACTIVITIES_KEY] = activities |
112 | 243 | zope.container.contained.contained( | 264 | zope.container.contained.contained( |
113 | 244 | activities, context, 'activities') | 265 | activities, context, 'activities') |
114 | @@ -248,6 +269,38 @@ | |||
115 | 248 | getSectionActivities.factory = Activities | 269 | getSectionActivities.factory = Activities |
116 | 249 | 270 | ||
117 | 250 | 271 | ||
118 | 272 | def getCourseActivities(context): | ||
119 | 273 | '''IAttributeAnnotatable object to ICourseActivities adapter.''' | ||
120 | 274 | annotations = annotation.interfaces.IAnnotations(context) | ||
121 | 275 | try: | ||
122 | 276 | return annotations[COURSE_ACTIVITIES_KEY] | ||
123 | 277 | except KeyError: | ||
124 | 278 | activities = CourseActivities(_('Course Activities')) | ||
125 | 279 | annotations[COURSE_ACTIVITIES_KEY] = activities | ||
126 | 280 | zope.container.contained.contained( | ||
127 | 281 | activities, context, 'activities') | ||
128 | 282 | return activities | ||
129 | 283 | |||
130 | 284 | # Convention to make adapter introspectable | ||
131 | 285 | getCourseActivities.factory = CourseActivities | ||
132 | 286 | |||
133 | 287 | |||
134 | 288 | def getCourseDeployedWorksheets(context): | ||
135 | 289 | '''IAttributeAnnotatable object to ICourseDeployedWorksheets adapter.''' | ||
136 | 290 | annotations = annotation.interfaces.IAnnotations(context) | ||
137 | 291 | try: | ||
138 | 292 | return annotations[COURSE_DEPLOYED_WORKSHEETS_KEY] | ||
139 | 293 | except KeyError: | ||
140 | 294 | worksheets = CourseDeployedWorksheets(_('Deployed Worksheets')) | ||
141 | 295 | annotations[COURSE_DEPLOYED_WORKSHEETS_KEY] = worksheets | ||
142 | 296 | zope.container.contained.contained( | ||
143 | 297 | worksheets, context, 'deployed_worksheets') | ||
144 | 298 | return worksheets | ||
145 | 299 | |||
146 | 300 | # Convention to make adapter introspectable | ||
147 | 301 | getCourseDeployedWorksheets.factory = CourseDeployedWorksheets | ||
148 | 302 | |||
149 | 303 | |||
150 | 251 | class LinkedActivity(Activity): | 304 | class LinkedActivity(Activity): |
151 | 252 | zope.interface.implements(interfaces.ILinkedActivity) | 305 | zope.interface.implements(interfaces.ILinkedActivity) |
152 | 253 | 306 | ||
153 | 254 | 307 | ||
154 | === added file 'src/schooltool/gradebook/browser/course_worksheets.py' | |||
155 | --- src/schooltool/gradebook/browser/course_worksheets.py 1970-01-01 00:00:00 +0000 | |||
156 | +++ src/schooltool/gradebook/browser/course_worksheets.py 2011-12-22 16:21:13 +0000 | |||
157 | @@ -0,0 +1,452 @@ | |||
158 | 1 | # | ||
159 | 2 | # SchoolTool - common information systems platform for school administration | ||
160 | 3 | # Copyright (c) 2005 Shuttleworth Foundation | ||
161 | 4 | # | ||
162 | 5 | # This program is free software; you can redistribute it and/or modify | ||
163 | 6 | # it under the terms of the GNU General Public License as published by | ||
164 | 7 | # the Free Software Foundation; either version 2 of the License, or | ||
165 | 8 | # (at your option) any later version. | ||
166 | 9 | # | ||
167 | 10 | # This program is distributed in the hope that it will be useful, | ||
168 | 11 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
169 | 12 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
170 | 13 | # GNU General Public License for more details. | ||
171 | 14 | # | ||
172 | 15 | # You should have received a copy of the GNU General Public License | ||
173 | 16 | # along with this program; if not, write to the Free Software | ||
174 | 17 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
175 | 18 | # | ||
176 | 19 | """ | ||
177 | 20 | Course Worksheet Views | ||
178 | 21 | """ | ||
179 | 22 | |||
180 | 23 | from zope.container.interfaces import INameChooser | ||
181 | 24 | from zope.browserpage.viewpagetemplatefile import ViewPageTemplateFile | ||
182 | 25 | from zope.security.checker import canWrite | ||
183 | 26 | from zope.security.interfaces import Unauthorized | ||
184 | 27 | from zope.security.proxy import removeSecurityProxy | ||
185 | 28 | from zope.traversing.api import getName | ||
186 | 29 | from zope.traversing.browser.absoluteurl import absoluteURL | ||
187 | 30 | from zope.i18n import translate | ||
188 | 31 | |||
189 | 32 | from z3c.form import form, field, button | ||
190 | 33 | |||
191 | 34 | from schooltool.app.interfaces import ISchoolToolApplication | ||
192 | 35 | from schooltool.gradebook import GradebookMessage as _ | ||
193 | 36 | from schooltool.common.inlinept import InheritTemplate | ||
194 | 37 | from schooltool.common.inlinept import InlineViewPageTemplate | ||
195 | 38 | from schooltool.course.interfaces import ISectionContainer, ISection | ||
196 | 39 | from schooltool.person.interfaces import IPerson | ||
197 | 40 | from schooltool.schoolyear.interfaces import ISchoolYear | ||
198 | 41 | from schooltool.schoolyear.interfaces import ISchoolYearContainer | ||
199 | 42 | from schooltool.skin import flourish | ||
200 | 43 | from schooltool.skin.flourish.page import TertiaryNavigationManager | ||
201 | 44 | from schooltool.term.interfaces import ITerm | ||
202 | 45 | |||
203 | 46 | from schooltool.gradebook.interfaces import (IActivities, ICourseActivities, | ||
204 | 47 | ICourseWorksheet, ICourseDeployedWorksheets, IGradebookRoot) | ||
205 | 48 | from schooltool.gradebook.activity import CourseWorksheet, Activity, Worksheet | ||
206 | 49 | from schooltool.gradebook.browser.activity import (FlourishActivityAddView, | ||
207 | 50 | FlourishActivityEditView) | ||
208 | 51 | from schooltool.gradebook.browser.report_card import copyActivities | ||
209 | 52 | |||
210 | 53 | |||
211 | 54 | class FlourishCourseTemplatesView(flourish.page.Page): | ||
212 | 55 | """A flourish view for managing course worksheet templates""" | ||
213 | 56 | |||
214 | 57 | @property | ||
215 | 58 | def title(self): | ||
216 | 59 | return self.context.__parent__.title | ||
217 | 60 | |||
218 | 61 | @property | ||
219 | 62 | def worksheets(self): | ||
220 | 63 | return tuple(removeSecurityProxy(self.context).values()) | ||
221 | 64 | |||
222 | 65 | |||
223 | 66 | class FlourishCourseWorksheetsLinks(flourish.page.RefineLinksViewlet): | ||
224 | 67 | """flourish course worksheet templates add links viewlet.""" | ||
225 | 68 | |||
226 | 69 | |||
227 | 70 | class FlourishCourseWorksheetAddView(flourish.form.AddForm): | ||
228 | 71 | """flourish view for adding a course worksheet.""" | ||
229 | 72 | |||
230 | 73 | fields = field.Fields(ICourseWorksheet).select('title') | ||
231 | 74 | template = InheritTemplate(flourish.page.Page.template) | ||
232 | 75 | label = None | ||
233 | 76 | legend = _('Course Worksheet Details') | ||
234 | 77 | |||
235 | 78 | @property | ||
236 | 79 | def title(self): | ||
237 | 80 | return self.context.__parent__.title | ||
238 | 81 | |||
239 | 82 | @button.buttonAndHandler(_('Submit'), name='add') | ||
240 | 83 | def handleAdd(self, action): | ||
241 | 84 | super(FlourishCourseWorksheetAddView, self).handleAdd.func(self, action) | ||
242 | 85 | |||
243 | 86 | @button.buttonAndHandler(_("Cancel")) | ||
244 | 87 | def handle_cancel_action(self, action): | ||
245 | 88 | url = absoluteURL(self.context, self.request) | ||
246 | 89 | self.request.response.redirect(url) | ||
247 | 90 | |||
248 | 91 | def create(self, data): | ||
249 | 92 | worksheet = CourseWorksheet(data['title']) | ||
250 | 93 | return worksheet | ||
251 | 94 | |||
252 | 95 | def add(self, worksheet): | ||
253 | 96 | chooser = INameChooser(self.context) | ||
254 | 97 | name = chooser.chooseName(worksheet.title, worksheet) | ||
255 | 98 | self.context[name] = worksheet | ||
256 | 99 | self._worksheet = worksheet | ||
257 | 100 | return worksheet | ||
258 | 101 | |||
259 | 102 | def nextURL(self): | ||
260 | 103 | return absoluteURL(self.context, self.request) | ||
261 | 104 | |||
262 | 105 | def updateActions(self): | ||
263 | 106 | super(FlourishCourseWorksheetAddView, self).updateActions() | ||
264 | 107 | self.actions['add'].addClass('button-ok') | ||
265 | 108 | self.actions['cancel'].addClass('button-cancel') | ||
266 | 109 | |||
267 | 110 | |||
268 | 111 | class FlourishCourseWorksheetEditView(flourish.form.Form, form.EditForm): | ||
269 | 112 | |||
270 | 113 | template = InheritTemplate(flourish.page.Page.template) | ||
271 | 114 | label = None | ||
272 | 115 | legend = _('Course Worksheet Template Information') | ||
273 | 116 | fields = field.Fields(ICourseWorksheet).select('title') | ||
274 | 117 | |||
275 | 118 | @property | ||
276 | 119 | def title(self): | ||
277 | 120 | return self.context.title | ||
278 | 121 | |||
279 | 122 | def update(self): | ||
280 | 123 | if 'form-submitted' in self.request: | ||
281 | 124 | for activity in self.context.values(): | ||
282 | 125 | name = 'delete.%s' % activity.__name__ | ||
283 | 126 | if name in self.request: | ||
284 | 127 | del self.context[activity.__name__] | ||
285 | 128 | break | ||
286 | 129 | return form.EditForm.update(self) | ||
287 | 130 | |||
288 | 131 | @button.buttonAndHandler(_('Submit'), name='apply') | ||
289 | 132 | def handleApply(self, action): | ||
290 | 133 | super(FlourishCourseWorksheetEditView, self).handleApply.func(self, action) | ||
291 | 134 | # XXX: hacky sucessful submit check | ||
292 | 135 | if (self.status == self.successMessage or | ||
293 | 136 | self.status == self.noChangesMessage): | ||
294 | 137 | self.request.response.redirect(self.nextURL()) | ||
295 | 138 | |||
296 | 139 | @button.buttonAndHandler(_("Cancel")) | ||
297 | 140 | def handle_cancel_action(self, action): | ||
298 | 141 | self.request.response.redirect(self.nextURL()) | ||
299 | 142 | |||
300 | 143 | def nextURL(self): | ||
301 | 144 | return absoluteURL(self.context.__parent__, self.request) | ||
302 | 145 | |||
303 | 146 | def updateActions(self): | ||
304 | 147 | super(FlourishCourseWorksheetEditView, self).updateActions() | ||
305 | 148 | self.actions['apply'].addClass('button-ok') | ||
306 | 149 | self.actions['cancel'].addClass('button-cancel') | ||
307 | 150 | |||
308 | 151 | |||
309 | 152 | class CourseWorksheetAddLinks(flourish.page.RefineLinksViewlet): | ||
310 | 153 | """Course worksheet add links viewlet.""" | ||
311 | 154 | |||
312 | 155 | |||
313 | 156 | class FlourishCourseActivityAddView(FlourishActivityAddView): | ||
314 | 157 | legend = _('Course Activity Details') | ||
315 | 158 | |||
316 | 159 | |||
317 | 160 | class CourseActivityAddTertiaryNavigationManager( | ||
318 | 161 | flourish.page.TertiaryNavigationManager): | ||
319 | 162 | |||
320 | 163 | template = InlineViewPageTemplate("") | ||
321 | 164 | |||
322 | 165 | |||
323 | 166 | class FlourishCourseActivityEditView(FlourishActivityEditView): | ||
324 | 167 | legend = _('Course Activity Details') | ||
325 | 168 | |||
326 | 169 | def nextURL(self): | ||
327 | 170 | return absoluteURL(self.context.__parent__, self.request) | ||
328 | 171 | |||
329 | 172 | |||
330 | 173 | class FlourishCourseWorksheetsBase(object): | ||
331 | 174 | |||
332 | 175 | @property | ||
333 | 176 | def course(self): | ||
334 | 177 | return self.context | ||
335 | 178 | |||
336 | 179 | @property | ||
337 | 180 | def schoolyear(self): | ||
338 | 181 | return ISchoolYear(self.course) | ||
339 | 182 | |||
340 | 183 | @property | ||
341 | 184 | def deployed(self): | ||
342 | 185 | return ICourseDeployedWorksheets(self.course) | ||
343 | 186 | |||
344 | 187 | @property | ||
345 | 188 | def activities(self): | ||
346 | 189 | return ICourseActivities(self.course) | ||
347 | 190 | |||
348 | 191 | def sheets(self): | ||
349 | 192 | return [sheet for sheet in self.all_sheets() if not sheet['checked']] | ||
350 | 193 | |||
351 | 194 | def all_sheets(self): | ||
352 | 195 | schoolyear = self.schoolyear | ||
353 | 196 | deployments = {} | ||
354 | 197 | for nm, sheet in self.deployed.items(): | ||
355 | 198 | sheet = removeSecurityProxy(sheet) | ||
356 | 199 | index = int(sheet.__name__[sheet.__name__.rfind('_') + 1:]) | ||
357 | 200 | deployment = deployments.setdefault(index, { | ||
358 | 201 | 'obj': sheet, | ||
359 | 202 | 'index': str(index), | ||
360 | 203 | 'checked': sheet.hidden, | ||
361 | 204 | 'terms': [False] * len(schoolyear), | ||
362 | 205 | }) | ||
363 | 206 | for index, term in enumerate(schoolyear.values()): | ||
364 | 207 | prefix = 'course_%s_%s' % (self.course.__name__, term.__name__) | ||
365 | 208 | if sheet.__name__.startswith(prefix): | ||
366 | 209 | deployment['terms'][index] = True | ||
367 | 210 | sheets = [v for k, v in sorted(deployments.items())] | ||
368 | 211 | return ([sheet for sheet in sheets if not sheet['checked']] + | ||
369 | 212 | [sheet for sheet in sheets if sheet['checked']]) | ||
370 | 213 | |||
371 | 214 | @property | ||
372 | 215 | def terms(self): | ||
373 | 216 | result = [{ | ||
374 | 217 | 'name': '', | ||
375 | 218 | 'title': _('-- Entire year --'), | ||
376 | 219 | 'selected': 'selected', | ||
377 | 220 | }] | ||
378 | 221 | for term in self.schoolyear.values(): | ||
379 | 222 | result.append({ | ||
380 | 223 | 'name': term.__name__, | ||
381 | 224 | 'title': term.title, | ||
382 | 225 | 'selected': '', | ||
383 | 226 | }) | ||
384 | 227 | return result | ||
385 | 228 | |||
386 | 229 | def getNewIndex(self, sheet, template_title): | ||
387 | 230 | if sheet.title.startswith(template_title): | ||
388 | 231 | rest = sheet.title[len(template_title):] | ||
389 | 232 | if not rest: | ||
390 | 233 | return 1 | ||
391 | 234 | elif len(rest) > 1 and rest[0] == '-' and rest[1:].isdigit(): | ||
392 | 235 | return int(rest[1:]) | ||
393 | 236 | return 0 | ||
394 | 237 | |||
395 | 238 | def deploy(self, term, template): | ||
396 | 239 | # get the next index and title | ||
397 | 240 | highest, title_index = 0, 0 | ||
398 | 241 | template_title = self.alternate_title | ||
399 | 242 | for sheet in self.deployed.values(): | ||
400 | 243 | index = int(sheet.__name__[sheet.__name__.rfind('_') + 1:]) | ||
401 | 244 | if index > highest: | ||
402 | 245 | highest = index | ||
403 | 246 | new_index = self.getNewIndex(sheet, template_title) | ||
404 | 247 | if new_index > title_index: | ||
405 | 248 | title_index = new_index | ||
406 | 249 | root = IGradebookRoot(ISchoolToolApplication(None)) | ||
407 | 250 | prefix = self.schoolyear.__name__ + '_' | ||
408 | 251 | for sheet in root.deployed.values(): | ||
409 | 252 | if sheet.__name__.startswith(prefix): | ||
410 | 253 | new_index = self.getNewIndex(sheet, template_title) | ||
411 | 254 | if new_index > title_index: | ||
412 | 255 | title_index = new_index | ||
413 | 256 | title = template_title | ||
414 | 257 | if title_index: | ||
415 | 258 | title += '-%s' % (title_index + 1) | ||
416 | 259 | |||
417 | 260 | # copy worksheet template to the term or whole year | ||
418 | 261 | if term: | ||
419 | 262 | terms = [term] | ||
420 | 263 | else: | ||
421 | 264 | terms = self.schoolyear.values() | ||
422 | 265 | for term in terms: | ||
423 | 266 | deployedKey = 'course_%s_%s_%s' % (self.course.__name__, | ||
424 | 267 | term.__name__, highest + 1) | ||
425 | 268 | deployedWorksheet = Worksheet(title) | ||
426 | 269 | self.deployed[deployedKey] = deployedWorksheet | ||
427 | 270 | copyActivities(removeSecurityProxy(template), deployedWorksheet) | ||
428 | 271 | |||
429 | 272 | # now copy the template to all sections in the term | ||
430 | 273 | sections = ISectionContainer(term) | ||
431 | 274 | for section in sections.values(): | ||
432 | 275 | if self.course not in section.courses: | ||
433 | 276 | continue | ||
434 | 277 | worksheetCopy = Worksheet(deployedWorksheet.title) | ||
435 | 278 | worksheetCopy.deployed = True | ||
436 | 279 | IActivities(section)[deployedWorksheet.__name__] = worksheetCopy | ||
437 | 280 | copyActivities(deployedWorksheet, worksheetCopy) | ||
438 | 281 | |||
439 | 282 | |||
440 | 283 | class FlourishManageCourseWorksheetTemplatesOverview(flourish.page.Content): | ||
441 | 284 | """A flourish viewlet for showing worksheet templates in course view""" | ||
442 | 285 | |||
443 | 286 | body_template = ViewPageTemplateFile( | ||
444 | 287 | 'templates/f_manage_course_worksheet_templates.pt') | ||
445 | 288 | |||
446 | 289 | |||
447 | 290 | class FlourishManageCourseSheetsOverview(FlourishCourseWorksheetsBase, | ||
448 | 291 | flourish.page.Content): | ||
449 | 292 | """A flourish viewlet for showing deployed worksheets in course view""" | ||
450 | 293 | |||
451 | 294 | body_template = ViewPageTemplateFile( | ||
452 | 295 | 'templates/f_manage_course_worksheets.pt') | ||
453 | 296 | |||
454 | 297 | |||
455 | 298 | class FlourishCourseWorksheetsView(FlourishCourseWorksheetsBase, | ||
456 | 299 | flourish.page.Page): | ||
457 | 300 | """A flourish view for managing corse worksheet deployment""" | ||
458 | 301 | |||
459 | 302 | def __init__(self, context, request): | ||
460 | 303 | super(FlourishCourseWorksheetsView, self).__init__(context, request) | ||
461 | 304 | self.alternate_title = self.request.get('alternate_title') | ||
462 | 305 | |||
463 | 306 | @property | ||
464 | 307 | def subtitle(self): | ||
465 | 308 | subtitle = _(u'Worksheets for ${year}', | ||
466 | 309 | mapping={'year': self.schoolyear.title}) | ||
467 | 310 | return translate(subtitle, context=self.request) | ||
468 | 311 | |||
469 | 312 | @property | ||
470 | 313 | def has_error(self): | ||
471 | 314 | return self.no_template or self.no_title | ||
472 | 315 | |||
473 | 316 | @property | ||
474 | 317 | def no_template(self): | ||
475 | 318 | return 'SUBMIT' in self.request and not self.request.get('template') | ||
476 | 319 | |||
477 | 320 | @property | ||
478 | 321 | def no_title(self): | ||
479 | 322 | return ('SUBMIT' in self.request and | ||
480 | 323 | not self.request.get('alternate_title')) | ||
481 | 324 | |||
482 | 325 | @property | ||
483 | 326 | def templates(self): | ||
484 | 327 | result = [{ | ||
485 | 328 | 'name': '', | ||
486 | 329 | 'title': _('-- Select a template --'), | ||
487 | 330 | 'selected': 'selected', | ||
488 | 331 | }] | ||
489 | 332 | for template in self.activities.values(): | ||
490 | 333 | result.append({ | ||
491 | 334 | 'name': template.__name__, | ||
492 | 335 | 'title': template.title, | ||
493 | 336 | 'selected': '', | ||
494 | 337 | }) | ||
495 | 338 | return result | ||
496 | 339 | |||
497 | 340 | def update(self): | ||
498 | 341 | if 'CANCEL' in self.request: | ||
499 | 342 | self.request.response.redirect(self.nextURL()) | ||
500 | 343 | if 'SUBMIT' in self.request: | ||
501 | 344 | if self.request.get('template') and self.alternate_title: | ||
502 | 345 | template = self.activities[self.request['template']] | ||
503 | 346 | term = self.request.get('term') | ||
504 | 347 | if term: | ||
505 | 348 | term = self.schoolyear[term] | ||
506 | 349 | self.deploy(term, template) | ||
507 | 350 | self.alternate_title = '' | ||
508 | 351 | |||
509 | 352 | def nextURL(self): | ||
510 | 353 | return absoluteURL(self.context, self.request) | ||
511 | 354 | |||
512 | 355 | |||
513 | 356 | class CourseWorksheetsActionLinks(flourish.page.RefineLinksViewlet): | ||
514 | 357 | """Course worksheets view action links viewlet.""" | ||
515 | 358 | |||
516 | 359 | |||
517 | 360 | class FlourishHideUnhideCourseWorkheetsView(FlourishCourseWorksheetsBase, | ||
518 | 361 | flourish.page.Page): | ||
519 | 362 | """A flourish view for hiding/unhiding course worksheet deployments""" | ||
520 | 363 | |||
521 | 364 | @property | ||
522 | 365 | def subtitle(self): | ||
523 | 366 | title = _(u'Hide/unhide Deployed Worksheets for ${year}', | ||
524 | 367 | mapping={'year': self.schoolyear.title}) | ||
525 | 368 | return translate(title, context=self.request) | ||
526 | 369 | |||
527 | 370 | def update(self): | ||
528 | 371 | if 'CANCEL' in self.request: | ||
529 | 372 | self.request.response.redirect(self.nextURL()) | ||
530 | 373 | elif 'SUBMIT' in self.request: | ||
531 | 374 | hidden = self.request.get('hidden', []) | ||
532 | 375 | schoolyear = self.schoolyear | ||
533 | 376 | for nm, sheet in self.deployed.items(): | ||
534 | 377 | sheet = removeSecurityProxy(sheet) | ||
535 | 378 | index = sheet.__name__[sheet.__name__.rfind('_') + 1:] | ||
536 | 379 | self.handleSheet(sheet, index, hidden) | ||
537 | 380 | self.request.response.redirect(self.nextURL()) | ||
538 | 381 | |||
539 | 382 | def handleSheet(self, sheet, index, hidden): | ||
540 | 383 | if index in hidden and not sheet.hidden: | ||
541 | 384 | sheet.hidden = True | ||
542 | 385 | elif index not in hidden and sheet.hidden: | ||
543 | 386 | sheet.hidden = False | ||
544 | 387 | else: | ||
545 | 388 | return | ||
546 | 389 | schoolyear = self.schoolyear | ||
547 | 390 | for term in schoolyear.values(): | ||
548 | 391 | deployedKey = 'course_%s_%s_%s' % (self.context.__name__, | ||
549 | 392 | term.__name__, index) | ||
550 | 393 | if sheet.__name__ == deployedKey: | ||
551 | 394 | for section in ISectionContainer(term).values(): | ||
552 | 395 | if self.context not in section.courses: | ||
553 | 396 | continue | ||
554 | 397 | activities = IActivities(section) | ||
555 | 398 | activities[deployedKey].hidden = sheet.hidden | ||
556 | 399 | return | ||
557 | 400 | |||
558 | 401 | def nextURL(self): | ||
559 | 402 | url = absoluteURL(self.context, self.request) | ||
560 | 403 | return url + '/deployed_worksheets.html' | ||
561 | 404 | |||
562 | 405 | |||
563 | 406 | class FlourishDeployAsCourseWorksheetView(FlourishCourseWorksheetsBase, | ||
564 | 407 | flourish.page.Page): | ||
565 | 408 | """A flourish view for deploying current gradebook worksheet as a | ||
566 | 409 | course worksheet. If form data is valid, it creates a course | ||
567 | 410 | worksheet template as a copy of the context and then deploys that | ||
568 | 411 | to the course for the given term..""" | ||
569 | 412 | |||
570 | 413 | @property | ||
571 | 414 | def course(self): | ||
572 | 415 | courses = list(ISection(self.context).courses) | ||
573 | 416 | if not courses: | ||
574 | 417 | return None | ||
575 | 418 | return courses[0] | ||
576 | 419 | |||
577 | 420 | @property | ||
578 | 421 | def has_error(self): | ||
579 | 422 | return self.no_title | ||
580 | 423 | |||
581 | 424 | @property | ||
582 | 425 | def no_title(self): | ||
583 | 426 | return 'SUBMIT' in self.request and not self.alternate_title | ||
584 | 427 | |||
585 | 428 | @property | ||
586 | 429 | def alternate_title(self): | ||
587 | 430 | if 'alternate_title' in self.request: | ||
588 | 431 | return self.request['alternate_title'] | ||
589 | 432 | return self.context.title | ||
590 | 433 | |||
591 | 434 | def update(self): | ||
592 | 435 | if 'CANCEL' in self.request: | ||
593 | 436 | self.request.response.redirect(self.nextURL()) | ||
594 | 437 | if 'SUBMIT' in self.request: | ||
595 | 438 | if not self.has_error: | ||
596 | 439 | template = Worksheet(self.alternate_title) | ||
597 | 440 | chooser = INameChooser(self.activities) | ||
598 | 441 | name = chooser.chooseName(template.title, template) | ||
599 | 442 | self.activities[name] = template | ||
600 | 443 | copyActivities(removeSecurityProxy(self.context), template) | ||
601 | 444 | term = self.request.get('term') | ||
602 | 445 | if term: | ||
603 | 446 | term = self.schoolyear[term] | ||
604 | 447 | self.deploy(term, template) | ||
605 | 448 | self.request.response.redirect(self.nextURL()) | ||
606 | 449 | |||
607 | 450 | def nextURL(self): | ||
608 | 451 | return absoluteURL(self.context, self.request) + '/gradebook' | ||
609 | 452 | |||
610 | 0 | 453 | ||
611 | === modified file 'src/schooltool/gradebook/browser/flourish.zcml' | |||
612 | --- src/schooltool/gradebook/browser/flourish.zcml 2011-11-07 06:19:05 +0000 | |||
613 | +++ src/schooltool/gradebook/browser/flourish.zcml 2011-12-22 16:21:13 +0000 | |||
614 | @@ -140,6 +140,17 @@ | |||
615 | 140 | /> | 140 | /> |
616 | 141 | 141 | ||
617 | 142 | <flourish:viewlet | 142 | <flourish:viewlet |
618 | 143 | name="gradebook_actions" | ||
619 | 144 | after="gradebook_settings" | ||
620 | 145 | manager="schooltool.skin.flourish.page.IPageRefineManager" | ||
621 | 146 | class=".gradebook.FlourishGradebookActionsLinks" | ||
622 | 147 | for="..interfaces.IGradebook" | ||
623 | 148 | title="Actions" | ||
624 | 149 | permission="schooltool.edit" | ||
625 | 150 | view=".gradebook.FlourishGradebookOverview" | ||
626 | 151 | /> | ||
627 | 152 | |||
628 | 153 | <flourish:viewlet | ||
629 | 143 | name="select_year" | 154 | name="select_year" |
630 | 144 | class=".gradebook.FlourishGradebookYearNavigationViewlet" | 155 | class=".gradebook.FlourishGradebookYearNavigationViewlet" |
631 | 145 | manager=".gradebook.FlourishGradebookYearNavigation" | 156 | manager=".gradebook.FlourishGradebookYearNavigation" |
632 | @@ -372,8 +383,17 @@ | |||
633 | 372 | 383 | ||
634 | 373 | <!-- Report Sheets --> | 384 | <!-- Report Sheets --> |
635 | 374 | <flourish:viewlet | 385 | <flourish:viewlet |
636 | 386 | name="manage-report-sheet-templates-overview" | ||
637 | 387 | after="manage-resources-overview" | ||
638 | 388 | view="schooltool.app.browser.app.ManageSchool" | ||
639 | 389 | permission="schooltool.edit" | ||
640 | 390 | manager="schooltool.skin.flourish.page.IPageContentManager" | ||
641 | 391 | class=".report_card.FlourishManageReportSheetTemplatesOverview" | ||
642 | 392 | /> | ||
643 | 393 | |||
644 | 394 | <flourish:viewlet | ||
645 | 375 | name="manage-report-sheets-overview" | 395 | name="manage-report-sheets-overview" |
647 | 376 | after="manage-resources-overview" | 396 | after="manage-report-sheet-templates-overview" |
648 | 377 | view="schooltool.app.browser.app.ManageSchool" | 397 | view="schooltool.app.browser.app.ManageSchool" |
649 | 378 | permission="schooltool.edit" | 398 | permission="schooltool.edit" |
650 | 379 | manager="schooltool.skin.flourish.page.IPageContentManager" | 399 | manager="schooltool.skin.flourish.page.IPageContentManager" |
651 | @@ -518,15 +538,6 @@ | |||
652 | 518 | /> | 538 | /> |
653 | 519 | </configure> | 539 | </configure> |
654 | 520 | 540 | ||
655 | 521 | <flourish:viewlet | ||
656 | 522 | name="gradebook/templates" | ||
657 | 523 | before="report_card_layout" | ||
658 | 524 | title="Report Sheet Templates" | ||
659 | 525 | class="schooltool.skin.flourish.page.LinkViewlet" | ||
660 | 526 | manager="schooltool.app.browser.app.CustomizeSchoolLinks" | ||
661 | 527 | permission="schooltool.edit" | ||
662 | 528 | /> | ||
663 | 529 | |||
664 | 530 | <flourish:page | 541 | <flourish:page |
665 | 531 | name="report_sheets" | 542 | name="report_sheets" |
666 | 532 | for="schooltool.app.interfaces.ISchoolToolApplication" | 543 | for="schooltool.app.interfaces.ISchoolToolApplication" |
667 | @@ -958,4 +969,163 @@ | |||
668 | 958 | /> | 969 | /> |
669 | 959 | </configure> | 970 | </configure> |
670 | 960 | 971 | ||
671 | 972 | <!-- Course Worksheets --> | ||
672 | 973 | <flourish:viewlet | ||
673 | 974 | name="manage-course-worksheet-templates" | ||
674 | 975 | before="manage-course-worksheets" | ||
675 | 976 | view="schooltool.course.browser.course.FlourishCourseView" | ||
676 | 977 | permission="schooltool.edit" | ||
677 | 978 | manager="schooltool.skin.flourish.page.IPageContentManager" | ||
678 | 979 | class=".course_worksheets.FlourishManageCourseWorksheetTemplatesOverview" | ||
679 | 980 | /> | ||
680 | 981 | |||
681 | 982 | <flourish:viewlet | ||
682 | 983 | name="manage-course-worksheets" | ||
683 | 984 | view="schooltool.course.browser.course.FlourishCourseView" | ||
684 | 985 | permission="schooltool.edit" | ||
685 | 986 | manager="schooltool.skin.flourish.page.IPageContentManager" | ||
686 | 987 | class=".course_worksheets.FlourishManageCourseSheetsOverview" | ||
687 | 988 | /> | ||
688 | 989 | |||
689 | 990 | <flourish:page | ||
690 | 991 | name="index.html" | ||
691 | 992 | for="schooltool.gradebook.interfaces.ICourseActivities" | ||
692 | 993 | class=".course_worksheets.FlourishCourseTemplatesView" | ||
693 | 994 | content_template="templates/f_course_worksheet_templates.pt" | ||
694 | 995 | permission="schooltool.edit" | ||
695 | 996 | subtitle="Worksheet Templates" | ||
696 | 997 | /> | ||
697 | 998 | |||
698 | 999 | <flourish:viewlet | ||
699 | 1000 | name="course-worksheets" | ||
700 | 1001 | manager="schooltool.skin.flourish.page.IPageRefineManager" | ||
701 | 1002 | class=".course_worksheets.FlourishCourseWorksheetsLinks" | ||
702 | 1003 | for="schooltool.gradebook.interfaces.ICourseActivities" | ||
703 | 1004 | title="Add" | ||
704 | 1005 | permission="schooltool.edit" | ||
705 | 1006 | view=".course_worksheets.FlourishCourseTemplatesView" | ||
706 | 1007 | /> | ||
707 | 1008 | |||
708 | 1009 | <flourish:viewlet | ||
709 | 1010 | name="addCourseWorksheet.html" | ||
710 | 1011 | title="Course Worksheet" | ||
711 | 1012 | class="schooltool.skin.flourish.page.LinkViewlet" | ||
712 | 1013 | manager=".course_worksheets.FlourishCourseWorksheetsLinks" | ||
713 | 1014 | permission="schooltool.edit" | ||
714 | 1015 | /> | ||
715 | 1016 | |||
716 | 1017 | <configure package="schooltool.skin.flourish"> | ||
717 | 1018 | <flourish:page | ||
718 | 1019 | name="addCourseWorksheet.html" | ||
719 | 1020 | for="schooltool.gradebook.interfaces.ICourseActivities" | ||
720 | 1021 | subtitle="New Course Worksheet" | ||
721 | 1022 | class="schooltool.gradebook.browser.course_worksheets.FlourishCourseWorksheetAddView" | ||
722 | 1023 | content_template="templates/z3c-schooltool-form.pt" | ||
723 | 1024 | permission="schooltool.edit" | ||
724 | 1025 | /> | ||
725 | 1026 | |||
726 | 1027 | <flourish:page | ||
727 | 1028 | name="addCourseActivity.html" | ||
728 | 1029 | for="schooltool.gradebook.interfaces.ICourseWorksheet" | ||
729 | 1030 | subtitle="New Course Activity" | ||
730 | 1031 | class="schooltool.gradebook.browser.course_worksheets.FlourishCourseActivityAddView" | ||
731 | 1032 | content_template="templates/z3c-schooltool-form.pt" | ||
732 | 1033 | permission="schooltool.edit" | ||
733 | 1034 | /> | ||
734 | 1035 | </configure> | ||
735 | 1036 | |||
736 | 1037 | <flourish:page | ||
737 | 1038 | name="index.html" | ||
738 | 1039 | for="schooltool.gradebook.interfaces.ICourseWorksheet" | ||
739 | 1040 | subtitle="Edit" | ||
740 | 1041 | class=".course_worksheets.FlourishCourseWorksheetEditView" | ||
741 | 1042 | content_template="templates/f_course_worksheet_edit.pt" | ||
742 | 1043 | permission="schooltool.edit" | ||
743 | 1044 | /> | ||
744 | 1045 | |||
745 | 1046 | <flourish:viewlet | ||
746 | 1047 | name="course-worksheet-add-links" | ||
747 | 1048 | manager="schooltool.skin.flourish.page.IPageRefineManager" | ||
748 | 1049 | class=".course_worksheets.CourseWorksheetAddLinks" | ||
749 | 1050 | view=".course_worksheets.FlourishCourseWorksheetEditView" | ||
750 | 1051 | title="Add" | ||
751 | 1052 | permission="schooltool.edit" | ||
752 | 1053 | /> | ||
753 | 1054 | |||
754 | 1055 | <flourish:viewlet | ||
755 | 1056 | name="addCourseActivity.html" | ||
756 | 1057 | title="Course Activity" | ||
757 | 1058 | class="schooltool.skin.flourish.page.LinkViewlet" | ||
758 | 1059 | manager=".course_worksheets.CourseWorksheetAddLinks" | ||
759 | 1060 | permission="schooltool.edit" | ||
760 | 1061 | /> | ||
761 | 1062 | |||
762 | 1063 | <flourish:viewletManager | ||
763 | 1064 | name="tertiary_navigation" | ||
764 | 1065 | provides="schooltool.skin.flourish.page.ITertiaryNavigationManager" | ||
765 | 1066 | class=".course_worksheets.CourseActivityAddTertiaryNavigationManager" | ||
766 | 1067 | view=".course_worksheets.FlourishCourseActivityAddView" | ||
767 | 1068 | permission="zope.Public" | ||
768 | 1069 | /> | ||
769 | 1070 | |||
770 | 1071 | <flourish:page | ||
771 | 1072 | name="editCourseActivity.html" | ||
772 | 1073 | for="..interfaces.IActivity" | ||
773 | 1074 | subtitle="Edit" | ||
774 | 1075 | content_template="templates/f_add_edit_activity.pt" | ||
775 | 1076 | class=".course_worksheets.FlourishCourseActivityEditView" | ||
776 | 1077 | permission="schooltool.edit" | ||
777 | 1078 | /> | ||
778 | 1079 | |||
779 | 1080 | <flourish:page | ||
780 | 1081 | name="deployed_worksheets.html" | ||
781 | 1082 | for="schooltool.course.interfaces.ICourse" | ||
782 | 1083 | class=".course_worksheets.FlourishCourseWorksheetsView" | ||
783 | 1084 | content_template="templates/f_course_worksheets.pt" | ||
784 | 1085 | permission="schooltool.edit" | ||
785 | 1086 | /> | ||
786 | 1087 | |||
787 | 1088 | <flourish:viewlet | ||
788 | 1089 | name="course-worksheets-action-links" | ||
789 | 1090 | manager="schooltool.skin.flourish.page.IPageRefineManager" | ||
790 | 1091 | class=".course_worksheets.CourseWorksheetsActionLinks" | ||
791 | 1092 | view=".course_worksheets.FlourishCourseWorksheetsView" | ||
792 | 1093 | title="Action" | ||
793 | 1094 | permission="schooltool.edit" | ||
794 | 1095 | /> | ||
795 | 1096 | |||
796 | 1097 | <flourish:viewlet | ||
797 | 1098 | name="hide_unhide_worksheets.html" | ||
798 | 1099 | title="Hide/unhide Worksheets" | ||
799 | 1100 | class="schooltool.skin.flourish.page.LinkViewlet" | ||
800 | 1101 | manager=".course_worksheets.CourseWorksheetsActionLinks" | ||
801 | 1102 | permission="schooltool.edit" | ||
802 | 1103 | /> | ||
803 | 1104 | |||
804 | 1105 | <flourish:page | ||
805 | 1106 | name="hide_unhide_worksheets.html" | ||
806 | 1107 | for="schooltool.course.interfaces.ICourse" | ||
807 | 1108 | class=".course_worksheets.FlourishHideUnhideCourseWorkheetsView" | ||
808 | 1109 | content_template="templates/f_hide_unhide_course_worksheets.pt" | ||
809 | 1110 | permission="schooltool.edit" | ||
810 | 1111 | /> | ||
811 | 1112 | |||
812 | 1113 | <flourish:viewlet | ||
813 | 1114 | name="../deploy_as_course_worksheet.html" | ||
814 | 1115 | title="Deploy as Course Worksheet" | ||
815 | 1116 | class="schooltool.skin.flourish.page.LinkViewlet" | ||
816 | 1117 | manager=".gradebook.FlourishGradebookActionsLinks" | ||
817 | 1118 | permission="schooltool.edit" | ||
818 | 1119 | /> | ||
819 | 1120 | |||
820 | 1121 | <flourish:page | ||
821 | 1122 | name="deploy_as_course_worksheet.html" | ||
822 | 1123 | for="..interfaces.IWorksheet" | ||
823 | 1124 | subtitle="Deploy as Course Worksheet" | ||
824 | 1125 | class=".course_worksheets.FlourishDeployAsCourseWorksheetView" | ||
825 | 1126 | content_template="templates/f_deploy_as_course_worksheet.pt" | ||
826 | 1127 | permission="schooltool.edit" | ||
827 | 1128 | /> | ||
828 | 1129 | |||
829 | 961 | </configure> | 1130 | </configure> |
830 | 1131 | |||
831 | 962 | 1132 | ||
832 | === modified file 'src/schooltool/gradebook/browser/gradebook.py' | |||
833 | --- src/schooltool/gradebook/browser/gradebook.py 2011-12-20 19:41:39 +0000 | |||
834 | +++ src/schooltool/gradebook/browser/gradebook.py 2011-12-22 16:21:13 +0000 | |||
835 | @@ -415,7 +415,7 @@ | |||
836 | 415 | self.due_date_hide = prefs.get('hide', False) | 415 | self.due_date_hide = prefs.get('hide', False) |
837 | 416 | 416 | ||
838 | 417 | self.apply_all_colspan = 1 | 417 | self.apply_all_colspan = 1 |
840 | 418 | if gradebook.context.deployed: | 418 | if not gradebook.context.canAverage(): |
841 | 419 | self.total_hide = True | 419 | self.total_hide = True |
842 | 420 | self.average_hide = True | 420 | self.average_hide = True |
843 | 421 | if not self.absences_hide: | 421 | if not self.absences_hide: |
844 | @@ -1057,6 +1057,10 @@ | |||
845 | 1057 | """flourish Gradebook Settings links viewlet.""" | 1057 | """flourish Gradebook Settings links viewlet.""" |
846 | 1058 | 1058 | ||
847 | 1059 | 1059 | ||
848 | 1060 | class FlourishGradebookActionsLinks(flourish.page.RefineLinksViewlet): | ||
849 | 1061 | """flourish Gradebook Actions links viewlet.""" | ||
850 | 1062 | |||
851 | 1063 | |||
852 | 1060 | class GradebookTertiaryNavigationManager(flourish.page.TertiaryNavigationManager): | 1064 | class GradebookTertiaryNavigationManager(flourish.page.TertiaryNavigationManager): |
853 | 1061 | 1065 | ||
854 | 1062 | template = InlineViewPageTemplate(""" | 1066 | template = InlineViewPageTemplate(""" |
855 | @@ -1075,8 +1079,11 @@ | |||
856 | 1075 | current = gradebook.context.__name__ | 1079 | current = gradebook.context.__name__ |
857 | 1076 | for worksheet in gradebook.worksheets: | 1080 | for worksheet in gradebook.worksheets: |
858 | 1077 | url = '%s/gradebook' % absoluteURL(worksheet, self.request) | 1081 | url = '%s/gradebook' % absoluteURL(worksheet, self.request) |
859 | 1082 | classes = worksheet.__name__ == current and ['active'] or [] | ||
860 | 1083 | if worksheet.deployed: | ||
861 | 1084 | classes.append('deployed') | ||
862 | 1078 | result.append({ | 1085 | result.append({ |
864 | 1079 | 'class': worksheet.__name__ == current and 'active' or None, | 1086 | 'class': classes and ' '.join(classes) or None, |
865 | 1080 | 'viewlet': u'<a href="%s">%s</a>' % (url, worksheet.title[:15]), | 1087 | 'viewlet': u'<a href="%s">%s</a>' % (url, worksheet.title[:15]), |
866 | 1081 | }) | 1088 | }) |
867 | 1082 | return result | 1089 | return result |
868 | @@ -1902,3 +1909,4 @@ | |||
869 | 1902 | return None | 1909 | return None |
870 | 1903 | can_view = flourish.canView(self.gradebook) | 1910 | can_view = flourish.canView(self.gradebook) |
871 | 1904 | return can_view | 1911 | return can_view |
872 | 1912 | |||
873 | 1905 | 1913 | ||
874 | === modified file 'src/schooltool/gradebook/browser/report_card.py' | |||
875 | --- src/schooltool/gradebook/browser/report_card.py 2011-11-12 04:02:28 +0000 | |||
876 | +++ src/schooltool/gradebook/browser/report_card.py 2011-12-22 16:21:13 +0000 | |||
877 | @@ -221,6 +221,14 @@ | |||
878 | 221 | return [] | 221 | return [] |
879 | 222 | 222 | ||
880 | 223 | 223 | ||
881 | 224 | class FlourishManageReportSheetTemplatesOverview(FlourishReportSheetsBase, | ||
882 | 225 | flourish.page.Content): | ||
883 | 226 | """A flourish viewlet for showing report sheet templates in school view""" | ||
884 | 227 | |||
885 | 228 | body_template = ViewPageTemplateFile( | ||
886 | 229 | 'templates/f_manage_report_sheet_templates_overview.pt') | ||
887 | 230 | |||
888 | 231 | |||
889 | 224 | class FlourishManageReportSheetsOverview(FlourishReportSheetsBase, | 232 | class FlourishManageReportSheetsOverview(FlourishReportSheetsBase, |
890 | 225 | flourish.page.Content): | 233 | flourish.page.Content): |
891 | 226 | """A flourish viewlet for showing deployed report sheets in school view""" | 234 | """A flourish viewlet for showing deployed report sheets in school view""" |
892 | @@ -500,6 +508,12 @@ | |||
893 | 500 | def title(self): | 508 | def title(self): |
894 | 501 | return self.context.title | 509 | return self.context.title |
895 | 502 | 510 | ||
896 | 511 | def display_scoresystem(self, activity): | ||
897 | 512 | ss = activity.scoresystem | ||
898 | 513 | if IRangedValuesScoreSystem.providedBy(ss): | ||
899 | 514 | return '%s - %s' % (ss.min, ss.max) | ||
900 | 515 | return ss.title | ||
901 | 516 | |||
902 | 503 | def update(self): | 517 | def update(self): |
903 | 504 | if 'form-submitted' in self.request: | 518 | if 'form-submitted' in self.request: |
904 | 505 | for activity in self.context.values(): | 519 | for activity in self.context.values(): |
905 | 506 | 520 | ||
906 | === modified file 'src/schooltool/gradebook/browser/resources/f_gradebook.css' | |||
907 | --- src/schooltool/gradebook/browser/resources/f_gradebook.css 2011-08-31 20:16:11 +0000 | |||
908 | +++ src/schooltool/gradebook/browser/resources/f_gradebook.css 2011-12-22 16:21:13 +0000 | |||
909 | @@ -33,3 +33,8 @@ | |||
910 | 33 | height: 18px; | 33 | height: 18px; |
911 | 34 | width: 104px; | 34 | width: 104px; |
912 | 35 | } | 35 | } |
913 | 36 | |||
914 | 37 | li.deployed a { | ||
915 | 38 | font-style: italic; | ||
916 | 39 | } | ||
917 | 40 | |||
918 | 36 | 41 | ||
919 | === added file 'src/schooltool/gradebook/browser/templates/f_course_worksheet_edit.pt' | |||
920 | --- src/schooltool/gradebook/browser/templates/f_course_worksheet_edit.pt 1970-01-01 00:00:00 +0000 | |||
921 | +++ src/schooltool/gradebook/browser/templates/f_course_worksheet_edit.pt 2011-12-22 16:21:13 +0000 | |||
922 | @@ -0,0 +1,45 @@ | |||
923 | 1 | <div i18n:domain="schooltool.gradebook"> | ||
924 | 2 | <div metal:use-macro="macro:form"> | ||
925 | 3 | <metal:block fill-slot="bottom"> | ||
926 | 4 | <input type="hidden" name="form-submitted" value="" /> | ||
927 | 5 | <h2 i18n:translate="">Course Activities</h2> | ||
928 | 6 | <table> | ||
929 | 7 | <thead> | ||
930 | 8 | <tr> | ||
931 | 9 | <th i18n:translate="">Title</th> | ||
932 | 10 | <th i18n:translate="">Score System</th> | ||
933 | 11 | <th i18n:translate="">Delete?</th> | ||
934 | 12 | </tr> | ||
935 | 13 | </thead> | ||
936 | 14 | <tal:block repeat="activity context/values"> | ||
937 | 15 | <tr> | ||
938 | 16 | <td> | ||
939 | 17 | <span tal:content="activity/title" /> | ||
940 | 18 | <a class="modify" href="" title="Edit" | ||
941 | 19 | tal:attributes="href string:${activity/@@absolute_url}/editCourseActivity.html" | ||
942 | 20 | i18n:attributes="title"> | ||
943 | 21 | <img tal:attributes="src context/++resource++schooltool.skin.flourish/edit-icon.png" | ||
944 | 22 | alt="Edit" | ||
945 | 23 | i18n:attributes="alt" /> | ||
946 | 24 | </a> | ||
947 | 25 | </td> | ||
948 | 26 | <td tal:content="string: ${activity/scoresystem/min} - ${activity/scoresystem/max}"/> | ||
949 | 27 | <td> | ||
950 | 28 | <button class="image" type="submit" title="Delete" value="1" | ||
951 | 29 | tal:attributes="name string:delete.${activity/__name__};" | ||
952 | 30 | i18n:attributes="title"> | ||
953 | 31 | <img alt="Delete" i18n:attributes="alt" | ||
954 | 32 | tal:attributes="src context/++resource++schooltool.skin.flourish/remove-icon.png" /> | ||
955 | 33 | </button> | ||
956 | 34 | </td> | ||
957 | 35 | </tr> | ||
958 | 36 | </tal:block> | ||
959 | 37 | </table> | ||
960 | 38 | <h3> | ||
961 | 39 | <a tal:attributes="href view/nextURL" | ||
962 | 40 | i18n:translate="">Done</a> | ||
963 | 41 | </h3> | ||
964 | 42 | </metal:block> | ||
965 | 43 | </div> | ||
966 | 44 | </div> | ||
967 | 45 | |||
968 | 0 | 46 | ||
969 | === added file 'src/schooltool/gradebook/browser/templates/f_course_worksheet_templates.pt' | |||
970 | --- src/schooltool/gradebook/browser/templates/f_course_worksheet_templates.pt 1970-01-01 00:00:00 +0000 | |||
971 | +++ src/schooltool/gradebook/browser/templates/f_course_worksheet_templates.pt 2011-12-22 16:21:13 +0000 | |||
972 | @@ -0,0 +1,26 @@ | |||
973 | 1 | <div tal:define="worksheets view/worksheets" i18n:domain="schooltool.gradebook"> | ||
974 | 2 | <form method="post" | ||
975 | 3 | tal:attributes="action string:${context/@@absolute_url}/worksheet_templates.html"> | ||
976 | 4 | <input type="hidden" name="form-submitted" value="" /> | ||
977 | 5 | <table> | ||
978 | 6 | <thead> | ||
979 | 7 | <tr> | ||
980 | 8 | <th i18n:translate="">Title</th> | ||
981 | 9 | </tr> | ||
982 | 10 | </thead> | ||
983 | 11 | <tr tal:repeat="worksheet worksheets"> | ||
984 | 12 | <td> | ||
985 | 13 | <tal:block replace="structure worksheet/@@link" /> | ||
986 | 14 | </td> | ||
987 | 15 | </tr> | ||
988 | 16 | <tr tal:condition="python: len(worksheets) == 0"> | ||
989 | 17 | <td i18n:translate="">This year has no course worksheets set up.</td> | ||
990 | 18 | </tr> | ||
991 | 19 | </table> | ||
992 | 20 | </form> | ||
993 | 21 | <h3> | ||
994 | 22 | <a tal:attributes="href string:${context/__parent__/@@absolute_url}" | ||
995 | 23 | i18n:translate="">Done</a> | ||
996 | 24 | </h3> | ||
997 | 25 | </div> | ||
998 | 26 | |||
999 | 0 | 27 | ||
1000 | === added file 'src/schooltool/gradebook/browser/templates/f_course_worksheets.pt' | |||
1001 | --- src/schooltool/gradebook/browser/templates/f_course_worksheets.pt 1970-01-01 00:00:00 +0000 | |||
1002 | +++ src/schooltool/gradebook/browser/templates/f_course_worksheets.pt 2011-12-22 16:21:13 +0000 | |||
1003 | @@ -0,0 +1,111 @@ | |||
1004 | 1 | <div i18n:domain="schooltool.gradebook" | ||
1005 | 2 | tal:define="sheets view/sheets; terms view/terms; schoolyear view/schoolyear"> | ||
1006 | 3 | <script type="text/javascript"> | ||
1007 | 4 | $(document).ready(function() { | ||
1008 | 5 | $('#template').change(function(e) { | ||
1009 | 6 | index = e.target.selectedIndex | ||
1010 | 7 | $('#alternate_title').val(e.target.options[index].text); | ||
1011 | 8 | }); | ||
1012 | 9 | }); | ||
1013 | 10 | </script> | ||
1014 | 11 | <h3 i18n:translate="">Currently Deployed Worksheets</h3> | ||
1015 | 12 | <table> | ||
1016 | 13 | <thead> | ||
1017 | 14 | <tr> | ||
1018 | 15 | <th i18n:translate="">Workheet</th> | ||
1019 | 16 | <tal:block repeat="term schoolyear/values"> | ||
1020 | 17 | <th tal:content="term/title" /> | ||
1021 | 18 | </tal:block> | ||
1022 | 19 | </tr> | ||
1023 | 20 | </thead> | ||
1024 | 21 | <tr tal:repeat="sheet sheets"> | ||
1025 | 22 | <td tal:content="sheet/obj/title" /> | ||
1026 | 23 | <tal:block repeat="term sheet/terms"> | ||
1027 | 24 | <td> | ||
1028 | 25 | <span tal:condition="term" class="ui-icon ui-icon-check ui-icon-center"></span> | ||
1029 | 26 | </td> | ||
1030 | 27 | </tal:block> | ||
1031 | 28 | </tr> | ||
1032 | 29 | <tr tal:condition="not: sheets"> | ||
1033 | 30 | <td tal:attributes="colspan python:len(schoolyear)+1" i18n:translate=""> | ||
1034 | 31 | This year has no worksheets deployed. | ||
1035 | 32 | </td> | ||
1036 | 33 | </tr> | ||
1037 | 34 | </table> | ||
1038 | 35 | <form method="post" class="standalone" | ||
1039 | 36 | tal:attributes="action request/getURL"> | ||
1040 | 37 | <div class="viewspace"> | ||
1041 | 38 | <div class="status" tal:condition="view/has_error"> | ||
1042 | 39 | <div class="summary ui-state-error ui-corner-all"> | ||
1043 | 40 | <span class="ui-icon ui-icon-alert">icon</span> | ||
1044 | 41 | <span i18n:domain="schooltool" i18n:translate="">Please correct the marked fields below.</span> | ||
1045 | 42 | </div> | ||
1046 | 43 | </div> | ||
1047 | 44 | <fieldset> | ||
1048 | 45 | <legend> | ||
1049 | 46 | <span i18n:translate="">Select worksheet to deploy</span> | ||
1050 | 47 | </legend> | ||
1051 | 48 | <div class="row"> | ||
1052 | 49 | <div class="label"> | ||
1053 | 50 | <label for="term"> | ||
1054 | 51 | <span i18n:translate="">Term or Year</span> | ||
1055 | 52 | </label> | ||
1056 | 53 | </div> | ||
1057 | 54 | <p class="hint" i18n:translate=""> | ||
1058 | 55 | Select a term or deploy to the entire year. | ||
1059 | 56 | </p> | ||
1060 | 57 | <div class="widget"> | ||
1061 | 58 | <select id="term" name="term"> | ||
1062 | 59 | <tal:block repeat="term terms"> | ||
1063 | 60 | <option tal:attributes="value term/name; selected term/selected" | ||
1064 | 61 | tal:content="term/title" /> | ||
1065 | 62 | </tal:block> | ||
1066 | 63 | </select> | ||
1067 | 64 | </div> | ||
1068 | 65 | </div> | ||
1069 | 66 | <div class="row"> | ||
1070 | 67 | <div class="label"> | ||
1071 | 68 | <label for="template"> | ||
1072 | 69 | <span i18n:translate="">Worksheet Template</span> | ||
1073 | 70 | </label> | ||
1074 | 71 | </div> | ||
1075 | 72 | <div class="error" tal:condition="view/no_template"> | ||
1076 | 73 | <div class="error" i18n:translate="">Required input is missing.</div> | ||
1077 | 74 | </div> | ||
1078 | 75 | <div class="widget"> | ||
1079 | 76 | <select id="template" name="template"> | ||
1080 | 77 | <tal:block repeat="template view/templates"> | ||
1081 | 78 | <option tal:attributes="value template/name; selected template/selected" | ||
1082 | 79 | tal:content="template/title" /> | ||
1083 | 80 | </tal:block> | ||
1084 | 81 | </select> | ||
1085 | 82 | </div> | ||
1086 | 83 | </div> | ||
1087 | 84 | <div class="row"> | ||
1088 | 85 | <div class="label"> | ||
1089 | 86 | <label for="term"> | ||
1090 | 87 | <span i18n:translate="">Title</span> | ||
1091 | 88 | </label> | ||
1092 | 89 | </div> | ||
1093 | 90 | <p class="hint" i18n:translate=""> | ||
1094 | 91 | If you deploy the same template multiple times, give each deployment | ||
1095 | 92 | an easily distinguishable name. | ||
1096 | 93 | </p> | ||
1097 | 94 | <div class="error" tal:condition="view/no_title"> | ||
1098 | 95 | <div class="error" i18n:translate="">Required input is missing.</div> | ||
1099 | 96 | </div> | ||
1100 | 97 | <div class="widget"> | ||
1101 | 98 | <input type="text" name="alternate_title" id="alternate_title" | ||
1102 | 99 | tal:attributes="value view/alternate_title" /> | ||
1103 | 100 | </div> | ||
1104 | 101 | </div> | ||
1105 | 102 | </fieldset> | ||
1106 | 103 | </div> | ||
1107 | 104 | <div class="buttons controls"> | ||
1108 | 105 | <input type="submit" class="button-ok" name="SUBMIT" value="Submit" | ||
1109 | 106 | i18n:attributes="value" /> | ||
1110 | 107 | <tal:block metal:use-macro="view/@@standard_macros/cancel-button" /> | ||
1111 | 108 | </div> | ||
1112 | 109 | </form> | ||
1113 | 110 | </div> | ||
1114 | 111 | |||
1115 | 0 | 112 | ||
1116 | === added file 'src/schooltool/gradebook/browser/templates/f_deploy_as_course_worksheet.pt' | |||
1117 | --- src/schooltool/gradebook/browser/templates/f_deploy_as_course_worksheet.pt 1970-01-01 00:00:00 +0000 | |||
1118 | +++ src/schooltool/gradebook/browser/templates/f_deploy_as_course_worksheet.pt 2011-12-22 16:21:13 +0000 | |||
1119 | @@ -0,0 +1,61 @@ | |||
1120 | 1 | <div i18n:domain="schooltool.gradebook" | ||
1121 | 2 | tal:define="terms view/terms"> | ||
1122 | 3 | <form method="post" class="standalone" | ||
1123 | 4 | tal:attributes="action request/getURL"> | ||
1124 | 5 | <div class="viewspace"> | ||
1125 | 6 | <div class="status" tal:condition="view/has_error"> | ||
1126 | 7 | <div class="summary ui-state-error ui-corner-all"> | ||
1127 | 8 | <span class="ui-icon ui-icon-alert">icon</span> | ||
1128 | 9 | <span i18n:domain="schooltool" i18n:translate="">Please correct the marked fields below.</span> | ||
1129 | 10 | </div> | ||
1130 | 11 | </div> | ||
1131 | 12 | <fieldset> | ||
1132 | 13 | <legend> | ||
1133 | 14 | <span i18n:translate="">Select term or year to deploy</span> | ||
1134 | 15 | </legend> | ||
1135 | 16 | <div class="row"> | ||
1136 | 17 | <div class="label"> | ||
1137 | 18 | <label for="term"> | ||
1138 | 19 | <span i18n:translate="">Term or Year</span> | ||
1139 | 20 | </label> | ||
1140 | 21 | </div> | ||
1141 | 22 | <p class="hint" i18n:translate=""> | ||
1142 | 23 | Select a term or deploy to the entire year. | ||
1143 | 24 | </p> | ||
1144 | 25 | <div class="widget"> | ||
1145 | 26 | <select id="term" name="term"> | ||
1146 | 27 | <tal:block repeat="term terms"> | ||
1147 | 28 | <option tal:attributes="value term/name; selected term/selected" | ||
1148 | 29 | tal:content="term/title" /> | ||
1149 | 30 | </tal:block> | ||
1150 | 31 | </select> | ||
1151 | 32 | </div> | ||
1152 | 33 | </div> | ||
1153 | 34 | <div class="row"> | ||
1154 | 35 | <div class="label"> | ||
1155 | 36 | <label for="term"> | ||
1156 | 37 | <span i18n:translate="">Title</span> | ||
1157 | 38 | </label> | ||
1158 | 39 | </div> | ||
1159 | 40 | <p class="hint" i18n:translate=""> | ||
1160 | 41 | If you deploy the same template multiple times, give each deployment | ||
1161 | 42 | an easily distinguishable name. | ||
1162 | 43 | </p> | ||
1163 | 44 | <div class="error" tal:condition="view/no_title"> | ||
1164 | 45 | <div class="error" i18n:translate="">Required input is missing.</div> | ||
1165 | 46 | </div> | ||
1166 | 47 | <div class="widget"> | ||
1167 | 48 | <input type="text" name="alternate_title" id="alternate_title" | ||
1168 | 49 | tal:attributes="value view/alternate_title" /> | ||
1169 | 50 | </div> | ||
1170 | 51 | </div> | ||
1171 | 52 | </fieldset> | ||
1172 | 53 | </div> | ||
1173 | 54 | <div class="buttons controls"> | ||
1174 | 55 | <input type="submit" class="button-ok" name="SUBMIT" value="Submit" | ||
1175 | 56 | i18n:attributes="value" /> | ||
1176 | 57 | <tal:block metal:use-macro="view/@@standard_macros/cancel-button" /> | ||
1177 | 58 | </div> | ||
1178 | 59 | </form> | ||
1179 | 60 | </div> | ||
1180 | 61 | |||
1181 | 0 | 62 | ||
1182 | === added file 'src/schooltool/gradebook/browser/templates/f_hide_unhide_course_worksheets.pt' | |||
1183 | --- src/schooltool/gradebook/browser/templates/f_hide_unhide_course_worksheets.pt 1970-01-01 00:00:00 +0000 | |||
1184 | +++ src/schooltool/gradebook/browser/templates/f_hide_unhide_course_worksheets.pt 2011-12-22 16:21:13 +0000 | |||
1185 | @@ -0,0 +1,44 @@ | |||
1186 | 1 | <div i18n:domain="schooltool.gradebook" | ||
1187 | 2 | tal:define="sheets view/all_sheets; schoolyear view/schoolyear"> | ||
1188 | 3 | <h3 i18n:translate="">Currently Deployed WorkSheets</h3> | ||
1189 | 4 | <form method="post" class="standalone" | ||
1190 | 5 | tal:attributes="action request/getURL"> | ||
1191 | 6 | <table> | ||
1192 | 7 | <thead> | ||
1193 | 8 | <tr> | ||
1194 | 9 | <th i18n:translate="">Deployed Worksheet</th> | ||
1195 | 10 | <th i18n:translate="">Index</th> | ||
1196 | 11 | <tal:block repeat="term schoolyear/values"> | ||
1197 | 12 | <th tal:content="term/title" /> | ||
1198 | 13 | </tal:block> | ||
1199 | 14 | <th i18n:translate="">Hidden?</th> | ||
1200 | 15 | </tr> | ||
1201 | 16 | </thead> | ||
1202 | 17 | <tr tal:repeat="sheet sheets"> | ||
1203 | 18 | <td tal:content="sheet/obj/title" /> | ||
1204 | 19 | <td tal:content="sheet/index" /> | ||
1205 | 20 | <tal:block repeat="term sheet/terms"> | ||
1206 | 21 | <td> | ||
1207 | 22 | <span tal:condition="term" class="ui-icon ui-icon-check ui-icon-center"></span> | ||
1208 | 23 | </td> | ||
1209 | 24 | </tal:block> | ||
1210 | 25 | <td> | ||
1211 | 26 | <input type="checkbox" name="hidden:list" | ||
1212 | 27 | tal:attributes="value sheet/index; | ||
1213 | 28 | checked sheet/checked" /> | ||
1214 | 29 | </td> | ||
1215 | 30 | </tr> | ||
1216 | 31 | <tr tal:condition="not: sheets"> | ||
1217 | 32 | <td tal:attributes="colspan python:len(schoolyear)+3" i18n:translate=""> | ||
1218 | 33 | This year has no worksheets deployed. | ||
1219 | 34 | </td> | ||
1220 | 35 | </tr> | ||
1221 | 36 | </table> | ||
1222 | 37 | <div class="buttons controls"> | ||
1223 | 38 | <input type="submit" class="button-ok" name="SUBMIT" value="Submit" | ||
1224 | 39 | i18n:attributes="value" /> | ||
1225 | 40 | <tal:block metal:use-macro="view/@@standard_macros/cancel-button" /> | ||
1226 | 41 | </div> | ||
1227 | 42 | </form> | ||
1228 | 43 | </div> | ||
1229 | 44 | |||
1230 | 0 | 45 | ||
1231 | === added file 'src/schooltool/gradebook/browser/templates/f_manage_course_worksheet_templates.pt' | |||
1232 | --- src/schooltool/gradebook/browser/templates/f_manage_course_worksheet_templates.pt 1970-01-01 00:00:00 +0000 | |||
1233 | +++ src/schooltool/gradebook/browser/templates/f_manage_course_worksheet_templates.pt 2011-12-22 16:21:13 +0000 | |||
1234 | @@ -0,0 +1,10 @@ | |||
1235 | 1 | <div class="manage-view" i18n:domain="schooltool"> | ||
1236 | 2 | <h3> | ||
1237 | 3 | <a title="Manage Worksheet Templates" | ||
1238 | 4 | tal:attributes="href string:${context/@@absolute_url}/activities" | ||
1239 | 5 | i18n:attributes="title" | ||
1240 | 6 | i18n:translate=""> | ||
1241 | 7 | Worksheet Templates | ||
1242 | 8 | </a> | ||
1243 | 9 | </h3> | ||
1244 | 10 | </div> | ||
1245 | 0 | 11 | ||
1246 | === added file 'src/schooltool/gradebook/browser/templates/f_manage_course_worksheets.pt' | |||
1247 | --- src/schooltool/gradebook/browser/templates/f_manage_course_worksheets.pt 1970-01-01 00:00:00 +0000 | |||
1248 | +++ src/schooltool/gradebook/browser/templates/f_manage_course_worksheets.pt 2011-12-22 16:21:13 +0000 | |||
1249 | @@ -0,0 +1,21 @@ | |||
1250 | 1 | <div class="manage-view" i18n:domain="schooltool" | ||
1251 | 2 | tal:define="sheets view/sheets"> | ||
1252 | 3 | <h3> | ||
1253 | 4 | <a title="Manage Deployed Worksheets" | ||
1254 | 5 | tal:attributes="href string:${context/@@absolute_url}/deployed_worksheets.html" | ||
1255 | 6 | i18n:attributes="title" | ||
1256 | 7 | i18n:translate=""> | ||
1257 | 8 | Deployed Worksheets | ||
1258 | 9 | </a> | ||
1259 | 10 | </h3> | ||
1260 | 11 | <p i18n:translate="" tal:condition="sheets"> | ||
1261 | 12 | There are | ||
1262 | 13 | <metal:block tal:replace="python:len(sheets)" i18n:name="count"/> | ||
1263 | 14 | worksheets deployed in | ||
1264 | 15 | <metal:block tal:replace="view/schoolyear/title" i18n:name="schoolyear"/> | ||
1265 | 16 | </p> | ||
1266 | 17 | <p i18n:translate="" tal:condition="not: sheets"> | ||
1267 | 18 | There are no worksheets deployed in | ||
1268 | 19 | <metal:block tal:replace="view/schoolyear/title" i18n:name="schoolyear"/> | ||
1269 | 20 | </p> | ||
1270 | 21 | </div> | ||
1271 | 0 | 22 | ||
1272 | === added file 'src/schooltool/gradebook/browser/templates/f_manage_report_sheet_templates_overview.pt' | |||
1273 | --- src/schooltool/gradebook/browser/templates/f_manage_report_sheet_templates_overview.pt 1970-01-01 00:00:00 +0000 | |||
1274 | +++ src/schooltool/gradebook/browser/templates/f_manage_report_sheet_templates_overview.pt 2011-12-22 16:21:13 +0000 | |||
1275 | @@ -0,0 +1,12 @@ | |||
1276 | 1 | <div class="manage-view" i18n:domain="schooltool" | ||
1277 | 2 | tal:condition="view/has_schoolyear" | ||
1278 | 3 | tal:define="sheets view/sheets"> | ||
1279 | 4 | <h3> | ||
1280 | 5 | <a title="Manage Report Sheet Templates" | ||
1281 | 6 | tal:attributes="href string:${context/@@absolute_url}/gradebook/templates" | ||
1282 | 7 | i18n:attributes="title" | ||
1283 | 8 | i18n:translate=""> | ||
1284 | 9 | Report Sheet Templates | ||
1285 | 10 | </a> | ||
1286 | 11 | </h3> | ||
1287 | 12 | </div> | ||
1288 | 0 | 13 | ||
1289 | === modified file 'src/schooltool/gradebook/browser/templates/f_manage_report_sheets_overview.pt' | |||
1290 | --- src/schooltool/gradebook/browser/templates/f_manage_report_sheets_overview.pt 2011-08-29 01:25:08 +0000 | |||
1291 | +++ src/schooltool/gradebook/browser/templates/f_manage_report_sheets_overview.pt 2011-12-22 16:21:13 +0000 | |||
1292 | @@ -2,11 +2,11 @@ | |||
1293 | 2 | tal:condition="view/has_schoolyear" | 2 | tal:condition="view/has_schoolyear" |
1294 | 3 | tal:define="sheets view/sheets"> | 3 | tal:define="sheets view/sheets"> |
1295 | 4 | <h3> | 4 | <h3> |
1297 | 5 | <a title="Manage Report Sheets" | 5 | <a title="Manage Deployed Report Sheets" |
1298 | 6 | tal:attributes="href string:${context/@@absolute_url}/report_sheets" | 6 | tal:attributes="href string:${context/@@absolute_url}/report_sheets" |
1299 | 7 | i18n:attributes="title" | 7 | i18n:attributes="title" |
1300 | 8 | i18n:translate=""> | 8 | i18n:translate=""> |
1302 | 9 | Report Sheets | 9 | Deployed Report Sheets |
1303 | 10 | </a> | 10 | </a> |
1304 | 11 | </h3> | 11 | </h3> |
1305 | 12 | <p i18n:translate="" tal:condition="sheets"> | 12 | <p i18n:translate="" tal:condition="sheets"> |
1306 | 13 | 13 | ||
1307 | === modified file 'src/schooltool/gradebook/browser/templates/f_template_manage.pt' | |||
1308 | --- src/schooltool/gradebook/browser/templates/f_template_manage.pt 2011-10-01 07:08:33 +0000 | |||
1309 | +++ src/schooltool/gradebook/browser/templates/f_template_manage.pt 2011-12-22 16:21:13 +0000 | |||
1310 | @@ -23,7 +23,7 @@ | |||
1311 | 23 | i18n:attributes="alt" /> | 23 | i18n:attributes="alt" /> |
1312 | 24 | </a> | 24 | </a> |
1313 | 25 | </td> | 25 | </td> |
1315 | 26 | <td tal:content="activity/scoresystem/title "/> | 26 | <td tal:content="python: view.display_scoresystem(activity)" /> |
1316 | 27 | <td> | 27 | <td> |
1317 | 28 | <button class="image" type="submit" title="Delete" value="1" | 28 | <button class="image" type="submit" title="Delete" value="1" |
1318 | 29 | tal:attributes="name string:delete.${activity/__name__};" | 29 | tal:attributes="name string:delete.${activity/__name__};" |
1319 | 30 | 30 | ||
1320 | === modified file 'src/schooltool/gradebook/browser/templates/f_templates_overview.pt' | |||
1321 | --- src/schooltool/gradebook/browser/templates/f_templates_overview.pt 2011-09-26 18:30:13 +0000 | |||
1322 | +++ src/schooltool/gradebook/browser/templates/f_templates_overview.pt 2011-12-22 16:21:13 +0000 | |||
1323 | @@ -15,5 +15,9 @@ | |||
1324 | 15 | </tr> | 15 | </tr> |
1325 | 16 | </table> | 16 | </table> |
1326 | 17 | </form> | 17 | </form> |
1327 | 18 | <h3> | ||
1328 | 19 | <a tal:attributes="href string:${context/schooltool:app/@@absolute_url}/manage" | ||
1329 | 20 | i18n:translate="">Done</a> | ||
1330 | 21 | </h3> | ||
1331 | 18 | </div> | 22 | </div> |
1332 | 19 | 23 | ||
1333 | 20 | 24 | ||
1334 | === modified file 'src/schooltool/gradebook/configure.zcml' | |||
1335 | --- src/schooltool/gradebook/configure.zcml 2011-11-22 17:30:59 +0000 | |||
1336 | +++ src/schooltool/gradebook/configure.zcml 2011-12-22 16:21:13 +0000 | |||
1337 | @@ -57,6 +57,18 @@ | |||
1338 | 57 | factory=".activity.getSectionActivities" | 57 | factory=".activity.getSectionActivities" |
1339 | 58 | trusted="true" | 58 | trusted="true" |
1340 | 59 | /> | 59 | /> |
1341 | 60 | <adapter | ||
1342 | 61 | for="schooltool.course.interfaces.ICourse" | ||
1343 | 62 | provides=".interfaces.ICourseActivities" | ||
1344 | 63 | factory=".activity.getCourseActivities" | ||
1345 | 64 | trusted="true" | ||
1346 | 65 | /> | ||
1347 | 66 | <adapter | ||
1348 | 67 | for="schooltool.course.interfaces.ICourse" | ||
1349 | 68 | provides=".interfaces.ICourseDeployedWorksheets" | ||
1350 | 69 | factory=".activity.getCourseDeployedWorksheets" | ||
1351 | 70 | trusted="true" | ||
1352 | 71 | /> | ||
1353 | 60 | 72 | ||
1354 | 61 | <!-- Activity Content and Security --> | 73 | <!-- Activity Content and Security --> |
1355 | 62 | <class class=".gradebook_init.GradebookRoot"> | 74 | <class class=".gradebook_init.GradebookRoot"> |
1356 | @@ -109,6 +121,26 @@ | |||
1357 | 109 | set_schema=".interfaces.IActivities" | 121 | set_schema=".interfaces.IActivities" |
1358 | 110 | /> | 122 | /> |
1359 | 111 | </class> | 123 | </class> |
1360 | 124 | <class class=".activity.CourseActivities"> | ||
1361 | 125 | <require | ||
1362 | 126 | permission="schooltool.view" | ||
1363 | 127 | interface=".interfaces.ICourseActivities" | ||
1364 | 128 | /> | ||
1365 | 129 | <require | ||
1366 | 130 | permission="schooltool.edit" | ||
1367 | 131 | set_schema=".interfaces.ICourseActivities" | ||
1368 | 132 | /> | ||
1369 | 133 | </class> | ||
1370 | 134 | <class class=".activity.CourseDeployedWorksheets"> | ||
1371 | 135 | <require | ||
1372 | 136 | permission="schooltool.view" | ||
1373 | 137 | interface=".interfaces.ICourseDeployedWorksheets" | ||
1374 | 138 | /> | ||
1375 | 139 | <require | ||
1376 | 140 | permission="schooltool.edit" | ||
1377 | 141 | set_schema=".interfaces.ICourseDeployedWorksheets" | ||
1378 | 142 | /> | ||
1379 | 143 | </class> | ||
1380 | 112 | <class class=".activity.Worksheet"> | 144 | <class class=".activity.Worksheet"> |
1381 | 113 | <allow interface="zope.interface.common.mapping.IReadMapping" /> | 145 | <allow interface="zope.interface.common.mapping.IReadMapping" /> |
1382 | 114 | <require | 146 | <require |
1383 | @@ -136,6 +168,19 @@ | |||
1384 | 136 | attributes="changePosition" | 168 | attributes="changePosition" |
1385 | 137 | /> | 169 | /> |
1386 | 138 | </class> | 170 | </class> |
1387 | 171 | <class class=".activity.CourseWorksheet"> | ||
1388 | 172 | <allow interface="zope.interface.common.mapping.IReadMapping" /> | ||
1389 | 173 | <require | ||
1390 | 174 | permission="schooltool.view" | ||
1391 | 175 | attributes="keys __iter__ values items __len__ title deployed" | ||
1392 | 176 | /> | ||
1393 | 177 | <require | ||
1394 | 178 | permission="schooltool.edit" | ||
1395 | 179 | interface="zope.interface.common.mapping.IWriteMapping" | ||
1396 | 180 | set_schema=".interfaces.ICourseWorksheet" | ||
1397 | 181 | attributes="changePosition" | ||
1398 | 182 | /> | ||
1399 | 183 | </class> | ||
1400 | 139 | <class class=".activity.Activity"> | 184 | <class class=".activity.Activity"> |
1401 | 140 | <allow interface="zope.interface.common.mapping.IReadMapping" /> | 185 | <allow interface="zope.interface.common.mapping.IReadMapping" /> |
1402 | 141 | <require | 186 | <require |
1403 | @@ -304,6 +349,12 @@ | |||
1404 | 304 | name="activities" | 349 | name="activities" |
1405 | 305 | adapter="schooltool.gradebook.interfaces.IActivities" | 350 | adapter="schooltool.gradebook.interfaces.IActivities" |
1406 | 306 | /> | 351 | /> |
1407 | 352 | <adapterTraverserPlugin | ||
1408 | 353 | for="schooltool.course.interfaces.ICourse" | ||
1409 | 354 | layer="zope.publisher.interfaces.http.IHTTPRequest" | ||
1410 | 355 | name="activities" | ||
1411 | 356 | adapter="schooltool.gradebook.interfaces.ICourseActivities" | ||
1412 | 357 | /> | ||
1413 | 307 | 358 | ||
1414 | 308 | <!-- special traversal adapter for traversing from worksheet to gradebook --> | 359 | <!-- special traversal adapter for traversing from worksheet to gradebook --> |
1415 | 309 | <adapter | 360 | <adapter |
1416 | 310 | 361 | ||
1417 | === modified file 'src/schooltool/gradebook/interfaces.py' | |||
1418 | --- src/schooltool/gradebook/interfaces.py 2011-08-30 16:15:01 +0000 | |||
1419 | +++ src/schooltool/gradebook/interfaces.py 2011-12-22 16:21:13 +0000 | |||
1420 | @@ -89,6 +89,18 @@ | |||
1421 | 89 | contains('.IWorksheet') | 89 | contains('.IWorksheet') |
1422 | 90 | 90 | ||
1423 | 91 | 91 | ||
1424 | 92 | class ICourseActivities(interfaces.IRequirement): | ||
1425 | 93 | """Container of Course Worksheet Templates that can be deployed""" | ||
1426 | 94 | |||
1427 | 95 | contains('.ICourseWorksheet') | ||
1428 | 96 | |||
1429 | 97 | |||
1430 | 98 | class ICourseDeployedWorksheets(interfaces.IRequirement): | ||
1431 | 99 | """Container of Deployed Course Worksheets (by term)""" | ||
1432 | 100 | |||
1433 | 101 | contains('.IWorksheet') | ||
1434 | 102 | |||
1435 | 103 | |||
1436 | 92 | class IWorksheet(interfaces.IRequirement): | 104 | class IWorksheet(interfaces.IRequirement): |
1437 | 93 | '''A list of activities that must be fulfilled in a course or section.''' | 105 | '''A list of activities that must be fulfilled in a course or section.''' |
1438 | 94 | 106 | ||
1439 | @@ -111,12 +123,15 @@ | |||
1440 | 111 | """Set the weight for the given category. Any numeric type is | 123 | """Set the weight for the given category. Any numeric type is |
1441 | 112 | acceptable""" | 124 | acceptable""" |
1442 | 113 | 125 | ||
1443 | 126 | def canAverage(): | ||
1444 | 127 | """return True if activities have scoresystems that can be averaged""" | ||
1445 | 128 | |||
1446 | 114 | containers(IActivities) | 129 | containers(IActivities) |
1447 | 115 | contains('.IActivity') | 130 | contains('.IActivity') |
1448 | 116 | 131 | ||
1449 | 117 | 132 | ||
1450 | 118 | class IReportWorksheet(interfaces.IRequirement): | 133 | class IReportWorksheet(interfaces.IRequirement): |
1452 | 119 | '''A list of report card activities that get copied into sections.''' | 134 | '''A worksheet template to get copied into section gradebooks.''' |
1453 | 120 | 135 | ||
1454 | 121 | containers(IGradebookTemplates, IGradebookDeployed) | 136 | containers(IGradebookTemplates, IGradebookDeployed) |
1455 | 122 | contains('.IReportActivity') | 137 | contains('.IReportActivity') |
1456 | @@ -126,13 +141,23 @@ | |||
1457 | 126 | description=_(u'Identifies the report sheet in teacher gradebooks.')) | 141 | description=_(u'Identifies the report sheet in teacher gradebooks.')) |
1458 | 127 | 142 | ||
1459 | 128 | 143 | ||
1460 | 144 | class ICourseWorksheet(interfaces.IRequirement): | ||
1461 | 145 | '''A worksheet template to get copied into section gradebooks.''' | ||
1462 | 146 | |||
1463 | 147 | contains('.IActivity') | ||
1464 | 148 | |||
1465 | 149 | title = zope.schema.TextLine( | ||
1466 | 150 | title=_(u'Title'), | ||
1467 | 151 | description=_(u'Identifies the course worksheet in gradebooks.')) | ||
1468 | 152 | |||
1469 | 153 | |||
1470 | 129 | class IActivity(interfaces.IRequirement): | 154 | class IActivity(interfaces.IRequirement): |
1471 | 130 | '''An activity to be graded''' | 155 | '''An activity to be graded''' |
1472 | 131 | 156 | ||
1473 | 132 | due_date = zope.schema.Date( | 157 | due_date = zope.schema.Date( |
1474 | 133 | title=_("Due Date"), | 158 | title=_("Due Date"), |
1475 | 134 | description=_("The date the activity is due to be graded."), | 159 | description=_("The date the activity is due to be graded."), |
1477 | 135 | required=True) | 160 | required=False) |
1478 | 136 | 161 | ||
1479 | 137 | label = zope.schema.TextLine( | 162 | label = zope.schema.TextLine( |
1480 | 138 | title=_(u"Label"), | 163 | title=_(u"Label"), |
1481 | @@ -164,7 +189,7 @@ | |||
1482 | 164 | 189 | ||
1483 | 165 | 190 | ||
1484 | 166 | class IReportActivity(IActivity): | 191 | class IReportActivity(IActivity): |
1486 | 167 | '''An activity to be deployed to section activities''' | 192 | '''A report card activity to be deployed to section activities''' |
1487 | 168 | 193 | ||
1488 | 169 | containers(IReportWorksheet) | 194 | containers(IReportWorksheet) |
1489 | 170 | 195 | ||
1490 | 171 | 196 | ||
1491 | === modified file 'src/schooltool/gradebook/tests/test_gradebook.py' | |||
1492 | --- src/schooltool/gradebook/tests/test_gradebook.py 2011-08-30 16:15:01 +0000 | |||
1493 | +++ src/schooltool/gradebook/tests/test_gradebook.py 2011-12-22 16:21:13 +0000 | |||
1494 | @@ -28,7 +28,7 @@ | |||
1495 | 28 | from zope.component import provideAdapter, provideUtility | 28 | from zope.component import provideAdapter, provideUtility |
1496 | 29 | from zope.interface import classImplements | 29 | from zope.interface import classImplements |
1497 | 30 | 30 | ||
1499 | 31 | from schooltool.course.interfaces import ISection | 31 | from schooltool.course.interfaces import ICourse, ISection |
1500 | 32 | from schooltool.relationship.tests import setUpRelationships | 32 | from schooltool.relationship.tests import setUpRelationships |
1501 | 33 | from schooltool.person.person import Person | 33 | from schooltool.person.person import Person |
1502 | 34 | from schooltool.requirement import testing | 34 | from schooltool.requirement import testing |
1503 | @@ -48,6 +48,12 @@ | |||
1504 | 48 | provideAdapter( | 48 | provideAdapter( |
1505 | 49 | activity.getSectionActivities, | 49 | activity.getSectionActivities, |
1506 | 50 | (ISection,), interfaces.IActivities) | 50 | (ISection,), interfaces.IActivities) |
1507 | 51 | provideAdapter( | ||
1508 | 52 | activity.getCourseActivities, | ||
1509 | 53 | (ICourse,), interfaces.ICourseActivities) | ||
1510 | 54 | provideAdapter( | ||
1511 | 55 | activity.getCourseDeployedWorksheets, | ||
1512 | 56 | (ICourse,), interfaces.ICourseDeployedWorksheets) | ||
1513 | 51 | 57 | ||
1514 | 52 | provideAdapter(gradebook.Gradebook) | 58 | provideAdapter(gradebook.Gradebook) |
1515 | 53 | 59 |
I have removed your merge from flourish branch.
# Your local branch will conflict. Push it aside rejected
# $ bzr branch . ../flourish-
# and get the real trunk
# $ bzr pull --overwrite lp:schooltool.gradebook