ConfigWebTool Version 0.9.5

--PVP2 Login --PVP2 Users to UserDatabase functionality --Mailaddress verification --Mail status messages to users and admin --add List with OpenRequests for admins --change OA Target configuration --add cleanUp Thread to remove old unused UserAccount requests --update UserDatabase to support PVP2 logins --add formID element validate received forms -- add first classes for STORK configuration make some Bugfixes
author: Thomas Lenz <tlenz@iaik.tugraz.at> 2013-09-19 16:19:00 +0200
committer: Thomas Lenz <tlenz@iaik.tugraz.at> 2013-09-19 16:19:00 +0200
commit: a27cf61551c129aee48ea533ad73f2ade37a757a (patch)
tree: c97a1ccc7b3afdec906c609de165b582db2b3149 /id/ConfigWebTool/src/main/webapp/jsp/snippets
parent: 2c7d70f182b554321b6baf3e225139a883d61035 (diff)
download: moa-id-spss-a27cf61551c129aee48ea533ad73f2ade37a757a.tar.gz
moa-id-spss-a27cf61551c129aee48ea533ad73f2ade37a757a.tar.bz2
moa-id-spss-a27cf61551c129aee48ea533ad73f2ade37a757a.zip
4 files changed, 174 insertions, 14 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp
index 72affde79..e9192b46e 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp
@@ -5,9 +5,14 @@
 <html>
 	<div id="header_area"> 
 <!-- 		<div> -->
-			<%=LanguageHelper.getGUIString("webpages.header.info", request) %> 
-			<s:property value="authUser.givenName"/> <s:property value="authUser.familyName"/>,&nbsp;&nbsp;&nbsp; 
-		 	<%=LanguageHelper.getGUIString("webpages.header.lastlogin", request) %> <s:property value="authUser.lastLogin"/>
+			<%=LanguageHelper.getGUIString("webpages.header.info", request) %>
+			<s:if test="authUser.isMandateUser()">
+				<s:property value="authUser.institute"/>
+			</s:if>
+			<s:else>
+				<s:property value="authUser.givenName"/> <s:property value="authUser.familyName"/>,&nbsp;&nbsp;&nbsp;
+			</s:else>  
+		 	<%=LanguageHelper.getGUIString("webpages.header.lastlogin", request) %> <s:property value="authUser.getFormatedLastLogin()"/>
 		 	
 		 	<s:url action="logout" var="logoutURL" namespace="/"/>
 			<a id="logoutbutton" href="<s:property value="#logoutURL" />"><%=LanguageHelper.getGUIString("webpages.index.logout", request) %></a>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp
index 26b12cdcb..4d02f4bda 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp
@@ -32,11 +32,13 @@
 					<s:url action="usermanagementInit" var="userManagementUrl" namespace="/secure"/>
 					<a href="<s:property value="#userManagementUrl" />"><%=LanguageHelper.getGUIString("webpages.mainpage.menu.general.usermanagement", request) %></a>
 			</div>
-
 			
-<%-- 			<div class="menu_element">
-				<a href=""><%=LanguageHelper.getGUIString("webpages.mainpage.menu.general.user", request) %></a>			
-			</div> --%>
+			<s:if test="authUser.isAdmin()">
+				<div class="menu_element">
+						<s:url action="adminRequestsInit" var="adminRequestsUrl" namespace="/secure"/>
+						<a href="<s:property value="#adminRequestsUrl" />"><%=LanguageHelper.getGUIString("webpages.mainpage.menu.general.adminrequests", request) %></a>
+				</div>
+			</s:if>
 
 		</div>  
 </html>
 \ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/user_list.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/user_list.jsp
index c5b67cbac..a1e8530af 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/user_list.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/user_list.jsp
@@ -4,7 +4,6 @@
 
 <html>
 		<s:if test="userlist && userlist.size > 0">	
-			<h3><%=LanguageHelper.getGUIString("webpages.listUsers.list.header", request) %></h3>
 			<div id="list_area">
 					<div id="listHeader" class="listElement">
 						<div class="userListFirst">
@@ -21,12 +20,22 @@
 				<s:iterator var="UserElement" value="userlist">
 
 					<div class="listElement" onclick="userOA(<s:property value='userID'/>);">
-						<div class="userListFirst">
-							<s:property value="givenName"/>
-						</div>
-						<div class="userListSecond">
-							<s:property value="familyName"/>
-						</div>
+						<s:if test="isMandateUser()">
+							<div class="userListFirstSecond">
+								<s:property value="institute"/>
+							</div>
+<!-- 							<div class="userListSecond">
+								
+							</div>
+ -->						</s:if>
+						<s:else>
+							<div class="userListFirst">
+								<s:property value="familyName"/>
+							</div>
+							<div class="userListSecond">
+								<s:property value="givenName"/>
+							</div>
+						</s:else>
 						<div class="userListThird">
 							<s:property value="userName"/>
 						</div>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/userfields.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/userfields.jsp
new file mode 100644
index 000000000..7d28a9236
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/userfields.jsp
@@ -0,0 +1,144 @@
+<%@page import="at.gv.egovernment.moa.id.configuration.helper.LanguageHelper"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+
+<html>
+							<div class="oa_config_block">	
+							<h3><%=LanguageHelper.getGUIString("webpages.edituser.header", request) %></h3>			
+							
+							<s:if test="!user.isIsmandateuser()">							
+								<s:textfield name="user.givenName" 
+									value="%{user.givenName}" 
+									labelposition="left"
+									key="webpages.edituser.givenname"
+									cssClass="textfield_long"
+									disabled="%{user.isPVPGenerated()}">
+								</s:textfield>	
+								<s:textfield name="user.familyName" 
+									value="%{user.familyName}" 
+									labelposition="left"
+									key="webpages.edituser.familyName"
+									cssClass="textfield_long"
+									disabled="%{user.isPVPGenerated()}">
+								</s:textfield>
+							</s:if>
+							<s:textfield name="user.institut" 
+								value="%{user.institut}" 
+								labelposition="left"
+								key="webpages.edituser.institut"
+								cssClass="textfield_long"
+								disabled="%{user.isPVPGenerated() && user.isIsmandateuser()}">
+							</s:textfield>
+							
+							<s:if test="authUser.isAuthenticated()">
+								<div id="mail_area">
+									<s:textfield name="user.mail" 
+										value="%{user.mail}" 
+										labelposition="left"
+										key="webpages.edituser.mail"
+										cssClass="textfield_mail">
+									</s:textfield>
+									<input 	type="button" 
+														onclick="sendVerificationMail();" 
+														value='<%=LanguageHelper.getGUIString("webpages.edituser.verify.mail.button", request) %>'
+									/>
+								</div>
+							</s:if>
+							<s:else>
+								<s:textfield name="user.mail" 
+										value="%{user.mail}" 
+										labelposition="left"
+										key="webpages.edituser.mail"
+										cssClass="textfield_long">
+								</s:textfield>
+							</s:else>
+
+							
+							<s:textfield name="user.phone" 
+								value="%{user.phone}" 
+								labelposition="left"
+								key="webpages.edituser.phone"
+								cssClass="textfield_long">
+							</s:textfield>
+						</div>
+						
+						<div class="oa_config_block">	
+							<h3><%=LanguageHelper.getGUIString("webpages.edituser.access.header", request) %></h3>
+							
+							<div id="usernamepassword_area">
+<%-- 							<s:if test="user.isIsusernamepasswordallowed()"> --%>
+								<s:if test="isNewUser()">	
+									<s:textfield name="user.username" 
+										value="%{user.username}" 
+										labelposition="left"
+										key="webpages.edituser.username"
+										cssClass="textfield_long"
+										maxlength="16">
+									</s:textfield>
+								</s:if>
+								<s:else>
+									<s:textfield name="user.username" 
+										value="%{user.username}" 
+										labelposition="left"
+										key="webpages.edituser.username"
+										cssClass="textfield_long"
+										disabled="true"
+										maxlength="16">
+									</s:textfield>
+								</s:else>
+									
+								<s:password name="user.password"  
+									labelposition="left"
+									key="webpages.edituser.password"
+									cssClass="textfield_long"
+									maxlength="16">
+								</s:password>
+								
+	  						<s:password name="user.password_second"  
+									labelposition="left"
+									key="webpages.edituser.password_second"
+									cssClass="textfield_long"
+									maxlength="16">
+								</s:password>
+							<%-- </s:if> --%>
+							</div>
+													
+							<s:textfield name="user.bpk" 
+								value="%{user.bpk}" 
+								labelposition="left"
+								key="webpages.edituser.bpk"
+								cssClass="textfield_long"
+								disabled="%{user.isPVPGenerated()}">
+							</s:textfield>							
+						</div>
+						
+						<s:if test="authUser.isAdmin() || user.isIsusernamepasswordallowed()">						
+							<div class="oa_config_block">	
+								<h3><%=LanguageHelper.getGUIString("webpages.edituser.role.header", request) %></h3>
+								<s:if test="authUser.isAdmin()">	
+									<s:checkbox name="user.active" 
+										value="%{user.active}" 
+										labelposition="left"
+										key="webpages.edituser.active"
+										cssClass="checkbox">
+									</s:checkbox>
+									<s:checkbox name="user.admin" 
+										value="%{user.admin}"
+										labelposition="left"
+										key="webpages.edituser.admin"
+										cssClass="checkbox">
+									</s:checkbox>
+								</s:if>
+								<s:checkbox name="user.isusernamepasswordallowed" 
+									value="%{user.isusernamepasswordallowed}"
+									labelposition="left"
+									key="webpages.edituser.isusernamepasswordallowed"
+									cssClass="checkbox"
+									id="isusernamepasswordallowed"
+									onclick="UseUserNamePassword();">
+								</s:checkbox>	
+							</div>
+						</s:if>
+						
+						<s:hidden name="user.userID" value="%{user.userID}"></s:hidden>
+</html>
+\ No newline at end of file
author	Thomas Lenz <tlenz@iaik.tugraz.at>	2013-09-19 16:19:00 +0200
committer	Thomas Lenz <tlenz@iaik.tugraz.at>	2013-09-19 16:19:00 +0200
commit	a27cf61551c129aee48ea533ad73f2ade37a757a (patch)
tree	c97a1ccc7b3afdec906c609de165b582db2b3149 /id/ConfigWebTool/src/main/webapp/jsp/snippets
parent	2c7d70f182b554321b6baf3e225139a883d61035 (diff)
download	moa-id-spss-a27cf61551c129aee48ea533ad73f2ade37a757a.tar.gz moa-id-spss-a27cf61551c129aee48ea533ad73f2ade37a757a.tar.bz2 moa-id-spss-a27cf61551c129aee48ea533ad73f2ade37a757a.zip