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

Apply places changes to the narrativeweb. (#547)

Browse Source 
* Apply places changes to the narrativeweb.

Also change order between locations and locations alternate names.

Fixes #10427

* Put the alternate locations back.

* Suppress extra line in Alternate Names section.
This commit is contained in:
Serge Noiraud 2018-02-16 11:10:01 +01:00 committed by GitHub
parent e202f5cd19
commit db263ff905
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
gramps/plugins/webreport/basepage.py
View File

@ -2560,6 +2560,44 @@ class BasePage: # pylint: disable=C1001
)
tbody += trow
# display all related locations
for placeref in place.get_placeref_list():
place_date = self.rlocale.get_date(placeref.get_date_object())
if place_date != "":
parent_place = self.r_db.get_place_from_handle(placeref.ref)
parent_name = parent_place.get_name().get_value()
trow = Html('tr') + (
Html("td", self._("Locations"), class_="ColumnAttribute",
inline=True),
Html("td", parent_name, class_="ColumnValue", inline=True),
Html("td", place_date, class_="ColumnValue", inline=True)
)
tbody += trow
altloc = place.get_alternative_names()
if altloc:
tbody += Html("tr") + Html("td", " ", colspan=2)
trow = Html("tr") + (
Html("th", self._("Alternate Names"), colspan=1,
class_="ColumnAttribute", inline=True),
Html("th", self._("Language"), colspan=1,
class_="ColumnAttribute", inline=True),
Html("th", self._("Date range in which the name is valid."), colspan=1,
class_="ColumnAttribute", inline=True),
)
tbody += trow
for loc in altloc:
place_date = self.rlocale.get_date(loc.date)
trow = Html("tr") + (
Html("td", loc.get_value(), class_="ColumnValue",
inline=True),
Html("td", loc.get_language(), class_="ColumnValue",
inline=True),
Html("td", place_date, class_="ColumnValue",
inline=True),
)
tbody += trow
altloc = place.get_alternate_locations()
if altloc:
tbody += Html("tr") + Html("td", " ", colspan=2)
@ -2587,20 +2625,6 @@ class BasePage: # pylint: disable=C1001
tbody += trow
tbody += Html("tr") + Html("td", " ", colspan=2)
# display all related locations
for placeref in place.get_placeref_list():
place_date = self.rlocale.get_date(placeref.get_date_object())
if place_date != "":
parent_place = self.r_db.get_place_from_handle(placeref.ref)
parent_name = parent_place.get_name().get_value()
trow = Html('tr') + (
Html("td", self._("Locations"), class_="ColumnAttribute",
inline=True),
Html("td", parent_name, class_="ColumnValue", inline=True),
Html("td", place_date, class_="ColumnValue", inline=True)
)
tbody += trow
# return place table to its callers
return table