Changeset 1683 for WAeUP_SRP/trunk/skins

Timestamp:

11 Apr 2007, 20:01:53 (18 years ago)

Author:

Henrik Bettermann

Message:

quite a few bugs fixed

File:

• WAeUP_SRP/trunk/skins/waeup_utilities/ti_188_resolve.py (modified) (5 diffs)

WAeUP_SRP/trunk/skins/waeup_utilities/ti_188_resolve.py

@@ -1 @@
-## Script (Python) "search_pins"
+## Script (Python) "ti_188_resolve"
 ##bind container=container
 ##bind context=context
@@ -67 +67 @@
         
         verdict =  sbrain.verdict       
-        if verdict in ('A','B',)
+        if verdict in ('A','B','',):
             continue
         
@@ -80 +80 @@
         if sres:
             dict['review_state'] = sres[0].review_state
-        if sbrain.level == '':
-            code = 'nyl'
-            nyl_count += 1
-        elif sbrain.level != lc:
+
+        #if sbrain.level == '':
+        #    code = 'nyl'
+        #    nyl_count += 1
+
+        if sbrain.level != lc:
             code = 'nok'
             wrong_count += 1
@@ -91 +93 @@
             if level is not None:
                 cr_count += 1
-                if dict['review_state'] == "school_fee_paid":
+                if dict['review_state'] in ('courses_registered', 'courses_validated'):
                     code = 'nok_cr'
-                    comment = "%(level)s deleted" % dict
+                    reg_count += 1
+                else:
+                    comment = "level %(level)s deleted" % dict                    
+                    comment = comment + ", level in students_catalog modified to %s" % lc
                     ##study_course.manage_delObjects((sbrain.level,))
-                elif dict['review_state'] != "school_fee_paid":
-                    reg_count += 1
-            comment = comment + " level in students_catalog modified to %s" % lc
-            ##context.students_catalog.modifyRecord(id = sbrain.id,level=lc,)
+                    ##context.students_catalog.modifyRecord(id = sbrain.id,level=lc,)
         else:
             ok_count += 1
@@ -111 +113 @@
         rwrite('"%(count)d:%(ok_count)d:%(nyl_count)d:%(wrong_count)d:%(cr_count)d:%(reg_count)d","%(code)s","%(id)s","%(name)s","%(level)s","%(level_res)s","%(review_state)s","%(comment)s"' % dict)
 
-rwrite("total: %(count)d<br> correct: %(ok_count)d<br> level == '': %(nyl_count)d<br> wrong: %(wrong_count)d<br> level created: %(cr_count)d<br> courses registered: %(reg_count)d" % dict )
+rwrite("total: %(count)d<br> correct: %(ok_count)d<br> wrong: %(wrong_count)d<br> level created: %(cr_count)d<br> courses registered: %(reg_count)d" % dict )
+
+