gnue/gnuef samples/zipcode/states.gfd src/GFFor...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:     James Thompson <address@hidden> 00/12/16 13:32:22

Modified files:
        gnuef/samples/zipcode: states.gfd 
        gnuef/src      : GFForm.py GFObjects.py 
        gnuef/src/drivers/postgresql: DBdriver.py 

Log message:
        Updated master/detail example
        More master/detail support

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/samples/zipcode/states.gfd.diff?r1=1.5&r2=1.6
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFForm.py.diff?r1=1.52&r2=1.53
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/GFObjects.py.diff?r1=1.46&r2=1.47
http://subversions.gnu.org/cgi-bin/cvsweb/gnue/gnuef/src/drivers/postgresql/DBdriver.py.diff?r1=1.8&r2=1.9

Patches:
Index: gnue/gnuef/samples/zipcode/states.gfd
diff -u gnue/gnuef/samples/zipcode/states.gfd:1.5 
gnue/gnuef/samples/zipcode/states.gfd:1.6
--- gnue/gnuef/samples/zipcode/states.gfd:1.5   Tue Dec  5 20:42:58 2000
+++ gnue/gnuef/samples/zipcode/states.gfd       Sat Dec 16 13:32:22 2000
@@ -4,8 +4,8 @@
   <options>
     <title>Master/Detail Demo</title>
     <version>0.0.1</version>
-    <height>480</height>
-    <width>540</width>
+    <height>18</height>
+    <width>32</width>
   </options>
 
   <database name="gnue" provider="postgresql" dbname="gnue" host="gnue"/>
@@ -14,23 +14,23 @@
 
   <page>
     <block name="state" datasource="state">
-      <label text="State Code" x="5" y="10"/>
-      <entry name="state" field="state" x="5" y="20" width="40" height="20" 
visibleCount="5"/>
-      <label text="Description" x="50" y="10"/>
-      <entry name="state" field="description" x="50" y="20" width="150" 
height="20" visibleCount="5"/>
+      <label text="State Code" x="1" y="1"/>
+      <entry name="state" field="state" x="1" y="2" width="2" height="1" 
visibleCount="5"/>
+      <label text="Description" x="5" y="1"/>
+      <entry name="state" field="description" x="5" y="2" width="30" 
height="1" visibleCount="5"/>
     </block>
 
 
     <!-- Block of cities -->
     <block name="cities"  datasource="cities" master="state.state" 
detail="state_code">
-      <label text="City" x="5" y="100"/>
-      <entry name="city" field="city" x="5" y="110" width="150" height="20" 
visibleCount="5" />
+      <label text="City" x="1" y="9"/>
+      <entry name="city" field="city" x="1" y="10" width="20" visibleCount="5" 
/>
 
-      <label text="State" x="65" y="100"/>
-      <entry name="state" field="state_code" x="65" y="110" width="150" 
height="20" visibleCount="5" />
+      <label text="State" x="22" y="9"/>
+      <entry name="state" field="state_code" x="22" y="10" width="2" 
visibleCount="5" />
 
-      <label text="Zip" x="125" y="100"/>
-      <entry name="zip" field="zip" x="125" y="110" width="150" height="20" 
visibleCount="5" />
+      <label text="Zip" x="25" y="9"/>
+      <entry name="zip" field="zip" x="25" y="10" width="5" visibleCount="5" />
     </block>
 
   </page>
Index: gnue/gnuef/src/GFForm.py
diff -u gnue/gnuef/src/GFForm.py:1.52 gnue/gnuef/src/GFForm.py:1.53
--- gnue/gnuef/src/GFForm.py:1.52       Fri Dec 15 19:32:11 2000
+++ gnue/gnuef/src/GFForm.py    Sat Dec 16 13:32:22 2000
@@ -526,7 +526,6 @@
     sys.stderr.write("(%s, %s)\n"%(event.data[0], event.data[1]))
     sys.stderr.write("Replacing with %s\n"% replacement)
     event.data[0].setValue(replacement)
-#    self.dispatchEvent(GFEvent('updateENTRY',self.currentEntry));
     
   #
   # keyPress
@@ -561,8 +560,6 @@
       
         self.currentEntry.cursorPosition = self.currentEntry.cursorPosition + 1
         self.currentEntry.setValue(currentvalue)
-  
-  #      self.dispatchEvent(GFEvent('updateENTRY',self.currentEntry));
       else:
         self.dispatchEvent(GFEvent('formALERT','Field is readonly'))
 
@@ -585,24 +582,6 @@
              currentvalue[self.currentEntry.cursorPosition+1:]
     self.currentEntry.setValue(currentvalue)
 
-#    self.dispatchEvent(GFEvent('updateENTRY',self.currentEntry));
-                                          
-    
-  #
-  # requireLogin
-  #
-  # Tells the UI to prompt for username/password and
-  # blocks until it gets them
-  #
-#  def uiInitialized(self,event):
-#
-#    self.loginInProgress = 1
-#    print "login required"
-#    self.dispatchEvent(GFEvent('requireLOGIN',self))
-#
-#    while self.loginInProgress:
-#      print "We're up dude!"
-#      pass
 
   def msgBox(self, event):
     self.dispatchEvent( GFEvent('msgBoxUI', event.data))
Index: gnue/gnuef/src/GFObjects.py
diff -u gnue/gnuef/src/GFObjects.py:1.46 gnue/gnuef/src/GFObjects.py:1.47
--- gnue/gnuef/src/GFObjects.py:1.46    Fri Dec 15 19:32:11 2000
+++ gnue/gnuef/src/GFObjects.py Sat Dec 16 13:32:22 2000
@@ -207,6 +207,12 @@
     if event.data == self:
       self.dataSourceLink.new()
       self.recordCount = self.dataSourceLink.getLastRecordNumber()
+
+      if hasattr(self,"master"):
+        masterBlock,masterField = string.split(self.master,'.')
+        fieldValue = self.form.findValue(masterBlock, masterField)
+        if len(fieldValue) > 0:
+          self.dataSourceLink.setField(self.recordCount,self.detail,fieldValue)
       
       oldRecord = self.currentRecord
       self.currentRecord = 0
@@ -542,7 +548,7 @@
           print "will be passing"
           print mask
                                                   
-        if self.resultSetStatus[count] == 'modified':
+        if self.resultSetStatus[count] in ('modified', 'Deleted'):
           if self.resultSet[count].has_key(self.dataConnection.uniqueKey):
             if self.resultSet[count][self.dataConnection.uniqueKey] == 
'delete':
               # record never in database so just mark for cleanup
@@ -600,7 +606,7 @@
         self.resultSet[recordNumber][self.dataConnection.uniqueKey] = \
         int(self.resultSet[recordNumber][self.dataConnection.uniqueKey]) * -1
 
-    self.resultSetStatus[recordNumber] = 'modified'
+    self.resultSetStatus[recordNumber] = 'Deleted'
     if GFOptions.DEBUG:
       print "removing object: %s" % 
(self.resultSet[recordNumber][self.dataConnection.uniqueKey])
 
Index: gnue/gnuef/src/drivers/postgresql/DBdriver.py
diff -u gnue/gnuef/src/drivers/postgresql/DBdriver.py:1.8 
gnue/gnuef/src/drivers/postgresql/DBdriver.py:1.9
--- gnue/gnuef/src/drivers/postgresql/DBdriver.py:1.8   Fri Dec 15 19:32:11 2000
+++ gnue/gnuef/src/drivers/postgresql/DBdriver.py       Sat Dec 16 13:32:22 2000
@@ -44,7 +44,6 @@
       if mask[fieldname] == None or len(mask[fieldname]) == 0:
         del mask[fieldname]
         
-    print "The mask is ", mask
     self.connection.insert(table,mask)
     return mask