Changeset 9002

Timestamp:

13 Jul 2012, 16:36:21 (12 years ago)

Author:

Henrik Bettermann

Message:

Add lecturer local role which has no dynamic role assignment yet.

Add test_import to CourseProcessorTests?.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• permissions.py (modified) (1 diff)
• permissions.txt (modified) (1 diff)
• students/dynamicroles.py (modified) (1 diff)
• university/course.py (modified) (1 diff)
• university/tests/sample_course_data.csv (added)
• university/tests/test_batching.py (modified) (3 diffs)

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

@@ -152 +152 @@
     grok.permissions('waeup.showStudents', 'waeup.viewAcademics')
 
+class Lecturer(grok.Role):
+    """The lecturer role is meant for the
+    assignment of dynamic roles only.
+    """
+    grok.name('waeup.local.Lecturer')
+    grok.title(u'Lecturer')
+    grok.permissions('waeup.showStudents', 'waeup.viewAcademics')
+
 class Owner(grok.Role):
     grok.name('waeup.local.Owner')

main/waeup.kofa/trunk/src/waeup/kofa/permissions.txt

@@ -42 +42 @@
 
     >>> len(list(get_waeup_roles(also_local=True)))
-    28
+    29
 
 

main/waeup.kofa/trunk/src/waeup/kofa/students/dynamicroles.py

@@ -46 +46 @@
     rolename_mapping = {
         'waeup.local.ClearanceOfficer':'waeup.StudentsClearanceOfficer',
-        'waeup.local.UGClearanceOfficer':'waeup.StudentsClearanceOfficer',
-        'waeup.local.PGClearanceOfficer':'waeup.StudentsClearanceOfficer',
         }
 

main/waeup.kofa/trunk/src/waeup/kofa/university/course.py

@@ -30 +30 @@
     grok.implements(ICourse, ICourseAdd)
 
-    local_roles = []
+    local_roles = ['waeup.local.Lecturer']
 
     def __init__(self,

main/waeup.kofa/trunk/src/waeup/kofa/university/tests/test_batching.py

@@ -64 +64 @@
 
 CERTIFICATE_HEADER_FIELDS = CERTIFICATE_SAMPLE_DATA.split(
+    '\n')[0].split(',')
+
+COURSE_SAMPLE_DATA = open(
+    os.path.join(os.path.dirname(__file__), 'sample_course_data.csv'),
+    'rb').read()
+
+COURSE_HEADER_FIELDS = COURSE_SAMPLE_DATA.split(
     '\n')[0].split(',')
 
@@ -375 +382 @@
         self.row3 = dict(department_code='DEP1', faculty_code='FAC1', code="CRS2")
         self.row4 = dict(department_code='DEP1', faculty_code='FAC1', code="CRS1")
+
+        self.csv_file_course = os.path.join(self.workdir, 'sample_course_data.csv')
+        open(self.csv_file_course, 'wb').write(COURSE_SAMPLE_DATA)
         return
 
@@ -419 +429 @@
         self.assertTrue('CRS1' not in self.app['faculties']['FAC1']['DEP1'].courses.keys())
         return
+
+    def test_import(self):
+        num, num_warns, fin_file, fail_file = self.proc.doImport(
+            self.csv_file_course, COURSE_HEADER_FIELDS)
+        content = open(fail_file).read()
+        self.assertEqual(num_warns,6)
+        self.assertEqual(
+            content,
+            'faculty_code,department_code,code,local_roles,--ERRORS--\r\n'
+            'FAC1,DEP1,CRS2,"[{\'user_name\':\'alice\',\'local_role\':\'waeup.local.Lecturer\'}]",'
+            'local_roles: alice does not exist\r\n'
+            'FAC1,DEP1,CRS2,"[{\'user_name\':\'anne\',\'local_role\':\'waeup.local.Boss\'}]",'
+            'local_roles: waeup.local.Boss not allowed\r\n'
+            'FAC1,DEP1,CRS2,[(\'anything\')],local_roles: no dicts\r\n'
+            'FAC1,DEP1,CRS2,[,local_roles: Error\r\n'
+            'FAC1,DEP1,CRS2,"[{\'user\':\'anne\',\'local\':\'waeup.local.Lecturer\'}]",'
+            'local_roles: user_name or local_role missing\r\n'
+            'FAC11,DEP2,CRS2,"[{\'user_name\':\'anne\',\'local_role\':\'waeup.local.Lecturer\'}]",'
+            'Not all parents do exist yet. Skipping\r\n'
+            )
+        # Anne got a local role in course ABC.
+        dep = self.app['faculties']['FAC1']['DEP1'].courses['CRS2']
+        role_map = IPrincipalRoleMap(dep)
+        local_role, user_name, setting = role_map.getPrincipalsAndRoles()[0]
+        self.assertEqual(user_name, 'anne')
+        self.assertEqual(local_role, 'waeup.local.Lecturer')
+        shutil.rmtree(os.path.dirname(fin_file))
+        return
+
 
 class CertificateProcessorTests(UniversityProcessorSetup):