apg 3 долоо хоног өмнө
parent
commit
1c0ceba9db

+ 6 - 4
src/main/java/scot/carricksoftware/grants/bootstrap/DataLoadTexts.java

@@ -49,10 +49,6 @@ public class DataLoadTexts {
         loadAppendixText();
         loadAppendixText();
     }
     }
 
 
-    private void loadDocumentText() {
-        DocumentTextCommand documentTextCommand = new DocumentTextCommandImpl();
-        documentTextService.saveDocumentTextCommand(documentTextCommand);
-    }
 
 
     private void loadPersonText() {
     private void loadPersonText() {
         PersonTextCommand personTextCommand = new PersonTextCommandImpl();
         PersonTextCommand personTextCommand = new PersonTextCommandImpl();
@@ -79,4 +75,10 @@ public class DataLoadTexts {
         placeTextService.savePlaceTextCommand(placeTextCommand);
         placeTextService.savePlaceTextCommand(placeTextCommand);
     }
     }
 
 
+    private void loadDocumentText() {
+        DocumentTextCommand documentTextCommand = new DocumentTextCommandImpl();
+        documentTextCommand.setHeading("document text heading");
+        documentTextService.saveDocumentTextCommand(documentTextCommand);
+    }
+
 }
 }

+ 16 - 0
src/main/java/scot/carricksoftware/grants/commands/text/DocumentTextCommand.java

@@ -9,4 +9,20 @@ public interface DocumentTextCommand {
     Long getId();
     Long getId();
 
 
     void setId(Long id);
     void setId(Long id);
+
+    String getLevel();
+
+    void setLevel(String level);
+
+    String getOrder();
+
+    void setOrder(String order);
+
+    String getHeading();
+
+    void setHeading(String heading);
+
+    String getContent();
+
+    void setContent(String content);
 }
 }

+ 45 - 0
src/main/java/scot/carricksoftware/grants/commands/text/DocumentTextCommandImpl.java

@@ -8,6 +8,10 @@ package scot.carricksoftware.grants.commands.text;
 public class DocumentTextCommandImpl implements DocumentTextCommand {
 public class DocumentTextCommandImpl implements DocumentTextCommand {
 
 
     Long Id;
     Long Id;
+    private String level;
+    private String order;
+    private String heading;
+    private String content;
 
 
     @Override
     @Override
     public Long getId() {
     public Long getId() {
@@ -20,4 +24,45 @@ public class DocumentTextCommandImpl implements DocumentTextCommand {
     }
     }
 
 
 
 
+    @Override
+    public String getLevel() {
+        return level;
+    }
+
+    @Override
+    public void setLevel(String level) {
+        this.level = level;
+    }
+
+    @Override
+    public String getOrder() {
+        return order;
+    }
+
+    @Override
+    public void setOrder(String order) {
+        this.order = order;
+    }
+
+    @Override
+    public String getHeading() {
+        return heading;
+    }
+
+    @Override
+    public void setHeading(String heading) {
+        this.heading = heading;
+    }
+
+    @Override
+    public String getContent() {
+        return content;
+    }
+
+    @Override
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+
 }
 }

+ 6 - 5
src/main/resources/templates/index.html

@@ -46,14 +46,13 @@
             <td>
             <td>
             </td>
             </td>
             <td>
             <td>
-                <a class="btn btn-outline-secondary btn-sm btn-block" href="countries">Countries</a>
+
             </td>
             </td>
             <td>
             <td>
                 <a class="btn btn-primary btn-lg btn-block" href="censusEntries">Census Entries</a>
                 <a class="btn btn-primary btn-lg btn-block" href="censusEntries">Census Entries</a>
             </td>
             </td>
             <td>
             <td>
-            </td>
-            <td>
+
             </td>
             </td>
         </tr>
         </tr>
         <tr>
         <tr>
@@ -63,11 +62,12 @@
                 <a class="btn btn-primary btn-sm btn-block" href="birthCertificates">Birth Certificates</a>
                 <a class="btn btn-primary btn-sm btn-block" href="birthCertificates">Birth Certificates</a>
             </td>
             </td>
             <td>
             <td>
-                <a class="btn btn-outline-secondary btn-sm btn-block" href="regions">Regions</a>
+                <a class="btn btn-outline-secondary btn-sm btn-block" href="countries">Countries</a>
             </td>
             </td>
             <td>
             <td>
                 <a class="btn btn-outline-secondary btn-sm btn-block" href="documentTexts">Document Texts</a>
                 <a class="btn btn-outline-secondary btn-sm btn-block" href="documentTexts">Document Texts</a>
             <td>
             <td>
+            <a class="btn btn-outline-secondary btn-sm btn-block" href="documentImages">Document Images</a>
             </td>
             </td>
         </tr>
         </tr>
         <tr>
         <tr>
@@ -77,7 +77,7 @@
                 <a class="btn btn-primary btn-sm btn-block" href="deathCertificates">Death Certificates</a>
                 <a class="btn btn-primary btn-sm btn-block" href="deathCertificates">Death Certificates</a>
             </td>
             </td>
             <td>
             <td>
-                <a class="btn btn-outline-secondary btn-sm btn-block" href="organisations">Organisations</a>
+                <a class="btn btn-outline-secondary btn-sm btn-block" href="regions">Regions</a>
             </td>
             </td>
             <td>
             <td>
                 <a class="btn btn-outline-secondary btn-sm btn-block" href="personTexts">Person Texts</a>
                 <a class="btn btn-outline-secondary btn-sm btn-block" href="personTexts">Person Texts</a>
@@ -94,6 +94,7 @@
                    href="marriageCertificates">Marriage Certificates</a>
                    href="marriageCertificates">Marriage Certificates</a>
             </td>
             </td>
             <td>
             <td>
+                <a class="btn btn-outline-secondary btn-sm btn-block" href="organisations">Organisations</a>
             </td>
             </td>
             <td>
             <td>
                 <a class="btn btn-outline-secondary btn-sm btn-block" href="placeTexts">Place Texts</a>
                 <a class="btn btn-outline-secondary btn-sm btn-block" href="placeTexts">Place Texts</a>