Changeset 1759

Timestamp:

8 May 2007, 21:43:38 (18 years ago)

Author:

Henrik Bettermann

Message:

makeStudentData must not change catalog
makeStudentData must set current_session

Location:

WAeUP_SRP/trunk

Files:

• WAeUPTool.py (modified) (4 diffs)
• skins/waeup_default/import_form.pt (modified) (2 diffs)
• skins/waeup_utilities/setCurrentSession.py (added)
• skins/waeup_utilities/set_current_session.py (deleted)

WAeUP_SRP/trunk/WAeUPTool.py

@@ -240 +240 @@
     def get_csv_filenames(self):
         "do it"
-        files = [file for file in os.listdir("%s/import/" % (i_home)) 
+        files = [file for file in os.listdir("%s/import/" % (i_home))
                  if file.endswith('.csv') and file.find('imported') == -1]
         return files
@@ -352 +352 @@
         clearance.getContent().edit(mapping=dc)
         self.portal_workflow.doActionFor(clearance,'close',dest_container=clearance)
-        catd = {}
-        catd['id'] = sid
-        catd['entry_mode']= da['entry_mode']
-        catd['matric_no'] = matric_no
-        catd['jamb_reg_no'] = da['jamb_reg_no']
-        catd['name'] = "%(firstname)s %(middlename)s %(lastname)s" % dp
-        catd['sex'] = dp['sex']
-        catd['level'] = level
-        catd['verdict'] = verdict
-        if certificate_brain:
-            cpath = certificate_brain.getPath().split('/')
-            catd['faculty'] = cpath[-4]
-            catd['department'] = cpath[-3]
-            catd['course'] = certcode
-        self.students_catalog.modifyRecord(**catd)
+##        catd = {}
+##        catd['id'] = sid
+##        catd['entry_mode']= da['entry_mode']
+##        catd['matric_no'] = matric_no
+##        catd['jamb_reg_no'] = da['jamb_reg_no']
+##        catd['name'] = "%(firstname)s %(middlename)s %(lastname)s" % dp
+##        catd['sex'] = dp['sex']
+##        catd['level'] = level
+##        catd['verdict'] = verdict
+##        if certificate_brain:
+##            cpath = certificate_brain.getPath().split('/')
+##            catd['faculty'] = cpath[-4]
+##            catd['department'] = cpath[-3]
+##            catd['course'] = certcode
+##        self.students_catalog.modifyRecord(**catd)
         #
         # Study Course
@@ -377 +377 @@
         dsc['current_level'] = level
         dsc['current_verdict'] = verdict
+        dsc['current_session'] = '06'
         studycourse.getContent().edit(mapping=dsc)
         #
@@ -852 +853 @@
             open("%s/import/%s_not_imported%s.csv" % (i_home,filename,current),"a").write(
                                                 '\n'.join(not_imported))
-        em = "Imported: %d, not imported: %d of total %d" % (total_imported,total_not_imported,total) 
+        em = "Imported: %d, not imported: %d of total %d" % (total_imported,total_not_imported,total)
         logger.info(em)
         return em

WAeUP_SRP/trunk/skins/waeup_default/import_form.pt

@@ -9 +9 @@
     <metal:block use-macro="here/waeup_content_master/macros/master">
       <metal:block fill-slot="main">
-      <h3>Import Data</h3>
+      <h3>Import Data!</h3>
       <br />      
         <form action="" id="editForm" method="post" 
@@ -18 +18 @@
           <br />
           <input type="submit" class="standalone" 
-                 name="import" value="import"
+                 name="import" value="Import"
                  tal:attributes="value button"
                  tal:condition="not:creation" />