Changeset 1321 for WAeUP_SRP/trunk

Timestamp:

19 Jan 2007, 11:03:16 (18 years ago)

Author:

Henrik Bettermann

Message:

no import headline fixed

Location:

WAeUP_SRP/trunk

Files:

• Students.py (modified) (6 diffs)
• skins/waeup_student/request_transfer.py (modified) (3 diffs)

WAeUP_SRP/trunk/Students.py

@@ -400 +400 @@
         name = 'DE_Admitted'
         no_import = []
-        s = ','.join(['"(%s)"' % fn for fn in csv_fields])
+        s = ','.join(['"%s"' % fn for fn in csv_fields])
         no_import.append('"Error",%s' % s)
         format = '"%(Error)s",' + ','.join(['"%%(%s)s"' % fn for fn in csv_fields])
@@ -939 +939 @@
                 start = False
                 logger.info('start loading from %s.csv' % name)
-                s = ','.join(['"(%s)"' % fn for fn in student.keys()])
+                s = ','.join(['"%s"' % fn for fn in student.keys()])
                 no_import.append('%s,"Error"' % s)
                 format = ','.join(['"%%(%s)s"' % fn for fn in student.keys()])
@@ -1049 +1049 @@
                 start = False
                 logger.info('start loading from %s.csv' % name)
-                s = ','.join(['"(%s)"' % fn for fn in student.keys()])
+                s = ','.join(['"%s"' % fn for fn in student.keys()])
                 imported.append(s)
                 no_import.append('%s,"Error"' % s)
@@ -1143 +1143 @@
                 start = False
                 logger.info('start loading from %s.csv' % name)
-                s = ','.join(['"(%s)"' % fn for fn in result.keys()])
+                s = ','.join(['"%s"' % fn for fn in result.keys()])
                 imported.append(s)
                 no_import.append('%s,"Error"' % s)
@@ -1237 +1237 @@
         name = 'StudyCourseChange'
         no_import = []
-        s = ','.join(['"(%s)"' % fn for fn in csv_fields])
+        s = ','.join(['"%s"' % fn for fn in csv_fields])
         no_import.append('"Error",%s' % s)
         format = '"%(Error)s",' + ','.join(['"%%(%s)s"' % fn for fn in csv_fields])
@@ -1344 +1344 @@
         name = 'pume_results'
         no_import = []
-        s = ','.join(['"(%s)"' % fn for fn in csv_fields])
+        s = ','.join(['"%s"' % fn for fn in csv_fields])
         no_import.append('%s\n' % s)
         logger = logging.getLogger('Import.%s' % name)

WAeUP_SRP/trunk/skins/waeup_student/request_transfer.py

@@ -1 @@
-## Script (Python) "pay_by_sc"
+## Script (Python) "request_transfer"
 ##bind container=container
 ##bind context=context
@@ -70 +70 @@
 pin = info['order_id'] = ds.get('pin')
 info['type_code'] = "%s" % pin
-info['type_description'] = 'School Fee SC %s' % pin
+info['type_description'] = 'Transfer Form SC %s' % pin
 payments.invokeFactory('Payment', p_id)
 payment = getattr(payments,p_id)
@@ -77 +77 @@
 payment.getContent().edit(mapping=info)
 wftool.doActionFor(payment,'close')
-wftool.doActionFor(student,'pay_school_fee')
 url = "%s/payments" % (student.absolute_url())
 request.RESPONSE.redirect(url)