Skip to content

Commit

Permalink
Merge pull request #2 from nla/FOLIOINT-237
Browse files Browse the repository at this point in the history 
FOLIOINT-237 New Service Points (PICMSS split) and UI.
  • Loading branch information
@nlaforwardism
nlaforwardism authored Jul 9, 2023
2 parents 1f5924f + 48568ab commit 51ca957
Show file tree
Hide file tree
Showing 5 changed files with 66 additions and 28 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<dependency>
<groupId>au.gov.nla</groupId>
<artifactId>folio-api</artifactId>
<version>1.0.10-SNAPSHOT</version>
<version>1.0.12-RELEASE</version>
</dependency>

<dependency>
Expand Down
7 changes: 5 additions & 2 deletions src/main/resources/stacklocations-spec.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,11 @@ stacklocations:
code: SPEC2-SP
label: Specials 2
-
code: PICMSS-SP
label: Pictures & Manuscripts
code: MSS-SP
label: Manuscripts
-
code: PIC-SP
label: Pictures
-
code: HUME-SP
label: Hume
Expand Down
36 changes: 30 additions & 6 deletions src/main/resources/static/css/pickslip.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ html {
--stack-SPEC2-SP: #3cc8b4;
--stack-HUME-SP: #b880fd;
--stack-MITCHELL-SP: #9f58f7;
--stack-PICMSS-SP: #f78653;
--stack-MSS-SP: #f78653;
--stack-PIC-SP: #faaf8e;
--stack-ASIAN-SP: #f1bb59;
}

Expand Down Expand Up @@ -122,7 +123,8 @@ tr.odd30 {
.nav-link.stack-SPEC2-SP:focus, .nav-link.stack-SPEC2-SP:hover { color: var(--stack-SPEC2-SP); }
.nav-link.stack-MITCHELL-SP:focus, .nav-link.stack-MITCHELL-SP:hover { color: var(--stack-MITCHELL-SP); }
.nav-link.stack-HUME-SP:focus, .nav-link.stack-HUME-SP:hover { color: var(--stack-HUME-SP); }
.nav-link.stack-PICMSS-SP:focus, .nav-link.stack-PICMSS-SP:hover { color: var(--stack-PICMSS-SP); }
.nav-link.stack-MSS-SP:focus, .nav-link.stack-MSS-SP:hover { color: var(--stack-MSS-SP); }
.nav-link.stack-PIC-SP:focus, .nav-link.stack-PIC-SP:hover { color: var(--stack-PIC-SP); }
.nav-link.stack-ASIAN-SP:focus, .nav-link.stack-ASIAN-SP:hover { color: var(--stack-ASIAN-SP); }

/* -- stacks - shadows -- */
Expand Down Expand Up @@ -176,9 +178,14 @@ div.stack-HUME-SP {
0 0 30px 0px var(--stack-HUME-SP) !important
}

div.stack-PICMSS-SP {
box-shadow : 0 0 5px 2px var(--stack-PICMSS-SP),
0 0 30px 0px var(--stack-PICMSS-SP) !important
div.stack-MSS-SP {
box-shadow : 0 0 5px 2px var(--stack-MSS-SP),
0 0 30px 0px var(--stack-MSS-SP) !important
}

div.stack-PIC-SP {
box-shadow : 0 0 5px 2px var(--stack-PIC-SP),
0 0 30px 0px var(--stack-PIC-SP) !important
}

div.stack-ASIAN-SP {
Expand All @@ -198,5 +205,22 @@ tr.stack-SPEC1-SP { border-left: 10px solid var(--stack-SPEC1-SP); }
tr.stack-SPEC2-SP { border-left: 10px solid var(--stack-SPEC2-SP); }
tr.stack-MITCHELL-SP { border-left: 10px solid var(--stack-MITCHELL-SP); }
tr.stack-HUME-SP { border-left: 10px solid var(--stack-HUME-SP); }
tr.stack-PICMSS-SP { border-left: 10px solid var(--stack-PICMSS-SP); }
tr.stack-MSS-SP { border-left: 10px solid var(--stack-MSS-SP); }
tr.stack-PIC-SP { border-left: 10px solid var(--stack-PIC-SP); }
tr.stack-ASIAN-SP { border-left: 10px solid var(--stack-ASIAN-SP); }

tr.stack-LAKE-SP.heading { border-bottom: 2px solid var(--stack-LAKE-SP); }
tr.stack-EAST-SP.heading { border-bottom: 2px solid var(--stack-EAST-SP); }
tr.stack-CENT-SP.heading { border-bottom: 2px solid var(--stack-CENT-SP); }
tr.stack-WEST-SP.heading { border-bottom: 2px solid var(--stack-WEST-SP); }
tr.stack-LG1-SP.heading { border-bottom: 2px solid var(--stack-LG1-SP); }
tr.stack-NEWS-SP.heading { border-bottom: 2px solid var(--stack-NEWS-SP); }
tr.stack-SPEC1-SP.heading { border-bottom: 2px solid var(--stack-SPEC1-SP); }
tr.stack-SPEC2-SP.heading { border-bottom: 2px solid var(--stack-SPEC2-SP); }
tr.stack-MITCHELL-SP.heading { border-bottom: 2px solid var(--stack-MITCHELL-SP); }
tr.stack-HUME-SP.heading { border-bottom: 2px solid var(--stack-HUME-SP); }
tr.stack-MSS-SP.heading { border-bottom: 2px solid var(--stack-MSS-SP); }
tr.stack-PIC-SP.heading { border-bottom: 2px solid var(--stack-PIC-SP); }
tr.stack-ASIAN-SP.heading { border-bottom: 2px solid var(--stack-ASIAN-SP); }

tr.heading { border-left: none; }
26 changes: 17 additions & 9 deletions src/main/resources/templates/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<div class="p-3">
<div class="container-fluid bg-light p-2 rounded">

<header th:replace="~{common/general :: admintitle('All Requests')}" />
<header th:replace="~{common/general :: admintitle('Requests')}" />

<div class="bg-white m-2 p-4 border border-1 rounded">

Expand All @@ -21,7 +21,7 @@
<tr>
<th scope="col">Time</th>
<th scope="col">Call Number</th>
<th scope="col">Year/Enum</th>
<th scope="col">Year</th>
<th scope="col">Status</th>
<th scope="col">Patron Group</th>
<th scope="col">Title</th>
Expand All @@ -35,9 +35,16 @@
<th:block th:each="loc : ${stacks}">
<th:block th:with="queue = ${queues.getPickslipsForStack(loc.code)}">

<tr class="heading bg-light text-muted fw-semibold" th:classappend="|stack-${loc.code}|" >
<td colspan="9" class="pt-3 px-2">
[[${loc.label}]]
<tr class="heading text-muted fw-semibold" th:classappend="|stack-${loc.code}|" >
<td colspan="9" class="pt-4 px-2">
<div class="d-flex justify-content-between">
<div>[[${loc.label}]]</div>
<th:block th:with="reassigned = ${queues.getVisitorsForStack(loc.code).size}">
<div th:if="${reassigned} > 0">
+ <span th:text="${reassigned}"></span> reassigned
</div>
</th:block>
</div>
</td>
</tr>

Expand All @@ -46,7 +53,10 @@
(s.parked ? 'parked ' : '') +
(s.request?.isRequestDateEvenThirty ? 'even30' : 'odd30')}">

<td class="px-4 nobreak">[[${#temporals.format(s.request.requestDate, 'HH:mm:ss - dd MMM yyyy')} ?: '-']]</td>
<td class="px-4 nobreak">
<span th:text="${#temporals.format(s.request.requestDate, 'HH:mm:ss')} ?: '-'"></span>
<span class="fw-lighter" th:text="${#temporals.format(s.request.requestDate, '- dd-MMM-yyyy')} ?: '-'"></span>
</td>

<td>
<a th:target="_blank"
Expand All @@ -55,9 +65,7 @@
+${@environment.getProperty('folio.request-view-postfix')}">[[${s.item.callNumber}]]</a>
</td>

<td th:text="${(s.item.yearCaption ?: '') + ' ' +
(s.item.enumeration ?: '') + ' ' +
(s.item.chronology ?: '')}"></td>
<td th:text="${(s.item.yearCaption ?: '')}"></td>

<td>
<span class="nobreak fs-teeny px-2 py-1 fw-lighter rounded-4"
Expand Down
23 changes: 13 additions & 10 deletions src/main/resources/templates/stack.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<tr>
<th scope="col">Time</th>
<th scope="col">Call Number</th>
<th scope="col">Year/Enum</th>
<th scope="col">Year</th>
<th scope="col">Status</th>
<th scope="col">Patron Group</th>
<th scope="col">Title</th>
Expand All @@ -37,17 +37,18 @@
</thead>
<tbody>
<tr th:each="s : ${visitors}">
<td class="nobreak">[[${#temporals.format(s.request.requestDate, 'HH:mm:ss dd-MMM-yyyy')} ?: '-']]</td>
<td class="nobreak">
<span th:text="${#temporals.format(s.request.requestDate, 'HH:mm:ss')} ?: '-'"></span>
<span class="fw-lighter" th:text="${#temporals.format(s.request.requestDate, '- dd-MMM-yyyy')} ?: '-'"></span>
</td>
<td>
<a th:target="_blank"
th:href="${@environment.getProperty('folio.request-view-prefix')}
+${s.request.id}
+${@environment.getProperty('folio.request-view-postfix')}">[[${s.item.callNumber}]]</a>
</td>

<td th:text="${(s.item.yearCaption ?: '') + ' ' +
(s.item.enumeration ?: '') + ' ' +
(s.item.chronology ?: '')}"></td>
<td th:text="${(s.item.yearCaption ?: '')}"></td>

<td> <span class="nobreak fs-teeny px-2 py-1 fw-lighter rounded-4"
th:classappend="|status-${s.request.isNotYetFilled() ? 'not-yet-filled' : 'other'}|">
Expand Down Expand Up @@ -91,7 +92,7 @@
<tr>
<th scope="col">Time</th>
<th scope="col">Call Number</th>
<th scope="col">Year/Enum</th>
<th scope="col">Year</th>
<th scope="col">Status</th>
<th scope="col">Patron Group</th>
<th scope="col">Title</th>
Expand All @@ -105,17 +106,19 @@
(s.parked ? 'parked ' : '') +
(s.request.isRequestDateEvenThirty ? 'even30' : 'odd30')}">

<td class="nobreak">[[${#temporals.format(s.request.requestDate, 'HH:mm:ss dd-MMM-yyyy')} ?: '-']]</td>
<td class="nobreak">
<span th:text="${#temporals.format(s.request.requestDate, 'HH:mm:ss')} ?: '-'"></span>
<span class="fw-lighter" th:text="${#temporals.format(s.request.requestDate, '- dd-MMM-yyyy')} ?: '-'"></span>
</td>

<td>
<a th:target="_blank"
th:href="${@environment.getProperty('folio.request-view-prefix')}
+${s.request.id}
+${@environment.getProperty('folio.request-view-postfix')}">[[${s.item.callNumber}]]</a>
</td>

<td th:text="${(s.item.yearCaption ?: '') + ' ' +
(s.item.enumeration ?: '') + ' ' +
(s.item.chronology ?: '')}"></td>
<td th:text="${(s.item.yearCaption ?: '')}"></td>

<td> <span class="nobreak fs-teeny px-2 py-1 fw-lighter rounded-4"
th:classappend="|status-${s.request.isNotYetFilled() ? 'not-yet-filled' : 'other'}|">
Expand Down

0 comments on commit 51ca957

Please sign in to comment.