Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
reg-app
Regapp
Commits
47c05827
Commit
47c05827
authored
May 20, 2021
by
michael.simon
Browse files
add check button for invalid registries
parent
4f029a2b
Changes
3
Hide whitespace changes
Inline
Side-by-side
bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/sadm/user/ServiceAdminUserListBean.java
View file @
47c05827
...
...
@@ -37,6 +37,7 @@ public class ServiceAdminUserListBean implements Serializable {
private
static
final
long
serialVersionUID
=
1L
;
private
GenericLazyDataModel
<
RegistryEntity
,
RegistryService
,
Long
>
list
;
private
GenericLazyDataModel
<
RegistryEntity
,
RegistryService
,
Long
>
allList
;
private
GenericLazyDataModel
<
RegistryEntity
,
RegistryService
,
Long
>
otherList
;
private
GenericLazyDataModel
<
RegistryEntity
,
RegistryService
,
Long
>
deletedList
;
private
GenericLazyDataModel
<
RegistryEntity
,
RegistryService
,
Long
>
lostAccessList
;
...
...
@@ -64,6 +65,10 @@ public class ServiceAdminUserListBean implements Serializable {
throw
new
NotAuthorizedException
(
"Nicht autorisiert"
);
}
public
RegistryStatus
[]
getRegistryStatusList
()
{
return
RegistryStatus
.
values
();
}
public
ServiceEntity
getServiceEntity
()
{
return
serviceEntity
;
}
...
...
@@ -90,6 +95,15 @@ public class ServiceAdminUserListBean implements Serializable {
return
list
;
}
public
GenericLazyDataModel
<
RegistryEntity
,
RegistryService
,
Long
>
getAllList
()
{
if
(
allList
==
null
)
{
Map
<
String
,
Object
>
filterMap
=
new
HashMap
<
String
,
Object
>();
filterMap
.
put
(
"service"
,
serviceEntity
);
allList
=
new
GenericLazyDataModelImpl
<
RegistryEntity
,
RegistryService
,
Long
>(
service
,
filterMap
);
}
return
allList
;
}
public
GenericLazyDataModel
<
RegistryEntity
,
RegistryService
,
Long
>
getOtherList
()
{
if
(
otherList
==
null
)
{
Map
<
String
,
Object
>
filterMap
=
new
HashMap
<
String
,
Object
>();
...
...
bwreg-webapp/src/main/webapp/service-admin/list-service-users.xhtml
View file @
47c05827
...
...
@@ -29,15 +29,17 @@
<div
id=
"panelInline"
>
<p:tabView
id=
"tabVw"
dynamic=
"true"
cache=
"false"
>
<p:tab
id=
"tab
1
"
title=
"#{messages.a
ctive
}"
>
<p:dataTable
id=
"registeredTable
1
"
var=
"registry"
value=
"#{serviceAdminUserListBean.
l
ist}"
paginator=
"true"
<p:tab
id=
"tab
0
"
title=
"#{messages.a
ll
}"
>
<p:dataTable
id=
"registeredTable
0
"
var=
"registry"
value=
"#{serviceAdminUserListBean.
allL
ist}"
paginator=
"true"
lazy=
"true"
rows=
"15"
style=
"width:auto; font-size: 1.2rem;"
>
<p:column
sortBy=
"#{registry.id}"
>
<f:facet
name=
"header"
>
<h:outputText
value=
"#{messages.id}"
/>
</f:facet>
<h:outputText
value=
"#{registry.id}"
/>
<h:link
outcome=
"show-service-registry.xhtml"
value=
"#{registry.id}"
filterMatchMode=
"contains"
>
<f:param
name=
"id"
value=
"#{registry.id}"
/>
</h:link>
</p:column>
<p:column
sortBy=
"#{registry.user.eppn}"
filterBy=
"#{registry.user.eppn}"
filterMatchMode=
"contains"
>
<f:facet
name=
"header"
>
...
...
@@ -71,10 +73,57 @@
</f:facet>
<h:outputText
value=
"#{of:formatDate(registry.lastStatusChange, 'dd.MM.yyyy HH:mm')}"
/>
</p:column>
<p:column
sortBy=
"#{registry.registryStatus}"
>
<p:column
field=
"registryStatus"
headerText=
"#{messages.status}"
sortBy=
"#{registry.registryStatus}"
>
<h:outputText
value=
"#{registry.registryStatus}"
/>
</p:column>
</p:dataTable>
</p:tab>
<p:tab
id=
"tab1"
title=
"#{messages.active}"
>
<p:dataTable
id=
"registeredTable1"
var=
"registry"
value=
"#{serviceAdminUserListBean.list}"
paginator=
"true"
lazy=
"true"
rows=
"15"
style=
"width:auto; font-size: 1.2rem;"
>
<p:column
sortBy=
"#{registry.id}"
>
<f:facet
name=
"header"
>
<h:outputText
value=
"#{messages.status}"
/>
<h:outputText
value=
"#{messages.id}"
/>
</f:facet>
<h:link
outcome=
"show-service-registry.xhtml"
value=
"#{registry.id}"
filterMatchMode=
"contains"
>
<f:param
name=
"id"
value=
"#{registry.id}"
/>
</h:link>
</p:column>
<p:column
sortBy=
"#{registry.user.eppn}"
filterBy=
"#{registry.user.eppn}"
filterMatchMode=
"contains"
>
<f:facet
name=
"header"
>
<h:outputText
value=
"#{messages.eppn}"
/>
</f:facet>
<h:link
outcome=
"show-service-registry.xhtml"
value=
"#{registry.user.eppn}"
filterMatchMode=
"contains"
>
<f:param
name=
"id"
value=
"#{registry.id}"
/>
</h:link>
</p:column>
<p:column
sortBy=
"#{registry.user.surName}"
filterBy=
"#{registry.user.surName}"
filterMatchMode=
"contains"
>
<f:facet
name=
"header"
>
<h:outputText
value=
"#{messages.sur_name}"
/>
</f:facet>
<h:outputText
value=
"#{registry.user.surName}"
/>
</p:column>
<p:column
sortBy=
"#{registry.user.givenName}"
filterBy=
"#{registry.user.givenName}"
>
<f:facet
name=
"header"
>
<h:outputText
value=
"#{messages.given_name}"
/>
</f:facet>
<h:outputText
value=
"#{registry.user.givenName}"
/>
</p:column>
<p:column
sortBy=
"#{registry.agreedTime}"
>
<f:facet
name=
"header"
>
<h:outputText
value=
"#{messages.registered_time}"
/>
</f:facet>
<h:outputText
value=
"#{of:formatDate(registry.agreedTime, 'dd.MM.yyyy HH:mm')}"
/>
</p:column>
<p:column
sortBy=
"#{registry.lastStatusChange}"
>
<f:facet
name=
"header"
>
<h:outputText
value=
"#{messages.last_status_change}"
/>
</f:facet>
<h:outputText
value=
"#{of:formatDate(registry.lastStatusChange, 'dd.MM.yyyy HH:mm')}"
/>
</p:column>
<p:column
field=
"registryStatus"
headerText=
"#{messages.status}"
sortBy=
"#{registry.registryStatus}"
>
<h:outputText
value=
"#{registry.registryStatus}"
/>
</p:column>
</p:dataTable>
...
...
@@ -87,7 +136,9 @@
<f:facet
name=
"header"
>
<h:outputText
value=
"#{messages.id}"
/>
</f:facet>
<h:outputText
value=
"#{registry.id}"
/>
<h:link
outcome=
"show-service-registry.xhtml"
value=
"#{registry.id}"
filterMatchMode=
"contains"
>
<f:param
name=
"id"
value=
"#{registry.id}"
/>
</h:link>
</p:column>
<p:column
sortBy=
"#{registry.user.eppn}"
filterBy=
"#{registry.user.eppn}"
>
<f:facet
name=
"header"
>
...
...
@@ -137,7 +188,9 @@
<f:facet
name=
"header"
>
<h:outputText
value=
"#{messages.id}"
/>
</f:facet>
<h:outputText
value=
"#{registry.id}"
/>
<h:link
outcome=
"show-service-registry.xhtml"
value=
"#{registry.id}"
filterMatchMode=
"contains"
>
<f:param
name=
"id"
value=
"#{registry.id}"
/>
</h:link>
</p:column>
<p:column
sortBy=
"#{registry.user.eppn}"
filterBy=
"#{registry.user.eppn}"
>
<f:facet
name=
"header"
>
...
...
@@ -187,7 +240,9 @@
<f:facet
name=
"header"
>
<h:outputText
value=
"#{messages.id}"
/>
</f:facet>
<h:outputText
value=
"#{registry.id}"
/>
<h:link
outcome=
"show-service-registry.xhtml"
value=
"#{registry.id}"
filterMatchMode=
"contains"
>
<f:param
name=
"id"
value=
"#{registry.id}"
/>
</h:link>
</p:column>
<p:column
sortBy=
"#{registry.user.eppn}"
filterBy=
"#{registry.user.eppn}"
>
<f:facet
name=
"header"
>
...
...
bwreg-webapp/src/main/webapp/service-admin/show-service-registry.xhtml
View file @
47c05827
...
...
@@ -76,7 +76,7 @@
<p:commandButton
id=
"fullReconId"
action=
"#{serviceAdminUserDetailBean.fullReconsiliation()}"
value=
"#{messages.full_reconsiliation}"
update=
"@form"
/>
</h:panelGroup>
<h:panelGroup
rendered=
"#{(serviceAdminUserDetailBean.entity.registryStatus == 'ACTIVE' || serviceAdminUserDetailBean.entity.registryStatus == 'LOST_ACCESS' || serviceAdminUserDetailBean.entity.registryStatus == 'ON_HOLD')}"
>
<h:panelGroup
rendered=
"#{(serviceAdminUserDetailBean.entity.registryStatus == 'ACTIVE' || serviceAdminUserDetailBean.entity.registryStatus == 'LOST_ACCESS' || serviceAdminUserDetailBean.entity.registryStatus == 'ON_HOLD'
|| serviceAdminUserDetailBean.entity.registryStatus == 'INVALID'
)}"
>
<p:commandButton
id=
"checkRegId"
action=
"#{serviceAdminUserDetailBean.checkRegistry()}"
value=
"Check Access"
update=
"@form"
/>
<p:commandButton
id=
"delUsr"
action=
"#{serviceAdminUserDetailBean.deregister()}"
value=
"#{messages.deregister}"
...
...
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