← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/database.py

Rename problem to exercise in the DB.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/database.py
410
410
# WORKSHEETS AND EXERCISES #
411
411
 
412
412
class Exercise(Storm):
413
 
    # Note: Table "problem" is called "Exercise" in the Object layer, since
414
 
    # it's called that everywhere else.
415
 
    __storm_table__ = "problem"
 
413
    __storm_table__ = "exercise"
416
414
    id = Unicode(primary=True, name="identifier")
417
415
    name = Unicode()
418
416
    description = Unicode()
487
485
        return self.offering.get_permissions(user)
488
486
 
489
487
class WorksheetExercise(Storm):
490
 
    __storm_table__ = "worksheet_problem"
 
488
    __storm_table__ = "worksheet_exercise"
491
489
    
492
 
    id = Int(primary=True, name="ws_prob_id")
 
490
    id = Int(primary=True, name="ws_ex_id")
493
491
 
494
492
    worksheet_id = Int(name="worksheetid")
495
493
    worksheet = Reference(worksheet_id, Worksheet.id)
496
 
    exercise_id = Unicode(name="problemid")
 
494
    exercise_id = Unicode(name="exerciseid")
497
495
    exercise = Reference(exercise_id, Exercise.id)
498
496
    optional = Bool()
499
497
    active = Bool()
517
515
    ExerciseSave may be extended with additional semantics (such as
518
516
    ExerciseAttempt).
519
517
    """
520
 
    __storm_table__ = "problem_save"
 
518
    __storm_table__ = "exercise_save"
521
519
    __storm_primary__ = "ws_ex_id", "user_id"
522
520
 
523
 
    ws_ex_id = Int(name="ws_prob_id")
 
521
    ws_ex_id = Int(name="ws_ex_id")
524
522
    worksheet_exercise = Reference(ws_ex_id, "WorksheetExercise.id")
525
523
 
526
524
    user_id = Int(name="loginid")
547
545
        they won't count (either as a penalty or success), but will still be
548
546
        stored.
549
547
    """
550
 
    __storm_table__ = "problem_attempt"
 
548
    __storm_table__ = "exercise_attempt"
551
549
    __storm_primary__ = "ws_ex_id", "user_id", "date"
552
550
 
553
551
    # The "text" field is the same but has a different name in the DB table
565
563
    __storm_primary__ = "exercise_id", "suiteid"
566
564
    
567
565
    suiteid = Int()
568
 
    exercise_id = Unicode(name="problemid")
 
566
    exercise_id = Unicode(name="exerciseid")
569
567
    description = Unicode()
570
568
    seq_no = Int()
571
569
    function = Unicode()
595
593
 
596
594
class TestSuiteVar(Storm):
597
595
    """A container for the arguments of a Test Suite"""
598
 
    __storm_table__ = "suite_variables"
 
596
    __storm_table__ = "suite_variable"
599
597
    __storm_primary__ = "varid"
600
598
    
601
599
    varid = Int()
611
609
    
612
610
class TestCasePart(Storm):
613
611
    """A container for the test elements of a Test Case"""
614
 
    __storm_table__ = "test_case_parts"
 
612
    __storm_table__ = "test_case_part"
615
613
    __storm_primary__ = "partid"
616
614
    
617
615
    partid = Int()