Changeset 6744

Timestamp:

13 Sep 2011, 09:43:13 (13 years ago)

Author:

Henrik Bettermann

Message:

Remove trash.

Rename entry_session_vocab and other academic session related things because of the ambiguity of the term 'session'. We should always use one of the following terms: entry session, current session or academic session.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• applicants/interfaces.py (modified) (1 diff)
• applicants/vocabularies.py (modified) (1 diff)
• students/interfaces.py (modified) (2 diffs)
• students/vocabularies.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/interfaces.py

@@ -443 +443 @@
         readonly = True,
         )
-    # entry_session is inherited from the container
-    #entry_session = schema.Choice(
-    #    source = entry_session_vocab,
-    #    title = u'Entry Session',
-    #    required = False,
-    #    readonly = True
-    #    )
     notice = schema.Text(
         title = u'Notice',

main/waeup.sirp/trunk/src/waeup/sirp/applicants/vocabularies.py

@@ -9 +9 @@
 from waeup.sirp.students.lgas import LGAS
 from waeup.sirp.students.vocabularies import (
-    entry_session_vocab, CertificateSource, GenderSource)
+    CertificateSource, GenderSource)
 
 #: Types of applications we support.

main/waeup.sirp/trunk/src/waeup/sirp/students/interfaces.py

@@ -7 +7 @@
 from waeup.sirp.students.vocabularies import (
   year_range, lgas_vocab, CertificateSource, GenderSource,
-  entry_session_vocab, verdicts, StudyLevelSource,
+  academic_sessions_vocab, verdicts, StudyLevelSource,
   )
 
@@ -130 +130 @@
     current_session = schema.Choice(
         title = u'Current Session',
-        source = entry_session_vocab,
+        source = academic_sessions_vocab,
         default = None,
         required = True,

main/waeup.sirp/trunk/src/waeup/sirp/students/vocabularies.py

@@ -14 +14 @@
     return range(curr_year - 2, curr_year + 5)
 
-def entry_sessions():
+def academic_sessions():
     curr_year = datetime.now().year
     year_range = range(curr_year - 10, curr_year + 2)
     return [('%s/%s' % (year,year+1), year) for year in year_range]
 
-entry_session_vocab = SimpleWAeUPVocabulary(*entry_sessions())
+academic_sessions_vocab = SimpleWAeUPVocabulary(*academic_sessions())
 
 lgas_vocab = SimpleWAeUPVocabulary(