홈 탐색 도움말
가입하기 로그인
apg
/
grants-writer
1
0
포크 0
파일 이슈 2 풀 리퀘스트 0 위키
소스 검색

Status list

Andrew Grant 2 달 전
부모
8565e9b0ee
커밋
e7fe9b4595
7개의 변경된 파일과 71개의 추가작업 그리고 11개의 파일을 삭제
분할 보기 변경상태 보기
  1. 3 0
      src/main/java/scot/carricksoftware/grantswriter/constants/MappingConstants.java
  2. 1 1
      src/main/java/scot/carricksoftware/grantswriter/constants/ViewConstants.java
  3. 2 1
      src/main/java/scot/carricksoftware/grantswriter/controllers/StatusController.java
  4. 2 2
      src/main/java/scot/carricksoftware/grantswriter/controllers/StatusControllerImpl.java
  5. 2 2
      src/main/java/scot/carricksoftware/grantswriter/services/status/StatusService.java
  6. 14 5
      src/main/java/scot/carricksoftware/grantswriter/services/status/StatusServiceImpl.java
  7. 47 0
      src/main/resources/templates/statusList.html

+ 3 - 0
src/main/java/scot/carricksoftware/grantswriter/constants/MappingConstants.java
파일 보기 

@@ -22,5 +22,8 @@ public class MappingConstants {
 
 
     public static final String PRINT = "/print";
 
 
+    public static final String STATUS = "/status";
 
+
 
+
 
 
 }

+ 1 - 1
src/main/java/scot/carricksoftware/grantswriter/constants/ViewConstants.java
파일 보기 

@@ -21,6 +21,6 @@ public class ViewConstants {
 
     public static final String TEX = "tex";
 
     public static final String HOME = "index";
 
 
-    public static final String STATUS = "status";
 
+    public static final String STATUS = "statusList";
 
 
 }

+ 2 - 1
src/main/java/scot/carricksoftware/grantswriter/controllers/StatusController.java
파일 보기 

@@ -12,6 +12,7 @@ import scot.carricksoftware.grantswriter.constants.MappingConstants;
 
 
 public interface StatusController {
 
 
-    @GetMapping(MappingConstants.FILES)
 
+    @SuppressWarnings("SameReturnValue")
 
+    @GetMapping(MappingConstants.STATUS)
 
     String getStatus(Model model);
 
 }

+ 2 - 2
src/main/java/scot/carricksoftware/grantswriter/controllers/StatusControllerImpl.java
파일 보기 

@@ -19,7 +19,7 @@ import scot.carricksoftware.grantswriter.services.status.StatusService;
 
 @Controller
 
 public class StatusControllerImpl implements StatusController {
 
 
-    private static final Logger logger = LogManager.getLogger(FilesControllerImpl.class);
 
+    private static final Logger logger = LogManager.getLogger(StatusControllerImpl.class);
 
 
     private final StatusService statusService;
 
 
@@ -27,7 +27,7 @@ public class StatusControllerImpl implements StatusController {
 
         this.statusService = statusService;
 
     }
 
 
-    @GetMapping(MappingConstants.FILES)
 
+    @GetMapping(MappingConstants.STATUS)
 
     @Override
 
     public String getStatus(Model model) {
 
         logger.info("StatusControllerImp::getStatus");

+ 2 - 2
src/main/java/scot/carricksoftware/grantswriter/services/status/StatusService.java
파일 보기 

@@ -6,10 +6,10 @@
 
 package scot.carricksoftware.grantswriter.services.status;
 
 
 
-import java.util.SortedMap;
 
+import java.util.LinkedHashMap;
 
 
 
 public interface StatusService {
 
 
-     SortedMap<String, String> getStatus();
 
+     LinkedHashMap<String, String> getStatus();
 
 }

+ 14 - 5
src/main/java/scot/carricksoftware/grantswriter/services/status/StatusServiceImpl.java
파일 보기 

@@ -9,18 +9,27 @@ import org.apache.logging.log4j.LogManager;
 
 import org.apache.logging.log4j.Logger;
 
 import org.springframework.stereotype.Service;
 
 
-import java.util.SortedMap;
 
-import java.util.TreeMap;
 
+import java.util.LinkedHashMap;
 
 
 @Service
 
 public class StatusServiceImpl implements StatusService {
 
 
     private static final Logger logger = LogManager.getLogger(StatusServiceImpl.class);
 
 
+    private final LinkedHashMap<String, String> status = new LinkedHashMap<>();
 
 
     @Override
 
-    public SortedMap<String, String> getStatus() {
 
-        logger.info("StatusServiceImpl::getStatus");
 
-        return new TreeMap<>();
 
+    public LinkedHashMap<String, String> getStatus() {
 
+        logger.info("StatusService::getStatus");
 
+
 
+        status.put("People", "0");
 
+        status.put("Birth Certificates", "0");
 
+        status.put("Marriage Certificates", "0");
 
+        status.put("Divorce Certificates", "0");
 
+        status.put("Death Certificates", "0");
 
+        status.put("", "");
 
+        status.put("Censuses", "0");
 
+        status.put("Census Entries", "0");
 
+        return status;
 
     }
 
 }

+ 47 - 0
src/main/resources/templates/statusList.html
파일 보기 

@@ -0,0 +1,47 @@
 
+<!DOCTYPE html>
 
+
 
+<!--
 
+  ~ Copyright (c) 2025 Andrew Grant of Carrick Software .
 
+  ~ All rights reserved.
 
+  -->
 
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
 
+<head>
 
+    <meta charset="UTF-8"/>
 
+    <title>Grants - census list</title>
 
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet"
 
+          integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
 
+</head>
 
+<body>
 
+<div th:insert="~{fragments/layout::banner}"></div>
 
+
 
+
 
+<div class="container text-center">
 
+    <div class="container border border-info
 
+                    rounded-3 text-center p-4">
 
+        <h3>Status</h3>
 
+        <table class="table table-striped table-bordered">
 
+            <thead class="table-dark">
 
+            <tr>
 
+                <th>Property</th>
 
+                <th>Value</th>
 
+            </tr>
 
+            </thead>
 
+
 
+            <tr th:each="property, iter   : ${statusFile}">
 
+                <td th:text="${property.getKey()}">123</td>
 
+                <td th:text="${property.getValue()}">123</td>
 
+            </tr>
 
+            <tfoot>
 
+            <tr>
 
+                <td colspan="4"><span>
 
+                         <a th:action="home" class="btn btn-success btn-sm"
 
+                            th:href="@{/}" th:text="'Home'"></a>
 
+                        </span></td>
 
+            </tr>
 
+            </tfoot>
 
+        </table>
 
+    </div>
 
+</div>
 
+</body>
 
+</html>
 
+