[gnue] r8817 - in trunk/gnue-forms/src: . GFObjects

[reinhard]

Author: reinhard
Date: 2006-10-17 09:25:29 -0500 (Tue, 17 Oct 2006)
New Revision: 8817

Modified:
   trunk/gnue-forms/src/GFForm.py
   trunk/gnue-forms/src/GFInstance.py
   trunk/gnue-forms/src/GFObjects/GFBlock.py
Log:
Moved logic to update record counter and status to GFBlock.


Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py      2006-10-17 14:22:27 UTC (rev 8816)
+++ trunk/gnue-forms/src/GFForm.py      2006-10-17 14:25:29 UTC (rev 8817)
@@ -657,9 +657,7 @@
 
     def update_status(self):
 
-        self.update_record_status()
         self.update_insert_status()
-        self.update_record_counter()
         self.update_page_counter()
 
     # -------------------------------------------------------------------------
@@ -670,24 +668,10 @@
 
     # -------------------------------------------------------------------------
 
-    def update_record_status(self):
+    def update_record_status(self, record_status):
 
-        if self._currentBlock is None:
-            status = ''
-        elif self._currentBlock.mode == 'query':
-            status = 'QRY'
-        else:
-            status = {
-                    None:       '',
-                    'empty':    'NEW',
-                    'inserted': 'MOD',
-                    'void':     'DEL',
-                    'clean':    'OK',
-                    'modified': 'MOD',
-                    'deleted':  'DEL'}[self._currentBlock.get_record_status()]
+        self.__update_status(record_status=record_status)
 
-        self.__update_status(record_status=status)
-
     # -------------------------------------------------------------------------
 
     def update_insert_status(self):
@@ -699,12 +683,10 @@
 
     # -------------------------------------------------------------------------
 
-    def update_record_counter(self):
+    def update_record_counter(self, record_number, record_count):
 
-        if self._currentBlock is not None:
-            self.__update_status(
-                    record_number=self._currentBlock._currentRecord+1,
-                    record_count=self._currentBlock._recordCount)
+        self.__update_status(record_number=record_number,
+                record_count=record_count)
 
     # -------------------------------------------------------------------------
 
@@ -1324,9 +1306,6 @@
                     raise
 
             finally:
-                self.update_record_counter()
-                self.update_record_status()
-
                 if self._currentBlock.is_empty ():
                     self.status_message (u_('Query returned no results.'))
                 else:
@@ -1351,8 +1330,6 @@
             # Do the actual work
             self.execute_commit()
         finally:
-            self.update_record_counter()
-            self.update_record_status()
             self.beginEditing()
 
     # -------------------------------------------------------------------------
@@ -1429,8 +1406,6 @@
             self.__clear_all_blocks()
 
         finally:
-            self.update_record_counter()
-            self.update_record_status()
             self.beginEditing()
 
     # -------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py  2006-10-17 14:22:27 UTC (rev 8816)
+++ trunk/gnue-forms/src/GFInstance.py  2006-10-17 14:25:29 UTC (rev 8817)
@@ -443,8 +443,6 @@
       event._form.endEditing()
       try:
         event._form.move_focus(event.data)
-
-        event._form.update_record_status()
       finally:
         event._form.beginEditing()
 
@@ -478,9 +476,7 @@
     if origEntry == event._form._currentEntry:
       event._form.next_entry()
 
-    event._form.update_record_status()
 
-
   # ---------------------------------------------------------------------------
   # Move focus to the previous entry
   # ---------------------------------------------------------------------------
@@ -501,9 +497,7 @@
     if origEntry == event._form._currentEntry:
       event._form.previous_entry()
 
-    event._form.update_record_status()
 
-
   # ---------------------------------------------------------------------------
   # Move focus to the next block
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFBlock.py   2006-10-17 14:22:27 UTC (rev 
8816)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py   2006-10-17 14:25:29 UTC (rev 
8817)
@@ -284,10 +284,7 @@
 
     self.__current_record_changed(True)
 
-    self._form.update_record_counter()
-    self._form.update_record_status()
 
-
   # ---------------------------------------------------------------------------
 
   def __dsCursorMoved (self, event):
@@ -487,6 +484,10 @@
             field.processTrigger('Post-Change')
             self.processTrigger('Post-Change')
 
+            # Status could have changed from clean to modified
+            if self._form.get_focus_block() is self:
+                self.__update_record_status()
+
         if self.mode != 'init':
             field.value_changed()
 
@@ -823,8 +824,10 @@
             return
 
         self._resultSet.current.delete()
-        self._form.update_record_status()
 
+        if self._form.get_focus_block() is self:
+            self.__update_record_status()
+
   # ---------------------------------------------------------------------------
 
   def undelete_record(self):
@@ -836,9 +839,11 @@
             return
 
         self._resultSet.current.undelete()
-        self._form.update_record_status()
 
+        if self._form.get_focus_block() is self:
+            self.__update_record_status()
 
+
   # ---------------------------------------------------------------------------
   # Queries
   # ---------------------------------------------------------------------------
@@ -1100,9 +1105,6 @@
         self.processTrigger('PRE-FOCUSIN')
         self.processTrigger('POST-FOCUSIN')
 
-        self._form.update_record_counter()
-        self._form.update_record_status()
-
   # ---------------------------------------------------------------------------
 
   def validate(self):
@@ -1198,8 +1200,34 @@
 
         self._form.refreshUIEvents()
 
+        self._form.update_record_counter(
+                record_number=self._currentRecord+1,
+                record_count=self._recordCount)
 
+        self.__update_record_status()
+
+
   # ---------------------------------------------------------------------------
+  # Update the record status
+  # ---------------------------------------------------------------------------
+
+  def __update_record_status(self):
+
+        if self.mode == 'query':
+            record_status = 'QRY'
+        else:
+            record_status = {
+                    None:       '',
+                    'empty':    'NEW',
+                    'inserted': 'MOD',
+                    'void':     'DEL',
+                    'clean':    'OK',
+                    'modified': 'MOD',
+                    'deleted':  'DEL'}[self.get_record_status()]
+
+        self._form.update_record_status(record_status)
+
+  # ---------------------------------------------------------------------------
   # Adjust the scrollbars connected to this block
   # ---------------------------------------------------------------------------