Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

3944: [NarWeb] Alternate Locations on places site in web report vers. 3.2.2

Browse Source 
svn: r15876
This commit is contained in:
Benny Malengier 2010-09-11 15:17:25 +00:00
parent 55afdd8296
commit de436d58ca
1 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/plugins/webreport/NarrativeWeb.py
View File

@ -125,7 +125,6 @@ DESCRHEAD = _("Description")
_EVENT = _("Event") _EVENT = _("Event")
GRAMPSID = _("Gramps ID") GRAMPSID = _("Gramps ID")
LATITUDE = _("Latitude") LATITUDE = _("Latitude")
LOCATIONS = _("Alternate Locations")
LONGITUDE = _("Longitude") LONGITUDE = _("Longitude")
NHEAD = _("Notes") NHEAD = _("Notes")
PARENTS = _("Parents") PARENTS = _("Parents")
@ -142,7 +141,7 @@ STREET = _("Street")
THEAD = _("Type") THEAD = _("Type")
TEMPLE = _("Temple") TEMPLE = _("Temple")
VHEAD = _("Value") VHEAD = _("Value")
ALTERNATE_LOCATIONS = _("Alternate Locations") ALT_LOCATIONS = _("Alternate Locations")
# initialize global variable # initialize global variable
place_lat_long = [] place_lat_long = []
@ -1946,7 +1945,7 @@ class BasePage(object):
(COUNTRY, ml.country), (COUNTRY, ml.country),
(LATITUDE, place.lat), (LATITUDE, place.lat),
(LONGITUDE, place.long), (LONGITUDE, place.long),
(ALTERNATE_LOCATIONS, place.get_alternate_locations() ) ]: (ALT_LOCATIONS, place.get_alternate_locations() ) ]:
if data: if data:
trow = Html("tr") + ( trow = Html("tr") + (
Html("td", label, class_ = "ColumnAttribute", inline = True), Html("td", label, class_ = "ColumnAttribute", inline = True),
@ -1954,6 +1953,30 @@ class BasePage(object):
) )
tbody += trow tbody += trow
altloc = place.get_alternate_locations()
if altloc:
table += Html("tr") + Html("td", " ", colspan = 2)
trow = Html("tr") + (
Html("th", ALT_LOCATIONS, colspan = 2, class_ = "ColumnAttribute", inline = True),
)
table += trow
for loc in (nonempt for nonempt in altloc if not nonempt.is_empty()):
for (label, data) in [
(STREET, loc.street),
(CITY, loc.city),
(PARISH, loc.parish),
(COUNTY, loc.county),
(STATE, loc.state),
(POSTAL, loc.postal),
(COUNTRY, loc.country),]:
if data:
trow = Html("tr") + (
Html("td", label, class_ = "ColumnAttribute", inline = True),
Html("td", data, class_ = "ColumnValue", inline = True)
)
table += trow
table += Html("tr") + Html("td", " ", colspan = 2)
# return place table to its callers # return place table to its callers
return table return table
@ -3435,12 +3458,12 @@ class SourceListPage(BasePage):
class SourcePage(BasePage): class SourcePage(BasePage):
def __init__(self, report, title, handle, src_list, gid = None): def __init__(self, report, title, handle, src_list):
db = report.database db = report.database
source = db.get_source_from_handle(handle) source = db.get_source_from_handle(handle)
if source is not None: if source is not None:
BasePage.__init__(self, report, title, gid) BasePage.__init__(self, report, title, source.gramps_id)
of = self.report.create_file(source.get_handle(), "src") of = self.report.create_file(source.get_handle(), "src")
self.up = True self.up = True
@ -3466,8 +3489,8 @@ class SourcePage(BasePage):
table += tbody table += tbody
grampsid = None grampsid = None
if not self.noid and gid: if not self.noid and self.gid:
grampsid = gid grampsid = self.gid
for (label, val) in [ for (label, val) in [
(GRAMPSID, grampsid), (GRAMPSID, grampsid),
@ -3957,9 +3980,9 @@ class IndividualPage(BasePage):
YCoordinates.sort() YCoordinates.sort()
MinY = YCoordinates[0] MinY = YCoordinates[0]
MaxY = YCoordinates[-1] MaxY = YCoordinates[-1]
spanY = int( Decimal( MaxY ) - Decimal( MinY ) ) spanY = int( Decimal( MaxY ) - Decimal( MinY ) )
spanX = int( Decimal( MaxX ) - Decimal( MinX ) ) spanX = int( Decimal( MaxX ) - Decimal( MinX ) )
# define smallset of Y and X span for span variables # define smallset of Y and X span for span variables
smallset = [num for num in xrange(-17, 0)] smallset = [num for num in xrange(-17, 0)]
@ -4000,14 +4023,14 @@ class IndividualPage(BasePage):
head += Html("script", src = url, type = "text/javascript", inline = True) head += Html("script", src = url, type = "text/javascript", inline = True)
# set map dimensions based on span of Y Coordinates # set map dimensions based on span of Y Coordinates
ymap = "" ymap = ""
if spanY in smallset: if spanY in smallset:
ymap = "small" ymap = "small"
elif spanY in middleset: elif spanY in middleset:
ymap = "middle" ymap = "middle"
elif spanY in largeset: elif spanY in largeset:
ymap = "large" ymap = "large"
ymap += "YMap" ymap += "YMap"
# begin familymap division # begin familymap division
with Html("div", class_ = "content", id = ymap) as mapbody: with Html("div", class_ = "content", id = ymap) as mapbody:
@ -4029,7 +4052,7 @@ class IndividualPage(BasePage):
xmap = "middle" xmap = "middle"
elif spanX in largeset: elif spanX in largeset:
xmap = "large" xmap = "large"
xmap += "XMap" xmap += "XMap"
# begin middle section division # begin middle section division
with Html("div", id = xmap) as middlesection: with Html("div", id = xmap) as middlesection:
@ -4044,10 +4067,10 @@ class IndividualPage(BasePage):
var map; var map;
function initialize() { function initialize() {
// create map object // create map object
map = new mxn.Mapstraction('familygooglev3', 'googlev3'); map = new mxn.Mapstraction('familygooglev3', 'googlev3');
// add map controls to image // add map controls to image
map.addControls({ map.addControls({
pan: true, pan: true,
@ -4096,8 +4119,8 @@ class IndividualPage(BasePage):
zoomlevel = 4 zoomlevel = 4
elif spanY in largeset: elif spanY in largeset:
zoomlevel = 4 zoomlevel = 4
else: else:
zoomlevel = 1 zoomlevel = 1
jsc += """ jsc += """
map.setCenterAndZoom(latlon, %d); map.setCenterAndZoom(latlon, %d);