Changeset 7841 for main/waeup.kofa/trunk/src/waeup/kofa/utils

Timestamp:

12 Mar 2012, 08:04:03 (13 years ago)

Author:

Henrik Bettermann

Message:

We don't need methods to fetch dictionaries.

Update interfaces.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/utils/utils.py (modified) (4 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/utils/utils.py

@@ -57 +57 @@
         }
 
-    def getExamSubjectsDict(self):
-        """Provide a dictionary of exam subjects.
-        """
-        return {
-            'accounts': 'Accounts',
-            'add_general_science': 'Add General Science',
-            'add_maths': 'Add Maths',
-            'agricultural_science': 'Agricultural Science',
-            'applied_electricity': 'Applied Electricity',
-            'arabi': 'Arabic',
-            'arithmetics': 'Arithmetics',
-            'art': 'Art',
-            'auto_mechanics': 'Auto Mechanics',
-            'basic_electricity': 'Basic Electricity',
-            'bible_knowledge': 'Bible Knowledge',
-            'biology': 'Biology',
-            'biology_alt_syl': 'Biology (Alt.Syl)',
-            'book_keeping': 'Book Keeping',
-            'building_construction': 'Building Construction',
-            'business_management': 'Business Management',
-            'business_construction_management': 'Business/Construction Management (Adv)',
-            'chemistry': 'Chemistry',
-            'chemistry_alt_syl': 'Chemistry (Alt.Syl)',
-            'christian_religious_studies': 'Christian Religious Studies',
-            'clerical_office_duties': 'Clerical Office Duties',
-            'clothing_and_textiles': 'Clothing and Textiles',
-            'commerce': 'Commerce',
-            'economics': 'Economics',
-            'education': 'Education',
-            'efik': 'Efik',
-            'electronics': 'Electronics',
-            'elementary_surveying': 'Elementary Surveying',
-            'english_language': 'English Language',
-            'engineering_science': 'Engineering Science',
-            'financial_accounting': 'Financial Accounting',
-            'food_and_nutrition': 'Food and Nutrition',
-            'french': 'French',
-            'further_mathematics': 'Further Mathematics',
-            'general_science': 'General Science',
-            'geography': 'Geography',
-            'german': 'German',
-            'government': 'Government',
-            'hausa': 'Hausa',
-            'hausa_literature': 'Hausa Literature',
-            'health_science': 'Health Science',
-            'history': 'History',
-            'home_management': 'Home Management',
-            'industrial_electrical_installation': 'Industrial Elect Installation (Adv)',
-            'intergrated_science': 'Intergrated Science',
-            'islamic_studies': 'Islamic Studies',
-            'literature_in_english': 'Literature in English',
-            'literature_in_nigerian_languages': 'Literature in Nigerian Languages',
-            'igbo': 'Igbo',
-            'igbo_literature': 'Igbo Literature',
-            'yoruba': 'Yoruba',
-            'yoruba_literature': 'Yoruba Literature',
-            'management_in_living': 'Management in Living',
-            'mathematics': 'Mathematics',
-            'metalwork': 'Metalwork',
-            'music': 'Music',
-            'nigerian_language': 'Nigerian Language',
-            'office_practice': 'Office Practice',
-            'physical_education': 'Physical Education',
-            'physical_health_education': 'Physical and Health Education',
-            'physics': 'Physics',
-            'physics_alt_syl': 'Physics (Alt.Syl)',
-            'principles_of_cost_accounting': 'Principles of Cost Accounting',
-            'rural_science': 'Rural Science',
-            'science': 'Science',
-            'secretarial_duties': 'Secretarial Duties',
-            'shorthand': 'Shorthand',
-            'sierra_leone_studies': 'Sierra Leone Studies',
-            'sierra_leone_languages': 'Sierra Leone Languages',
-            'social_studies': 'Social Studies',
-            'statistics': 'Statistics',
-            'teaching_practice': 'Teaching Practice',
-            'technical_drawing': 'Technical Drawing',
-            'typewriting': 'Typewriting',
-            'visual_art': 'Visual Art',
-            'woodwork': 'Woodwork',
-            'winding_elect_machines': 'Winding of Elect Machines and Elect Eng Sc'
-            }
-
-    def getExamGradesDict(self):
-        """Provide a dictionary of exam grades.
-        """
-        return {
-            'A1': 'Excellent (A1)',
-            'A2': 'Very Good (A2)',
-            'A3': 'Good (A3)',
-            'B2': 'Very Good (B2)',
-            'B3': 'Good (B3)',
-            'C4': 'Credit (C4)',
-            'C5': 'Credit (C5)',
-            'C6': 'Credit (C6)',
-            'D7': 'Pass (D7)',
-            'E8': 'Pass (E8)',
-            'F9': 'Fail (F9)',
-            'Aa': 'A (a)',
-            'Bb': 'B (b)',
-            'Cc': 'C (c)',
-            'Dd': 'D (d)',
-            'Ee': 'E (e)',
-            'Ff': 'F (f)',
-            'Gg': 'G (g)'
-            }
-
-    def getInstTypeDict(self):
-        """Provide a dictionary of study modes.
-        """
-        return {
+    EXAM_SUBJECTS_DICT = {
+        'accounts': 'Accounts',
+        'add_general_science': 'Add General Science',
+        'add_maths': 'Add Maths',
+        'agricultural_science': 'Agricultural Science',
+        'applied_electricity': 'Applied Electricity',
+        'arabi': 'Arabic',
+        'arithmetics': 'Arithmetics',
+        'art': 'Art',
+        'auto_mechanics': 'Auto Mechanics',
+        'basic_electricity': 'Basic Electricity',
+        'bible_knowledge': 'Bible Knowledge',
+        'biology': 'Biology',
+        'biology_alt_syl': 'Biology (Alt.Syl)',
+        'book_keeping': 'Book Keeping',
+        'building_construction': 'Building Construction',
+        'business_management': 'Business Management',
+        'business_construction_management': 'Business/Construction Management (Adv)',
+        'chemistry': 'Chemistry',
+        'chemistry_alt_syl': 'Chemistry (Alt.Syl)',
+        'christian_religious_studies': 'Christian Religious Studies',
+        'clerical_office_duties': 'Clerical Office Duties',
+        'clothing_and_textiles': 'Clothing and Textiles',
+        'commerce': 'Commerce',
+        'economics': 'Economics',
+        'education': 'Education',
+        'efik': 'Efik',
+        'electronics': 'Electronics',
+        'elementary_surveying': 'Elementary Surveying',
+        'english_language': 'English Language',
+        'engineering_science': 'Engineering Science',
+        'financial_accounting': 'Financial Accounting',
+        'food_and_nutrition': 'Food and Nutrition',
+        'french': 'French',
+        'further_mathematics': 'Further Mathematics',
+        'general_science': 'General Science',
+        'geography': 'Geography',
+        'german': 'German',
+        'government': 'Government',
+        'hausa': 'Hausa',
+        'hausa_literature': 'Hausa Literature',
+        'health_science': 'Health Science',
+        'history': 'History',
+        'home_management': 'Home Management',
+        'industrial_electrical_installation': 'Industrial Elect Installation (Adv)',
+        'intergrated_science': 'Intergrated Science',
+        'islamic_studies': 'Islamic Studies',
+        'literature_in_english': 'Literature in English',
+        'literature_in_nigerian_languages': 'Literature in Nigerian Languages',
+        'igbo': 'Igbo',
+        'igbo_literature': 'Igbo Literature',
+        'yoruba': 'Yoruba',
+        'yoruba_literature': 'Yoruba Literature',
+        'management_in_living': 'Management in Living',
+        'mathematics': 'Mathematics',
+        'metalwork': 'Metalwork',
+        'music': 'Music',
+        'nigerian_language': 'Nigerian Language',
+        'office_practice': 'Office Practice',
+        'physical_education': 'Physical Education',
+        'physical_health_education': 'Physical and Health Education',
+        'physics': 'Physics',
+        'physics_alt_syl': 'Physics (Alt.Syl)',
+        'principles_of_cost_accounting': 'Principles of Cost Accounting',
+        'rural_science': 'Rural Science',
+        'science': 'Science',
+        'secretarial_duties': 'Secretarial Duties',
+        'shorthand': 'Shorthand',
+        'sierra_leone_studies': 'Sierra Leone Studies',
+        'sierra_leone_languages': 'Sierra Leone Languages',
+        'social_studies': 'Social Studies',
+        'statistics': 'Statistics',
+        'teaching_practice': 'Teaching Practice',
+        'technical_drawing': 'Technical Drawing',
+        'typewriting': 'Typewriting',
+        'visual_art': 'Visual Art',
+        'woodwork': 'Woodwork',
+        'winding_elect_machines': 'Winding of Elect Machines and Elect Eng Sc'
+        }
+
+    EXAM_GRADES_DICT = {
+        'A1': 'Excellent (A1)',
+        'A2': 'Very Good (A2)',
+        'A3': 'Good (A3)',
+        'B2': 'Very Good (B2)',
+        'B3': 'Good (B3)',
+        'C4': 'Credit (C4)',
+        'C5': 'Credit (C5)',
+        'C6': 'Credit (C6)',
+        'D7': 'Pass (D7)',
+        'E8': 'Pass (E8)',
+        'F9': 'Fail (F9)',
+        'Aa': 'A (a)',
+        'Bb': 'B (b)',
+        'Cc': 'C (c)',
+        'Dd': 'D (d)',
+        'Ee': 'E (e)',
+        'Ff': 'F (f)',
+        'Gg': 'G (g)'
+        }
+
+    INST_TYPES_DICT = {
         'faculty': 'Faculty of',
         'department': 'Department of',
@@ -177 +168 @@
         }
 
-    def getStudyModesDict(self):
-        """Provide a dictionary of study modes.
-        """
-        return {
+    STUDY_MODES_DICT = {
         'rmd_ft': 'Remedial with deficiencies',
         'dp_pt': 'Diploma Part Time',
@@ -200 +188 @@
         }
 
-    def getAppCatDict(self):
-        """Provide a dictionary of study modes.
-        """
-        return {
+    APP_CATS_DICT = {
         'basic': 'PUME, PDE, PCE, PRENCE',
         'no': 'no application',
@@ -211 +196 @@
         }
 
-    def getSemesterDict(self):
-        """Provide a dictionary of semester or trimester types.
-        """
-        return {
+    SEMESTER_DICT = {
         1: 'First Semester',
         2: 'Second Semester',