27
26
import ivle.console
28
27
import ivle.database
29
28
from ivle.database import Exercise, ExerciseAttempt, ExerciseSave, Worksheet, \
30
29
Offering, Subject, Semester, WorksheetExercise
30
import ivle.worksheet.utils
33
32
import ivle.webapp.tutorial.test
35
33
from ivle.webapp.base.rest import (JSONRESTView, named_operation,
36
34
require_permission)
37
35
from ivle.webapp.errors import NotFound
54
52
self.worksheet_exercise = req.store.find(WorksheetExercise,
55
WorksheetExercise.exercise_id == exercise,
53
WorksheetExercise.exercise_id == unicode(exercise),
56
54
WorksheetExercise.worksheet_id == Worksheet.id,
57
55
Worksheet.offering_id == Offering.id,
56
Worksheet.identifier == unicode(worksheet),
58
57
Offering.subject_id == Subject.id,
59
Subject.code == subject,
58
Subject.short_name == subject,
60
59
Offering.semester_id == Semester.id,
61
60
Semester.year == year,
62
61
Semester.semester == semester).one()
113
112
# Query the DB to get an updated score on whether or not this problem
114
113
# has EVER been completed (may be different from "passed", if it has
115
114
# been completed before), and the total number of attempts.
116
completed, attempts = ivle.worksheet.get_exercise_status(req.store,
117
req.user, self.worksheet_exercise)
115
completed, attempts = ivle.worksheet.utils.get_exercise_status(
116
req.store, req.user, self.worksheet_exercise)
118
117
test_results["completed"] = completed
119
118
test_results["attempts"] = attempts
136
135
except ValueError:
138
# XXX Hack around Google Code issue #87
139
# Query from the given date +1 secnod.
140
# Date is in seconds (eg. 3:47:12), while the data is in finer time
141
# (eg. 3:47:12.3625). The query "date <= 3:47:12" will fail because
142
# 3:47:12.3625 is greater. Hence we do the query from +1 second,
143
# "date <= 3:47:13", and it finds the correct submission, UNLESS there
144
# are multiple submissions inside the same second.
145
date += datetime.timedelta(seconds=1)
139
147
worksheet_exercise = req.store.find(WorksheetExercise,
140
148
WorksheetExercise.exercise_id == exercise,
141
149
WorksheetExercise.worksheet_id == Worksheet.id,
142
150
Worksheet.identifier == worksheet,
143
151
Worksheet.offering_id == Offering.id,
144
152
Offering.subject_id == Subject.id,
145
Subject.code == subject,
153
Subject.short_name == subject,
146
154
Offering.semester_id == Semester.id,
147
155
Semester.year == year,
148
156
Semester.semester == semester).one()
150
attempt = ivle.worksheet.get_exercise_attempt(req.store, user,
158
attempt = ivle.worksheet.utils.get_exercise_attempt(req.store, user,
151
159
worksheet_exercise, as_of=date,
152
160
allow_inactive=HISTORY_ALLOW_INACTIVE)
161
169
return {'code': self.context.text}
164
class ExerciseRESTView(JSONRESTView):
165
'''REST view of an exercise.'''
167
def get_permissions(self, user):
168
# XXX: Do it properly.
169
# XXX: Does any user have the ability to save as themselves?
170
# XXX: Does a user EVER have permission to save as another user?
176
@named_operation('save')
172
class WorksheetExerciseRESTView(JSONRESTView):
173
'''REST view of a worksheet exercise.'''
175
def __init__(self, req, subject, year, semester, worksheet, exercise):
176
self.context = req.store.find(WorksheetExercise,
177
WorksheetExercise.exercise_id == exercise,
178
WorksheetExercise.worksheet_id == Worksheet.id,
179
Worksheet.offering_id == Offering.id,
180
Offering.subject_id == Subject.id,
181
Subject.short_name == subject,
182
Offering.semester_id == Semester.id,
183
Semester.year == year,
184
Semester.semester == semester).one()
186
if self.context is None:
189
@named_operation('view')
177
190
def save(self, req, text):
178
191
# Find the appropriate WorksheetExercise to save to. If its not found,
179
192
# the user is submitting against a non-existant worksheet/exercise
180
worksheet_exercise = req.store.find(WorksheetExercise,
181
WorksheetExercise.exercise_id == self.exercise,
182
WorksheetExercise.worksheet_id == Worksheet.id,
183
Worksheet.offering_id == Offering.id,
184
Offering.subject_id == Subject.id,
185
Subject.code == self.subject,
186
Offering.semester_id == Semester.id,
187
Semester.year == self.year,
188
Semester.semester == self.semester).one()
190
if worksheet_exercise is None:
193
194
old_save = req.store.find(ExerciseSave,
194
ExerciseSave.ws_ex_id == worksheet_exercise.id,
195
ExerciseSave.ws_ex_id == self.context.id,
195
196
ExerciseSave.user == req.user).one()
197
198
#Overwrite the old, or create a new if there isn't one
209
210
return {"result": "ok"}
213
213
# Note that this is the view of an existing worksheet. Creation is handled
214
214
# by OfferingRESTView (as offerings have worksheets)
215
215
class WorksheetRESTView(JSONRESTView):
216
216
"""View used to update a worksheet."""
218
def get_permissions(self, user):
219
# XXX: Do it properly.
220
# XXX: Lecturers should be allowed to add worksheets Only to subjects
221
# under their control
230
218
def __init__(self, req, **kwargs):
232
220
self.worksheet = kwargs['worksheet']
238
226
Worksheet.identifier == self.worksheet,
239
227
Worksheet.offering_id == Offering.id,
240
228
Offering.subject_id == Subject.id,
241
Subject.code == self.subject,
229
Subject.short_name == self.subject,
242
230
Offering.semester_id == Semester.id,
243
231
Semester.year == self.year,
244
232
Semester.semester == self.semester).one()
246
234
if self.context is None:
249
@named_operation('save')
237
@named_operation('edit')
250
238
def save(self, req, name, assessable, data, format):
251
239
"""Takes worksheet data and saves it."""
252
240
self.context.name = unicode(name)
253
241
self.context.assessable = self.convert_bool(assessable)
254
242
self.context.data = unicode(data)
255
243
self.context.format = unicode(format)
256
ivle.worksheet.update_exerciselist(self.context)
244
ivle.worksheet.utils.update_exerciselist(self.context)
258
246
return {"result": "ok"}
260
248
class WorksheetsRESTView(JSONRESTView):
261
249
"""View used to update and create Worksheets."""
263
def get_permissions(self, user):
264
# XXX: Do it properly.
265
# XXX: Lecturers should be allowed to add worksheets Only to subjects
266
# under their control
275
251
def __init__(self, req, **kwargs):
277
253
self.subject = kwargs['subject']
281
257
self.context = req.store.find(Offering,
282
258
Offering.subject_id == Subject.id,
283
Subject.code == self.subject,
259
Subject.short_name == self.subject,
284
260
Offering.semester_id == Semester.id,
285
261
Semester.year == self.year,
286
262
Semester.semester == self.semester).one()
added
removed
ivle/webapp/tutorial/service.py
