Changeset 1771

Timestamp:

11 May 2007, 11:37:16 (18 years ago)

Author:

Henrik Bettermann

Message:

import LGA as string
and other fixes

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/layouts/import_student.xml (modified) (4 diffs)
• skins/waeup_default/getNextSessionId.py (modified) (1 diff)
• skins/waeup_default/import_form.pt (modified) (2 diffs)
• skins/waeup_epayment/pay_by_sc.py (modified) (1 diff)
• skins/waeup_utilities/ti_188_resolve.py (modified) (1 diff)

WAeUP_SRP/trunk/profiles/default/layouts/import_student.xml

@@ -56 +56 @@
   <property name="vocabulary">states</property>
  </widget>
- <widget name="lga" meta_type="Select Widget">
+ <widget name="lga" meta_type="String Widget">
   <property name="title">LGA</property>
   <property name="fields">
@@ -66 +66 @@
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
-  <property name="vocabulary">local_gov_areas</property>
  </widget>
  <widget name="firstname" meta_type="String Widget">
@@ -271 +270 @@
   <row>
    <cell name="current_mode"/>
-  </row>  
+  </row>
   <row>
    <cell name="entry_session"/>
@@ -296 +295 @@
    <cell name="study_course"/>
   </row>
- 
+
  </table>
 </object>

WAeUP_SRP/trunk/skins/waeup_default/getNextSessionId.py

@@ -13 +13 @@
 """
 
-if session != context.getSessionId()[2:]:
+if session != context.getSessionId()[-2:]:
     ns = int(session) + 1
 else:

WAeUP_SRP/trunk/skins/waeup_default/import_form.pt

@@ -3 +3 @@
            data_storage options/ds;
            formaction options/formaction|string:import;
-           button options/button|string:import;
+           button options/button|string:Import;
            creation creation|nothing;"
            >
@@ -18 +18 @@
           <br />
           <input type="submit" class="standalone" 
-                 name="import" value="Import"
+                 name="import" value="import"
                  tal:attributes="value button"
                  tal:condition="not:creation" />

WAeUP_SRP/trunk/skins/waeup_epayment/pay_by_sc.py

@@ -92 +92 @@
     payment.getContent().edit(mapping=info)
     wftool.doActionFor(payment,'close')
-    if next_session == context.getSessionId()[2:]:
+    if next_session == context.getSessionId()[-2:]:
         wftool.doActionFor(student,'pay_school_fee')
     else:

WAeUP_SRP/trunk/skins/waeup_utilities/ti_188_resolve.py

@@ -49 +49 @@
 res = scat()
 for sbrain in res:
+    if not sbrain.matric_no:
+        continue
     if str(sbrain.level) == '100':
         ec = "new"