← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/webapp/tutorial/service.py

  • Committer: William Grant
  • Date: 2009-02-25 23:04:11 UTC
  • Revision ID: grantw@unimelb.edu.au-20090225230411-lbdyl32ir0m3d59b
Make all of the services executable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/tutorial/service.py
28
28
import ivle.database
29
29
from ivle.database import Exercise, ExerciseAttempt, ExerciseSave, Worksheet, \
30
30
                          Offering, Subject, Semester, WorksheetExercise
31
 
import ivle.worksheet.utils
 
31
import ivle.worksheet
32
32
import ivle.conf
33
33
import ivle.webapp.tutorial.test
 
34
 
34
35
from ivle.webapp.base.rest import (JSONRESTView, named_operation,
35
36
                                   require_permission)
36
37
from ivle.webapp.errors import NotFound
51
52
            raise NotFound()
52
53
        
53
54
        self.worksheet_exercise = req.store.find(WorksheetExercise,
54
 
            WorksheetExercise.exercise_id == unicode(exercise),
 
55
            WorksheetExercise.exercise_id == exercise,
55
56
            WorksheetExercise.worksheet_id == Worksheet.id,
56
57
            Worksheet.offering_id == Offering.id,
57
 
            Worksheet.identifier == unicode(worksheet),
58
58
            Offering.subject_id == Subject.id,
59
 
            Subject.short_name == subject,
 
59
            Subject.code == subject,
60
60
            Offering.semester_id == Semester.id,
61
61
            Semester.year == year,
62
62
            Semester.semester == semester).one()
113
113
        # Query the DB to get an updated score on whether or not this problem
114
114
        # has EVER been completed (may be different from "passed", if it has
115
115
        # been completed before), and the total number of attempts.
116
 
        completed, attempts = ivle.worksheet.utils.get_exercise_status(
117
 
                req.store, req.user, self.worksheet_exercise)
 
116
        completed, attempts = ivle.worksheet.get_exercise_status(req.store,
 
117
            req.user, self.worksheet_exercise)
118
118
        test_results["completed"] = completed
119
119
        test_results["attempts"] = attempts
120
120
 
136
136
        except ValueError:
137
137
            raise NotFound()
138
138
 
139
 
        # XXX Hack around Google Code issue #87
140
 
        # Query from the given date +1 secnod.
141
 
        # Date is in seconds (eg. 3:47:12), while the data is in finer time
142
 
        # (eg. 3:47:12.3625). The query "date <= 3:47:12" will fail because
143
 
        # 3:47:12.3625 is greater. Hence we do the query from +1 second,
144
 
        # "date <= 3:47:13", and it finds the correct submission, UNLESS there
145
 
        # are multiple submissions inside the same second.
146
 
        date += datetime.timedelta(seconds=1)
147
 
 
148
139
        worksheet_exercise = req.store.find(WorksheetExercise,
149
140
            WorksheetExercise.exercise_id == exercise,
150
141
            WorksheetExercise.worksheet_id == Worksheet.id,
151
142
            Worksheet.identifier == worksheet,
152
143
            Worksheet.offering_id == Offering.id,
153
144
            Offering.subject_id == Subject.id,
154
 
            Subject.short_name == subject,
 
145
            Subject.code == subject,
155
146
            Offering.semester_id == Semester.id,
156
147
            Semester.year == year,
157
148
            Semester.semester == semester).one()
158
149
            
159
 
        attempt = ivle.worksheet.utils.get_exercise_attempt(req.store, user,
 
150
        attempt = ivle.worksheet.get_exercise_attempt(req.store, user,
160
151
                        worksheet_exercise, as_of=date,
161
152
                        allow_inactive=HISTORY_ALLOW_INACTIVE) 
162
153
 
170
161
        return {'code': self.context.text}
171
162
 
172
163
 
173
 
class WorksheetExerciseRESTView(JSONRESTView):
174
 
    '''REST view of a worksheet exercise.'''
175
 
 
176
 
    def __init__(self, req, subject, year, semester, worksheet, exercise):
177
 
        self.context = req.store.find(WorksheetExercise,
178
 
            WorksheetExercise.exercise_id == exercise,
179
 
            WorksheetExercise.worksheet_id == Worksheet.id,
180
 
            Worksheet.offering_id == Offering.id,
181
 
            Offering.subject_id == Subject.id,
182
 
            Subject.short_name == subject,
183
 
            Offering.semester_id == Semester.id,
184
 
            Semester.year == year,
185
 
            Semester.semester == semester).one()
186
 
        
187
 
        if self.context is None:
188
 
            raise NotFound()
189
 
 
190
 
    @named_operation('view')
 
164
class ExerciseRESTView(JSONRESTView):
 
165
    '''REST view of an exercise.'''
 
166
 
 
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?
 
171
        if user is not None:
 
172
            return set(['save'])
 
173
        else:
 
174
            return set()
 
175
 
 
176
    @named_operation('save')
191
177
    def save(self, req, text):
192
178
        # Find the appropriate WorksheetExercise to save to. If its not found,
193
179
        # 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()
 
189
        
 
190
        if worksheet_exercise is None:
 
191
            raise NotFound()
194
192
 
195
193
        old_save = req.store.find(ExerciseSave,
196
 
            ExerciseSave.ws_ex_id == self.context.id,
 
194
            ExerciseSave.ws_ex_id == worksheet_exercise.id,
197
195
            ExerciseSave.user == req.user).one()
198
196
        
199
197
        #Overwrite the old, or create a new if there isn't one
203
201
        else:
204
202
            new_save = old_save
205
203
        
206
 
        new_save.worksheet_exercise = self.context
 
204
        new_save.worksheet_exercise = worksheet_exercise
207
205
        new_save.user = req.user
208
206
        new_save.text = unicode(text)
209
207
        new_save.date = datetime.datetime.now()
211
209
        return {"result": "ok"}
212
210
 
213
211
 
 
212
 
214
213
# Note that this is the view of an existing worksheet. Creation is handled
215
214
# by OfferingRESTView (as offerings have worksheets)
216
215
class WorksheetRESTView(JSONRESTView):
217
216
    """View used to update a worksheet."""
218
217
 
 
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
 
222
        if user is not None:
 
223
            if user.admin:
 
224
                return set(['save'])
 
225
            else:
 
226
                return set()
 
227
        else:
 
228
            return set()    
 
229
 
219
230
    def __init__(self, req, **kwargs):
220
231
    
221
232
        self.worksheet = kwargs['worksheet']
227
238
            Worksheet.identifier == self.worksheet,
228
239
            Worksheet.offering_id == Offering.id,
229
240
            Offering.subject_id == Subject.id,
230
 
            Subject.short_name == self.subject,
 
241
            Subject.code == self.subject,
231
242
            Offering.semester_id == Semester.id,
232
243
            Semester.year == self.year,
233
244
            Semester.semester == self.semester).one()
235
246
        if self.context is None:
236
247
            raise NotFound()
237
248
    
238
 
    @named_operation('edit')
 
249
    @named_operation('save')
239
250
    def save(self, req, name, assessable, data, format):
240
251
        """Takes worksheet data and saves it."""
241
252
        self.context.name = unicode(name)
242
253
        self.context.assessable = self.convert_bool(assessable)
243
254
        self.context.data = unicode(data)
244
255
        self.context.format = unicode(format)
245
 
        ivle.worksheet.utils.update_exerciselist(self.context)
 
256
        ivle.worksheet.update_exerciselist(self.context)
246
257
        
247
258
        return {"result": "ok"}
248
259
 
249
260
class WorksheetsRESTView(JSONRESTView):
250
261
    """View used to update and create Worksheets."""
251
262
    
 
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
 
267
        if user is not None:
 
268
            if user.admin:
 
269
                return set(['edit'])
 
270
            else:
 
271
                return set()
 
272
        else:
 
273
            return set()
 
274
 
252
275
    def __init__(self, req, **kwargs):
253
276
    
254
277
        self.subject = kwargs['subject']
257
280
    
258
281
        self.context = req.store.find(Offering,
259
282
            Offering.subject_id == Subject.id,
260
 
            Subject.short_name == self.subject,
 
283
            Subject.code == self.subject,
261
284
            Offering.semester_id == Semester.id,
262
285
            Semester.year == self.year,
263
286
            Semester.semester == self.semester).one()
282
305
        
283
306
        # This call is added for clarity, as the worksheet is implicitly added.        
284
307
        req.store.add(new_worksheet)
285
 
 
286
 
        ivle.worksheet.utils.update_exerciselist(new_worksheet)
287
 
 
 
308
        
 
309
        ivle.worksheet.update_exerciselist(new_worksheet)
 
310
        
288
311
        return {"result": "ok"}
289
312
 
290
313
    @named_operation('edit')