Kaynağa Gözat

GatherBirthCertificateFatherTimeLineDataImpl::AddFatherOccupation

Andrew Grant 2 ay önce
ebeveyn
işleme
51a81d5060

+ 13 - 0
src/main/java/scot/carricksoftware/grantswriter/domains/certificates/birthcertificate/BirthCertificate.java

@@ -28,6 +28,10 @@ public class BirthCertificate extends BaseEntity {
     @JoinColumn(name = "`father_id`")
     private Person father;
 
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @Column(name = "`father_rank`")
+    private String fatherRank;
+
     @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne()
     @JoinColumn(name = "`mother_id`")
@@ -149,4 +153,13 @@ public class BirthCertificate extends BaseEntity {
     public void setUntrackedInformant(String untrackedInformant) {
         this.untrackedInformant = untrackedInformant;
     }
+
+    public String getFatherRank() {
+        return fatherRank;
+    }
+
+    @SuppressWarnings("unused")
+    public void setFatherRank(String fatherRank) {
+        this.fatherRank = fatherRank;
+    }
 }

+ 14 - 0
src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/GatherBirthCertificateFatherTimeLineDataImpl.java

@@ -33,10 +33,24 @@ public class GatherBirthCertificateFatherTimeLineDataImpl implements GatherBirth
         logger.info("GatherBirthCertificateNewBornTimeLineDataImpl::Gather");
         for (BirthCertificate birthCertificate : birthCertificates) {
             addFather(timelineData.getTimeLine(), birthCertificate);
+            addFatherOccupation(timelineData.getTimeLine(), birthCertificate);
             addRefs(birthCertificate);
         }
     }
 
+    private void addFatherOccupation(TreeMap<DMY, List<String>> timeLine, BirthCertificate birthCertificate) {
+        logger.info("GatherBirthCertificateFatherTimeLineDataImpl::AddFatherOccupation");
+
+        List<String> existingValues = timeLine.get(getDMY(birthCertificate.getWhenBorn()));
+        if (existingValues == null) {
+            existingValues = new ArrayList<>();
+        }
+
+        existingValues.add("Occupation registered as " + birthCertificate.getFatherRank());
+        timeLine.put(getDMY(birthCertificate.getWhenBorn()), existingValues);
+
+    }
+
     private void addRefs(BirthCertificate birthCertificate) {
         timelineData.getRefs().add("Birth Certificate for : " + birthCertificate.getNewBorn());
     }