Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
adapt
ace
Commits
d8faa6fc
Commit
d8faa6fc
authored
Apr 05, 2017
by
Michael Ritter
Browse files
Use the group summary to display count/size information
parent
4b92557a
Changes
3
Hide whitespace changes
Inline
Side-by-side
ace-am/src/main/java/edu/umiacs/ace/monitor/access/CollectionCountContext.java
View file @
d8faa6fc
...
...
@@ -326,6 +326,7 @@ public class CollectionCountContext implements ServletContextListener {
try
{
queryCollection
(
c
);
GroupSummaryContext
.
updateGroup
(
c
.
getGroup
());
}
finally
{
lock
.
unlock
();
}
...
...
ace-am/src/main/java/edu/umiacs/ace/monitor/access/StatusServlet.java
View file @
d8faa6fc
...
...
@@ -210,6 +210,7 @@ public class StatusServlet extends EntityManagerServlet {
request
.
setAttribute
(
PAGE_STATES
,
ImmutableList
.
copyOf
(
CStateBean
.
values
()));
request
.
setAttribute
(
PAGE_COUNT
,
count
);
request
.
setAttribute
(
PAGE_NUMBER
,
pb
);
request
.
setAttribute
(
"groups"
,
GroupSummaryContext
.
summaries
);
if
(
hasJson
(
request
))
{
dispatcher
=
request
.
getRequestDispatcher
(
"status-json.jsp"
);
}
else
if
(
hasCsv
(
request
))
{
...
...
ace-am/src/main/webapp/status.jsp
View file @
d8faa6fc
...
...
@@ -186,25 +186,22 @@
</thead>
<c:set
var=
"count"
value=
"0"
/>
<jsp:useBean
id=
"today"
class=
"java.util.Date"
/>
<c:set
var=
"counttotal"
value=
"0"
/>
<c:set
var=
"sizetotal"
value=
"0"
/>
<c:forEach
var=
"item"
items=
"
${
collections
}
"
>
<c:if
test=
"
${
currgroup
!=
item
.
collection
.
group
&&
item
.
collection
.
group
!=
null
}
"
>
<script
type=
"text/javascript"
>
myp
=
document
.
getElementById
(
"
group${currgroup}
"
);
if
(
myp
!=
null
)
{
myp
.
innerHTML
=
'
${counttotal} /
<c:choose><c:when
test=
"
${
sizetotal
>
0
}
"
><d:FileSize
value=
"
${
sizetotal
}
"
/></c:when><c:otherwise>
0 B
</c:otherwise></c:choose>
'
;
}
</script>
<c:set
var=
"group"
value=
"
${
item
.
collection
.
group
}
"
/>
<c:set
var=
"group_count"
value=
"
${
groups
[
group
].
count
}
"
/>
<c:set
var=
"size"
value=
"
${
groups
[
group
].
size
}
"
/>
<tr>
<td
class=
"groupheader"
colspan=
"3"
onclick=
"toggleVisibility('spexpand${item.collection.group}','inline'); toggleVisibility('sphide${item.collection.group}','inline');"
>
<span
onclick=
"showGroup('grouptr${item.collection.group}')"
id=
"spexpand${item.collection.group}"
style=
"display:none;float: left;width: 25px;"
>
[+]
</span>
<span
onclick=
"hideGroup('grouptr${item.collection.group}')"
id=
"sphide${item.collection.group}"
style=
"display:inline;float: left;width: 25px;"
>
[-]
</span>
${item.collection.group}
<td
class=
"groupheader"
colspan=
"3"
onclick=
"toggleVisibility('spexpand${group}','inline'); toggleVisibility('sphide${group}','inline');"
>
<span
onclick=
"showGroup('grouptr${group}')"
id=
"spexpand${group}"
style=
"display:none;float: left;width: 25px;"
>
[+]
</span>
<span
onclick=
"hideGroup('grouptr${group}')"
id=
"sphide${group}"
style=
"display:inline;float: left;width: 25px;"
>
[-]
</span>
${group}
</td>
<td
class=
"groupheader"
colspan=
"3"
id=
"group${group}"
>
${group_count} /
<c:choose><c:when
test=
"
${
size
>
0
}
"
><d:FileSize
value=
"
${
size
}
"
/></c:when><c:otherwise>
0 B
</c:otherwise></c:choose>
</td>
<td
class=
"groupheader"
colspan=
"3"
id=
"group${item.collection.group}"
></td>
</tr>
<c:set
var=
"counttotal"
value=
"0"
/>
<c:set
var=
"sizetotal"
value=
"0"
/>
...
...
@@ -271,13 +268,7 @@
</tr>
<c:set
var=
"count"
value=
"
${
count
+
1
}
"
/>
<c:set
var=
"currgroup"
value=
"
${
item
.
collection
.
group
}
"
/>
<c:set
var=
"counttotal"
value=
"
${
counttotal
+
item
.
totalFiles
}
"
/>
<c:set
var=
"sizetotal"
value=
"
${
sizetotal
+
item
.
totalSize
}
"
/>
</c:forEach>
<script
type=
"text/javascript"
>
myp
=
document
.
getElementById
(
"
group${currgroup}
"
);
myp
.
innerHTML
=
'
${counttotal} /
<c:choose><c:when
test=
"
${
sizetotal
>
0
}
"
><d:FileSize
value=
"
${
sizetotal
}
"
/></c:when><c:otherwise>
0 B
</c:otherwise></c:choose>
'
;
</script>
<tr><td
colspan=
"5"
><br/><d:Auth
role=
"Collection Modify"
showUnauthenticated=
"true"
><a
href=
"ManageCollection"
>
Add Collection
</a></d:Auth>
 
<d:Auth
role=
"Audit"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment