← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/database.py

  • Committer: me at id
  • Date: 2009-01-15 05:45:05 UTC
  • mto: This revision was merged to the branch mainline in revision 1090.
  • Revision ID: svn-v3-trunk0:2b9c9e99-6f39-0410-b283-7f802c844ae2:branches%2Fstorm:1160
ivle.database.User: Order 'enrolments' the same way as 'active_enrolments'.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/database.py
77
77
    studentid = Unicode()
78
78
    settings = Unicode()
79
79
 
80
 
    enrolments = ReferenceSet(id, 'Enrolment.user_id')
81
 
 
82
80
    def _get_role(self):
83
81
        if self.rolenm is None:
84
82
            return None
121
119
        fieldval = self.acct_exp
122
120
        return fieldval is not None and datetime.datetime.now() > fieldval
123
121
 
124
 
    @property
125
 
    def active_enrolments(self):
126
 
        '''A sanely ordered list of the user's active enrolments.'''
 
122
    def _get_enrolments(self, justactive):
127
123
        return Store.of(self).find(Enrolment,
128
124
            Enrolment.user_id == self.id,
129
 
            Enrolment.active == True,
 
125
            (Enrolment.active == True) if justactive else True,
130
126
            Enrolment.offering_id == Offering.id,
131
127
            Offering.semester_id == Semester.id,
132
128
            Offering.subject_id == Subject.id).order_by(
135
131
                Desc(Subject.code)
136
132
            )
137
133
 
 
134
    @property
 
135
    def active_enrolments(self):
 
136
        '''A sanely ordered list of the user's active enrolments.'''
 
137
        return self._get_enrolments(True)
 
138
 
 
139
    @property
 
140
    def enrolments(self):
 
141
        '''A sanely ordered list of all of the user's enrolments.'''
 
142
        return self._get_enrolments(False) 
138
143
 
139
144
    @staticmethod
140
145
    def hash_password(password):