Changeset 182 for waeup_product/trunk/skins/waeup_student

Timestamp:

16 Nov 2005, 23:30:12 (19 years ago)

Author:

joachim

Message:

=eligibility edit geht fast

Location:

waeup_product/trunk/skins/waeup_student

Files:

• eligibility.py (modified) (4 diffs)
• layout_eligibility_create.pt (modified) (2 diffs)
• process_waeup_login.py (modified) (1 diff)

waeup_product/trunk/skins/waeup_student/eligibility.py

@@ -9 +9 @@
 rset = request.set
 fget = request.form.get
+form = request.form
 fhas = request.form.has_key
 
@@ -18 +19 @@
 sr = eli.schoolresults
 
-res,psm,ds = lt.renderLayout(layout_id= 'student_schoolresults',
+validate = fhas('add') or fhas('change') or fhas('delete')
+
+form['widget__jamb_results'] = eli.jamb_results                      
+form['widget__jamb_aggregate'] =eli.jamb_aggregate
+form['widget__faculty'] =eli.faculty                      
+form['widget__course'] =eli.course       
+res,psm,ds = lt.renderLayout(layout_id= 'student_eligibility_edit',
                       schema_id= 'student_eligibility',
                       context=context,
@@ -29 +36 @@
 
 inr = 0
+rset('ds',ds)
 if fhas('add') and (fget('type') or fget('subject') or fget('result')):
     sr.append((fget('type'),fget('subject'),fget('result')))
@@ -48 +56 @@
 else:
     psm = ''
-eli.edit(mapping={'schoolresults': sr})
-res,dummy,ds = lt.renderLayout(layout_id= 'student_schoolresults',
+ds.set('schoolresults',sr)
+eli.edit(mapping={'schoolresults':sr,
+                  'jamb_aggregate': fget('widget__aggregate'),
+                  })
+#eli.edit(mapping=ds)
+res,dummy,ds = lt.renderLayout(layout_id= 'student_eligibility_edit',
                       schema_id= 'student_eligibility',
                       context=context,

waeup_product/trunk/skins/waeup_student/layout_eligibility_create.pt

@@ -10 +10 @@
              edit_form     python:ti and ti.getActionById('edit',   'cpsdocument_edit_form') or  'cpsdocument_edit_form';
              metadata_form python:ti and ti.getActionById('metadata', 'cpsdocument_metadata') or 'cpsdocument_metadata';
-             formaction string:check_admission_form;
+             formaction options/formaction;
              first_layout options/first_layout|python:0;
              last_layout options/last_layout|python:0;
              is_flexible options/is_flexible;
              cpsmcat nocall:here/translation_service;
+             results options/schoolresults;
              "
              >
-  <form action='eligibility' method='post'
+  <form action='eligibility' method='post' tal:attributes="action formaction"
         enctype='multipart/form-data' class='workflow'>
     <div class='group'>
@@ -76 +77 @@
           </tr>
         </table>
-        <input type="submit" class="standalone" name="cpsdocument_edit_button" value="submit" />
-      </div>        
-    </div>
+    <table cellspacing="0" cellpadding="2" border="0" width="100%" tal:condition="results|nothing">
+      <tr>
+        <td align="left" valign="top">
+          &nbsp;
+        </td>
+        <td align="left" valign="top">
+          <div class="label">Type</div>
+        </td>
+        <td align="left" valign="top">
+          <div class="label">Subject</div>
+        </td>
+        <td align="left" valign="top">
+          <div class="label">Result</div>
+        </td>
+      </tr>
+      <span tal:repeat="row results" tal:omit-tag="">
+        <tr tal:define="rindex repeat/row/index">
+          <td align="left" valign="top">
+            <input type="checkbox" name="keys:list" value="100" tal:attributes="value string:${repeat/row/index}"/>
+          </td>
+          <td align="left" valign="top">
+            <div class="field">
+              <input type="text" name="key_0" value="100" size="20" 
+                     tal:attributes="name string:type_${rindex};value python:row[0]" />
+            </div>
+          </td>
+          <td align="left">
+            <div class="field">
+              <input type="text" name="label_0" value="Year 1 (100 Level)" size="40" 
+                     tal:attributes="name string:subject_${rindex};value python:row[1]" />
+            </div>
+          </td>
+          <td align="left">
+            <div class="field">
+              <input type="text" name="msgid_0" value="" size="10" 
+                     tal:attributes="name string:result_${rindex};value python:row[2]" />
+            </div>
+          </td>
+        </tr>
+      </span>
+      <tr>
+        <td align="left" colspan="3">
+          <input class="standalone" type="submit" name="change" value=" Change " />
+          <input class="standalone" type="submit" name="delete" value=" Delete " />
+        </td>
+      </tr>
+    </table>
+    <table cellspacing="0" cellpadding="2" border="0" width="100%">
+      <tr>
+        <td align="left" valign="top" colspan="2">
+          <div>Add a new postprimary school result</div>
+        </td>
+      </tr>
+      <tr>
+        <td align="left" valign="top">
+          &nbsp;
+        </td>
+        <td align="left" valign="top">
+          <div class="label">Type</div>
+        </td>
+        <td align="left" valign="top">
+          <div class="label">Subject</div>
+        </td>
+        <td align="left" valign="top">
+          <div class="label">Result</div>
+        </td>
+      </tr>
+      <tr>
+        <td align="left" valign="top">
+          &nbsp;
+        </td>
+        <td align="left" valign="top">
+          <div  class="field">
+            <input type="text" name="type" value="" size="20" /> 
+          </div>
+        </td>
+        <td align="left">
+          <div  class="field">
+            <input type="text" name="subject" value="" size="40" />
+          </div>
+        </td>
+        <td align="left">
+          <div  class="field">
+            <input type="text" name="result" value="" size="10" />
+          </div>
+        </td>
+      </tr>
+      <tr>
+        <td align="left" colspan="3">
+          <input class="standalone" type="submit" name="add" value=" Add " />
+        </td>
+      </tr>
+    </table>
   </form>
 </metal:block>

waeup_product/trunk/skins/waeup_student/process_waeup_login.py

@@ -53 +53 @@
 context.notifyCPSDocumentCreation(ob=pd)
 
-return response.redirect("%s/personal_addon" % ma.absolute_url())
+return response.redirect("%s" % ma.absolute_url())
 #return ma.personal_addon(REQUEST=context.REQUEST)