Changeset 3219

Timestamp:

25 Feb 2008, 12:40:14 (17 years ago)

Author:

joachim

Message:

check if required fields are present in data-record

Location:

WAeUP_SRP/base

Files:

• WAeUPImport.py (modified) (3 diffs)
• WAeUPTool.py (modified) (3 diffs)
• Widgets.py (modified) (2 diffs)

WAeUP_SRP/base/WAeUPImport.py

@@ -104 +104 @@
         for widget in self.layout.keys():
             self.validators[widget] = self.layout[widget].validate
+        self.required_keys = {}
+        for mode in self.required_modes:
+            self.required_keys[mode] = [self.layout.getIdUnprefixed(id)
+                                for id,widget in self.layout.objectItems()
+                                if widget.is_required]
         self.init_errors = ','.join(errors)
 
@@ -279 +284 @@
     plural_name = "%ss" % name
     commit_after = 1000000
+    required_modes = ('create','edit')
 
     def getStudentRecord(self,mapping): ###(
@@ -405 +411 @@
     plural_name = "%ss" % name
     commit_after = 100000
+    required_modes = ('create','edit')
 
     def create(self,mapping):

WAeUP_SRP/base/WAeUPTool.py

@@ -1 @@
-#-*- mode: python; mode: fold -*-
+# -*- mode: python; mode: fold; -*-
 # (C) Copyright 2005 The WAeUP group  <http://www.waeup.org>
 # Author: Joachim Schmitz (js@aixtraware.de)
@@ -1440 +1440 @@
             msg = 'not ignorable key(s): "%s" found in heading' % ", ".join(diff2schema)
             return msg
-        # if import_mode in importer.required_modes:
-        #     required_keys = [importer.layout.getIdUnprefixed(id)
-        #                         for id,widget in importer.layout.objectItems()
-        #                         if widget.is_required]
-        #     if not set(required_keys).issubset(set(import_keys)):
-        #         diff2import = set(required_keys).difference(set(import_keys))
-        #         msg = 'required key(s): "%s" not found in heading' % ", ".join(diff2import)
-        #         return msg
         #
         # start importing
@@ -1486 +1478 @@
             total += 1
             import_mode = item.get('import_mode','edit')
+            if (import_mode in importer.required_modes and 
+                not set(importer.required_keys[import_mode]).issubset(set(import_keys))):
+                diff2import = set(importer.required_keys[import_mode]).difference(set(import_keys))
+                error_string += 'required key(s): "%s" not found in heading' % ", ".join(diff2import)
             import_method = getattr(importer, '%(import_mode)s' % vars(),None )
             if import_method is None:

WAeUP_SRP/base/Widgets.py

@@ -444 +444 @@
             datastructure.setError(widget_id, "'%s' not a valid level" % v)
             return 0
-        if self.is_required and not len(v):
-            datastructure.setError(widget_id, "level key required")
-            return 0
+        # if self.is_required and len(v) == 0:
+        #     datastructure.setError(widget_id, "level key required")
+        #     return 0
 
         datamodel = datastructure.getDataModel()
@@ -519 +519 @@
             datastructure.setError(widget_id, "'%s' not a valid verdict key" % v)
             return 0
-        if self.is_required and not len(v):
-            datastructure.setError(widget_id, "verdict required")
-            return 0
+        # if self.is_required and not len(v):
+        #     datastructure.setError(widget_id, "verdict required")
+        #     return 0
 
         datamodel = datastructure.getDataModel()