Changeset 11780 for main/kofacustom.nigeria/trunk/src

Timestamp:

26 Aug 2014, 09:09:39 (10 years ago)

Author:

Henrik Bettermann

Message:

Add more exam subjects.

Location:

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria

Files:

• students/tests/test_export.py (modified) (2 diffs)
• utils/utils.py (modified) (1 diff)

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/tests/test_export.py

@@ -20 +20 @@
         self.setup_for_export()
         result_entry = ResultEntry(
-            NigeriaKofaUtils.EXAM_SUBJECTS_DICT.keys()[0],
-            NigeriaKofaUtils.EXAM_GRADES[0][0]
+            sorted(NigeriaKofaUtils.EXAM_SUBJECTS_DICT.keys())[0],
+            sorted(NigeriaKofaUtils.EXAM_GRADES)[0][0]
             )
         self.student.alr_results = [
@@ -63 +63 @@
             'suspended,suspended_comment,password,state,history,certcode,is_postgrad,'
             'current_level,current_session\r\nmy adm code,,,,'
-            '"[(\'visual_art\', \'A1\')]",0,my clr code,1981-02-04#,,,'
-            'anna@sample.com,,,,,,,,,,,Anna,,,,,"[(\'visual_art\', \'A1\')]"'
+            '"[(\'accounts\', \'A\')]",0,my clr code,1981-02-04#,,,'
+            'anna@sample.com,,,,,,,,,,,Anna,,,,,"[(\'accounts\', \'A\')]"'
             ',,,,,,,,,,,,,,,,Tester,,,234,M.,NG,,,,,,,,,'
             '"Studentroad 21\nLagos 123456\n",,+234-123-12345#,123,,,,,'
-            '"[(\'visual_art\', \'A1\')]",,f,A111111,0,,,created,'
+            '"[(\'accounts\', \'A\')]",,f,A111111,0,,,created,'
             '[u\'2012-11-06 13:16:41 WAT - Record created by system\'],'
             'CERT1,0,200,2012\r\n',

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/utils/utils.py

@@ -139 +139 @@
         'second_written': 'Second Written',
         'pract_tests': 'Practical Tests',
+        # Added 25/08/2014
+        'animal_husbandry_(alt_a)': 'Animal Husbandry (Alt A)',
+        'animal_husbandry_(alt_b)': 'Animal Husbandry (Alt B)',
+        'auto_electrical_work': 'Auto Electrical Work',
+        'auto_mechanical_work': 'Auto Mechanical Work',
+        'catering_craft_practice': 'Catering Craft Practice',
+        'civic_education': 'Civic Education',
+        'computer_studies': 'Computer Studies',
+        'cosmetology': 'Cosmetology',
+        'data_processing': 'Data Processing',
+        'dyeing_&_bleaching': 'Dyeing & Bleaching',
+        'electrical_installation_and_maintenance_work': 'Electrical Installation and Maintenance Work',
+        'fisheries_(alt_a)_ghana_candidates': 'Fisheries (Alt A) Ghana Candidates',
+        'fisheries_(alt_b)_nigeria_candidates': 'Fisheries (Alt B) Nigeria Candidates',
+        'garment_making': 'Garment Making',
+        'general_agriculture': 'General Agriculture',
+        'gsm_phones_maintenance_and_repairs': 'Gsm Phones Maintenance and Repairs',
+        'health_education': 'Health Education',
+        'insurance': 'Insurance',
+        'painting_and_decorating': 'Painting and Decorating',
+        'photography': 'Photography',
+        'printing_craft_practice': 'Printing Craft Practice',
+        'store_management': 'Store Management',
+        'textiles': 'Textiles',
+
         }