Changeset 807 for WAeUP_SRP/trunk/Widgets.py

Timestamp:

9 Nov 2006, 12:03:52 (18 years ago)

Author:

joachim

Message:

results added

File:

• WAeUP_SRP/trunk/Widgets.py (modified) (4 diffs)

WAeUP_SRP/trunk/Widgets.py

@@ -329 +329 @@
         v = datamodel[self.fields[0]]
         #import pdb;pdb.set_trace()
-        clear_doc = self.getStudentInfo()['clear_doc']
-        vd = getattr(clear_doc,self.fields[0],None)
-        if not vd:
-            vd = {}
+        #clear_doc = self.getStudentInfo()['clear_doc']
+        #vd = getattr(clear_doc,self.fields[0],None)
+##        if not vd:
+##            vd = []
         widget_id = self.getWidgetId()
-        datastructure[widget_id] = vd
+        datastructure[widget_id] = v
         datastructure[widget_id+'_s'] = ''
         datastructure[widget_id+'_g'] = ''
@@ -341 +341 @@
     def validate(self, datastructure, **kw): ###(
         """Validate datastructure and update datamodel."""
-        import pdb;pdb.set_trace()
+        #import pdb;pdb.set_trace()
         widget_id = self.getWidgetId()
         v = datastructure[widget_id]
@@ -347 +347 @@
         s = datastructure[widget_id+'_s'].strip()
         g = datastructure[widget_id+'_g'].strip()
-        if not type(v) is type({}):
-            pass
-        elif not s and g:
-            err = "no subject grad for subject %s " % s
-        elif v.has_key(s):
-            err = "grad for subject %s already given" % s
-        elif s and g:
-            v[s] = g
+        while 1:
+            if not s and g:
+                err = "no subject grad for subject %s " % s
+                break
+            i = 0
+            done = False
+            for sv,gv in v:
+                if sv == s:
+                    done = True
+                    if not g:
+                        v.pop(i)
+                        break
+                    v[i] = (s,g)
+                    break
+                i += 1
+            if done:
+                break
+            if s and g:
+                v.append((s,g))
+            break
         if err:
             datastructure.setError(widget_id, err)
@@ -379 +391 @@
         widget_id = self.getWidgetId()
         v = datamodel[self.fields[0]]
-        datastructure[widget_id] = [{'subject': f,
-                                     'grade': v[f]} for f in v.keys()]
+        datastructure[widget_id] = v
         datastructure[widget_id+'_s'] = ''
         datastructure[widget_id+'_g'] = ''