Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Genesys PGR
Genesys Backend
Commits
cc27971f
Commit
cc27971f
authored
Oct 27, 2016
by
Matija Obreza
Browse files
Display PDCI in explorer (fixes
#57
)
parent
bca4edf1
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/genesys2/server/model/json/Api1Constants.java
View file @
cc27971f
...
...
@@ -311,4 +311,12 @@ public interface Api1Constants {
*/
public
static
final
String
GEOREFMETH
=
"georefMeth"
;
}
public
static
interface
Pdci
{
/**
* PDCI Score
*/
public
static
final
String
SCORE
=
"score"
;
}
}
src/main/java/org/genesys2/server/service/impl/GenesysServiceImpl.java
View file @
cc27971f
...
...
@@ -213,6 +213,7 @@ public class GenesysServiceImpl implements GenesysService, DatasetService {
columnList
.
add
(
"institute."
+
Api1Constants
.
Institute
.
INSTCODE
);
columnList
.
add
(
"geo."
+
Api1Constants
.
Geo
.
LATITUDE_LONGITUDE
);
columnList
.
add
(
"coll."
+
Api1Constants
.
Collecting
.
COLLMISSID
);
columnList
.
add
(
"pdci."
+
Api1Constants
.
Pdci
.
SCORE
);
availableDisplayColumns
=
Collections
.
unmodifiableList
(
columnList
);
List
<
String
>
displayList
=
new
ArrayList
<
String
>();
...
...
src/main/resources/content/language.properties
View file @
cc27971f
...
...
@@ -381,6 +381,7 @@ accession.svalbard-data.depositDate=Deposit date
accession.svalbard-data.boxNumber
=
Box number
accession.svalbard-data.quantity
=
Quantity
accession.remarks
=
Remarks
accession.pdci.score
=
PDCI Score
accession.imageGallery
=
Accession images
...
...
src/main/webapp/WEB-INF/jsp/accession/explore2.jsp
View file @
cc27971f
...
...
@@ -183,6 +183,9 @@
/></a></p></td>
</c:forEach>
</c:when>
<c:when
test=
"
${
col
eq
'pdci.score'
}
"
>
<td
class=
"notimportant
<c:if
test=
'
${
i
.
count
ge
2
}
'
>
hidden-xs
</c:if>
<c:if
test=
'
${
i
.
count
gt
2
}
'
>
hidden-sm
</c:if>
"
><p><fmt:formatNumber
value=
"
${
accession
.
pdciScore
}
"
/></p></td>
</c:when>
<c:otherwise>
<c:set
var=
"elVal"
value=
"
${
accession
}
"
/>
<c:forTokens
items=
"
${
col
}
"
delims=
"."
var=
"item"
>
...
...
@@ -706,6 +709,13 @@
'
class
'
:
"
notimportant
<c:if
test=
'
${
i
.
count
ge
2
}
'
>
hidden-xs
</c:if>
<c:if
test=
'
${
i
.
count
gt
2
}
'
>
hidden-sm
</c:if>
"
}).
appendTo
(
row
)));
</c:when>
<c:when
test=
"
${
col
eq
'pdci.score'
}
"
>
$
(
"
<span/>
"
,
{
text
:
''
+
pagedData
.
content
[
i
].
pdciScore
}).
appendTo
(
$
(
"
<p></p>
"
).
appendTo
(
$
(
"
<td/>
"
,
{
'
class
'
:
"
notimportant
<c:if
test=
'
${
i
.
count
ge
2
}
'
>
hidden-xs
</c:if>
<c:if
test=
'
${
i
.
count
gt
2
}
'
>
hidden-sm
</c:if>
"
}).
appendTo
(
row
)));
</c:when>
<c:when
test=
"
${
col
eq
'geo.latitudeAndLongitude'
}
"
>
var
geoLatitude
=
""
;
var
geoLongitude
=
""
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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