[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue common/etc/sample.report-filters.conf comm...
|
From: |
Jason Cater |
|
Subject: |
gnue common/etc/sample.report-filters.conf comm... |
|
Date: |
Tue, 10 Sep 2002 11:15:22 -0400 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Branch: forms-input-mask
Changes by: Jason Cater <address@hidden> 02/09/10 11:15:22
Modified files:
common/etc : sample.report-filters.conf
common/src/FormatMasks: BaseMask.py DateMask.py
common/src/dbdrivers/_dbsig: DBdriver.py
forms/src : GFClient.py GFDisplayHandler.py GFForm.py
GFInstance.py GFParser.py
forms/src/GFObjects: GFBox.py GFEntry.py __init__.py
Added files:
forms/src/GFObjects: GFParameter.py
Log message:
added support for command-line parameters
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/etc/sample.report-filters.conf.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/FormatMasks/BaseMask.py.diff?only_with_tag=forms-input-mask&tr1=1.16&tr2=1.16.2.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/FormatMasks/DateMask.py.diff?only_with_tag=forms-input-mask&tr1=1.23&tr2=1.23.2.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/_dbsig/DBdriver.py.diff?tr1=1.53&tr2=1.54&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFClient.py.diff?only_with_tag=forms-input-mask&tr1=1.46&tr2=1.46.2.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFDisplayHandler.py.diff?only_with_tag=forms-input-mask&tr1=1.30.2.1&tr2=1.30.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFForm.py.diff?only_with_tag=forms-input-mask&tr1=1.170&tr2=1.170.2.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFInstance.py.diff?only_with_tag=forms-input-mask&tr1=1.56&tr2=1.56.2.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFParser.py.diff?only_with_tag=forms-input-mask&tr1=1.69&tr2=1.69.2.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFParameter.py?only_with_tag=forms-input-mask&rev=1.1.2.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFBox.py.diff?only_with_tag=forms-input-mask&tr1=1.3&tr2=1.3.6.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/GFEntry.py.diff?only_with_tag=forms-input-mask&tr1=1.64.2.1&tr2=1.64.2.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFObjects/__init__.py.diff?only_with_tag=forms-input-mask&tr1=1.2&tr2=1.2.8.1&r1=text&r2=text
Patches:
Index: gnue/common/etc/sample.report-filters.conf
diff -c gnue/common/etc/sample.report-filters.conf:1.11
gnue/common/etc/sample.report-filters.conf:1.12
*** gnue/common/etc/sample.report-filters.conf:1.11 Wed Aug 7 19:29:18 2002
--- gnue/common/etc/sample.report-filters.conf Tue Sep 10 11:15:22 2002
***************
*** 48,53 ****
--- 48,57 ----
engine = merge_rtf
template =
/home/jason/cvs/gnue/reports/samples/mailmerge/gnue-intro-letter.abiword.rtf
+ [mailmerge:authorizations-rh.rtf]
+ description = Reading At Home Authorizations
+ engine = merge_rtf
+ template = /public/data/merge-reports/authorizations-rh.rtf
#
# It is not necessary to define 'raw' drivers
Index: gnue/common/src/FormatMasks/BaseMask.py
diff -c gnue/common/src/FormatMasks/BaseMask.py:1.16
gnue/common/src/FormatMasks/BaseMask.py:1.17
*** gnue/common/src/FormatMasks/BaseMask.py:1.16 Mon Jul 15 04:22:02 2002
--- gnue/common/src/FormatMasks/BaseMask.py Sat Aug 24 21:05:26 2002
***************
*** 29,35 ****
from gnue.common import GDebug
from FormatExceptions import *
! # TODO: i18n
# import locale
# locale.nl_langinfo( option)
#
--- 29,35 ----
from gnue.common import GDebug
from FormatExceptions import *
! # TODO: i18n
# import locale
# locale.nl_langinfo( option)
#
***************
*** 160,181 ****
# Take a mask string and break it into its elements and map it to handlers
! def parseMask(self, mask):
GDebug.printMesg(15,'parseMask("%s")' % mask)
maskHandler = []
# Load a predefined mask, if that's what user specified
# TODO: Should predefined masks be pulled from other than gnue.conf?
if len(mask) > 1 and mask[0] == '&':
! if mask[1:] == self.basetype:
! mask = gConfig('%smask' % self.basetype, self.defaultmask)
! else:
! try:
! mask = gConfig('%smask_%s' % (self.basetype, mask[1:]))
! except KeyError:
! raise PredefinedMaskNotFound, \
! _('The requested format mask "%s" is not defined for %s
fields') \
! % (mask[1:], self.basetype)
# Process each character in mask at a time
isLiteral = 0
--- 160,188 ----
# Take a mask string and break it into its elements and map it to handlers
! def parseMask(self, mask, edit=0):
GDebug.printMesg(15,'parseMask("%s")' % mask)
maskHandler = []
# Load a predefined mask, if that's what user specified
# TODO: Should predefined masks be pulled from other than gnue.conf?
if len(mask) > 1 and mask[0] == '&':
! for i in range(edit+1):
! edstr = ('edit','')[i]
! if mask[1:] == self.basetype:
! try:
! mask = gConfig('%s%smask' % (self.basetype, edstr),
self.defaultmask)
! except KeyError:
! pass
! else:
! try:
! mask = gConfig('%smask_%s' % (self.basetype, edstr, mask[1:]))
! except KeyError:
! pass
! if not len(mask):
! raise PredefinedMaskNotFound, \
! _('The requested format mask "%s" is not defined for %s
fields') \
! % (mask[1:], self.basetype)
# Process each character in mask at a time
isLiteral = 0
Index: gnue/common/src/FormatMasks/DateMask.py
diff -c gnue/common/src/FormatMasks/DateMask.py:1.22
gnue/common/src/FormatMasks/DateMask.py:1.23
*** gnue/common/src/FormatMasks/DateMask.py:1.22 Mon May 6 22:27:04 2002
--- gnue/common/src/FormatMasks/DateMask.py Mon Jul 15 04:22:02 2002
***************
*** 58,111 ****
from gnue.common.GDateTime import GDateTime, InvalidDate
from FormatExceptions import *
- # TODO: This is obviously not Internationalized!
- # TODO (after some time...): will have to check whether it works...
- monthNames = [ _('January'),
- _('February'),
- _('March'),
- _('April'),
- _('May'),
- _('June'),
- _('July'),
- _('August'),
- _('September'),
- _('October'),
- _('November'),
- _('December')]
-
- monthAbbrevNames = [_('Jan'),
- _('Feb'),
- _('Mar'),
- _('Apr'),
- _('May'),
- _('Jun'),
- _('Jul'),
- _('Aug'),
- _('Sep'),
- _('Oct'),
- _('Nov'),
- _('Dec')]
-
- weekdayNames = [_('Sunday'),
- _('Monday'),
- _('Tuesday'),
- _('Wednesday'),
- _('Thursday'),
- _('Friday'),
- _('Saturday')]
-
- weekdayAbbrevNames = [_('Sun'),
- _('Mon'),
- _('Tue'),
- _('Wed'),
- _('Thu'),
- _('Fri'),
- _('Sat')]
-
-
- predefinedDateLiterals = "-./: ,"
-
-
class DateLiteral (Literal):
def addSelfToDate(self, value, date):
pass
--- 58,63 ----
Index: gnue/common/src/dbdrivers/_dbsig/DBdriver.py
diff -c gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.53
gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.54
*** gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.53 Thu Jul 18 14:18:32 2002
--- gnue/common/src/dbdrivers/_dbsig/DBdriver.py Tue Sep 10 11:15:22 2002
***************
*** 167,172 ****
--- 167,175 ----
return 0
return 1
else:
+ # We no longer need the cursor if we are read only
+ if self._readonly:
+ self._cursor.close()
return 0
else:
return 0
Index: gnue/forms/src/GFClient.py
diff -c gnue/forms/src/GFClient.py:1.45 gnue/forms/src/GFClient.py:1.46
*** gnue/forms/src/GFClient.py:1.45 Tue Jun 4 19:20:47 2002
--- gnue/forms/src/GFClient.py Mon Jul 1 20:32:47 2002
***************
*** 112,122 ****
self._ui = dyn_import("gnue.forms.uidrivers.%s" % (self.ui_type))
uiloaded = 1
except ImportError, err:
! GDebug.printMesg(0,'Unable to load UI driver %s' % (self.ui_type))
GDebug.printMesg(1,err)
if self.ui_type != 'nstti':
self.ui_type = 'nstti'
else:
sys.exit()
self.loadKeyMappings()
--- 112,123 ----
self._ui = dyn_import("gnue.forms.uidrivers.%s" % (self.ui_type))
uiloaded = 1
except ImportError, err:
! GDebug.printMesg(1,_("Unable to load UI driver")+" %s" % self.ui_type)
GDebug.printMesg(1,err)
if self.ui_type != 'nstti':
self.ui_type = 'nstti'
else:
+ self.handleStartupError(_("Unable to load any valid UI drivers.
Aborting."))
sys.exit()
self.loadKeyMappings()
Index: gnue/forms/src/GFDisplayHandler.py
diff -c gnue/forms/src/GFDisplayHandler.py:1.31
gnue/forms/src/GFDisplayHandler.py:1.32
*** gnue/forms/src/GFDisplayHandler.py:1.31 Sat Aug 24 21:05:26 2002
--- gnue/forms/src/GFDisplayHandler.py Mon Aug 26 13:54:02 2002
***************
*** 35,48 ****
try:
from mx.DateTime import DateTime
except ImportError:
! raise """
This GNUe tool requires mxDateTime to be installed
! You can find the mxDateTime at
http://www.lemburg.com/files/python/mxDateTime.html
"""
#############################################################################
#
--- 35,50 ----
try:
from mx.DateTime import DateTime
except ImportError:
! print """
This GNUe tool requires mxDateTime to be installed
! You can find the mxDateTime at
http://www.lemburg.com/files/python/mxDateTime.html
"""
+ import sys
+ sys.exit()
#############################################################################
#
***************
*** 492,498 ****
class NumberDisplayHandler(FieldDisplayHandler):
def __init__(self, entry, eventHandler, displayMask, inputMask):
## FieldDisplayHandler.__init__(self, entry, eventHandler,
! ## DateMask.DateMask(displayMask, inputMask))
FieldDisplayHandler.__init__(self, entry, eventHandler, None)
--- 494,500 ----
class NumberDisplayHandler(FieldDisplayHandler):
def __init__(self, entry, eventHandler, displayMask, inputMask):
## FieldDisplayHandler.__init__(self, entry, eventHandler,
! ## DateMask.DateMask(displayMask, inputMask, displayMask))
FieldDisplayHandler.__init__(self, entry, eventHandler, None)
***************
*** 570,581 ****
#
class DateDisplayHandler(FieldDisplayHandler):
def __init__(self, entry, eventHandler, displayMask, inputMask):
!
! if not self.displayMask:
!
! FieldDisplayHandler.__init__(self, entry, eventHandler,
! DateMask.DateMask(displayMask, inputMask))
! ## FieldDisplayHandler.__init__(self, entry, eventHandler, None)
def setValue(self, value):
--- 572,580 ----
#
class DateDisplayHandler(FieldDisplayHandler):
def __init__(self, entry, eventHandler, displayMask, inputMask):
! ## FieldDisplayHandler.__init__(self, entry, eventHandler,
! ## DateMask.DateMask(displayMask, inputMask, displayMask))
! FieldDisplayHandler.__init__(self, entry, eventHandler, None)
def setValue(self, value):
***************
*** 585,595 ****
# TODO: Replace with format mask
def _buildDisplayHelper(self, value, editing):
if editing:
! self.formatter.getFormattedInput(value)
! ## format = "%m/%d/%Y"
else:
! self.formatter.getFormattedOutput(value)
! ## format = "%m/%d/%y"
if value in (None,""):
return ""
--- 584,592 ----
# TODO: Replace with format mask
def _buildDisplayHelper(self, value, editing):
if editing:
! format = "%m/%d/%Y"
else:
! format = "%m/%d/%y"
if value in (None,""):
return ""
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.169 gnue/forms/src/GFForm.py:1.170
*** gnue/forms/src/GFForm.py:1.169 Sat Jun 15 15:51:35 2002
--- gnue/forms/src/GFForm.py Sat Jun 15 17:15:08 2002
***************
*** 46,52 ****
# Defines which objects are "Tab Stops"
TabStops = ('GFEntry','GFButton')
- #TabStops = ('GFEntry',)
class GFForm(GFObj, GRootObj, GFEventAware):
def __init__(self, parent=None, app=None):
--- 46,51 ----
***************
*** 187,193 ****
entry = None
if isinstance(object, GFObj):
! if object._type == 'GFEntry' and not object.hidden:
return object
else:
for child in object._children:
--- 186,194 ----
entry = None
if isinstance(object, GFObj):
! if (object._type in TabStops and
! (not object.hidden) and ((not object.readonly) or
! (self._currentBlock.mode=='query' and object._queryable))):
return object
else:
for child in object._children:
***************
*** 547,562 ****
lastEntry = self._currentEntry
for object in self._currentEntry._block._children:
! if object._type in TabStops and \
! not object.hidden and (not object.readonly or \
! (self._currentBlock.mode=='query' and object._queryable)):
nextEntry = object
lastEntry = object
keepNext = 0
for object in self._currentEntry._block._children:
# Put the first field as the next to rollover
! if object._type in TabStops and not object.hidden and not
object.readonly:
if object == self._currentEntry:
break
--- 548,565 ----
lastEntry = self._currentEntry
for object in self._currentEntry._block._children:
! if (object._type in TabStops and
! (not object.hidden) and ((not object.readonly) or
! (self._currentBlock.mode=='query' and object._queryable))):
nextEntry = object
lastEntry = object
keepNext = 0
for object in self._currentEntry._block._children:
# Put the first field as the next to rollover
! if (object._type in TabStops and
! (not object.hidden) and ((not object.readonly) or
! (self._currentBlock.mode=='query' and object._queryable))):
if object == self._currentEntry:
break
Index: gnue/forms/src/GFInstance.py
diff -c gnue/forms/src/GFInstance.py:1.55 gnue/forms/src/GFInstance.py:1.56
*** gnue/forms/src/GFInstance.py:1.55 Mon Jul 1 19:09:14 2002
--- gnue/forms/src/GFInstance.py Thu Jul 4 14:53:04 2002
***************
*** 552,558 ****
self._entryUpdated()
!
def _handlePreCommit(self, event, trigger):
try:
block = event.record._parent._block
--- 552,558 ----
self._entryUpdated()
!
def _handlePreCommit(self, event, trigger):
try:
block = event.record._parent._block
***************
*** 563,568 ****
--- 563,571 ----
block._preCommitWorkingRecord = event.record
block.mode = 'precommit'
block.processTrigger(trigger)
+ for child in block._children:
+ if child._type == 'GFEntry':
+ child.processTrigger(trigger)
block.mode = saveMode
Index: gnue/forms/src/GFObjects/GFBox.py
diff -c gnue/forms/src/GFObjects/GFBox.py:1.2
gnue/forms/src/GFObjects/GFBox.py:1.3
*** gnue/forms/src/GFObjects/GFBox.py:1.2 Wed Jul 18 18:45:01 2001
--- gnue/forms/src/GFObjects/GFBox.py Mon Oct 8 08:38:14 2001
***************
*** 16,22 ****
# write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
#
! # Copyright 2000. 2001 Free Software Foundation
#
#
# FILE:
--- 16,22 ----
# write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
#
! # Copyright 2000, 2001 Free Software Foundation
#
#
# FILE:
Index: gnue/forms/src/GFObjects/GFEntry.py
diff -c gnue/forms/src/GFObjects/GFEntry.py:1.65
gnue/forms/src/GFObjects/GFEntry.py:1.66
*** gnue/forms/src/GFObjects/GFEntry.py:1.65 Sat Aug 24 21:05:26 2002
--- gnue/forms/src/GFObjects/GFEntry.py Mon Aug 26 13:54:02 2002
***************
*** 60,65 ****
--- 60,67 ----
self._allowedValues = None
self._allowedValuesDescr = [""]
+ self._maskHandler = None
+
self._rows = 1
self._gap = 0
***************
*** 185,190 ****
--- 187,193 ----
for field in [self.fk_key] + self._fk_descr:
self._fk_datasource.referenceField(field, None)
+
if hasattr(self, 'queryDefault') and \
self.queryDefault != None and \
self._bound and \
***************
*** 195,217 ****
# Create an appropriate display handler
if self.style == 'checkbox':
self._displayHandler = GFDisplayHandler.CheckboxDisplayHandler(self,
! self._block._form._app.eventController)
elif self.style == 'dropdown':
self._displayHandler = GFDisplayHandler.DropdownDisplayHandler(self,
! self._block._form._app.eventController)
elif self.typecast == 'text':
self._displayHandler = GFDisplayHandler.TextDisplayHandler(self,
self._block._form._app.eventController,
! self._inputmask, self._displaymask)
elif self.typecast == 'number':
self._displayHandler = GFDisplayHandler.NumberDisplayHandler(self,
self._block._form._app.eventController,
self._inputmask, self._displaymask)
elif self.typecast == 'date':
self._displayHandler = GFDisplayHandler.DateDisplayHandler(self,
! self._block._form._app.eventController,
! self._inputmask, self._displaymask)
!
def isQueryable(self):
return self._queryable
--- 198,218 ----
# Create an appropriate display handler
if self.style == 'checkbox':
self._displayHandler = GFDisplayHandler.CheckboxDisplayHandler(self,
! self._block._form._app.eventController, self._maskHandler)
elif self.style == 'dropdown':
self._displayHandler = GFDisplayHandler.DropdownDisplayHandler(self,
! self._block._form._app.eventController, self._maskHandler)
elif self.typecast == 'text':
self._displayHandler = GFDisplayHandler.TextDisplayHandler(self,
self._block._form._app.eventController,
! self._inputmask, self._displaymask, self._formatmask)
elif self.typecast == 'number':
self._displayHandler = GFDisplayHandler.NumberDisplayHandler(self,
self._block._form._app.eventController,
self._inputmask, self._displaymask)
elif self.typecast == 'date':
self._displayHandler = GFDisplayHandler.DateDisplayHandler(self,
! self._block._form._app.eventController, self._inputmask,
self._displaymask)
def isQueryable(self):
return self._queryable
Index: gnue/forms/src/GFObjects/__init__.py
diff -c gnue/forms/src/GFObjects/__init__.py:1.1
gnue/forms/src/GFObjects/__init__.py:1.2
*** gnue/forms/src/GFObjects/__init__.py:1.1 Fri Jun 29 18:55:58 2001
--- gnue/forms/src/GFObjects/__init__.py Sat Jun 30 01:03:07 2001
***************
*** 16,22 ****
]
for module in __all__:
! exec "from %s import %s" % (module,module)
# print "importing", module
# __import__(module,globals(), locals(), [module])
--- 16,22 ----
]
for module in __all__:
! exec "from gnue.forms.GFObjects.%s import %s" % (module,module)
# print "importing", module
# __import__(module,globals(), locals(), [module])
Index: gnue/forms/src/GFParser.py
diff -c gnue/forms/src/GFParser.py:1.68 gnue/forms/src/GFParser.py:1.69
*** gnue/forms/src/GFParser.py:1.68 Thu Jul 4 03:04:06 2002
--- gnue/forms/src/GFParser.py Thu Jul 4 18:36:07 2002
***************
*** 148,154 ****
'Attributes': {
'name': {
'Unique': 1,
! 'Typecast': GTypecast.name } },
'ParentTags': ('form',) },
'block': {
--- 148,156 ----
'Attributes': {
'name': {
'Unique': 1,
! 'Typecast': GTypecast.name },
! 'caption': {
! 'Typecast': GTypecast.text } },
'ParentTags': ('form',) },
'block': {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue common/etc/sample.report-filters.conf comm...,
Jason Cater <=