Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TASK-1562 Pedigree graph with a three-generation family fails to render properly in Family browser detailed tab #2253

Merged
merged 22 commits into from
Apr 13, 2023

Conversation

jtarraga
Copy link
Member

@jtarraga jtarraga commented Mar 1, 2023

Implement pedigree graph.

@jtarraga
Copy link
Member Author

jtarraga commented Mar 1, 2023

@jtarraga jtarraga requested a review from pfurio March 1, 2023 16:25
@jtarraga jtarraga changed the title TASK-1562 TASK-1562 Pedigree graph with a three-generation family fails to render properly in Family browser detailed tab Mar 1, 2023
Copy link
Member

@pfurio pfurio left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure which field name I would use to contain the base 64 pedigree graph image, but I would certainly not call it b64PedigreeGraph. If everyone's happy with that, we can go ahead.

@@ -153,6 +153,9 @@ public class Family extends Annotable {
description = FieldConstants.FAMILY_ROLES)
private Map<String, Map<String, FamiliarRelationship>> roles;

@DataField(id = "b64PedigreeGraph", description = FieldConstants.FAMILY_PEDIGREE_GRAPH)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it really going to be called that way?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So, finally, this will be an object :

"pedigreeGraph" : {"base64":"..", "json":{...}}

@jtarraga jtarraga requested a review from pfurio March 8, 2023 18:18
@jtarraga jtarraga requested a review from j-coll March 13, 2023 15:00

import static org.junit.Assert.*;

public class FamilyAnalysisTest extends GenericTest {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reminder : We'll need to add the @Category to this test once the categories are merged

@jtarraga jtarraga requested a review from j-coll March 16, 2023 18:12
@halender halender merged commit a2b2921 into develop Apr 13, 2023
@halender halender deleted the TASK-1562 branch April 13, 2023 10:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants