Changeset 13935 for main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

Timestamp:

14 Jun 2016, 01:38:12 (8 years ago)

Author:

uli

Message:

Merge changes from uli-scores-upload back into trunk.

Location:

main/waeup.kofa/trunk

Files:

• . (modified) (1 prop)
• src/waeup/kofa (modified) (1 prop)
• src/waeup/kofa/students/browser.py (modified) (8 diffs)

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

@@ -18 +18 @@
 """UI components for students and related components.
 """
-import sys
+import csv
 import grok
 import pytz
+import sys
+from cStringIO import StringIO
+from datetime import datetime
+from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState
 from urllib import urlencode
-from datetime import datetime
-from zope.event import notify
-from zope.i18n import translate
 from zope.catalog.interfaces import ICatalog
 from zope.component import queryUtility, getUtility, createObject
+from zope.event import notify
+from zope.formlib.textwidgets import BytesDisplayWidget
+from zope.i18n import translate
 from zope.schema.interfaces import ConstraintNotSatisfied, RequiredMissing
-from zope.formlib.textwidgets import BytesDisplayWidget
 from zope.security import checkPermission
-from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState
-from waeup.kofa.accesscodes import (
-    invalidate_accesscode, get_access_code)
+from waeup.kofa.accesscodes import invalidate_accesscode, get_access_code
 from waeup.kofa.accesscodes.workflow import USED
+from waeup.kofa.browser.breadcrumbs import Breadcrumb
+from waeup.kofa.browser.interfaces import ICaptchaManager
 from waeup.kofa.browser.layout import (
     KofaPage, KofaEditFormPage, KofaAddFormPage, KofaDisplayFormPage,
     NullValidator, jsaction, action, UtilityView)
-from waeup.kofa.browser.breadcrumbs import Breadcrumb
 from waeup.kofa.browser.pages import (
     ContactAdminFormPage, ExportCSVView, doll_up, exports_not_allowed,
     LocalRoleAssignmentUtilityView)
-from waeup.kofa.browser.interfaces import ICaptchaManager
 from waeup.kofa.hostels.hostel import NOT_OCCUPIED
 from waeup.kofa.interfaces import (
     IKofaObject, IUserAccount, IExtFileStore, IPasswordValidator, IContactForm,
-    IKofaUtils, IUniversity, IObjectHistory, academic_sessions, ICSVExporter,
-    academic_sessions_vocab, IJobManager, IDataCenter, DOCLINK)
+    IKofaUtils, IObjectHistory, academic_sessions, ICSVExporter,
+    academic_sessions_vocab, IDataCenter, DOCLINK)
 from waeup.kofa.interfaces import MessageFactory as _
-from waeup.kofa.widgets.datewidget import (
-    FriendlyDateWidget, FriendlyDateDisplayWidget,
-    FriendlyDatetimeDisplayWidget)
 from waeup.kofa.mandates.mandate import PasswordMandate
 from waeup.kofa.university.interfaces import (
     IDepartment, ICertificate, ICourse)
+from waeup.kofa.university.certificate import (
+    VirtualCertificateExportJobContainer)
+from waeup.kofa.university.department import (
+    VirtualDepartmentExportJobContainer)
 from waeup.kofa.university.faculty import VirtualFacultyExportJobContainer
-from waeup.kofa.university.department import VirtualDepartmentExportJobContainer
 from waeup.kofa.university.facultiescontainer import (
-    VirtualFacultiesExportJobContainer, FacultiesContainer)
-from waeup.kofa.university.certificate import (
-    VirtualCertificateExportJobContainer,)
+    VirtualFacultiesExportJobContainer)
 from waeup.kofa.university.course import (
     VirtualCourseExportJobContainer,)
 from waeup.kofa.university.vocabularies import course_levels
 from waeup.kofa.utils.batching import VirtualExportJobContainer
-from waeup.kofa.utils.helpers import get_current_principal, to_timezone, now
+from waeup.kofa.utils.helpers import get_current_principal, now
+from waeup.kofa.widgets.datewidget import FriendlyDatetimeDisplayWidget
 from waeup.kofa.students.interfaces import (
-    IStudentsContainer, IStudent,
-    IUGStudentClearance,IPGStudentClearance,
+    IStudentsContainer, IStudent, IUGStudentClearance, IPGStudentClearance,
     IStudentPersonal, IStudentPersonalEdit, IStudentBase, IStudentStudyCourse,
     IStudentStudyCourseTransfer, IStudentStudyCourseTranscript,
-    IStudentAccommodation, IStudentStudyLevel,
-    ICourseTicket, ICourseTicketAdd, IStudentPaymentsContainer,
-    IStudentOnlinePayment, IStudentPreviousPayment, IStudentBalancePayment,
-    IBedTicket, IStudentsUtils, IStudentRequestPW, IStudentTranscript
+    IStudentAccommodation, IStudentStudyLevel, ICourseTicket, ICourseTicketAdd,
+    IStudentPaymentsContainer, IStudentOnlinePayment, IStudentPreviousPayment,
+    IStudentBalancePayment, IBedTicket, IStudentsUtils, IStudentRequestPW,
+    IStudentTranscript
     )
 from waeup.kofa.students.catalog import search, StudentQueryResultItem
-from waeup.kofa.students.studylevel import StudentStudyLevel, CourseTicket
 from waeup.kofa.students.vocabularies import StudyLevelSource
-from waeup.kofa.students.workflow import (CREATED, ADMITTED, PAID,
-    CLEARANCE, REQUESTED, RETURNING, CLEARED, REGISTERED, VALIDATED,
-    GRADUATED, TRANSCRIPT, FORBIDDEN_POSTGRAD_TRANS)
-
-
-grok.context(IKofaObject) # Make IKofaObject the default context
+from waeup.kofa.students.workflow import (
+    ADMITTED, PAID, CLEARANCE, REQUESTED, RETURNING, CLEARED, REGISTERED,
+    VALIDATED, GRADUATED, TRANSCRIPT, FORBIDDEN_POSTGRAD_TRANS
+    )
+
+
+grok.context(IKofaObject)  # Make IKofaObject the default context
+
 
 # Save function used for save methods in pages
@@ -90 +90 @@
     # Turn list of lists into single list
     if changed_fields:
-        changed_fields = reduce(lambda x,y: x+y, changed_fields.values())
+        changed_fields = reduce(lambda x, y: x+y, changed_fields.values())
     # Inform catalog if certificate has changed
     # (applyData does this only for the context)
@@ -1199 +1199 @@
     def label(self):
         # Here we know that the cookie has been set
-        lang = self.request.cookies.get('kofa.language')
         return _('${a}: Transcript Data', mapping = {
             'a':self.context.student.display_fullname})
@@ -1397 +1396 @@
     def render(self):
         portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
-        Term = translate(_('Term'), 'waeup.kofa', target_language=portal_language)
         Code = translate(_('Code'), 'waeup.kofa', target_language=portal_language)
         Title = translate(_('Title'), 'waeup.kofa', target_language=portal_language)
@@ -3104 +3102 @@
         return list(coursetickets)
 
+    def _extract_uploadfile(self, uploadfile):
+        """Get a mapping of student-ids to scores.
+
+        The mapping is constructed by reading contents from `uploadfile`.
+
+        We expect uploadfile to be a regular CSV file with columns
+        ``student_id`` and ``score`` (other cols are ignored).
+        """
+        result = dict()
+        data = StringIO(uploadfile.read())  # ensure we have something seekable
+        reader = csv.DictReader(data)
+        for row in reader:
+            if not 'student_id' in row or not 'score' in row:
+                continue
+            result[row['student_id']] = row['score']
+        return result
+
     def update(self,  *args, **kw):
         form = self.request.form
-        ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
+        ob_class = self.__implemented__.__name__.replace('waeup.kofa.', '')
         self.current_academic_session = grok.getSite()[
             'configuration'].current_academic_session
@@ -3124 +3139 @@
             self.redirect(self.url(self.context))
             return
-        if 'UPDATE' in form:
-            error = ''
-            if not editable_tickets:
-                return
-            scores = form['scores']
-            sids = form['sids']
-            if isinstance(scores, basestring):
-                scores = [scores]
-            if isinstance(sids, basestring):
-                sids = [sids]
-            formvals = dict([(sids[i], scores[i]) for i in range(len(sids))])
-            for ticket in editable_tickets:
-                score = ticket.score
-                sid = ticket.student.student_id
-                if formvals[sid] == '':
-                    score = None
-                else:
-                    try:
-                        score = int(formvals[sid])
-                    except ValueError:
-                        error += '%s, ' % ticket.student.display_fullname
-                if ticket.score != score:
-                    ticket.score = score
-                    ticket.student.__parent__.logger.info(
-                        '%s - %s %s/%s score updated (%s)' %
-                        (ob_class, ticket.student.student_id,
-                         ticket.level, ticket.code, score))
-                    #notify(grok.ObjectModifiedEvent(ticket))
-            if error:
-                self.flash(_('Error: Score(s) of %s have not be updated. '
-                  'Only integers are allowed.' % error.strip(', ')),
-                  type="danger")
-        return
+        if not 'UPDATE' in form:
+            return
+        error = ''
+        if not editable_tickets:
+            return
+        formvals = dict(zip(form['sids'], form['scores']))
+        if form['uploadfile']:
+            try:
+                formvals = self._extract_uploadfile(form['uploadfile'])
+            except:
+                self.flash(
+                    _('Uploaded file contains illegal data. Ignored'),
+                    type="danger")
+        for ticket in editable_tickets:
+            score = ticket.score
+            sid = ticket.student.student_id
+            if sid not in formvals:
+                continue
+            if formvals[sid] == '':
+                score = None
+            else:
+                try:
+                    score = int(formvals[sid])
+                except ValueError:
+                    error += '%s, ' % ticket.student.display_fullname
+            if ticket.score != score:
+                ticket.score = score
+                ticket.student.__parent__.logger.info(
+                    '%s - %s %s/%s score updated (%s)' % (
+                        ob_class, ticket.student.student_id,
+                        ticket.level, ticket.code, score)
+                    )
+        if error:
+            self.flash(
+                _('Error: Score(s) of following students have not been '
+                    'updated (only integers are allowed): %s.' % error.strip(', ')),
+                type="danger")
+        return
+
 
 class DownloadScoresView(UtilityView, grok.View):
@@ -3166 +3187 @@
 
     def update(self):
-        ob_class = self.__implemented__.__name__.replace('waeup.kofa.','')
         self.current_academic_session = grok.getSite()[
             'configuration'].current_academic_session
@@ -3350 +3370 @@
             date_format = '%d/%m/%Y'
             try:
-                dummy = datetime.strptime(payments_start, date_format)
-                dummy = datetime.strptime(payments_end, date_format)
+                datetime.strptime(payments_start, date_format)
+                datetime.strptime(payments_end, date_format)
             except ValueError:
                 self.flash(_('Payment dates do not match format d/m/Y.'),