gnue/designer/src base/Instance.py forms/Instan...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/12/22 22:36:24

Modified files:
        designer/src/base: Instance.py 
        designer/src/forms: Instance.py 
        designer/src/reports: Instance.py 
        designer/src/templates/reports: Labels.py MailMerge.py 
                                        SimpleReport.py 

Log message:
        more wizard updates

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/base/Instance.py.diff?tr1=1.78&tr2=1.79&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/forms/Instance.py.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/reports/Instance.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/templates/reports/Labels.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/templates/reports/MailMerge.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/templates/reports/SimpleReport.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: gnue/designer/src/base/Instance.py
diff -c gnue/designer/src/base/Instance.py:1.78 
gnue/designer/src/base/Instance.py:1.79
*** gnue/designer/src/base/Instance.py:1.78     Sun Dec 22 20:31:38 2002
--- gnue/designer/src/base/Instance.py  Sun Dec 22 22:36:23 2002
***************
*** 86,92 ****
  
    # Used by TemplateParser to build a wizard.current dict
    def buildWizardCurrentDict(self):
!     return {}
  
    ########################################################################
    #
--- 86,92 ----
  
    # Used by TemplateParser to build a wizard.current dict
    def buildWizardCurrentDict(self):
!     return {'object': self._currentObject}
  
    ########################################################################
    #
Index: gnue/designer/src/forms/Instance.py
diff -c gnue/designer/src/forms/Instance.py:1.27 
gnue/designer/src/forms/Instance.py:1.28
*** gnue/designer/src/forms/Instance.py:1.27    Sat Dec 21 15:36:16 2002
--- gnue/designer/src/forms/Instance.py Sun Dec 22 22:36:24 2002
***************
*** 234,241 ****
              'block': self.visualEditor.block,
              'object': self._currentObject}
  
!   # Hack having to do with UIwxpython import
!   def uiEventTrap(self, event):
!     pass
  
  
--- 234,241 ----
              'block': self.visualEditor.block,
              'object': self._currentObject}
  
! #  # Hack having to do with UIwxpython import
! #  def uiEventTrap(self, event):
! #    pass
  
  
Index: gnue/designer/src/reports/Instance.py
diff -c gnue/designer/src/reports/Instance.py:1.11 
gnue/designer/src/reports/Instance.py:1.12
*** gnue/designer/src/reports/Instance.py:1.11  Sat Dec 21 01:30:28 2002
--- gnue/designer/src/reports/Instance.py       Sun Dec 22 22:36:24 2002
***************
*** 52,57 ****
--- 52,68 ----
      #self._tableMappings = {}
      BaseInstance.__init__(self, app, *args, **params)
  
+     report = self.rootObject
+     report._parameters = report.findChildOfType('GRParameters') or \
+         self.incubator.createObject(report, 'parameters', report, select=0)
+     report._sortoptions = report.findChildOfType('GRSortOptions') or \
+         self.incubator.createObject(report, 'sortoptions', report, select=0)
+     report._sources = report.findChildOfType('GRSources') or \
+         self.incubator.createObject(report, 'sources', report, select=0)
+     report._layout = report.findChildOfType('GRLayout') or \
+         self.incubator.createObject(report, 'layout', report, select=0)
+ 
+ 
  
    def loadBuffer(self, buffer):
      report = GRParser.loadFile (buffer, self, initialize=0)
***************
*** 114,128 ****
    def createWizards(self):
      self.loadWizards(wizards)
  
  
    def preSave(self):
-     pass
- 
-   # Hack having to do with UIwxpython import
-   def uiEventTrap(self, event):
-     pass
- 
- 
  
  
  
--- 125,148 ----
    def createWizards(self):
      self.loadWizards(wizards)
  
+   # Used by TemplateParser to build a wizard.current dict
+   def buildWizardCurrentDict(self):
+     report = self.rootObject
+     return { 'report': report,
+              'sources': report._sources,
+              'parameters': report._parameters,
+              'layout': report._layout,
+              'sortoptions': report._sortoptions,
+              'object': self._currentObject }
  
    def preSave(self):
  
+     # Resort the main sections to a logical order
+     report = self.rootObject
+     for o in [report._parameters, report._sortoptions,
+               report._sources, report._layout]:
+       report._children.pop(report._children.index(o))
+       if len(o._children):
+         report._children.append(p)
  
  
Index: gnue/designer/src/templates/reports/Labels.py
diff -c gnue/designer/src/templates/reports/Labels.py:1.3 
gnue/designer/src/templates/reports/Labels.py:1.4
*** gnue/designer/src/templates/reports/Labels.py:1.3   Fri Dec 20 03:47:25 2002
--- gnue/designer/src/templates/reports/Labels.py       Sun Dec 22 22:36:24 2002
***************
*** 53,59 ****
    #
    def Start(self, report, current):
      self.report = report
! 
  
  
    ###############
--- 53,59 ----
    #
    def Start(self, report, current):
      self.report = report
!     self.current = current
  
  
    ###############
***************
*** 148,160 ****
        tableKey = string.upper(self.variables['table'][0]) + \
                      string.replace(self.variables['table'][1:],' ','_')
  
!     sources = None
!     for child in self.report._children:
!       if child._type == 'GRSources':
!         sources = child
!         break
!     if not sources:
!       sources = self.AddElement('sources', self.report, {})
  
      # Create a single datasource based on user's input
      datasource = self.AddElement('datasource', sources,
--- 148,159 ----
        tableKey = string.upper(self.variables['table'][0]) + \
                      string.replace(self.variables['table'][1:],' ','_')
  
! 
!     # Get the common report objects
!     report = self.report
!     sources = self.current['sources']
!     layout = self.current['layout']
! 
  
      # Create a single datasource based on user's input
      datasource = self.AddElement('datasource', sources,
***************
*** 175,197 ****
        if field.name in self.variables['fields']:
          fields[field.name] = field
  
! 
!     layout = None
!     for child in self.report._children:
!       if child._type == 'GRLayout':
!         layout = child
!         break
!     if not layout:
!       layout = self.AddElement('layout', self.report, {})
! 
!     self.report.findChildOfType('GRLayout')._xmlchildnamespace = 
'GNUe:Reports:Labels'
  
      out_labels = self.AddElement('out:labels', layout, {})
      section = self.AddElement('section', out_labels, {'source': 
datasource.name})
      out_label = self.AddElement('out:label', section, {})
      out_region = self.AddElement('out:region', out_label, {'name':"primary"})
  
! # Add each field
      for name in self.variables['fields']:
        field = fields[name]
        out_line = self.AddElement('out:line', out_region, {})
--- 174,187 ----
        if field.name in self.variables['fields']:
          fields[field.name] = field
  
!     layout._xmlchildnamespace = 'GNUe:Reports:Labels'
  
      out_labels = self.AddElement('out:labels', layout, {})
      section = self.AddElement('section', out_labels, {'source': 
datasource.name})
      out_label = self.AddElement('out:label', section, {})
      out_region = self.AddElement('out:region', out_label, {'name':"primary"})
  
!     # Add each field
      for name in self.variables['fields']:
        field = fields[name]
        out_line = self.AddElement('out:line', out_region, {})
Index: gnue/designer/src/templates/reports/MailMerge.py
diff -c gnue/designer/src/templates/reports/MailMerge.py:1.3 
gnue/designer/src/templates/reports/MailMerge.py:1.4
*** gnue/designer/src/templates/reports/MailMerge.py:1.3        Fri Dec 20 
03:47:25 2002
--- gnue/designer/src/templates/reports/MailMerge.py    Sun Dec 22 22:36:24 2002
***************
*** 53,59 ****
    #
    def Start(self, report, current):
      self.report = report
! 
  
  
    ###############
--- 53,59 ----
    #
    def Start(self, report, current):
      self.report = report
!     self.current = current
  
  
    ###############
***************
*** 148,160 ****
        tableKey = string.upper(self.variables['table'][0]) + \
                      string.replace(self.variables['table'][1:],' ','_')
  
!     sources = None
!     for child in self.report._children:
!       if child._type == 'GRSources':
!         sources = child
!         break
!     if not sources:
!       sources = self.AddElement('sources', self.report, {})
  
      # Create a single datasource based on user's input
      datasource = self.AddElement('datasource', sources,
--- 148,157 ----
        tableKey = string.upper(self.variables['table'][0]) + \
                      string.replace(self.variables['table'][1:],' ','_')
  
!     # Get the common report objects
!     report = self.report
!     sources = self.current['sources']
!     layout = self.current['layout']
  
      # Create a single datasource based on user's input
      datasource = self.AddElement('datasource', sources,
***************
*** 175,190 ****
        if field.name in self.variables['fields']:
          fields[field.name] = field
  
! 
!     layout = None
!     for child in self.report._children:
!       if child._type == 'GRLayout':
!         layout = child
!         break
!     if not layout:
!       layout = self.AddElement('layout', self.report, {})
! 
!     self.report.findChildOfType('GRLayout')._xmlchildnamespace = 
'GNUe:Reports:MailMerge'
  
      out_mailmerge = self.AddElement('out:mailmerge', layout, {})
      section = self.AddElement('section', out_mailmerge, {'source': 
datasource.name})
--- 172,178 ----
        if field.name in self.variables['fields']:
          fields[field.name] = field
  
!     layout._xmlchildnamespace = 'GNUe:Reports:MailMerge'
  
      out_mailmerge = self.AddElement('out:mailmerge', layout, {})
      section = self.AddElement('section', out_mailmerge, {'source': 
datasource.name})
Index: gnue/designer/src/templates/reports/SimpleReport.py
diff -c gnue/designer/src/templates/reports/SimpleReport.py:1.5 
gnue/designer/src/templates/reports/SimpleReport.py:1.6
*** gnue/designer/src/templates/reports/SimpleReport.py:1.5     Fri Dec 20 
03:47:25 2002
--- gnue/designer/src/templates/reports/SimpleReport.py Sun Dec 22 22:36:24 2002
***************
*** 53,59 ****
    #
    def Start(self, report, current):
      self.report = report
! 
  
  
    ###############
--- 53,59 ----
    #
    def Start(self, report, current):
      self.report = report
!     self.current = current
  
  
    ###############
***************
*** 152,167 ****
        tableKey = string.upper(self.variables['table'][0]) + \
                      string.replace(self.variables['table'][1:],' ','_')
  
      # Set the basic attributes of the report
!     self.ModifyElement(self.report, title=self.variables['title'])
! 
!     sources = None
!     for child in self.report._children:
!       if child._type == 'GRSources':
!         sources = child
!         break
!     if not sources:
!       sources = self.AddElement('sources', self.report, {})
  
      # Create a single datasource based on user's input
      datasource = self.AddElement('datasource', sources,
--- 152,164 ----
        tableKey = string.upper(self.variables['table'][0]) + \
                      string.replace(self.variables['table'][1:],' ','_')
  
+     # Get the common report objects
+     report = self.report
+     sources = self.current['sources']
+     layout = self.current['layout']
+ 
      # Set the basic attributes of the report
!     report['title'] = self.variables['title']
  
      # Create a single datasource based on user's input
      datasource = self.AddElement('datasource', sources,
***************
*** 182,197 ****
        if field.name in self.variables['fields']:
          fields[field.name] = field
  
! 
!     layout = None
!     for child in self.report._children:
!       if child._type == 'GRLayout':
!         layout = child
!         break
!     if not layout:
!       layout = self.AddElement('layout', self.report, {})
! 
!     self.report.findChildOfType('GRLayout')._xmlchildnamespace = 
'GNUe:Reports:SimpleTabulation'
  
      out_report = self.AddElement('out:report', layout, {})
      out_reportTitle = self.AddElement('out:reportTitle', out_report, {}, 
content=self.variables['title'])
--- 179,186 ----
        if field.name in self.variables['fields']:
          fields[field.name] = field
  
! 
!     layout._xmlchildnamespace = 'GNUe:Reports:SimpleTabulation'
  
      out_report = self.AddElement('out:report', layout, {})
      out_reportTitle = self.AddElement('out:reportTitle', out_report, {}, 
content=self.variables['title'])
***************
*** 207,217 ****
        elif field.datatype == 'date':
          attrs['align'] = "center"
        out_colhead = self.AddElement('out:colhead', out_tablehead, attrs, 
content=field.name)
!     
      section = self.AddElement('section', out_table, {'name': "detailes", 
'source': datasource.name})
      out_row = self.AddElement('out:row', section, {})
  
! # Add each field
      for name in self.variables['fields']:
        field = fields[name]
        attrs = {}
--- 196,206 ----
        elif field.datatype == 'date':
          attrs['align'] = "center"
        out_colhead = self.AddElement('out:colhead', out_tablehead, attrs, 
content=field.name)
! 
      section = self.AddElement('section', out_table, {'name': "detailes", 
'source': datasource.name})
      out_row = self.AddElement('out:row', section, {})
  
!     # Add each field
      for name in self.variables['fields']:
        field = fields[name]
        attrs = {}