diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties
index 7e203f651d73b23aab4a29f1105e6eb0e0ec6a3c..3b7c538dafe48032f4ab467b2efd9597b4be7e96 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties
@@ -1039,3 +1039,4 @@ observedPhase=Observed phase at biofix date
YSTEMBTEMP=Yellow Stemborer Temperature Model
addIllustration=Add illustration
allRoles=All roles
+allStatuses=All statuses
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties
index bdcacc07ee8f68888eef846957c8b5ab77cf2667..bb9653e045f85d43e06250948804dd95c770a56b 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties
@@ -1032,3 +1032,4 @@ observedPhase=Observed phase at biofix date
YSTEMBTEMP=Yellow Stemborer Temperature Model
addIllustration=Add illustration
allRoles=All roles
+allStatuses=All statuses
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties
index 9e7aff9d91fb799362e1c06e51ff65a6dd382c48..076d4b6059dbde4cd8627443542ddba64d430e4e 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties
@@ -1031,3 +1031,4 @@ observedPhase=Observed phase at biofix date
YSTEMBTEMP=Yellow Stemborer Temperature Model
addIllustration=Add illustration
allRoles=All roles
+allStatuses=All statuses
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
index ff13d5946e81bc56d90a7d6dfff2842b1661163b..55c9412dcefcf209f51d7be54786b09dd4931d1d 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
@@ -1040,3 +1040,4 @@ observedPhase=Observert utviklingsstadium ved biofix-dato
YSTEMBTEMP=Yellow Stemborer temperaturmodell
addIllustration=Legg til illustrasjon
allRoles=Alle roller
+allStatuses=Alle statuser
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties
index 1281432bf0ff57abecd1f195fc22a6c3b283cba2..4bd388a6d593250d1d8a469c0e306eb98145647d 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties
@@ -1033,3 +1033,4 @@ observedPhase=Observed phase at biofix date
YSTEMBTEMP=Yellow Stemborer Temperature Model
addIllustration=Add illustration
allRoles=All roles
+allStatuses=All statuses
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties
index fb0fbad23a3369f2a4b273ae5595d7ed1777da44..21a6db363439269f7656e3725adeb3ff8d744919 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties
@@ -1026,3 +1026,4 @@ observedPhase=Observed phase at biofix date
YSTEMBTEMP=Yellow Stemborer Temperature Model
addIllustration=Add illustration
allRoles=All roles
+allStatuses=All statuses
diff --git a/src/main/webapp/templates/userList.ftl b/src/main/webapp/templates/userList.ftl
index 548e9455cad0598a81a536f5b9462a29f798e020..b5a0d5ba96d48a5451368b3d0ae189f68a9cc421 100755
--- a/src/main/webapp/templates/userList.ftl
+++ b/src/main/webapp/templates/userList.ftl
@@ -24,31 +24,37 @@
padding-inline-start: 1px;
}
</style>
-
+
</#macro>
<#macro custom_js>
<script type="text/javascript">
-
+
+ const statusPlace = 2;
const orgPlace = 3;
const table = document.getElementById("userList");
const tr = table.getElementsByTagName("tr");
- function sortByOrgAndUserRole() {
+ function sortAll() {
var organID = document.getElementById("selectOrg").value;
var roleTypeId = document.getElementById("selectUserRole").value;
+ var statusId = document.getElementById("selectStatus").value;
for (i = 1; i < tr.length; i++) {
var organization = tr[i].getElementsByTagName("td")[orgPlace].id;
var role = tr[i].getElementsByTagName('li');
+ var status = tr[i].getElementsByTagName("td")[statusPlace].id;
+ var displayStatus = true;
var displayOrg = true;
var displayRole = false;
if (organID != '-1' && organization != organID) {
displayOrg = false;
}
-
- var role = tr[i].getElementsByTagName('li');
+
+ if (statusId != '-1' && status != statusId) {
+ displayStatus = false;
+ }
if(roleTypeId == -1){
displayRole = true;
@@ -65,7 +71,7 @@
}
}
}
- if (displayRole && displayOrg) {
+ if (displayRole && displayOrg && displayStatus) {
tr[i].style.display = "";
} else {
tr[i].style.display = "none";
@@ -77,25 +83,25 @@
var roleTypeId = document.getElementById("selectUserRole").value;
for (i = 1; i < tr.length; i++) {
- var isDiplay = false;
+ var isDisplay = false;
var role = tr[i].getElementsByTagName('li');
if(roleTypeId == -1){
- isDiplay = true;
+ isDisplay = true;
} else {
if(role != null){
for(j = 0; j<role.length ; j++){
- if(isDiplay != true){
+ if(isDisplay != true){
var userType = role[j].id;
if(userType == roleTypeId){
- isDiplay = true;
+ isDisplay = true;
}
}
}
}
}
- if (isDiplay) {
+ if (isDisplay) {
tr[i].style.display = "";
} else {
tr[i].style.display = "none";
@@ -113,28 +119,46 @@
</p>
<#if messageKey?has_content>
<div class="alert alert-success">${i18nBundle(messageKey)}</div>
- </#if>
+ </#if>
<tr>
<td>
+ <div class="row">
+ <div class="col-sm-4">
<#if user.isSuperUser() || user.isOrganizationAdmin() >
- <select onchange="<#if user.isSuperUser()>sortByOrgAndUserRole();<#else>sortByUserRole();</#if>" id="selectUserRole" class="form-control">
+ <select onchange="<#if user.isSuperUser()>sortAll();<#else>sortByUserRole();</#if>" id="selectUserRole" class="form-control">
<option value="-1">${i18nBundle.allRoles}</option>
<#list vipsLogicRoles as role>
<option value="${role.vipsLogicRoleId}">${i18nBundle["vipsLogicRole_" + role.vipsLogicRoleId]}</option>
</#list>
</select>
</#if>
- <br>
+ </div>
+ <div class="col-sm-4">
<#if user.isSuperUser() >
- <select onclick="sortByOrgAndUserRole();" id="selectOrg" class="form-control">
+ <select onchange="sortAll();" id="selectOrg" class="form-control">
<option value="-1">${i18nBundle.allOrganizations}</option>
<#list organizations as org>
<option value=${org.organizationId}>${org.organizationName}</option>
</#list>
</select>
</#if>
+ </div>
+ <div class="col-sm-4">
+ <#if user.isSuperUser() || user.isOrganizationAdmin()>
+ <select id="selectStatus" onchange="sortAll();" class="form-control">
+ <option value="-1">${i18nBundle.allStatuses}</option>
+ <option value="1">${i18nBundle["userStatus_" + 1]}</option>
+ <option value="2">${i18nBundle["userStatus_" + 2]}</option>
+ <option value="3">${i18nBundle["userStatus_" + 3]}</option>
+ <option value="4">${i18nBundle["userStatus_" + 4]}</option>
+ <option value="5">${i18nBundle["userStatus_" + 5]}</option>
+ </select>
+ </#if>
+ </div>
+ </div>
</td>
</tr>
+ <br>
<div class="table-responsive">
<table class="table table-striped" id="userList">
<thead>
@@ -153,7 +177,7 @@
<tr>
<td><a href="/user?action=viewUser&userId=${user.userId}">${user.lastName}</a></td>
<td><a href="/user?action=viewUser&userId=${user.userId}">${user.firstName}</a></td>
- <td>${i18nBundle["userStatus_" + user.userStatusId]}</td>
+ <td id=${user.userStatusId}>${i18nBundle["userStatus_" + user.userStatusId]}</td>
<td id=${user.organizationId.organizationId}>${user.organizationId.organizationName}</td>
<td>
<#list user.vipsLogicRoles as role>