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

Added spouse, sibling, and child relations to data entry gramplet; still missing parent and bugs in finding families

Browse Source 
svn: r11514
This commit is contained in:
Doug Blank 2008-12-24 04:57:09 +00:00
parent c1b027e0b5
commit 7ccb661592
1 changed files with 62 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/plugins/DefaultGramplets.py
View File

@ -1540,7 +1540,7 @@ class DataEntryGramplet(Gramplet):
current_person = self.dirty_person current_person = self.dirty_person
else: else:
current_person = self.dbstate.get_active_person() current_person = self.dbstate.get_active_person()
# Pre-check to make sure everything is ok: # Pre-check to make sure everything is ok: -------------------------------------------
if surname == "" and firstname == "": if surname == "" and firstname == "":
ErrorDialog(_("Please provide a name."), _("Can't add new person.")) ErrorDialog(_("Please provide a name."), _("Can't add new person."))
return return
@ -1574,7 +1574,7 @@ class DataEntryGramplet(Gramplet):
if current_person == None: if current_person == None:
ErrorDialog(_("Please set an active person."), _("Can't add new person as a child.")) ErrorDialog(_("Please set an active person."), _("Can't add new person as a child."))
return return
# Start the transaction: # Start the transaction: ------------------------------------------------------------
self.trans = self.dbstate.db.transaction_begin() self.trans = self.dbstate.db.transaction_begin()
# New person -------------------------------------------------- # New person --------------------------------------------------
# Add birth # Add birth
@ -1607,7 +1607,7 @@ class DataEntryGramplet(Gramplet):
# "Add as a Spouse" # "Add as a Spouse"
added = False added = False
family = None family = None
for family_handle in person.get_family_handle_list(): for family_handle in current_person.get_family_handle_list():
family = self.dbstate.db.get_family_from_gramps_id(family_handle) family = self.dbstate.db.get_family_from_gramps_id(family_handle)
if family: if family:
fam_husband_handle = family.get_father_handle() fam_husband_handle = family.get_father_handle()
@ -1712,12 +1712,67 @@ class DataEntryGramplet(Gramplet):
print "Error, we couldn't add them: both same gender" print "Error, we couldn't add them: both same gender"
elif self.de_widgets["NPRelation"].get_active() == self.AS_SIBLING: elif self.de_widgets["NPRelation"].get_active() == self.AS_SIBLING:
# "Add as a Sibling" # "Add as a Sibling"
pass added = False
for family_handle in current_person.get_parent_family_handle_list():
family = self.dbstate.db.get_family_from_gramps_id(family_handle)
if family:
childref = gen.lib.ChildRef()
childref.set_reference_handle(person.get_handle())
family.add_child_ref( childref)
person.add_parent_family_handle(family.get_handle())
added = True
break
if added:
self.dbstate.db.commit_family(family, self.trans)
else:
family = gen.lib.Family()
self.dbstate.db.add_family(family, self.trans)
childref = gen.lib.ChildRef()
childref.set_reference_handle(person.get_handle())
family.add_child_ref( childref)
childref = gen.lib.ChildRef()
childref.set_reference_handle(current_person.get_handle())
family.add_child_ref( childref)
person.add_parent_family_handle(family.get_handle())
current_person.add_parent_family_handle(family.get_handle())
self.dbstate.db.commit_family(family, self.trans)
elif self.de_widgets["NPRelation"].get_active() == self.AS_CHILD: elif self.de_widgets["NPRelation"].get_active() == self.AS_CHILD:
# "Add as a Child" # "Add as a Child"
pass added = False
self.dbstate.db.commit_person(current_person, self.trans) family = None
self.dbstate.db.commit_person(person, self.trans) for family_handle in current_person.get_family_handle_list():
family = self.dbstate.db.get_family_from_gramps_id(family_handle)
if family:
childref = gen.lib.ChildRef()
childref.set_reference_handle(person.get_handle())
family.add_child_ref( childref)
person.add_parent_family_handle(family.get_handle())
added = True
break
if added:
self.dbstate.db.commit_family(family, self.trans)
else:
if current_person.get_gender() == gen.lib.Person.UNKNOWN:
print "Error: can't add person as child. Need parent's gender."
else:
family = gen.lib.Family()
self.dbstate.db.add_family(family, self.trans)
childref = gen.lib.ChildRef()
childref.set_reference_handle(person.get_handle())
family.add_child_ref( childref)
person.add_parent_family_handle(family.get_handle())
current_person.add_family_handle(family.get_handle())
if gen.lib.Person.FEMALE:
family.set_mother_handle(current_person.get_handle())
else:
family.set_father_handle(current_person.get_handle())
self.dbstate.db.commit_family(family, self.trans)
# Commit changes -------------------------------------------------
if current_person:
self.dbstate.db.commit_person(current_person, self.trans)
if person:
self.dbstate.db.commit_person(person, self.trans)
self.dbstate.db.transaction_commit(self.trans, self.dbstate.db.transaction_commit(self.trans,
(_("Gramplet Data Entry: %s") % name_displayer.display(person))) (_("Gramplet Data Entry: %s") % name_displayer.display(person)))