1080.1.2
by matt.giuca
New module: ivle.database. Classes and utilities for Storm ORM. |
1 |
# IVLE - Informatics Virtual Learning Environment
|
2 |
# Copyright (C) 2007-2009 The University of Melbourne
|
|
3 |
#
|
|
4 |
# This program is free software; you can redistribute it and/or modify
|
|
5 |
# it under the terms of the GNU General Public License as published by
|
|
6 |
# the Free Software Foundation; either version 2 of the License, or
|
|
7 |
# (at your option) any later version.
|
|
8 |
#
|
|
9 |
# This program is distributed in the hope that it will be useful,
|
|
10 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
11 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
12 |
# GNU General Public License for more details.
|
|
13 |
#
|
|
14 |
# You should have received a copy of the GNU General Public License
|
|
15 |
# along with this program; if not, write to the Free Software
|
|
16 |
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
17 |
||
18 |
# Author: Matt Giuca, Will Grant
|
|
19 |
||
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
20 |
"""Database utilities and content classes.
|
1080.1.2
by matt.giuca
New module: ivle.database. Classes and utilities for Storm ORM. |
21 |
|
22 |
This module provides all of the classes which map to database tables.
|
|
23 |
It also provides miscellaneous utility functions for database interaction.
|
|
24 |
"""
|
|
25 |
||
1197
by Matt Giuca
ivle.chat, ivle.database, ivle.makeuser: Replaced use of md5 library with |
26 |
import hashlib |
1080.1.15
by me at id
Give ivle.database.User {password,account}_expired attributes, and get |
27 |
import datetime |
1660
by Matt Giuca
ivle.database: Added a security check on Project.submit() that the path meets certain constraints, to avoid path injection. Fixes LP bug #522462. |
28 |
import os |
1784
by Matt Giuca
ivle.webapp.admin.subject: Abstracted code to generate Subversion URL into the database. User and ProjectGroup objects now have a get_svn_url method. |
29 |
import urlparse |
1806
by David Coles
URL quote paths in checkout URLs. |
30 |
import urllib |
1080.1.13
by me at id
ivle.database.User: Add an authenticate() method, and a hash_password() |
31 |
|
1080.1.4
by matt.giuca
ivle.database: Added User class. |
32 |
from storm.locals import create_database, Store, Int, Unicode, DateTime, \ |
1080.1.27
by me at id
ivle.database.User: Add an 'active_enrolments' property, which returns a list |
33 |
Reference, ReferenceSet, Bool, Storm, Desc |
1165.3.45
by William Grant
Add Project.latest_submissions, which excludes superseded submissions. |
34 |
from storm.expr import Select, Max |
1099.1.242
by Nick Chadwick
Fixed a problem with exercise editor, which wasn't editing or adding |
35 |
from storm.exceptions import NotOneError, IntegrityError |
1080.1.2
by matt.giuca
New module: ivle.database. Classes and utilities for Storm ORM. |
36 |
|
1099.1.220
by Nick Chadwick
Merged from trunk |
37 |
from ivle.worksheet.rst import rst |
1080.1.2
by matt.giuca
New module: ivle.database. Classes and utilities for Storm ORM. |
38 |
|
1080.1.39
by Matt Giuca
ivle.database: Added __all__ to the top of the file. |
39 |
__all__ = ['get_store', |
40 |
'User', |
|
41 |
'Subject', 'Semester', 'Offering', 'Enrolment', |
|
42 |
'ProjectSet', 'Project', 'ProjectGroup', 'ProjectGroupMembership', |
|
1165.1.4
by William Grant
Add database classes for assessed, project_extension and project_submission. |
43 |
'Assessed', 'ProjectSubmission', 'ProjectExtension', |
1080.1.59
by Matt Giuca
ivle.worksheet, ivle.database: Added/updated __all__. |
44 |
'Exercise', 'Worksheet', 'WorksheetExercise', |
1080.1.61
by William Grant
ivle.database: Add an Offering.enrol(user) method, which enrols the user in |
45 |
'ExerciseSave', 'ExerciseAttempt', |
1110
by William Grant
ivle-enrol now allows updating of existing enrolments. It also sets the role. |
46 |
'TestCase', 'TestSuite', 'TestSuiteVar' |
1080.1.39
by Matt Giuca
ivle.database: Added __all__ to the top of the file. |
47 |
]
|
48 |
||
1080.1.25
by me at id
ivle.database: Add Subject, Semester and Offering. |
49 |
def _kwarg_init(self, **kwargs): |
50 |
for k,v in kwargs.items(): |
|
1080.1.46
by William Grant
ivle.database._kwarg_init: Check with hasattr() on the class, not the object, |
51 |
if k.startswith('_') or not hasattr(self.__class__, k): |
1080.1.25
by me at id
ivle.database: Add Subject, Semester and Offering. |
52 |
raise TypeError("%s got an unexpected keyword argument '%s'" |
1080.1.45
by William Grant
ivle.database._kwarg_init: Fix exception throwing. |
53 |
% (self.__class__.__name__, k)) |
1080.1.25
by me at id
ivle.database: Add Subject, Semester and Offering. |
54 |
setattr(self, k, v) |
55 |
||
1201
by William Grant
ivle.database.get_store() now takes a configuration object. |
56 |
def get_conn_string(config): |
57 |
"""Create a Storm connection string to the IVLE database
|
|
58 |
||
59 |
@param config: The IVLE configuration.
|
|
1080.1.2
by matt.giuca
New module: ivle.database. Classes and utilities for Storm ORM. |
60 |
"""
|
1099.1.174
by William Grant
ivle.database.get_conn_string() now defaults to localhost:5432, rather than |
61 |
|
62 |
clusterstr = '' |
|
1201
by William Grant
ivle.database.get_store() now takes a configuration object. |
63 |
if config['database']['username']: |
64 |
clusterstr += config['database']['username'] |
|
65 |
if config['database']['password']: |
|
66 |
clusterstr += ':' + config['database']['password'] |
|
1099.1.174
by William Grant
ivle.database.get_conn_string() now defaults to localhost:5432, rather than |
67 |
clusterstr += '@' |
68 |
||
1201
by William Grant
ivle.database.get_store() now takes a configuration object. |
69 |
host = config['database']['host'] or 'localhost' |
70 |
port = config['database']['port'] or 5432 |
|
1099.1.174
by William Grant
ivle.database.get_conn_string() now defaults to localhost:5432, rather than |
71 |
|
72 |
clusterstr += '%s:%d' % (host, port) |
|
73 |
||
1201
by William Grant
ivle.database.get_store() now takes a configuration object. |
74 |
return "postgres://%s/%s" % (clusterstr, config['database']['name']) |
75 |
||
76 |
def get_store(config): |
|
77 |
"""Create a Storm store connected to the IVLE database.
|
|
78 |
||
79 |
@param config: The IVLE configuration.
|
|
80 |
"""
|
|
81 |
return Store(create_database(get_conn_string(config))) |
|
1080.1.4
by matt.giuca
ivle.database: Added User class. |
82 |
|
1080.1.39
by Matt Giuca
ivle.database: Added __all__ to the top of the file. |
83 |
# USERS #
|
84 |
||
1080.1.26
by me at id
ivle.database: Add an Enrolment class, and reference(set)s between all of the |
85 |
class User(Storm): |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
86 |
"""An IVLE user account."""
|
1080.1.4
by matt.giuca
ivle.database: Added User class. |
87 |
__storm_table__ = "login" |
88 |
||
89 |
id = Int(primary=True, name="loginid") |
|
90 |
login = Unicode() |
|
91 |
passhash = Unicode() |
|
92 |
state = Unicode() |
|
1101
by William Grant
Privileges (apart from admin) are now offering-local, not global. |
93 |
admin = Bool() |
1080.1.4
by matt.giuca
ivle.database: Added User class. |
94 |
unixid = Int() |
95 |
nick = Unicode() |
|
96 |
pass_exp = DateTime() |
|
97 |
acct_exp = DateTime() |
|
98 |
last_login = DateTime() |
|
99 |
svn_pass = Unicode() |
|
100 |
email = Unicode() |
|
101 |
fullname = Unicode() |
|
102 |
studentid = Unicode() |
|
103 |
settings = Unicode() |
|
104 |
||
1080.1.25
by me at id
ivle.database: Add Subject, Semester and Offering. |
105 |
__init__ = _kwarg_init |
1080.1.4
by matt.giuca
ivle.database: Added User class. |
106 |
|
107 |
def __repr__(self): |
|
108 |
return "<%s '%s'>" % (type(self).__name__, self.login) |
|
1080.1.5
by matt.giuca
ivle.database.User: Add the missing methods from ivle.user.User. |
109 |
|
1080.1.13
by me at id
ivle.database.User: Add an authenticate() method, and a hash_password() |
110 |
def authenticate(self, password): |
111 |
"""Validate a given password against this user.
|
|
112 |
||
113 |
Returns True if the given password matches the password hash for this
|
|
114 |
User, False if it doesn't match, and None if there is no hash for the
|
|
115 |
user.
|
|
116 |
"""
|
|
117 |
if self.passhash is None: |
|
118 |
return None |
|
119 |
return self.hash_password(password) == self.passhash |
|
120 |
||
1080.1.15
by me at id
Give ivle.database.User {password,account}_expired attributes, and get |
121 |
@property
|
1165.1.26
by William Grant
Add display_name properties to users and groups. |
122 |
def display_name(self): |
1165.3.69
by Matt Giuca
ivle.database: User/ProjectGroup: Added 'short_name' methods so we have a |
123 |
"""Returns the "nice name" of the user or group."""
|
1165.1.26
by William Grant
Add display_name properties to users and groups. |
124 |
return self.fullname |
125 |
||
126 |
@property
|
|
1165.3.69
by Matt Giuca
ivle.database: User/ProjectGroup: Added 'short_name' methods so we have a |
127 |
def short_name(self): |
128 |
"""Returns the database "identifier" name of the user or group."""
|
|
129 |
return self.login |
|
130 |
||
131 |
@property
|
|
1080.1.15
by me at id
Give ivle.database.User {password,account}_expired attributes, and get |
132 |
def password_expired(self): |
1080.1.5
by matt.giuca
ivle.database.User: Add the missing methods from ivle.user.User. |
133 |
fieldval = self.pass_exp |
1080.1.15
by me at id
Give ivle.database.User {password,account}_expired attributes, and get |
134 |
return fieldval is not None and datetime.datetime.now() > fieldval |
135 |
||
136 |
@property
|
|
137 |
def account_expired(self): |
|
1080.1.5
by matt.giuca
ivle.database.User: Add the missing methods from ivle.user.User. |
138 |
fieldval = self.acct_exp |
1080.1.15
by me at id
Give ivle.database.User {password,account}_expired attributes, and get |
139 |
return fieldval is not None and datetime.datetime.now() > fieldval |
1080.1.6
by matt.giuca
ivle.database.User: Added get_by_login method. |
140 |
|
1099.1.121
by William Grant
Don't set req.user unless the login in the session specifies a valid user. |
141 |
@property
|
142 |
def valid(self): |
|
143 |
return self.state == 'enabled' and not self.account_expired |
|
144 |
||
1080.1.29
by me at id
ivle.database.User: Order 'enrolments' the same way as 'active_enrolments'. |
145 |
def _get_enrolments(self, justactive): |
1080.1.27
by me at id
ivle.database.User: Add an 'active_enrolments' property, which returns a list |
146 |
return Store.of(self).find(Enrolment, |
147 |
Enrolment.user_id == self.id, |
|
1080.1.29
by me at id
ivle.database.User: Order 'enrolments' the same way as 'active_enrolments'. |
148 |
(Enrolment.active == True) if justactive else True, |
1080.1.27
by me at id
ivle.database.User: Add an 'active_enrolments' property, which returns a list |
149 |
Enrolment.offering_id == Offering.id, |
150 |
Offering.semester_id == Semester.id, |
|
151 |
Offering.subject_id == Subject.id).order_by( |
|
152 |
Desc(Semester.year), |
|
1822.1.1
by William Grant
Replace semester.semester with semester.{code,url_name,display_name}. |
153 |
Desc(Semester.display_name), |
1080.1.27
by me at id
ivle.database.User: Add an 'active_enrolments' property, which returns a list |
154 |
Desc(Subject.code) |
155 |
)
|
|
156 |
||
1080.1.68
by William Grant
ivle.database.User: Add a write-only 'password' attribute. When set, it will |
157 |
def _set_password(self, password): |
158 |
if password is None: |
|
159 |
self.passhash = None |
|
160 |
else: |
|
161 |
self.passhash = unicode(User.hash_password(password)) |
|
162 |
password = property(fset=_set_password) |
|
163 |
||
1080.1.29
by me at id
ivle.database.User: Order 'enrolments' the same way as 'active_enrolments'. |
164 |
@property
|
1080.1.31
by me at id
ivle.database.User: Add 'subjects', an attribute containing currently |
165 |
def subjects(self): |
166 |
return Store.of(self).find(Subject, |
|
167 |
Enrolment.user_id == self.id, |
|
168 |
Enrolment.active == True, |
|
169 |
Offering.id == Enrolment.offering_id, |
|
170 |
Subject.id == Offering.subject_id).config(distinct=True) |
|
171 |
||
1080.1.36
by William Grant
ivle.database: Add ProjectSet, Project, ProjectGroup, ProjectGroupMembership |
172 |
# TODO: Invitations should be listed too?
|
173 |
def get_groups(self, offering=None): |
|
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
174 |
"""Get groups of which this user is a member.
|
175 |
||
176 |
@param offering: An optional offering to restrict the search to.
|
|
177 |
"""
|
|
1080.1.36
by William Grant
ivle.database: Add ProjectSet, Project, ProjectGroup, ProjectGroupMembership |
178 |
preds = [ |
179 |
ProjectGroupMembership.user_id == self.id, |
|
180 |
ProjectGroup.id == ProjectGroupMembership.project_group_id, |
|
181 |
]
|
|
182 |
if offering: |
|
183 |
preds.extend([ |
|
184 |
ProjectSet.offering_id == offering.id, |
|
185 |
ProjectGroup.project_set_id == ProjectSet.id, |
|
186 |
])
|
|
187 |
return Store.of(self).find(ProjectGroup, *preds) |
|
188 |
||
189 |
@property
|
|
190 |
def groups(self): |
|
191 |
return self.get_groups() |
|
192 |
||
1080.1.31
by me at id
ivle.database.User: Add 'subjects', an attribute containing currently |
193 |
@property
|
1080.1.29
by me at id
ivle.database.User: Order 'enrolments' the same way as 'active_enrolments'. |
194 |
def active_enrolments(self): |
195 |
'''A sanely ordered list of the user's active enrolments.'''
|
|
196 |
return self._get_enrolments(True) |
|
197 |
||
198 |
@property
|
|
199 |
def enrolments(self): |
|
200 |
'''A sanely ordered list of all of the user's enrolments.'''
|
|
201 |
return self._get_enrolments(False) |
|
1080.1.27
by me at id
ivle.database.User: Add an 'active_enrolments' property, which returns a list |
202 |
|
1165.1.11
by William Grant
Let callsites ask User.get_projects() to show inactive offerings too. |
203 |
def get_projects(self, offering=None, active_only=True): |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
204 |
"""Find projects that the user can submit.
|
1165.1.10
by William Grant
Add User.get_projects(), returning a list of submission targets. |
205 |
|
1165.1.11
by William Grant
Let callsites ask User.get_projects() to show inactive offerings too. |
206 |
This will include projects for offerings in which the user is
|
1165.1.10
by William Grant
Add User.get_projects(), returning a list of submission targets. |
207 |
enrolled, as long as the project is not in a project set which has
|
208 |
groups (ie. if maximum number of group members is 0).
|
|
209 |
||
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
210 |
@param active_only: Whether to only search active offerings.
|
211 |
@param offering: An optional offering to restrict the search to.
|
|
212 |
"""
|
|
1165.1.10
by William Grant
Add User.get_projects(), returning a list of submission targets. |
213 |
return Store.of(self).find(Project, |
214 |
Project.project_set_id == ProjectSet.id, |
|
1165.1.46
by William Grant
Respect the new max_students_per_group semantics in Python. |
215 |
ProjectSet.max_students_per_group == None, |
1165.1.10
by William Grant
Add User.get_projects(), returning a list of submission targets. |
216 |
ProjectSet.offering_id == Offering.id, |
1165.1.11
by William Grant
Let callsites ask User.get_projects() to show inactive offerings too. |
217 |
(offering is None) or (Offering.id == offering.id), |
1165.1.10
by William Grant
Add User.get_projects(), returning a list of submission targets. |
218 |
Semester.id == Offering.semester_id, |
1165.1.11
by William Grant
Let callsites ask User.get_projects() to show inactive offerings too. |
219 |
(not active_only) or (Semester.state == u'current'), |
1165.1.10
by William Grant
Add User.get_projects(), returning a list of submission targets. |
220 |
Enrolment.offering_id == Offering.id, |
1564
by William Grant
Restrict some queries to active enrolments. |
221 |
Enrolment.user_id == self.id, |
222 |
Enrolment.active == True) |
|
1165.1.10
by William Grant
Add User.get_projects(), returning a list of submission targets. |
223 |
|
1080.1.13
by me at id
ivle.database.User: Add an authenticate() method, and a hash_password() |
224 |
@staticmethod
|
225 |
def hash_password(password): |
|
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
226 |
"""Hash a password with MD5."""
|
1197
by Matt Giuca
ivle.chat, ivle.database, ivle.makeuser: Replaced use of md5 library with |
227 |
return hashlib.md5(password).hexdigest() |
1080.1.13
by me at id
ivle.database.User: Add an authenticate() method, and a hash_password() |
228 |
|
1080.1.6
by matt.giuca
ivle.database.User: Added get_by_login method. |
229 |
@classmethod
|
230 |
def get_by_login(cls, store, login): |
|
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
231 |
"""Find a user in a store by login name."""
|
1080.1.7
by matt.giuca
The new ivle.database.User class is now used in Request and usrmgt, which |
232 |
return store.find(cls, cls.login == unicode(login)).one() |
1080.1.25
by me at id
ivle.database: Add Subject, Semester and Offering. |
233 |
|
1810
by David Coles
Fixes for the export command. |
234 |
def get_svn_url(self, config): |
1784
by Matt Giuca
ivle.webapp.admin.subject: Abstracted code to generate Subversion URL into the database. User and ProjectGroup objects now have a get_svn_url method. |
235 |
"""Get the subversion repository URL for this user or group."""
|
1810
by David Coles
Fixes for the export command. |
236 |
url = config['urls']['svn_addr'] |
1784
by Matt Giuca
ivle.webapp.admin.subject: Abstracted code to generate Subversion URL into the database. User and ProjectGroup objects now have a get_svn_url method. |
237 |
path = 'users/%s' % self.login |
1789
by Matt Giuca
Changed database.py get_svn_url to take a req; include the req.user.login in the Subversion URL. This allows you to check out repositories without separately supplying the IVLE URL (as Subversion won't ask for a username by default). Also removed --username= from the lecturer project view, as it's redundant now. This fixes Launchpad bug #543936. |
238 |
return urlparse.urljoin(url, path) |
1784
by Matt Giuca
ivle.webapp.admin.subject: Abstracted code to generate Subversion URL into the database. User and ProjectGroup objects now have a get_svn_url method. |
239 |
|
1544
by Matt Giuca
Added an argument 'config' to every single get_permissions method throughout the program. All calls to get_permissions pass a config. This is to allow per-site policy configurations on permissions. |
240 |
def get_permissions(self, user, config): |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
241 |
"""Determine privileges held by a user over this object.
|
242 |
||
243 |
If the user requesting privileges is this user or an admin,
|
|
244 |
they may do everything. Otherwise they may do nothing.
|
|
245 |
"""
|
|
1101
by William Grant
Privileges (apart from admin) are now offering-local, not global. |
246 |
if user and user.admin or user is self: |
1294.2.137
by William Grant
Grant all users the view_public permission on Users. |
247 |
return set(['view_public', 'view', 'edit', 'submit_project']) |
1099.1.110
by William Grant
Implement an authorization system in the new framework. This breaks the REST |
248 |
else: |
1294.2.137
by William Grant
Grant all users the view_public permission on Users. |
249 |
return set(['view_public']) |
1099.1.110
by William Grant
Implement an authorization system in the new framework. This breaks the REST |
250 |
|
1080.1.39
by Matt Giuca
ivle.database: Added __all__ to the top of the file. |
251 |
# SUBJECTS AND ENROLMENTS #
|
252 |
||
1080.1.26
by me at id
ivle.database: Add an Enrolment class, and reference(set)s between all of the |
253 |
class Subject(Storm): |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
254 |
"""A subject (or course) which is run in some semesters."""
|
255 |
||
1080.1.25
by me at id
ivle.database: Add Subject, Semester and Offering. |
256 |
__storm_table__ = "subject" |
257 |
||
258 |
id = Int(primary=True, name="subjectid") |
|
259 |
code = Unicode(name="subj_code") |
|
260 |
name = Unicode(name="subj_name") |
|
261 |
short_name = Unicode(name="subj_short_name") |
|
262 |
||
1080.1.26
by me at id
ivle.database: Add an Enrolment class, and reference(set)s between all of the |
263 |
offerings = ReferenceSet(id, 'Offering.subject_id') |
264 |
||
1080.1.25
by me at id
ivle.database: Add Subject, Semester and Offering. |
265 |
__init__ = _kwarg_init |
266 |
||
267 |
def __repr__(self): |
|
268 |
return "<%s '%s'>" % (type(self).__name__, self.short_name) |
|
269 |
||
1544
by Matt Giuca
Added an argument 'config' to every single get_permissions method throughout the program. All calls to get_permissions pass a config. This is to allow per-site policy configurations on permissions. |
270 |
def get_permissions(self, user, config): |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
271 |
"""Determine privileges held by a user over this object.
|
272 |
||
273 |
If the user requesting privileges is an admin, they may edit.
|
|
274 |
Otherwise they may only read.
|
|
275 |
"""
|
|
1099.1.110
by William Grant
Implement an authorization system in the new framework. This breaks the REST |
276 |
perms = set() |
277 |
if user is not None: |
|
278 |
perms.add('view') |
|
1101
by William Grant
Privileges (apart from admin) are now offering-local, not global. |
279 |
if user.admin: |
1099.1.141
by Nick Chadwick
Updated the exercises to be loaded from the database, not a local file. |
280 |
perms.add('edit') |
1099.1.110
by William Grant
Implement an authorization system in the new framework. This breaks the REST |
281 |
return perms |
282 |
||
1195.1.1
by Matt Giuca
ivle.database: Added Subject.active_offerings, which can be used by tools |
283 |
def active_offerings(self): |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
284 |
"""Find active offerings for this subject.
|
285 |
||
286 |
Return a sequence of currently active offerings for this subject
|
|
1195.1.1
by Matt Giuca
ivle.database: Added Subject.active_offerings, which can be used by tools |
287 |
(offerings whose semester.state is "current"). There should be 0 or 1
|
288 |
elements in this sequence, but it's possible there are more.
|
|
289 |
"""
|
|
1195.1.6
by Matt Giuca
ivle.database: Added Subject.offering_for_semester. |
290 |
return self.offerings.find(Offering.semester_id == Semester.id, |
291 |
Semester.state == u'current') |
|
292 |
||
293 |
def offering_for_semester(self, year, semester): |
|
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
294 |
"""Get the offering for the given year/semester, or None.
|
295 |
||
296 |
@param year: A string representation of the year.
|
|
297 |
@param semester: A string representation of the semester.
|
|
298 |
"""
|
|
1195.1.6
by Matt Giuca
ivle.database: Added Subject.offering_for_semester. |
299 |
return self.offerings.find(Offering.semester_id == Semester.id, |
300 |
Semester.year == unicode(year), |
|
1822.1.1
by William Grant
Replace semester.semester with semester.{code,url_name,display_name}. |
301 |
Semester.url_name == unicode(semester)).one() |
1195.1.1
by Matt Giuca
ivle.database: Added Subject.active_offerings, which can be used by tools |
302 |
|
1080.1.26
by me at id
ivle.database: Add an Enrolment class, and reference(set)s between all of the |
303 |
class Semester(Storm): |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
304 |
"""A semester in which subjects can be run."""
|
305 |
||
1080.1.25
by me at id
ivle.database: Add Subject, Semester and Offering. |
306 |
__storm_table__ = "semester" |
307 |
||
308 |
id = Int(primary=True, name="semesterid") |
|
309 |
year = Unicode() |
|
1822.1.1
by William Grant
Replace semester.semester with semester.{code,url_name,display_name}. |
310 |
code = Unicode() |
311 |
url_name = Unicode() |
|
312 |
display_name = Unicode() |
|
1104
by William Grant
Replace Semester.active with Semester.state, allowing more useful state |
313 |
state = Unicode() |
1080.1.25
by me at id
ivle.database: Add Subject, Semester and Offering. |
314 |
|
1080.1.26
by me at id
ivle.database: Add an Enrolment class, and reference(set)s between all of the |
315 |
offerings = ReferenceSet(id, 'Offering.semester_id') |
1124
by William Grant
Add Semester.enrolments. |
316 |
enrolments = ReferenceSet(id, |
317 |
'Offering.semester_id', |
|
318 |
'Offering.id', |
|
319 |
'Enrolment.offering_id') |
|
1080.1.26
by me at id
ivle.database: Add an Enrolment class, and reference(set)s between all of the |
320 |
|
1080.1.25
by me at id
ivle.database: Add Subject, Semester and Offering. |
321 |
__init__ = _kwarg_init |
322 |
||
323 |
def __repr__(self): |
|
1822.1.1
by William Grant
Replace semester.semester with semester.{code,url_name,display_name}. |
324 |
return "<%s %s/%s>" % (type(self).__name__, self.year, self.code) |
1080.1.25
by me at id
ivle.database: Add Subject, Semester and Offering. |
325 |
|
1080.1.26
by me at id
ivle.database: Add an Enrolment class, and reference(set)s between all of the |
326 |
class Offering(Storm): |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
327 |
"""An offering of a subject in a particular semester."""
|
328 |
||
1080.1.25
by me at id
ivle.database: Add Subject, Semester and Offering. |
329 |
__storm_table__ = "offering" |
330 |
||
331 |
id = Int(primary=True, name="offeringid") |
|
332 |
subject_id = Int(name="subject") |
|
333 |
subject = Reference(subject_id, Subject.id) |
|
334 |
semester_id = Int(name="semesterid") |
|
335 |
semester = Reference(semester_id, Semester.id) |
|
1451.1.2
by William Grant
Move Subject.url to Offering, and add Offering.description. Show these on the offering index. |
336 |
description = Unicode() |
337 |
url = Unicode() |
|
1695.1.2
by William Grant
Integrate new columns into the model. |
338 |
show_worksheet_marks = Bool() |
339 |
worksheet_cutoff = DateTime() |
|
1080.1.25
by me at id
ivle.database: Add Subject, Semester and Offering. |
340 |
groups_student_permissions = Unicode() |
341 |
||
1080.1.26
by me at id
ivle.database: Add an Enrolment class, and reference(set)s between all of the |
342 |
enrolments = ReferenceSet(id, 'Enrolment.offering_id') |
1080.1.79
by William Grant
ivle.database.Offering: Add a members ReferenceSet. |
343 |
members = ReferenceSet(id, |
344 |
'Enrolment.offering_id', |
|
345 |
'Enrolment.user_id', |
|
346 |
'User.id') |
|
1080.1.76
by William Grant
ivle.database.Offering: Add project_sets referenceset. |
347 |
project_sets = ReferenceSet(id, 'ProjectSet.offering_id') |
1442.1.7
by William Grant
Add Offering.projects. |
348 |
projects = ReferenceSet(id, |
349 |
'ProjectSet.offering_id', |
|
350 |
'ProjectSet.id', |
|
351 |
'Project.project_set_id') |
|
1080.1.26
by me at id
ivle.database: Add an Enrolment class, and reference(set)s between all of the |
352 |
|
1099.1.180
by Nick Chadwick
This commit changes the tutorial service, which now almost exclusively |
353 |
worksheets = ReferenceSet(id, |
354 |
'Worksheet.offering_id', |
|
1099.1.212
by Nick Chadwick
Added a new page to display exercises. This will then be modified to |
355 |
order_by="seq_no" |
1099.1.180
by Nick Chadwick
This commit changes the tutorial service, which now almost exclusively |
356 |
)
|
1099.1.114
by Nick Chadwick
Modified the database so that exercises are now stored in the database, rather |
357 |
|
1080.1.25
by me at id
ivle.database: Add Subject, Semester and Offering. |
358 |
__init__ = _kwarg_init |
359 |
||
360 |
def __repr__(self): |
|
361 |
return "<%s %r in %r>" % (type(self).__name__, self.subject, |
|
362 |
self.semester) |
|
1080.1.26
by me at id
ivle.database: Add an Enrolment class, and reference(set)s between all of the |
363 |
|
1110
by William Grant
ivle-enrol now allows updating of existing enrolments. It also sets the role. |
364 |
def enrol(self, user, role=u'student'): |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
365 |
"""Enrol a user in this offering.
|
366 |
||
367 |
Enrolments handle both the staff and student cases. The role controls
|
|
368 |
the privileges granted by this enrolment.
|
|
369 |
"""
|
|
1110
by William Grant
ivle-enrol now allows updating of existing enrolments. It also sets the role. |
370 |
enrolment = Store.of(self).find(Enrolment, |
1080.1.61
by William Grant
ivle.database: Add an Offering.enrol(user) method, which enrols the user in |
371 |
Enrolment.user_id == user.id, |
1110
by William Grant
ivle-enrol now allows updating of existing enrolments. It also sets the role. |
372 |
Enrolment.offering_id == self.id).one() |
373 |
||
374 |
if enrolment is None: |
|
375 |
enrolment = Enrolment(user=user, offering=self) |
|
376 |
self.enrolments.add(enrolment) |
|
377 |
||
378 |
enrolment.active = True |
|
379 |
enrolment.role = role |
|
1080.1.61
by William Grant
ivle.database: Add an Offering.enrol(user) method, which enrols the user in |
380 |
|
1132
by William Grant
Add Offering.unenrol(), to unenrol a user from an offering. |
381 |
def unenrol(self, user): |
382 |
'''Unenrol a user from this offering.'''
|
|
383 |
enrolment = Store.of(self).find(Enrolment, |
|
384 |
Enrolment.user_id == user.id, |
|
385 |
Enrolment.offering_id == self.id).one() |
|
386 |
Store.of(enrolment).remove(enrolment) |
|
387 |
||
1544
by Matt Giuca
Added an argument 'config' to every single get_permissions method throughout the program. All calls to get_permissions pass a config. This is to allow per-site policy configurations on permissions. |
388 |
def get_permissions(self, user, config): |
1099.1.141
by Nick Chadwick
Updated the exercises to be loaded from the database, not a local file. |
389 |
perms = set() |
390 |
if user is not None: |
|
1131
by William Grant
Offerings now give 'view' only to user enrolled in them. 'edit' is granted |
391 |
enrolment = self.get_enrolment(user) |
392 |
if enrolment or user.admin: |
|
393 |
perms.add('view') |
|
1558
by William Grant
Allow tutors to manage groups. |
394 |
if enrolment and enrolment.role == u'tutor': |
1556
by William Grant
Allow tutors to view project submissions. |
395 |
perms.add('view_project_submissions') |
1547
by Matt Giuca
Added two new configuration options under [policy], for deciding whether tutors can enrol students and edit worksheets. The permissions set in database.py reflects these config options. Documented. This entirely fixes Launchpad Bug #520232 and Bug #493945, regarding tutors having too much power. |
396 |
# Site-specific policy on the role of tutors
|
397 |
if config['policy']['tutors_can_enrol_students']: |
|
398 |
perms.add('enrol') |
|
399 |
perms.add('enrol_student') |
|
400 |
if config['policy']['tutors_can_edit_worksheets']: |
|
401 |
perms.add('edit_worksheets') |
|
1558
by William Grant
Allow tutors to manage groups. |
402 |
if config['policy']['tutors_can_admin_groups']: |
403 |
perms.add('admin_groups') |
|
1547
by Matt Giuca
Added two new configuration options under [policy], for deciding whether tutors can enrol students and edit worksheets. The permissions set in database.py reflects these config options. Documented. This entirely fixes Launchpad Bug #520232 and Bug #493945, regarding tutors having too much power. |
404 |
if (enrolment and enrolment.role in (u'lecturer')) or user.admin: |
1556
by William Grant
Allow tutors to view project submissions. |
405 |
perms.add('view_project_submissions') |
1558
by William Grant
Allow tutors to manage groups. |
406 |
perms.add('admin_groups') |
1542
by Matt Giuca
Tutors can now (once again) edit worksheets. |
407 |
perms.add('edit_worksheets') |
1689.1.1
by Matt Giuca
Added permission view_worksheet_marks to lecturer/admin roles. |
408 |
perms.add('view_worksheet_marks') |
1542
by Matt Giuca
Tutors can now (once again) edit worksheets. |
409 |
perms.add('edit') # Can edit projects & details |
1377
by Matt Giuca
database: Added finer-grained enrol permissions on offerings. |
410 |
perms.add('enrol') # Can see enrolment screen at all |
411 |
perms.add('enrol_student') # Can enrol students |
|
412 |
perms.add('enrol_tutor') # Can enrol tutors |
|
413 |
if user.admin: |
|
414 |
perms.add('enrol_lecturer') # Can enrol lecturers |
|
1099.1.141
by Nick Chadwick
Updated the exercises to be loaded from the database, not a local file. |
415 |
return perms |
416 |
||
1129
by William Grant
Move the group admin view to per-offering. |
417 |
def get_enrolment(self, user): |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
418 |
"""Find the user's enrolment in this offering."""
|
1129
by William Grant
Move the group admin view to per-offering. |
419 |
try: |
420 |
enrolment = self.enrolments.find(user=user).one() |
|
421 |
except NotOneError: |
|
422 |
enrolment = None |
|
423 |
||
424 |
return enrolment |
|
425 |
||
1165.3.42
by William Grant
Fix ProjectView's total assigned count by dealing with ResultSets only. |
426 |
def get_members_by_role(self, role): |
427 |
return Store.of(self).find(User, |
|
428 |
Enrolment.user_id == User.id, |
|
429 |
Enrolment.offering_id == self.id, |
|
430 |
Enrolment.role == role |
|
1364
by Matt Giuca
database: Offering.get_members_by_role now sorts the data. |
431 |
).order_by(User.login) |
1165.3.42
by William Grant
Fix ProjectView's total assigned count by dealing with ResultSets only. |
432 |
|
1165.3.43
by William Grant
Turn the new database methods into properties where appropriate. |
433 |
@property
|
434 |
def students(self): |
|
1165.3.42
by William Grant
Fix ProjectView's total assigned count by dealing with ResultSets only. |
435 |
return self.get_members_by_role(u'student') |
1165.4.2
by Nick Chadwick
Added a get_assigned method to project sets, to find out which objects |
436 |
|
1442.1.23
by William Grant
Add Offering.get_open_projects_for_user. |
437 |
def get_open_projects_for_user(self, user): |
438 |
"""Find all projects currently open to submissions by a user."""
|
|
439 |
# XXX: Respect extensions.
|
|
440 |
return self.projects.find(Project.deadline > datetime.datetime.now()) |
|
441 |
||
1737
by Matt Giuca
Offering page: Display the worksheet cutoff to students, if there is one. |
442 |
def has_worksheet_cutoff_passed(self, user): |
443 |
"""Check whether the worksheet cutoff has passed.
|
|
444 |
A user is required, in case we support extensions.
|
|
445 |
"""
|
|
446 |
if self.worksheet_cutoff is None: |
|
447 |
return False |
|
448 |
else: |
|
449 |
return self.worksheet_cutoff < datetime.datetime.now() |
|
450 |
||
1603
by William Grant
Add UI to clone worksheets between offerings -- replacing ivle-cloneworksheets. |
451 |
def clone_worksheets(self, source): |
452 |
"""Clone all worksheets from the specified source to this offering."""
|
|
453 |
import ivle.worksheet.utils |
|
454 |
for worksheet in source.worksheets: |
|
455 |
newws = Worksheet() |
|
456 |
newws.seq_no = worksheet.seq_no |
|
457 |
newws.identifier = worksheet.identifier |
|
458 |
newws.name = worksheet.name |
|
459 |
newws.assessable = worksheet.assessable |
|
1695.1.2
by William Grant
Integrate new columns into the model. |
460 |
newws.published = worksheet.published |
1603
by William Grant
Add UI to clone worksheets between offerings -- replacing ivle-cloneworksheets. |
461 |
newws.data = worksheet.data |
462 |
newws.format = worksheet.format |
|
463 |
newws.offering = self |
|
464 |
Store.of(self).add(newws) |
|
465 |
ivle.worksheet.utils.update_exerciselist(newws) |
|
466 |
||
467 |
||
1080.1.26
by me at id
ivle.database: Add an Enrolment class, and reference(set)s between all of the |
468 |
class Enrolment(Storm): |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
469 |
"""An enrolment of a user in an offering.
|
470 |
||
471 |
This represents the roles of both staff and students.
|
|
472 |
"""
|
|
473 |
||
1080.1.26
by me at id
ivle.database: Add an Enrolment class, and reference(set)s between all of the |
474 |
__storm_table__ = "enrolment" |
475 |
__storm_primary__ = "user_id", "offering_id" |
|
476 |
||
477 |
user_id = Int(name="loginid") |
|
478 |
user = Reference(user_id, User.id) |
|
479 |
offering_id = Int(name="offeringid") |
|
480 |
offering = Reference(offering_id, Offering.id) |
|
1101
by William Grant
Privileges (apart from admin) are now offering-local, not global. |
481 |
role = Unicode() |
1080.1.26
by me at id
ivle.database: Add an Enrolment class, and reference(set)s between all of the |
482 |
notes = Unicode() |
483 |
active = Bool() |
|
484 |
||
1080.1.81
by William Grant
ivle.database.Enrolment: Add a groups attribute, containing groups of which |
485 |
@property
|
486 |
def groups(self): |
|
487 |
return Store.of(self).find(ProjectGroup, |
|
488 |
ProjectSet.offering_id == self.offering.id, |
|
489 |
ProjectGroup.project_set_id == ProjectSet.id, |
|
490 |
ProjectGroupMembership.project_group_id == ProjectGroup.id, |
|
491 |
ProjectGroupMembership.user_id == self.user.id) |
|
492 |
||
1080.1.26
by me at id
ivle.database: Add an Enrolment class, and reference(set)s between all of the |
493 |
__init__ = _kwarg_init |
494 |
||
495 |
def __repr__(self): |
|
496 |
return "<%s %r in %r>" % (type(self).__name__, self.user, |
|
497 |
self.offering) |
|
1080.1.36
by William Grant
ivle.database: Add ProjectSet, Project, ProjectGroup, ProjectGroupMembership |
498 |
|
1613
by William Grant
Add UI to edit/delete enrolments. |
499 |
def get_permissions(self, user, config): |
500 |
# A user can edit any enrolment that they could have created.
|
|
501 |
perms = set() |
|
502 |
if ('enrol_' + str(self.role)) in self.offering.get_permissions( |
|
503 |
user, config): |
|
504 |
perms.add('edit') |
|
505 |
return perms |
|
506 |
||
507 |
def delete(self): |
|
508 |
"""Delete this enrolment."""
|
|
509 |
Store.of(self).remove(self) |
|
510 |
||
511 |
||
1080.1.39
by Matt Giuca
ivle.database: Added __all__ to the top of the file. |
512 |
# PROJECTS #
|
513 |
||
1080.1.36
by William Grant
ivle.database: Add ProjectSet, Project, ProjectGroup, ProjectGroupMembership |
514 |
class ProjectSet(Storm): |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
515 |
"""A set of projects that share common groups.
|
516 |
||
517 |
Each student project group is attached to a project set. The group is
|
|
518 |
valid for all projects in the group's set.
|
|
519 |
"""
|
|
520 |
||
1080.1.36
by William Grant
ivle.database: Add ProjectSet, Project, ProjectGroup, ProjectGroupMembership |
521 |
__storm_table__ = "project_set" |
522 |
||
523 |
id = Int(name="projectsetid", primary=True) |
|
524 |
offering_id = Int(name="offeringid") |
|
525 |
offering = Reference(offering_id, Offering.id) |
|
526 |
max_students_per_group = Int() |
|
527 |
||
1080.1.77
by William Grant
ivle.database.ProjectSet: Add projects and project_groups referencesets. |
528 |
projects = ReferenceSet(id, 'Project.project_set_id') |
529 |
project_groups = ReferenceSet(id, 'ProjectGroup.project_set_id') |
|
530 |
||
1080.1.36
by William Grant
ivle.database: Add ProjectSet, Project, ProjectGroup, ProjectGroupMembership |
531 |
__init__ = _kwarg_init |
532 |
||
533 |
def __repr__(self): |
|
534 |
return "<%s %d in %r>" % (type(self).__name__, self.id, |
|
535 |
self.offering) |
|
536 |
||
1544
by Matt Giuca
Added an argument 'config' to every single get_permissions method throughout the program. All calls to get_permissions pass a config. This is to allow per-site policy configurations on permissions. |
537 |
def get_permissions(self, user, config): |
538 |
return self.offering.get_permissions(user, config) |
|
1165.3.2
by Nick Chadwick
Created a new view for IVLE, allowing lecturers and tutors to |
539 |
|
1442.1.12
by William Grant
Display either 'solo' or the list of other group members on the offering project listing. |
540 |
def get_groups_for_user(self, user): |
541 |
"""List all groups in this offering of which the user is a member."""
|
|
542 |
assert self.is_group |
|
543 |
return Store.of(self).find( |
|
544 |
ProjectGroup, |
|
545 |
ProjectGroupMembership.user_id == user.id, |
|
546 |
ProjectGroupMembership.project_group_id == ProjectGroup.id, |
|
547 |
ProjectGroup.project_set_id == self.id) |
|
548 |
||
1442.1.15
by William Grant
Show the group name in the case of a group project. |
549 |
def get_submission_principal(self, user): |
550 |
"""Get the principal on behalf of which the user can submit.
|
|
1442.1.12
by William Grant
Display either 'solo' or the list of other group members on the offering project listing. |
551 |
|
1442.1.15
by William Grant
Show the group name in the case of a group project. |
552 |
If this is a solo project set, the given user is returned. If
|
553 |
the user is a member of exactly one group, all the group is
|
|
554 |
returned. Otherwise, None is returned.
|
|
1442.1.12
by William Grant
Display either 'solo' or the list of other group members on the offering project listing. |
555 |
"""
|
556 |
if self.is_group: |
|
557 |
groups = self.get_groups_for_user(user) |
|
558 |
if groups.count() == 1: |
|
1442.1.15
by William Grant
Show the group name in the case of a group project. |
559 |
return groups.one() |
1442.1.12
by William Grant
Display either 'solo' or the list of other group members on the offering project listing. |
560 |
else: |
561 |
return None |
|
562 |
else: |
|
1442.1.15
by William Grant
Show the group name in the case of a group project. |
563 |
return user |
1442.1.12
by William Grant
Display either 'solo' or the list of other group members on the offering project listing. |
564 |
|
1165.3.43
by William Grant
Turn the new database methods into properties where appropriate. |
565 |
@property
|
1375.1.3
by William Grant
Add ProjectSet.is_group, a property determining whether it is a group or solo set. |
566 |
def is_group(self): |
567 |
return self.max_students_per_group is not None |
|
568 |
||
569 |
@property
|
|
1165.3.43
by William Grant
Turn the new database methods into properties where appropriate. |
570 |
def assigned(self): |
571 |
"""Get the entities (groups or users) assigned to submit this project.
|
|
572 |
||
573 |
This will be a Storm ResultSet.
|
|
574 |
"""
|
|
575 |
#If its a solo project, return everyone in offering
|
|
1375.1.3
by William Grant
Add ProjectSet.is_group, a property determining whether it is a group or solo set. |
576 |
if self.is_group: |
577 |
return self.project_groups |
|
578 |
else: |
|
1165.3.43
by William Grant
Turn the new database methods into properties where appropriate. |
579 |
return self.offering.students |
1165.4.2
by Nick Chadwick
Added a get_assigned method to project sets, to find out which objects |
580 |
|
1513
by Matt Giuca
submit: Now produces a graceful user error if submitting a project after the deadline (forbidden by HTML, but still possible and not due to malice). Previously resulted in an internal server error. |
581 |
class DeadlinePassed(Exception): |
582 |
"""An exception indicating that a project cannot be submitted because the
|
|
583 |
deadline has passed."""
|
|
584 |
def __init__(self): |
|
585 |
pass
|
|
586 |
def __str__(self): |
|
587 |
return "The project deadline has passed" |
|
588 |
||
1080.1.36
by William Grant
ivle.database: Add ProjectSet, Project, ProjectGroup, ProjectGroupMembership |
589 |
class Project(Storm): |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
590 |
"""A student project for which submissions can be made."""
|
591 |
||
1080.1.36
by William Grant
ivle.database: Add ProjectSet, Project, ProjectGroup, ProjectGroupMembership |
592 |
__storm_table__ = "project" |
593 |
||
594 |
id = Int(name="projectid", primary=True) |
|
1165.1.4
by William Grant
Add database classes for assessed, project_extension and project_submission. |
595 |
name = Unicode() |
596 |
short_name = Unicode() |
|
1080.1.36
by William Grant
ivle.database: Add ProjectSet, Project, ProjectGroup, ProjectGroupMembership |
597 |
synopsis = Unicode() |
598 |
url = Unicode() |
|
599 |
project_set_id = Int(name="projectsetid") |
|
600 |
project_set = Reference(project_set_id, ProjectSet.id) |
|
601 |
deadline = DateTime() |
|
602 |
||
1165.1.5
by William Grant
Add relevant ReferenceSets to Project and Assessed. |
603 |
assesseds = ReferenceSet(id, 'Assessed.project_id') |
604 |
submissions = ReferenceSet(id, |
|
605 |
'Assessed.project_id', |
|
606 |
'Assessed.id', |
|
607 |
'ProjectSubmission.assessed_id') |
|
608 |
||
1080.1.36
by William Grant
ivle.database: Add ProjectSet, Project, ProjectGroup, ProjectGroupMembership |
609 |
__init__ = _kwarg_init |
610 |
||
611 |
def __repr__(self): |
|
1165.1.4
by William Grant
Add database classes for assessed, project_extension and project_submission. |
612 |
return "<%s '%s' in %r>" % (type(self).__name__, self.short_name, |
1080.1.36
by William Grant
ivle.database: Add ProjectSet, Project, ProjectGroup, ProjectGroupMembership |
613 |
self.project_set.offering) |
614 |
||
1812.1.2
by Matt Giuca
ivle.database: Project.submit now has a 'late' parameter which, if True, will disregard the project's deadline (to allow for late submissions). |
615 |
def can_submit(self, principal, user, late=False): |
616 |
"""
|
|
617 |
@param late: If True, does not take the deadline into account.
|
|
618 |
"""
|
|
1165.1.19
by William Grant
Add Project.submit(), to create a submission for the principal, path and rev. |
619 |
return (self in principal.get_projects() and |
1812.1.2
by Matt Giuca
ivle.database: Project.submit now has a 'late' parameter which, if True, will disregard the project's deadline (to allow for late submissions). |
620 |
(late or not self.has_deadline_passed(user))) |
1165.1.19
by William Grant
Add Project.submit(), to create a submission for the principal, path and rev. |
621 |
|
1812.1.2
by Matt Giuca
ivle.database: Project.submit now has a 'late' parameter which, if True, will disregard the project's deadline (to allow for late submissions). |
622 |
def submit(self, principal, path, revision, who, late=False): |
1165.1.42
by William Grant
Record who submitted each submission. |
623 |
"""Submit a Subversion path and revision to a project.
|
624 |
||
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
625 |
@param principal: The owner of the Subversion repository, and the
|
626 |
entity on behalf of whom the submission is being made
|
|
627 |
@param path: A path within that repository to submit.
|
|
628 |
@param revision: The revision of that path to submit.
|
|
629 |
@param who: The user who is actually making the submission.
|
|
1812.1.2
by Matt Giuca
ivle.database: Project.submit now has a 'late' parameter which, if True, will disregard the project's deadline (to allow for late submissions). |
630 |
@param late: If True, will not raise a DeadlinePassed exception even
|
631 |
after the deadline. (Default False.)
|
|
1165.1.42
by William Grant
Record who submitted each submission. |
632 |
"""
|
633 |
||
1812.1.2
by Matt Giuca
ivle.database: Project.submit now has a 'late' parameter which, if True, will disregard the project's deadline (to allow for late submissions). |
634 |
if not self.can_submit(principal, who, late=late): |
1513
by Matt Giuca
submit: Now produces a graceful user error if submitting a project after the deadline (forbidden by HTML, but still possible and not due to malice). Previously resulted in an internal server error. |
635 |
raise DeadlinePassed() |
1165.1.19
by William Grant
Add Project.submit(), to create a submission for the principal, path and rev. |
636 |
|
637 |
a = Assessed.get(Store.of(self), principal, self) |
|
638 |
ps = ProjectSubmission() |
|
1660
by Matt Giuca
ivle.database: Added a security check on Project.submit() that the path meets certain constraints, to avoid path injection. Fixes LP bug #522462. |
639 |
# Raise SubmissionError if the path is illegal
|
640 |
ps.path = ProjectSubmission.test_and_normalise_path(path) |
|
1165.1.19
by William Grant
Add Project.submit(), to create a submission for the principal, path and rev. |
641 |
ps.revision = revision |
642 |
ps.date_submitted = datetime.datetime.now() |
|
643 |
ps.assessed = a |
|
1165.1.42
by William Grant
Record who submitted each submission. |
644 |
ps.submitter = who |
1165.1.19
by William Grant
Add Project.submit(), to create a submission for the principal, path and rev. |
645 |
|
646 |
return ps |
|
647 |
||
1544
by Matt Giuca
Added an argument 'config' to every single get_permissions method throughout the program. All calls to get_permissions pass a config. This is to allow per-site policy configurations on permissions. |
648 |
def get_permissions(self, user, config): |
649 |
return self.project_set.offering.get_permissions(user, config) |
|
1165.3.2
by Nick Chadwick
Created a new view for IVLE, allowing lecturers and tutors to |
650 |
|
1165.3.45
by William Grant
Add Project.latest_submissions, which excludes superseded submissions. |
651 |
@property
|
652 |
def latest_submissions(self): |
|
653 |
"""Return the latest submission for each Assessed."""
|
|
654 |
return Store.of(self).find(ProjectSubmission, |
|
655 |
Assessed.project_id == self.id, |
|
656 |
ProjectSubmission.assessed_id == Assessed.id, |
|
657 |
ProjectSubmission.date_submitted == Select( |
|
658 |
Max(ProjectSubmission.date_submitted), |
|
659 |
ProjectSubmission.assessed_id == Assessed.id, |
|
660 |
tables=ProjectSubmission |
|
661 |
)
|
|
662 |
)
|
|
663 |
||
1442.1.13
by William Grant
Reduce the opacity of projects that are closed. |
664 |
def has_deadline_passed(self, user): |
665 |
"""Check whether the deadline has passed."""
|
|
666 |
# XXX: Need to respect extensions.
|
|
667 |
return self.deadline < datetime.datetime.now() |
|
668 |
||
1442.1.19
by William Grant
Add Project.get_submissions_for_principal, a helper to retrieve the submission ResultSet of submissions by a user or group. |
669 |
def get_submissions_for_principal(self, principal): |
670 |
"""Fetch a ResultSet of all submissions by a particular principal."""
|
|
671 |
assessed = Assessed.get(Store.of(self), principal, self) |
|
672 |
if assessed is None: |
|
673 |
return
|
|
674 |
return assessed.submissions |
|
675 |
||
1710.1.19
by Matt Giuca
Added project delete view, and ability to delete projects in the database. Currently unlinked. |
676 |
@property
|
677 |
def can_delete(self): |
|
678 |
"""Can only delete if there are no submissions."""
|
|
679 |
return self.submissions.count() == 0 |
|
1442.1.19
by William Grant
Add Project.get_submissions_for_principal, a helper to retrieve the submission ResultSet of submissions by a user or group. |
680 |
|
1710.1.19
by Matt Giuca
Added project delete view, and ability to delete projects in the database. Currently unlinked. |
681 |
def delete(self): |
682 |
"""Delete the project. Fails if can_delete is False."""
|
|
683 |
if not self.can_delete: |
|
684 |
raise IntegrityError() |
|
685 |
for assessed in self.assesseds: |
|
686 |
assessed.delete() |
|
687 |
Store.of(self).remove(self) |
|
1165.1.19
by William Grant
Add Project.submit(), to create a submission for the principal, path and rev. |
688 |
|
1080.1.36
by William Grant
ivle.database: Add ProjectSet, Project, ProjectGroup, ProjectGroupMembership |
689 |
class ProjectGroup(Storm): |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
690 |
"""A group of students working together on a project."""
|
691 |
||
1080.1.36
by William Grant
ivle.database: Add ProjectSet, Project, ProjectGroup, ProjectGroupMembership |
692 |
__storm_table__ = "project_group" |
693 |
||
694 |
id = Int(name="groupid", primary=True) |
|
695 |
name = Unicode(name="groupnm") |
|
696 |
project_set_id = Int(name="projectsetid") |
|
697 |
project_set = Reference(project_set_id, ProjectSet.id) |
|
698 |
nick = Unicode() |
|
699 |
created_by_id = Int(name="createdby") |
|
700 |
created_by = Reference(created_by_id, User.id) |
|
701 |
epoch = DateTime() |
|
702 |
||
1080.1.78
by William Grant
ivle.database.ProjectGroup.members: Use a ReferenceSet. |
703 |
members = ReferenceSet(id, |
704 |
"ProjectGroupMembership.project_group_id", |
|
705 |
"ProjectGroupMembership.user_id", |
|
706 |
"User.id") |
|
707 |
||
1080.1.36
by William Grant
ivle.database: Add ProjectSet, Project, ProjectGroup, ProjectGroupMembership |
708 |
__init__ = _kwarg_init |
709 |
||
710 |
def __repr__(self): |
|
711 |
return "<%s %s in %r>" % (type(self).__name__, self.name, |
|
712 |
self.project_set.offering) |
|
713 |
||
1165.1.26
by William Grant
Add display_name properties to users and groups. |
714 |
@property
|
715 |
def display_name(self): |
|
1165.3.69
by Matt Giuca
ivle.database: User/ProjectGroup: Added 'short_name' methods so we have a |
716 |
"""Returns the "nice name" of the user or group."""
|
717 |
return self.nick |
|
718 |
||
719 |
@property
|
|
720 |
def short_name(self): |
|
721 |
"""Returns the database "identifier" name of the user or group."""
|
|
1165.3.67
by William Grant
Don't show the group display name for now; it's not settable. |
722 |
return self.name |
1165.1.26
by William Grant
Add display_name properties to users and groups. |
723 |
|
1165.1.12
by William Grant
Implement ProjectGroup.get_projects(), with identical interface. |
724 |
def get_projects(self, offering=None, active_only=True): |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
725 |
'''Find projects that the group can submit.
|
1165.1.12
by William Grant
Implement ProjectGroup.get_projects(), with identical interface. |
726 |
|
727 |
This will include projects in the project set which owns this group,
|
|
728 |
unless the project set disallows groups (in which case none will be
|
|
729 |
returned).
|
|
730 |
||
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
731 |
@param active_only: Whether to only search active offerings.
|
732 |
@param offering: An optional offering to restrict the search to.
|
|
1165.1.12
by William Grant
Implement ProjectGroup.get_projects(), with identical interface. |
733 |
'''
|
734 |
return Store.of(self).find(Project, |
|
735 |
Project.project_set_id == ProjectSet.id, |
|
736 |
ProjectSet.id == self.project_set.id, |
|
1165.1.46
by William Grant
Respect the new max_students_per_group semantics in Python. |
737 |
ProjectSet.max_students_per_group != None, |
1165.1.12
by William Grant
Implement ProjectGroup.get_projects(), with identical interface. |
738 |
ProjectSet.offering_id == Offering.id, |
739 |
(offering is None) or (Offering.id == offering.id), |
|
740 |
Semester.id == Offering.semester_id, |
|
741 |
(not active_only) or (Semester.state == u'current')) |
|
742 |
||
1810
by David Coles
Fixes for the export command. |
743 |
def get_svn_url(self, config): |
1784
by Matt Giuca
ivle.webapp.admin.subject: Abstracted code to generate Subversion URL into the database. User and ProjectGroup objects now have a get_svn_url method. |
744 |
"""Get the subversion repository URL for this user or group."""
|
1810
by David Coles
Fixes for the export command. |
745 |
url = config['urls']['svn_addr'] |
1784
by Matt Giuca
ivle.webapp.admin.subject: Abstracted code to generate Subversion URL into the database. User and ProjectGroup objects now have a get_svn_url method. |
746 |
path = 'groups/%s_%s_%s_%s' % ( |
747 |
self.project_set.offering.subject.short_name, |
|
748 |
self.project_set.offering.semester.year, |
|
1822.1.1
by William Grant
Replace semester.semester with semester.{code,url_name,display_name}. |
749 |
self.project_set.offering.semester.url_name, |
1784
by Matt Giuca
ivle.webapp.admin.subject: Abstracted code to generate Subversion URL into the database. User and ProjectGroup objects now have a get_svn_url method. |
750 |
self.name |
751 |
)
|
|
1789
by Matt Giuca
Changed database.py get_svn_url to take a req; include the req.user.login in the Subversion URL. This allows you to check out repositories without separately supplying the IVLE URL (as Subversion won't ask for a username by default). Also removed --username= from the lecturer project view, as it's redundant now. This fixes Launchpad bug #543936. |
752 |
return urlparse.urljoin(url, path) |
1165.1.12
by William Grant
Implement ProjectGroup.get_projects(), with identical interface. |
753 |
|
1544
by Matt Giuca
Added an argument 'config' to every single get_permissions method throughout the program. All calls to get_permissions pass a config. This is to allow per-site policy configurations on permissions. |
754 |
def get_permissions(self, user, config): |
1165.1.7
by William Grant
Grant submit_project on users to themselves, and on groups to their members. |
755 |
if user.admin or user in self.members: |
756 |
return set(['submit_project']) |
|
757 |
else: |
|
758 |
return set() |
|
759 |
||
1080.1.36
by William Grant
ivle.database: Add ProjectSet, Project, ProjectGroup, ProjectGroupMembership |
760 |
class ProjectGroupMembership(Storm): |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
761 |
"""A student's membership in a project group."""
|
762 |
||
1080.1.36
by William Grant
ivle.database: Add ProjectSet, Project, ProjectGroup, ProjectGroupMembership |
763 |
__storm_table__ = "group_member" |
764 |
__storm_primary__ = "user_id", "project_group_id" |
|
765 |
||
766 |
user_id = Int(name="loginid") |
|
767 |
user = Reference(user_id, User.id) |
|
768 |
project_group_id = Int(name="groupid") |
|
769 |
project_group = Reference(project_group_id, ProjectGroup.id) |
|
770 |
||
771 |
__init__ = _kwarg_init |
|
772 |
||
773 |
def __repr__(self): |
|
774 |
return "<%s %r in %r>" % (type(self).__name__, self.user, |
|
775 |
self.project_group) |
|
776 |
||
1165.1.4
by William Grant
Add database classes for assessed, project_extension and project_submission. |
777 |
class Assessed(Storm): |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
778 |
"""A composite of a user or group combined with a project.
|
779 |
||
780 |
Each project submission and extension refers to an Assessed. It is the
|
|
781 |
sole specifier of the repository and project.
|
|
782 |
"""
|
|
783 |
||
1165.1.4
by William Grant
Add database classes for assessed, project_extension and project_submission. |
784 |
__storm_table__ = "assessed" |
785 |
||
786 |
id = Int(name="assessedid", primary=True) |
|
787 |
user_id = Int(name="loginid") |
|
788 |
user = Reference(user_id, User.id) |
|
789 |
project_group_id = Int(name="groupid") |
|
790 |
project_group = Reference(project_group_id, ProjectGroup.id) |
|
791 |
||
792 |
project_id = Int(name="projectid") |
|
793 |
project = Reference(project_id, Project.id) |
|
794 |
||
1165.1.5
by William Grant
Add relevant ReferenceSets to Project and Assessed. |
795 |
extensions = ReferenceSet(id, 'ProjectExtension.assessed_id') |
1442.1.18
by William Grant
Order Assessed.submissions by date_submitted. |
796 |
submissions = ReferenceSet( |
797 |
id, 'ProjectSubmission.assessed_id', order_by='date_submitted') |
|
1165.1.5
by William Grant
Add relevant ReferenceSets to Project and Assessed. |
798 |
|
1165.1.4
by William Grant
Add database classes for assessed, project_extension and project_submission. |
799 |
def __repr__(self): |
800 |
return "<%s %r in %r>" % (type(self).__name__, |
|
801 |
self.user or self.project_group, self.project) |
|
802 |
||
1165.3.12
by William Grant
Add an Assessed.principal property. |
803 |
@property
|
1165.3.49
by Matt Giuca
ivle.database.Assessed: Added property is_group. |
804 |
def is_group(self): |
805 |
"""True if the Assessed is a group, False if it is a user."""
|
|
806 |
return self.project_group is not None |
|
807 |
||
808 |
@property
|
|
1165.3.12
by William Grant
Add an Assessed.principal property. |
809 |
def principal(self): |
810 |
return self.project_group or self.user |
|
811 |
||
1522
by Matt Giuca
Subject page: Added Verify links on the subject pages to any projects with |
812 |
@property
|
813 |
def checkout_location(self): |
|
814 |
"""Returns the location of the Subversion workspace for this piece of
|
|
815 |
assessment, relative to each group member's home directory."""
|
|
816 |
subjectname = self.project.project_set.offering.subject.short_name |
|
817 |
if self.is_group: |
|
818 |
checkout_dir_name = self.principal.short_name |
|
819 |
else: |
|
820 |
checkout_dir_name = "mywork" |
|
821 |
return subjectname + "/" + checkout_dir_name |
|
822 |
||
1165.1.18
by William Grant
Add a method to retrieve or create an Assessed given a principal and project. |
823 |
@classmethod
|
824 |
def get(cls, store, principal, project): |
|
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
825 |
"""Find or create an Assessed for the given user or group and project.
|
826 |
||
827 |
@param principal: The user or group.
|
|
828 |
@param project: The project.
|
|
829 |
"""
|
|
1165.1.18
by William Grant
Add a method to retrieve or create an Assessed given a principal and project. |
830 |
t = type(principal) |
831 |
if t not in (User, ProjectGroup): |
|
832 |
raise AssertionError('principal must be User or ProjectGroup') |
|
833 |
||
834 |
a = store.find(cls, |
|
835 |
(t is User) or (cls.project_group_id == principal.id), |
|
836 |
(t is ProjectGroup) or (cls.user_id == principal.id), |
|
1445.1.2
by William Grant
Ensure that Assessed.get restricts the search to the requested project. |
837 |
cls.project_id == project.id).one() |
1165.1.18
by William Grant
Add a method to retrieve or create an Assessed given a principal and project. |
838 |
|
839 |
if a is None: |
|
840 |
a = cls() |
|
841 |
if t is User: |
|
842 |
a.user = principal |
|
843 |
else: |
|
844 |
a.project_group = principal |
|
845 |
a.project = project |
|
846 |
store.add(a) |
|
847 |
||
848 |
return a |
|
849 |
||
1710.1.19
by Matt Giuca
Added project delete view, and ability to delete projects in the database. Currently unlinked. |
850 |
def delete(self): |
851 |
"""Delete the assessed. Fails if there are any submissions. Deletes
|
|
852 |
extensions."""
|
|
853 |
if self.submissions.count() > 0: |
|
854 |
raise IntegrityError() |
|
855 |
for extension in self.extensions: |
|
856 |
extension.delete() |
|
857 |
Store.of(self).remove(self) |
|
1165.1.18
by William Grant
Add a method to retrieve or create an Assessed given a principal and project. |
858 |
|
1165.1.4
by William Grant
Add database classes for assessed, project_extension and project_submission. |
859 |
class ProjectExtension(Storm): |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
860 |
"""An extension granted to a user or group on a particular project.
|
861 |
||
862 |
The user or group and project are specified by the Assessed.
|
|
863 |
"""
|
|
864 |
||
1165.1.4
by William Grant
Add database classes for assessed, project_extension and project_submission. |
865 |
__storm_table__ = "project_extension" |
866 |
||
867 |
id = Int(name="extensionid", primary=True) |
|
868 |
assessed_id = Int(name="assessedid") |
|
869 |
assessed = Reference(assessed_id, Assessed.id) |
|
1818.1.1
by Matt Giuca
Database: Modified project_extension table; replaced 'deadline TIMESTAMP' with 'days INT'. This means the extension is a time delta on top of the existing deadline, not a replacement deadline. |
870 |
days = Int() |
1165.1.4
by William Grant
Add database classes for assessed, project_extension and project_submission. |
871 |
approver_id = Int(name="approver") |
872 |
approver = Reference(approver_id, User.id) |
|
873 |
notes = Unicode() |
|
874 |
||
1710.1.19
by Matt Giuca
Added project delete view, and ability to delete projects in the database. Currently unlinked. |
875 |
def delete(self): |
876 |
"""Delete the extension."""
|
|
877 |
Store.of(self).remove(self) |
|
878 |
||
1660
by Matt Giuca
ivle.database: Added a security check on Project.submit() that the path meets certain constraints, to avoid path injection. Fixes LP bug #522462. |
879 |
class SubmissionError(Exception): |
880 |
"""Denotes a validation error during submission."""
|
|
881 |
pass
|
|
882 |
||
1165.1.4
by William Grant
Add database classes for assessed, project_extension and project_submission. |
883 |
class ProjectSubmission(Storm): |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
884 |
"""A submission from a user or group repository to a particular project.
|
885 |
||
886 |
The content of a submission is a single path and revision inside a
|
|
887 |
repository. The repository is that owned by the submission's user and
|
|
888 |
group, while the path and revision are explicit.
|
|
889 |
||
890 |
The user or group and project are specified by the Assessed.
|
|
891 |
"""
|
|
892 |
||
1165.1.4
by William Grant
Add database classes for assessed, project_extension and project_submission. |
893 |
__storm_table__ = "project_submission" |
894 |
||
895 |
id = Int(name="submissionid", primary=True) |
|
896 |
assessed_id = Int(name="assessedid") |
|
897 |
assessed = Reference(assessed_id, Assessed.id) |
|
898 |
path = Unicode() |
|
899 |
revision = Int() |
|
1165.1.42
by William Grant
Record who submitted each submission. |
900 |
submitter_id = Int(name="submitter") |
901 |
submitter = Reference(submitter_id, User.id) |
|
1165.1.4
by William Grant
Add database classes for assessed, project_extension and project_submission. |
902 |
date_submitted = DateTime() |
903 |
||
1522
by Matt Giuca
Subject page: Added Verify links on the subject pages to any projects with |
904 |
def get_verify_url(self, user): |
905 |
"""Get the URL for verifying this submission, within the account of
|
|
906 |
the given user."""
|
|
907 |
# If this is a solo project, then self.path will be prefixed with the
|
|
908 |
# subject name. Remove the first path segment.
|
|
909 |
submitpath = self.path[1:] if self.path[:1] == '/' else self.path |
|
910 |
if not self.assessed.is_group: |
|
911 |
if '/' in submitpath: |
|
912 |
submitpath = submitpath.split('/', 1)[1] |
|
913 |
else: |
|
914 |
submitpath = '' |
|
915 |
return "/files/%s/%s/%s?r=%d" % (user.login, |
|
916 |
self.assessed.checkout_location, submitpath, self.revision) |
|
1165.1.4
by William Grant
Add database classes for assessed, project_extension and project_submission. |
917 |
|
1810
by David Coles
Fixes for the export command. |
918 |
def get_svn_url(self, config): |
1806
by David Coles
URL quote paths in checkout URLs. |
919 |
"""Get subversion URL for this submission"""
|
920 |
princ = self.assessed.principal |
|
1810
by David Coles
Fixes for the export command. |
921 |
base = princ.get_svn_url(config) |
1806
by David Coles
URL quote paths in checkout URLs. |
922 |
if self.path.startswith(os.sep): |
923 |
return os.path.join(base, |
|
924 |
urllib.quote(self.path[1:].encode('utf-8'))) |
|
925 |
else: |
|
926 |
return os.path.join(base, urllib.quote(self.path.encode('utf-8'))) |
|
927 |
||
1810
by David Coles
Fixes for the export command. |
928 |
def get_svn_export_command(self, req): |
929 |
"""Returns a Unix shell command to export a submission"""
|
|
930 |
svn_url = self.get_svn_url(req.config) |
|
931 |
username = (req.user.login if req.user.login.isalnum() else |
|
932 |
"'%s'"%req.user.login) |
|
933 |
export_dir = self.assessed.principal.short_name |
|
934 |
return "svn export --username %s -r%d '%s' %s"%(req.user.login, |
|
935 |
self.revision, svn_url, export_dir) |
|
1806
by David Coles
URL quote paths in checkout URLs. |
936 |
|
1660
by Matt Giuca
ivle.database: Added a security check on Project.submit() that the path meets certain constraints, to avoid path injection. Fixes LP bug #522462. |
937 |
@staticmethod
|
938 |
def test_and_normalise_path(path): |
|
939 |
"""Test that path is valid, and normalise it. This prevents possible
|
|
940 |
injections using malicious paths.
|
|
941 |
Returns the updated path, if successful.
|
|
942 |
Raises SubmissionError if invalid.
|
|
943 |
"""
|
|
944 |
# Ensure the path is absolute to prevent being tacked onto working
|
|
945 |
# directories.
|
|
946 |
# Prevent '\n' because it will break all sorts of things.
|
|
947 |
# Prevent '[' and ']' because they can be used to inject into the
|
|
948 |
# svn.conf.
|
|
949 |
# Normalise to avoid resulting in ".." path segments.
|
|
950 |
if not os.path.isabs(path): |
|
951 |
raise SubmissionError("Path is not absolute") |
|
952 |
if any(c in path for c in "\n[]"): |
|
953 |
raise SubmissionError("Path must not contain '\\n', '[' or ']'") |
|
954 |
return os.path.normpath(path) |
|
955 |
||
1812.1.5
by Matt Giuca
ivle.database: ProjectSubmission now has a 'late' property to tell whether a submission was made late. |
956 |
@property
|
957 |
def late(self): |
|
958 |
"""True if the project was submitted late."""
|
|
1812.1.7
by Matt Giuca
database: Added ProjectSubmissions.days_late for more info. |
959 |
return self.days_late > 0 |
960 |
||
961 |
@property
|
|
962 |
def days_late(self): |
|
963 |
"""The number of days the project was submitted late (rounded up), or
|
|
964 |
0 if on-time."""
|
|
1812.1.5
by Matt Giuca
ivle.database: ProjectSubmission now has a 'late' property to tell whether a submission was made late. |
965 |
# XXX: Need to respect extensions.
|
1812.1.7
by Matt Giuca
database: Added ProjectSubmissions.days_late for more info. |
966 |
return max(0, |
967 |
(self.date_submitted - self.assessed.project.deadline).days + 1) |
|
1812.1.5
by Matt Giuca
ivle.database: ProjectSubmission now has a 'late' property to tell whether a submission was made late. |
968 |
|
1080.1.40
by Matt Giuca
ivle.database: Added Worksheet and Exercise classes (more to come in this |
969 |
# WORKSHEETS AND EXERCISES #
|
970 |
||
971 |
class Exercise(Storm): |
|
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
972 |
"""An exercise for students to complete in a worksheet.
|
973 |
||
974 |
An exercise may be present in any number of worksheets.
|
|
975 |
"""
|
|
976 |
||
1099.1.195
by William Grant
Rename problem to exercise in the DB. |
977 |
__storm_table__ = "exercise" |
1099.1.114
by Nick Chadwick
Modified the database so that exercises are now stored in the database, rather |
978 |
id = Unicode(primary=True, name="identifier") |
979 |
name = Unicode() |
|
980 |
description = Unicode() |
|
1720.1.4
by William Grant
Cache exercise and worksheet rST->XHTML conversions in the DB. |
981 |
_description_xhtml_cache = Unicode(name='description_xhtml_cache') |
1099.1.114
by Nick Chadwick
Modified the database so that exercises are now stored in the database, rather |
982 |
partial = Unicode() |
983 |
solution = Unicode() |
|
984 |
include = Unicode() |
|
985 |
num_rows = Int() |
|
1080.1.40
by Matt Giuca
ivle.database: Added Worksheet and Exercise classes (more to come in this |
986 |
|
1099.6.2
by Nick Chadwick
Added a listing of all exercises |
987 |
worksheet_exercises = ReferenceSet(id, |
988 |
'WorksheetExercise.exercise_id') |
|
989 |
||
1080.1.50
by Matt Giuca
ivle.database: Added WorksheetExercise (relates worksheets to exercises), and |
990 |
worksheets = ReferenceSet(id, |
991 |
'WorksheetExercise.exercise_id', |
|
992 |
'WorksheetExercise.worksheet_id', |
|
993 |
'Worksheet.id'
|
|
994 |
)
|
|
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
995 |
|
1099.1.212
by Nick Chadwick
Added a new page to display exercises. This will then be modified to |
996 |
test_suites = ReferenceSet(id, |
997 |
'TestSuite.exercise_id', |
|
998 |
order_by='seq_no') |
|
1080.1.50
by Matt Giuca
ivle.database: Added WorksheetExercise (relates worksheets to exercises), and |
999 |
|
1080.1.40
by Matt Giuca
ivle.database: Added Worksheet and Exercise classes (more to come in this |
1000 |
__init__ = _kwarg_init |
1001 |
||
1002 |
def __repr__(self): |
|
1003 |
return "<%s %s>" % (type(self).__name__, self.name) |
|
1004 |
||
1544
by Matt Giuca
Added an argument 'config' to every single get_permissions method throughout the program. All calls to get_permissions pass a config. This is to allow per-site policy configurations on permissions. |
1005 |
def get_permissions(self, user, config): |
1006 |
return self.global_permissions(user, config) |
|
1536
by Matt Giuca
Fixed policy on who is able to view the list of exercises and create a new one. Rather than being 'if you can edit any offering', it is now the same rule as determining whether you can edit exercises. |
1007 |
|
1008 |
@staticmethod
|
|
1544
by Matt Giuca
Added an argument 'config' to every single get_permissions method throughout the program. All calls to get_permissions pass a config. This is to allow per-site policy configurations on permissions. |
1009 |
def global_permissions(user, config): |
1536
by Matt Giuca
Fixed policy on who is able to view the list of exercises and create a new one. Rather than being 'if you can edit any offering', it is now the same rule as determining whether you can edit exercises. |
1010 |
"""Gets the set of permissions this user has over *all* exercises.
|
1011 |
This is used to determine who may view the exercises list, and create
|
|
1012 |
new exercises."""
|
|
1099.1.210
by Nick Chadwick
Modified the database layer so that exercises have a get_permissions |
1013 |
perms = set() |
1099.1.234
by Nick Chadwick
Permissions for editing and deleting exercises now come from the |
1014 |
roles = set() |
1099.1.210
by Nick Chadwick
Modified the database layer so that exercises have a get_permissions |
1015 |
if user is not None: |
1101
by William Grant
Privileges (apart from admin) are now offering-local, not global. |
1016 |
if user.admin: |
1099.1.210
by Nick Chadwick
Modified the database layer so that exercises have a get_permissions |
1017 |
perms.add('edit') |
1018 |
perms.add('view') |
|
1165.2.2
by Nick Chadwick
fixed a bug in which tutors weren't able to edit the exercises of |
1019 |
elif u'lecturer' in set((e.role for e in user.active_enrolments)): |
1020 |
perms.add('edit') |
|
1021 |
perms.add('view') |
|
1547
by Matt Giuca
Added two new configuration options under [policy], for deciding whether tutors can enrol students and edit worksheets. The permissions set in database.py reflects these config options. Documented. This entirely fixes Launchpad Bug #520232 and Bug #493945, regarding tutors having too much power. |
1022 |
elif (config['policy']['tutors_can_edit_worksheets'] |
1023 |
and u'tutor' in set((e.role for e in user.active_enrolments))): |
|
1024 |
# Site-specific policy on the role of tutors
|
|
1099.1.234
by Nick Chadwick
Permissions for editing and deleting exercises now come from the |
1025 |
perms.add('edit') |
1026 |
perms.add('view') |
|
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1027 |
|
1099.1.210
by Nick Chadwick
Modified the database layer so that exercises have a get_permissions |
1028 |
return perms |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1029 |
|
1720.1.4
by William Grant
Cache exercise and worksheet rST->XHTML conversions in the DB. |
1030 |
def _cache_description_xhtml(self, invalidate=False): |
1031 |
# Don't regenerate an existing cache unless forced.
|
|
1032 |
if self._description_xhtml_cache is not None and not invalidate: |
|
1033 |
return
|
|
1034 |
||
1035 |
if self.description: |
|
1036 |
self._description_xhtml_cache = rst(self.description) |
|
1037 |
else: |
|
1038 |
self._description_xhtml_cache = None |
|
1039 |
||
1720.1.1
by William Grant
Abstract reStructuredText rendering into ivle.database. |
1040 |
@property
|
1041 |
def description_xhtml(self): |
|
1042 |
"""The XHTML exercise description, converted from reStructuredText."""
|
|
1720.1.4
by William Grant
Cache exercise and worksheet rST->XHTML conversions in the DB. |
1043 |
self._cache_description_xhtml() |
1044 |
return self._description_xhtml_cache |
|
1080.1.51
by Matt Giuca
tutorial: Replaced call to ivle.db.create_worksheet with local code (roughly |
1045 |
|
1720.1.3
by William Grant
Abstract worksheet and exercise data setting. |
1046 |
def set_description(self, description): |
1047 |
self.description = description |
|
1720.1.4
by William Grant
Cache exercise and worksheet rST->XHTML conversions in the DB. |
1048 |
self._cache_description_xhtml(invalidate=True) |
1720.1.3
by William Grant
Abstract worksheet and exercise data setting. |
1049 |
|
1099.1.242
by Nick Chadwick
Fixed a problem with exercise editor, which wasn't editing or adding |
1050 |
def delete(self): |
1051 |
"""Deletes the exercise, providing it has no associated worksheets."""
|
|
1052 |
if (self.worksheet_exercises.count() > 0): |
|
1053 |
raise IntegrityError() |
|
1099.1.233
by Nick Chadwick
Exercise objects in the database module, along with their test cases, |
1054 |
for suite in self.test_suites: |
1055 |
suite.delete() |
|
1099.1.242
by Nick Chadwick
Fixed a problem with exercise editor, which wasn't editing or adding |
1056 |
Store.of(self).remove(self) |
1099.1.233
by Nick Chadwick
Exercise objects in the database module, along with their test cases, |
1057 |
|
1080.1.40
by Matt Giuca
ivle.database: Added Worksheet and Exercise classes (more to come in this |
1058 |
class Worksheet(Storm): |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1059 |
"""A worksheet with exercises for students to complete.
|
1060 |
||
1061 |
Worksheets are owned by offerings.
|
|
1062 |
"""
|
|
1063 |
||
1080.1.40
by Matt Giuca
ivle.database: Added Worksheet and Exercise classes (more to come in this |
1064 |
__storm_table__ = "worksheet" |
1065 |
||
1066 |
id = Int(primary=True, name="worksheetid") |
|
1099.1.114
by Nick Chadwick
Modified the database so that exercises are now stored in the database, rather |
1067 |
offering_id = Int(name="offeringid") |
1099.4.1
by Nick Chadwick
Working on putting worksheets into the database. |
1068 |
identifier = Unicode() |
1069 |
name = Unicode() |
|
1080.1.40
by Matt Giuca
ivle.database: Added Worksheet and Exercise classes (more to come in this |
1070 |
assessable = Bool() |
1695.1.2
by William Grant
Integrate new columns into the model. |
1071 |
published = Bool() |
1099.4.1
by Nick Chadwick
Working on putting worksheets into the database. |
1072 |
data = Unicode() |
1720.1.4
by William Grant
Cache exercise and worksheet rST->XHTML conversions in the DB. |
1073 |
_data_xhtml_cache = Unicode(name='data_xhtml_cache') |
1099.1.180
by Nick Chadwick
This commit changes the tutorial service, which now almost exclusively |
1074 |
seq_no = Int() |
1075 |
format = Unicode() |
|
1080.1.40
by Matt Giuca
ivle.database: Added Worksheet and Exercise classes (more to come in this |
1076 |
|
1099.1.141
by Nick Chadwick
Updated the exercises to be loaded from the database, not a local file. |
1077 |
attempts = ReferenceSet(id, "ExerciseAttempt.worksheetid") |
1099.1.118
by William Grant
Fix a bad reference introduced with the worksheet changes. |
1078 |
offering = Reference(offering_id, 'Offering.id') |
1099.1.114
by Nick Chadwick
Modified the database so that exercises are now stored in the database, rather |
1079 |
|
1103
by William Grant
Worksheet.worksheet_exercises now only contains active ones. |
1080 |
all_worksheet_exercises = ReferenceSet(id, |
1081 |
'WorksheetExercise.worksheet_id') |
|
1082 |
||
1083 |
# Use worksheet_exercises to get access to the *active* WorksheetExercise
|
|
1084 |
# objects binding worksheets to exercises. This is required to access the
|
|
1080.1.50
by Matt Giuca
ivle.database: Added WorksheetExercise (relates worksheets to exercises), and |
1085 |
# "optional" field.
|
1099.1.220
by Nick Chadwick
Merged from trunk |
1086 |
|
1103
by William Grant
Worksheet.worksheet_exercises now only contains active ones. |
1087 |
@property
|
1088 |
def worksheet_exercises(self): |
|
1089 |
return self.all_worksheet_exercises.find(active=True) |
|
1080.1.50
by Matt Giuca
ivle.database: Added WorksheetExercise (relates worksheets to exercises), and |
1090 |
|
1080.1.40
by Matt Giuca
ivle.database: Added Worksheet and Exercise classes (more to come in this |
1091 |
__init__ = _kwarg_init |
1092 |
||
1093 |
def __repr__(self): |
|
1094 |
return "<%s %s>" % (type(self).__name__, self.name) |
|
1080.1.47
by Matt Giuca
ivle.database: Added Worksheet.get_by_name method. |
1095 |
|
1099.1.242
by Nick Chadwick
Fixed a problem with exercise editor, which wasn't editing or adding |
1096 |
def remove_all_exercises(self): |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1097 |
"""Remove all exercises from this worksheet.
|
1098 |
||
1080.1.51
by Matt Giuca
tutorial: Replaced call to ivle.db.create_worksheet with local code (roughly |
1099 |
This does not delete the exercises themselves. It just removes them
|
1100 |
from the worksheet.
|
|
1101 |
"""
|
|
1099.1.242
by Nick Chadwick
Fixed a problem with exercise editor, which wasn't editing or adding |
1102 |
store = Store.of(self) |
1103 |
for ws_ex in self.all_worksheet_exercises: |
|
1104 |
if ws_ex.saves.count() > 0 or ws_ex.attempts.count() > 0: |
|
1105 |
raise IntegrityError() |
|
1080.1.51
by Matt Giuca
tutorial: Replaced call to ivle.db.create_worksheet with local code (roughly |
1106 |
store.find(WorksheetExercise, |
1107 |
WorksheetExercise.worksheet == self).remove() |
|
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1108 |
|
1544
by Matt Giuca
Added an argument 'config' to every single get_permissions method throughout the program. All calls to get_permissions pass a config. This is to allow per-site policy configurations on permissions. |
1109 |
def get_permissions(self, user, config): |
1695.1.9
by William Grant
Forbid normal users from viewing unpublished worksheets. |
1110 |
offering_perms = self.offering.get_permissions(user, config) |
1111 |
||
1112 |
perms = set() |
|
1113 |
||
1114 |
# Anybody who can view an offering can view a published
|
|
1115 |
# worksheet.
|
|
1116 |
if 'view' in offering_perms and self.published: |
|
1117 |
perms.add('view') |
|
1118 |
||
1119 |
# Any worksheet editors can both view and edit.
|
|
1120 |
if 'edit_worksheets' in offering_perms: |
|
1121 |
perms.add('view') |
|
1542
by Matt Giuca
Tutors can now (once again) edit worksheets. |
1122 |
perms.add('edit') |
1695.1.9
by William Grant
Forbid normal users from viewing unpublished worksheets. |
1123 |
|
1542
by Matt Giuca
Tutors can now (once again) edit worksheets. |
1124 |
return perms |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1125 |
|
1720.1.4
by William Grant
Cache exercise and worksheet rST->XHTML conversions in the DB. |
1126 |
def _cache_data_xhtml(self, invalidate=False): |
1127 |
# Don't regenerate an existing cache unless forced.
|
|
1128 |
if self._data_xhtml_cache is not None and not invalidate: |
|
1129 |
return
|
|
1130 |
||
1131 |
if self.format == u'rst': |
|
1132 |
self._data_xhtml_cache = rst(self.data) |
|
1133 |
else: |
|
1134 |
self._data_xhtml_cache = None |
|
1135 |
||
1720.1.1
by William Grant
Abstract reStructuredText rendering into ivle.database. |
1136 |
@property
|
1137 |
def data_xhtml(self): |
|
1138 |
"""The XHTML of this worksheet, converted from rST if required."""
|
|
1720.1.4
by William Grant
Cache exercise and worksheet rST->XHTML conversions in the DB. |
1139 |
# Update the rST -> XHTML cache, if required.
|
1140 |
self._cache_data_xhtml() |
|
1141 |
||
1099.1.220
by Nick Chadwick
Merged from trunk |
1142 |
if self.format == u'rst': |
1720.1.4
by William Grant
Cache exercise and worksheet rST->XHTML conversions in the DB. |
1143 |
return self._data_xhtml_cache |
1099.1.220
by Nick Chadwick
Merged from trunk |
1144 |
else: |
1145 |
return self.data |
|
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1146 |
|
1720.1.3
by William Grant
Abstract worksheet and exercise data setting. |
1147 |
def set_data(self, data): |
1148 |
self.data = data |
|
1720.1.4
by William Grant
Cache exercise and worksheet rST->XHTML conversions in the DB. |
1149 |
self._cache_data_xhtml(invalidate=True) |
1720.1.3
by William Grant
Abstract worksheet and exercise data setting. |
1150 |
|
1099.1.242
by Nick Chadwick
Fixed a problem with exercise editor, which wasn't editing or adding |
1151 |
def delete(self): |
1099.1.233
by Nick Chadwick
Exercise objects in the database module, along with their test cases, |
1152 |
"""Deletes the worksheet, provided it has no attempts on any exercises.
|
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1153 |
|
1099.1.233
by Nick Chadwick
Exercise objects in the database module, along with their test cases, |
1154 |
Returns True if delete succeeded, or False if this worksheet has
|
1155 |
attempts attached."""
|
|
1156 |
for ws_ex in self.all_worksheet_exercises: |
|
1157 |
if ws_ex.saves.count() > 0 or ws_ex.attempts.count() > 0: |
|
1099.1.242
by Nick Chadwick
Fixed a problem with exercise editor, which wasn't editing or adding |
1158 |
raise IntegrityError() |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1159 |
|
1099.1.233
by Nick Chadwick
Exercise objects in the database module, along with their test cases, |
1160 |
self.remove_all_exercises() |
1099.1.242
by Nick Chadwick
Fixed a problem with exercise editor, which wasn't editing or adding |
1161 |
Store.of(self).remove(self) |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1162 |
|
1080.1.50
by Matt Giuca
ivle.database: Added WorksheetExercise (relates worksheets to exercises), and |
1163 |
class WorksheetExercise(Storm): |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1164 |
"""A link between a worksheet and one of its exercises.
|
1165 |
||
1166 |
These may be marked optional, in which case the exercise does not count
|
|
1167 |
for marking purposes. The sequence number is used to order the worksheet
|
|
1168 |
ToC.
|
|
1169 |
"""
|
|
1170 |
||
1099.1.195
by William Grant
Rename problem to exercise in the DB. |
1171 |
__storm_table__ = "worksheet_exercise" |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1172 |
|
1099.1.195
by William Grant
Rename problem to exercise in the DB. |
1173 |
id = Int(primary=True, name="ws_ex_id") |
1080.1.50
by Matt Giuca
ivle.database: Added WorksheetExercise (relates worksheets to exercises), and |
1174 |
|
1175 |
worksheet_id = Int(name="worksheetid") |
|
1176 |
worksheet = Reference(worksheet_id, Worksheet.id) |
|
1099.1.195
by William Grant
Rename problem to exercise in the DB. |
1177 |
exercise_id = Unicode(name="exerciseid") |
1080.1.50
by Matt Giuca
ivle.database: Added WorksheetExercise (relates worksheets to exercises), and |
1178 |
exercise = Reference(exercise_id, Exercise.id) |
1179 |
optional = Bool() |
|
1099.4.3
by Nick Chadwick
Updated the tutorial service, to now allow users to edit worksheets |
1180 |
active = Bool() |
1181 |
seq_no = Int() |
|
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1182 |
|
1099.1.180
by Nick Chadwick
This commit changes the tutorial service, which now almost exclusively |
1183 |
saves = ReferenceSet(id, "ExerciseSave.ws_ex_id") |
1099.1.183
by William Grant
Fix a reference typo in ivle.database. |
1184 |
attempts = ReferenceSet(id, "ExerciseAttempt.ws_ex_id") |
1080.1.50
by Matt Giuca
ivle.database: Added WorksheetExercise (relates worksheets to exercises), and |
1185 |
|
1186 |
__init__ = _kwarg_init |
|
1187 |
||
1188 |
def __repr__(self): |
|
1189 |
return "<%s %s in %s>" % (type(self).__name__, self.exercise.name, |
|
1099.4.1
by Nick Chadwick
Working on putting worksheets into the database. |
1190 |
self.worksheet.identifier) |
1080.1.55
by Matt Giuca
ivle.database: Added ExerciseAttempt and ExerciseSave classes. |
1191 |
|
1544
by Matt Giuca
Added an argument 'config' to every single get_permissions method throughout the program. All calls to get_permissions pass a config. This is to allow per-site policy configurations on permissions. |
1192 |
def get_permissions(self, user, config): |
1193 |
return self.worksheet.get_permissions(user, config) |
|
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1194 |
|
1131
by William Grant
Offerings now give 'view' only to user enrolled in them. 'edit' is granted |
1195 |
|
1080.1.55
by Matt Giuca
ivle.database: Added ExerciseAttempt and ExerciseSave classes. |
1196 |
class ExerciseSave(Storm): |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1197 |
"""A potential exercise solution submitted by a user for storage.
|
1198 |
||
1199 |
This is not an actual tested attempt at an exercise, it's just a save of
|
|
1200 |
the editing session.
|
|
1201 |
"""
|
|
1202 |
||
1099.1.195
by William Grant
Rename problem to exercise in the DB. |
1203 |
__storm_table__ = "exercise_save" |
1099.1.180
by Nick Chadwick
This commit changes the tutorial service, which now almost exclusively |
1204 |
__storm_primary__ = "ws_ex_id", "user_id" |
1205 |
||
1099.1.195
by William Grant
Rename problem to exercise in the DB. |
1206 |
ws_ex_id = Int(name="ws_ex_id") |
1099.1.180
by Nick Chadwick
This commit changes the tutorial service, which now almost exclusively |
1207 |
worksheet_exercise = Reference(ws_ex_id, "WorksheetExercise.id") |
1208 |
||
1080.1.55
by Matt Giuca
ivle.database: Added ExerciseAttempt and ExerciseSave classes. |
1209 |
user_id = Int(name="loginid") |
1210 |
user = Reference(user_id, User.id) |
|
1211 |
date = DateTime() |
|
1212 |
text = Unicode() |
|
1213 |
||
1214 |
__init__ = _kwarg_init |
|
1215 |
||
1216 |
def __repr__(self): |
|
1217 |
return "<%s %s by %s at %s>" % (type(self).__name__, |
|
1696
by Matt Giuca
ivle.database: Fixed crash on repr of ExerciseSave, looked up wrong attribute. |
1218 |
self.worksheet_exercise.exercise.name, self.user.login, |
1219 |
self.date.strftime("%c")) |
|
1080.1.55
by Matt Giuca
ivle.database: Added ExerciseAttempt and ExerciseSave classes. |
1220 |
|
1221 |
class ExerciseAttempt(ExerciseSave): |
|
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1222 |
"""An attempt at solving an exercise.
|
1223 |
||
1224 |
This is a special case of ExerciseSave, used when the user submits a
|
|
1225 |
candidate solution. Like an ExerciseSave, it constitutes exercise solution
|
|
1226 |
data.
|
|
1227 |
||
1228 |
In addition, it contains information about the result of the submission:
|
|
1229 |
||
1230 |
- complete - True if this submission was successful, rendering this
|
|
1231 |
exercise complete for this user in this worksheet.
|
|
1232 |
- active - True if this submission is "active" (usually true).
|
|
1233 |
Submissions may be de-activated by privileged users for
|
|
1234 |
special reasons, and then they won't count (either as a
|
|
1235 |
penalty or success), but will still be stored.
|
|
1236 |
"""
|
|
1237 |
||
1099.1.195
by William Grant
Rename problem to exercise in the DB. |
1238 |
__storm_table__ = "exercise_attempt" |
1099.1.180
by Nick Chadwick
This commit changes the tutorial service, which now almost exclusively |
1239 |
__storm_primary__ = "ws_ex_id", "user_id", "date" |
1080.1.55
by Matt Giuca
ivle.database: Added ExerciseAttempt and ExerciseSave classes. |
1240 |
|
1241 |
# The "text" field is the same but has a different name in the DB table
|
|
1242 |
# for some reason.
|
|
1243 |
text = Unicode(name="attempt") |
|
1244 |
complete = Bool() |
|
1245 |
active = Bool() |
|
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1246 |
|
1544
by Matt Giuca
Added an argument 'config' to every single get_permissions method throughout the program. All calls to get_permissions pass a config. This is to allow per-site policy configurations on permissions. |
1247 |
def get_permissions(self, user, config): |
1099.1.113
by William Grant
Give console and tutorial services security declarations. |
1248 |
return set(['view']) if user is self.user else set() |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1249 |
|
1099.1.114
by Nick Chadwick
Modified the database so that exercises are now stored in the database, rather |
1250 |
class TestSuite(Storm): |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1251 |
"""A container to group an exercise's test cases.
|
1252 |
||
1253 |
The test suite contains some information on how to test. The function to
|
|
1254 |
test, variables to set and stdin data are stored here.
|
|
1255 |
"""
|
|
1256 |
||
1099.1.114
by Nick Chadwick
Modified the database so that exercises are now stored in the database, rather |
1257 |
__storm_table__ = "test_suite" |
1258 |
__storm_primary__ = "exercise_id", "suiteid" |
|
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1259 |
|
1099.1.114
by Nick Chadwick
Modified the database so that exercises are now stored in the database, rather |
1260 |
suiteid = Int() |
1099.1.195
by William Grant
Rename problem to exercise in the DB. |
1261 |
exercise_id = Unicode(name="exerciseid") |
1099.1.141
by Nick Chadwick
Updated the exercises to be loaded from the database, not a local file. |
1262 |
description = Unicode() |
1263 |
seq_no = Int() |
|
1264 |
function = Unicode() |
|
1265 |
stdin = Unicode() |
|
1099.1.114
by Nick Chadwick
Modified the database so that exercises are now stored in the database, rather |
1266 |
exercise = Reference(exercise_id, Exercise.id) |
1099.1.212
by Nick Chadwick
Added a new page to display exercises. This will then be modified to |
1267 |
test_cases = ReferenceSet(suiteid, 'TestCase.suiteid', order_by="seq_no") |
1268 |
variables = ReferenceSet(suiteid, 'TestSuiteVar.suiteid', order_by='arg_no') |
|
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1269 |
|
1099.1.242
by Nick Chadwick
Fixed a problem with exercise editor, which wasn't editing or adding |
1270 |
def delete(self): |
1099.1.233
by Nick Chadwick
Exercise objects in the database module, along with their test cases, |
1271 |
"""Delete this suite, without asking questions."""
|
1427
by William Grant
Fix deletion of test suites with variables. |
1272 |
for variable in self.variables: |
1099.1.233
by Nick Chadwick
Exercise objects in the database module, along with their test cases, |
1273 |
variable.delete() |
1274 |
for test_case in self.test_cases: |
|
1275 |
test_case.delete() |
|
1099.1.242
by Nick Chadwick
Fixed a problem with exercise editor, which wasn't editing or adding |
1276 |
Store.of(self).remove(self) |
1099.1.114
by Nick Chadwick
Modified the database so that exercises are now stored in the database, rather |
1277 |
|
1278 |
class TestCase(Storm): |
|
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1279 |
"""A container for actual tests (see TestCasePart), inside a test suite.
|
1280 |
||
1281 |
It is the lowest level shown to students on their pass/fail status."""
|
|
1282 |
||
1099.1.114
by Nick Chadwick
Modified the database so that exercises are now stored in the database, rather |
1283 |
__storm_table__ = "test_case" |
1284 |
__storm_primary__ = "testid", "suiteid" |
|
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1285 |
|
1099.1.114
by Nick Chadwick
Modified the database so that exercises are now stored in the database, rather |
1286 |
testid = Int() |
1287 |
suiteid = Int() |
|
1099.1.141
by Nick Chadwick
Updated the exercises to be loaded from the database, not a local file. |
1288 |
suite = Reference(suiteid, "TestSuite.suiteid") |
1099.1.114
by Nick Chadwick
Modified the database so that exercises are now stored in the database, rather |
1289 |
passmsg = Unicode() |
1290 |
failmsg = Unicode() |
|
1394.1.5
by William Grant
Drop TestSuite file match default from the UI -- we don't support file tests any more. |
1291 |
test_default = Unicode() # Currently unused - only used for file matching. |
1099.1.114
by Nick Chadwick
Modified the database so that exercises are now stored in the database, rather |
1292 |
seq_no = Int() |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1293 |
|
1099.1.141
by Nick Chadwick
Updated the exercises to be loaded from the database, not a local file. |
1294 |
parts = ReferenceSet(testid, "TestCasePart.testid") |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1295 |
|
1099.1.141
by Nick Chadwick
Updated the exercises to be loaded from the database, not a local file. |
1296 |
__init__ = _kwarg_init |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1297 |
|
1099.1.242
by Nick Chadwick
Fixed a problem with exercise editor, which wasn't editing or adding |
1298 |
def delete(self): |
1099.1.233
by Nick Chadwick
Exercise objects in the database module, along with their test cases, |
1299 |
for part in self.parts: |
1300 |
part.delete() |
|
1099.1.242
by Nick Chadwick
Fixed a problem with exercise editor, which wasn't editing or adding |
1301 |
Store.of(self).remove(self) |
1099.1.141
by Nick Chadwick
Updated the exercises to be loaded from the database, not a local file. |
1302 |
|
1303 |
class TestSuiteVar(Storm): |
|
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1304 |
"""A variable used by an exercise test suite.
|
1305 |
||
1306 |
This may represent a function argument or a normal variable.
|
|
1307 |
"""
|
|
1308 |
||
1099.1.195
by William Grant
Rename problem to exercise in the DB. |
1309 |
__storm_table__ = "suite_variable" |
1099.1.141
by Nick Chadwick
Updated the exercises to be loaded from the database, not a local file. |
1310 |
__storm_primary__ = "varid" |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1311 |
|
1099.1.141
by Nick Chadwick
Updated the exercises to be loaded from the database, not a local file. |
1312 |
varid = Int() |
1313 |
suiteid = Int() |
|
1314 |
var_name = Unicode() |
|
1315 |
var_value = Unicode() |
|
1316 |
var_type = Unicode() |
|
1317 |
arg_no = Int() |
|
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1318 |
|
1099.1.141
by Nick Chadwick
Updated the exercises to be loaded from the database, not a local file. |
1319 |
suite = Reference(suiteid, "TestSuite.suiteid") |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1320 |
|
1099.1.141
by Nick Chadwick
Updated the exercises to be loaded from the database, not a local file. |
1321 |
__init__ = _kwarg_init |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1322 |
|
1099.1.242
by Nick Chadwick
Fixed a problem with exercise editor, which wasn't editing or adding |
1323 |
def delete(self): |
1324 |
Store.of(self).remove(self) |
|
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1325 |
|
1099.1.141
by Nick Chadwick
Updated the exercises to be loaded from the database, not a local file. |
1326 |
class TestCasePart(Storm): |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1327 |
"""An actual piece of code to test an exercise solution."""
|
1328 |
||
1099.1.195
by William Grant
Rename problem to exercise in the DB. |
1329 |
__storm_table__ = "test_case_part" |
1099.1.141
by Nick Chadwick
Updated the exercises to be loaded from the database, not a local file. |
1330 |
__storm_primary__ = "partid" |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1331 |
|
1099.1.141
by Nick Chadwick
Updated the exercises to be loaded from the database, not a local file. |
1332 |
partid = Int() |
1333 |
testid = Int() |
|
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1334 |
|
1099.1.141
by Nick Chadwick
Updated the exercises to be loaded from the database, not a local file. |
1335 |
part_type = Unicode() |
1336 |
test_type = Unicode() |
|
1337 |
data = Unicode() |
|
1338 |
filename = Unicode() |
|
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1339 |
|
1099.1.141
by Nick Chadwick
Updated the exercises to be loaded from the database, not a local file. |
1340 |
test = Reference(testid, "TestCase.testid") |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1341 |
|
1099.1.114
by Nick Chadwick
Modified the database so that exercises are now stored in the database, rather |
1342 |
__init__ = _kwarg_init |
1241
by William Grant
Vastly improve docstrings throughout ivle.database. |
1343 |
|
1099.1.242
by Nick Chadwick
Fixed a problem with exercise editor, which wasn't editing or adding |
1344 |
def delete(self): |
1345 |
Store.of(self).remove(self) |