MOA-ID Configuration Tool Beta

12 files changed, 403 insertions, 22 deletions

diff --git a/id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml b/id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml
index c8ba8ab8a..7b27b0c4d 100644
--- a/id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml
+++ b/id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml
@@ -8,23 +8,23 @@
 		<filter-class>at.gv.egovernment.moa.id.configuration.filter.AuthenticationFilter</filter-class>
 		<init-param>
 			<param-name>loginPage</param-name>
-			<param-value>index.action</param-value>
+			<param-value>./index.action</param-value>
 		</init-param>
 		<init-param>
 			<param-name>errorPage</param-name>
-			<param-value>error.action</param-value>
+			<param-value>./error.action</param-value>
 		</init-param>
 		<init-param>
 			<param-name>sessionLostPage</param-name>
-			<param-value>/</param-value>
+			<param-value>./authenticate.action</param-value>
 		</init-param>
-		<init-param>
+ 		<init-param>
 			<param-name>authenticatedPage</param-name>
-			<param-value>main.action</param-value>
+			<param-value>./secure/main.action</param-value>
 		</init-param>
 		<init-param>
 			<param-name>allowed</param-name>
-			<param-value>^.*((/index.action)|(/error.action)|(/jsp/.*)|(/css/.*)|(/images/.*)|(/js/.*))$</param-value>
+			<param-value>^.*((/index.action)|(/error.action)|(/authenticate.action)|(/logout.action)|(/jsp/.*)|(/css/.*)|(/images/.*)|(/js/.*))$</param-value>
 		</init-param>
 	</filter>
 	<filter-mapping>
diff --git a/id/ConfigWebTool/src/main/webapp/css/index.css b/id/ConfigWebTool/src/main/webapp/css/index.css
index 5edddd506..49e9f41d1 100644
--- a/id/ConfigWebTool/src/main/webapp/css/index.css
+++ b/id/ConfigWebTool/src/main/webapp/css/index.css
@@ -6,12 +6,17 @@
 	display: block;
 }
 
-#header_area>p {
+#header_area>div {
 	font-size: 20px;
   margin-left: 25px;
   padding-top: 8px;
 }
 
+#header_area #logoutbutton {
+	  float: right;
+    padding-right: 25px;
+}
+
 #menu_area {
 	margin-top: 25px;
 	border-color: black;
@@ -245,6 +250,28 @@ div .wwgrp br {
 	float: left;
 }
 
+.userListFirst {
+	position: relative;
+	width: 200px;
+	float: left;
+	
+}
+
+.userListSecond {
+	position: relative;
+	float: left;
+	width: 200px;
+}
+
+.userListThird {
+	position: relative;
+	float: left;
+}
+
+.disabled {
+
+}
+
 #footer_area {
     background-color: green;
     clear: both;
diff --git a/id/ConfigWebTool/src/main/webapp/index.jsp b/id/ConfigWebTool/src/main/webapp/index.jsp
index 44d3bef5a..4e49eac75 100644
--- a/id/ConfigWebTool/src/main/webapp/index.jsp
+++ b/id/ConfigWebTool/src/main/webapp/index.jsp
@@ -15,9 +15,40 @@
 		<h1><%=LanguageHelper.getGUIString("webpages.index.header", request) %></h1>
 		
 		<div id="information_area">
+			<s:if test="hasActionErrors()">
+   			<div id="error_area">
+   			<label><%=LanguageHelper.getGUIString("error.title", request) %></label>
+    		<s:actionerror/>
+   		</div>
+		</s:if>	
+		
+		<div id="information_area">
 			<p><%=LanguageHelper.getGUIString("webpages.index.desciption.head", request) %></p>
-			<br/>
-			<a href="secure/main.action">Login</a>
+			
+			<div class="oa_config_block">
+				
+					<s:form namespace="/" method="POST" enctype="multipart/form-data">
+				
+							<s:textfield name="username" 
+								value="%{username}" 
+								labelposition="left"
+								key="webpages.edituser.username"
+								cssClass="textfield_long"
+								maxlength="16">
+							</s:textfield>
+								
+							<s:password name="password"  
+								labelposition="left"
+								key="webpages.edituser.password"
+								cssClass="textfield_long"
+								maxlength="16">
+							</s:password>
+							
+							<s:submit key="webpages.index.login" action="authenticate"/>		
+							
+					</s:form>
+			</div>
+			
 		</div>
 		
 	</body>
diff --git a/id/ConfigWebTool/src/main/webapp/js/common.js b/id/ConfigWebTool/src/main/webapp/js/common.js
index 431824c2a..5271a4006 100644
--- a/id/ConfigWebTool/src/main/webapp/js/common.js
+++ b/id/ConfigWebTool/src/main/webapp/js/common.js
@@ -48,6 +48,10 @@ function editOA(oaid){
 	$('#selectOAForm_OAID').val(oaid);
 	$('#selectOAForm').submit();
 }
+function userOA(userid){
+	$('#selectUserForm_OAID').val(userid);
+	$('#selectUserForm').submit();	
+}
 function oaOnLoad() {
 	oaBusinessService();
 	oaSSOService();
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp b/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp
new file mode 100644
index 000000000..a332fb425
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/jsp/edituser.jsp
@@ -0,0 +1,142 @@
+<%@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" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+	<head>
+		<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+		<link rel="stylesheet" type="text/css" href="../css/index.css">
+		<title><%=LanguageHelper.getGUIString("title", request) %></title>
+		<script type="text/javascript" src="../js/common.js"></script>
+		<script src="../js/jquery.js"></script>
+	</head>
+	
+	<body>
+		
+ 		<jsp:include page="snippets/header_userinfos.jsp"></jsp:include>
+
+		<jsp:include page="snippets/main_menu.jsp"></jsp:include>
+		
+		<div id="information_area">
+			<s:if test="hasActionErrors()">
+   			<div id="error_area">
+   				<label><%=LanguageHelper.getGUIString("error.title", request) %></label>
+      			<s:actionerror/>
+   			</div>
+			</s:if>	
+						
+			<div id="list_area">
+							
+					<s:form namespace="/secure" method="POST" enctype="multipart/form-data">
+				
+						<div class="oa_config_block">	
+							<h3><%=LanguageHelper.getGUIString("webpages.edituser.header", request) %></h3>												
+							<s:textfield name="user.givenName" 
+								value="%{user.givenName}" 
+								labelposition="left"
+								key="webpages.edituser.givenname"
+								cssClass="textfield_long">
+							</s:textfield>	
+							<s:textfield name="user.familyName" 
+								value="%{user.familyName}" 
+								labelposition="left"
+								key="webpages.edituser.familyName"
+								cssClass="textfield_long">
+							</s:textfield>
+							<s:textfield name="user.institut" 
+								value="%{user.institut}" 
+								labelposition="left"
+								key="webpages.edituser.institut"
+								cssClass="textfield_long">
+							</s:textfield>
+							<s:textfield name="user.mail" 
+								value="%{user.mail}" 
+								labelposition="left"
+								key="webpages.edituser.mail"
+								cssClass="textfield_long">
+							</s:textfield>
+							<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>
+							<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:textfield name="user.bpk" 
+								value="%{user.bpk}" 
+								labelposition="left"
+								key="webpages.edituser.bpk"
+								cssClass="textfield_long">
+							</s:textfield>							
+						</div>
+						
+						<s:if test="authUser.isAdmin()">
+							<div class="oa_config_block">	
+								<h3><%=LanguageHelper.getGUIString("webpages.edituser.role.header", request) %></h3>	
+								<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>
+							</div>
+						</s:if>
+						
+						<s:hidden name="user.userID" value="%{user.userID}"></s:hidden>
+						
+						<div id="button_area">
+							
+							<s:if test="authUser.isAdmin()">
+								<s:submit key="webpages.edit.back" action="usermanagementInit"/>
+							</s:if>		
+							<s:submit key="webpages.edit.save" action="saveUser"/>
+							<s:if test="!isNewUser()">
+								<s:submit key="webpages.edit.delete.user" action="deleteUser"/>
+							</s:if>								
+					</div>												
+					</s:form>
+				</div>
+		</div>
+		
+		<jsp:include page="snippets/footer.jsp"></jsp:include>
+		
+	</body>
+</html>
\ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/importexport.jsp b/id/ConfigWebTool/src/main/webapp/jsp/importexport.jsp
new file mode 100644
index 000000000..b28bc5f57
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/jsp/importexport.jsp
@@ -0,0 +1,76 @@
+<%@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" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+	<head>
+		<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+		<link rel="stylesheet" type="text/css" href="../css/index.css">
+		<title><%=LanguageHelper.getGUIString("title", request) %></title>
+		<script type="text/javascript" src="../js/common.js"></script>
+		<script src="../js/jquery.js"></script>
+	</head>
+	
+	<body>
+		
+ 		<jsp:include page="snippets/header_userinfos.jsp"></jsp:include>
+
+		<jsp:include page="snippets/main_menu.jsp"></jsp:include>
+		
+		<div id="information_area">
+			<s:if test="hasActionErrors()">
+   			<div id="error_area">
+   				<label><%=LanguageHelper.getGUIString("error.title", request) %></label>
+      			<s:actionerror/>
+   			</div>
+			</s:if>	
+						
+			<div id="list_area">
+				<h2><%=LanguageHelper.getGUIString("webpages.inportexport.header", request) %></h2>
+				
+				
+				<s:if test="authUser.isAdmin()">
+				
+					<p><%=LanguageHelper.getGUIString("webpages.inportexport.descripten", request) %></p>
+					
+					<s:form namespace="/secure" method="POST" enctype="multipart/form-data">
+				
+				
+						<div class="oa_config_block">
+							<h3><%=LanguageHelper.getGUIString("webpages.inportexport.legacyimport.header", request) %></h3>					
+							<s:file name="fileUpload" key="webpages.inportexport.legacyimport.upload" cssClass="textfield_long"></s:file>
+							
+							<div id="button_area">
+								<%-- <s:submit key="webpages.edit.back" action="main"/> --%>		
+								<s:submit key="webpages.edit.import" action="importlegacy"/>
+							</div>	
+						</div>
+									
+					</s:form>
+					
+					<s:form namespace="/secure" method="POST" enctype="multipart/form-data">
+				
+				
+						<div class="oa_config_block">
+							<h3><%=LanguageHelper.getGUIString("webpages.inportexport.import.header", request) %></h3>					
+ 							<s:file name="fileUpload" key="webpages.inportexport.import.upload" cssClass="textfield_long"></s:file>
+
+							<div id="button_area">
+								<s:submit key="webpages.edit.import" action="importConfig"/>		
+								<s:submit key="webpages.edit.export" action="exportConfig"/>
+							</div>							
+							
+						</div>
+					</s:form>
+				</s:if>
+
+			</div>
+			
+		</div>
+		
+		<jsp:include page="snippets/footer.jsp"></jsp:include>
+		
+	</body>
+</html>
\ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/mainpage.jsp b/id/ConfigWebTool/src/main/webapp/jsp/mainpage.jsp
index c3a4921e9..b700970cc 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/mainpage.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/mainpage.jsp
@@ -26,7 +26,7 @@
    			</div>
 			</s:if>	
 		
-			<p>das ist ein Test Text</p>
+			<p>Im Menü auf der rechten Seite können Sie die einzelnen Operationen wählen.</p>
 		</div>
 		
 		<jsp:include page="snippets/footer.jsp"></jsp:include>
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 a10b6e202..56fcf9681 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/header_userinfos.jsp
@@ -4,9 +4,14 @@
 
 <html>
 	<div id="header_area"> 
-		<p><%=LanguageHelper.getGUIString("webpages.header.info", request) %> 
+		<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"/>
-		</p>
+		 	
+		 	<s:url action="logout" var="logoutURL" namespace="/"/>
+			<a id="logoutbutton" href="<s:property value="#logoutURL" />"><%=LanguageHelper.getGUIString("webpages.index.logout", request) %></a>
+		</div>
+
+		
 	</div>
 </html>  
\ No newline at end of file
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 06bb1130c..26b12cdcb 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/main_menu.jsp
@@ -5,34 +5,38 @@
 <html>
 		<div id="menu_area">
 			<div class="menu_element">
-					<s:url action="newOA.action" var="newOA" namespace="/secure"/>
+					<s:url action="newOA" var="newOA" namespace="/secure"/>
 					<a href="<s:property value="#newOA" />"><%=LanguageHelper.getGUIString("webpages.mainpage.menu.oa.insert", request) %></a>
 			</div>
 			<div class="menu_element">
-					<s:url action="searchOAInit.action" var="searchOAs" namespace="/secure"/>
+					<s:url action="searchOAInit" var="searchOAs" namespace="/secure"/>
 					<a href="<s:property value="#searchOAs" />"><%=LanguageHelper.getGUIString("webpages.mainpage.menu.oa.search", request) %></a>
 			</div>
 			<div class="menu_element">
-					<s:url action="listallapplications.action" var="listAllOAs" namespace="/secure"/>
+					<s:url action="listallapplications" var="listAllOAs" namespace="/secure"/>
 					<a href="<s:property value="#listAllOAs" />"><%=LanguageHelper.getGUIString("webpages.mainpage.menu.oa.display", request) %></a>
 			</div>
 			
 			<s:if test="authUser.isAdmin()">
 				<div class="menu_element">
-						<s:url action="loadGeneralConfig.action" var="generalConfig" namespace="/secure"/>
+						<s:url action="loadGeneralConfig" var="generalConfig" namespace="/secure"/>
 						<a href="<s:property value="#generalConfig" />"><%=LanguageHelper.getGUIString("webpages.mainpage.menu.general.config.moaid", request) %></a>
 				</div>
 				<div class="menu_element">
-						<a href=""><%=LanguageHelper.getGUIString("webpages.mainpage.menu.general.importexport", request) %></a>
-				</div>
-				<div class="menu_element">
-						<a href=""><%=LanguageHelper.getGUIString("webpages.mainpage.menu.general.usermanagement", request) %></a>
+						<s:url action="importexport" var="importexportUrl" namespace="/secure"/>
+						<a href="<s:property value="#importexportUrl" />"><%=LanguageHelper.getGUIString("webpages.mainpage.menu.general.importexport", request) %></a>
 				</div>
 			</s:if>
 			
 			<div class="menu_element">
-				<a href=""><%=LanguageHelper.getGUIString("webpages.mainpage.menu.general.user", request) %></a>			
+					<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> --%>
+
 		</div>  
 </html>
\ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp
index 2e1b0365f..113e822f8 100644
--- a/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/oas_list.jsp
@@ -28,7 +28,7 @@
 				</s:iterator>
 			</div>
 			
-			<s:form namespace="/" method="GET" id="selectOAForm" action="loadOA" namespace="/secure">
+			<s:form method="POST" id="selectOAForm" action="loadOA" namespace="/secure">
 				<s:hidden id="selectOAForm_OAID" name="oaidobj"></s:hidden>
 			</s:form> 
 		</s:if>
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/snippets/user_list.jsp b/id/ConfigWebTool/src/main/webapp/jsp/snippets/user_list.jsp
new file mode 100644
index 000000000..c5b67cbac
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/jsp/snippets/user_list.jsp
@@ -0,0 +1,42 @@
+<%@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>
+		<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">
+							<%=LanguageHelper.getGUIString("webpages.listUsers.list.first", request) %>
+						</div>
+						<div class="userListSecond">
+							<%=LanguageHelper.getGUIString("webpages.listUsers.list.second", request) %>
+						</div>
+						<div class="userListThird">
+							<%=LanguageHelper.getGUIString("webpages.listUsers.list.third", request) %>
+						</div>
+					</div>
+					
+				<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>
+						<div class="userListThird">
+							<s:property value="userName"/>
+						</div>
+					</div>
+					
+				</s:iterator>
+			</div>
+			
+			<s:form method="POST" id="selectUserForm" action="editUser" namespace="/secure">
+				<s:hidden id="selectUserForm_OAID" name="useridobj"></s:hidden>
+			</s:form> 
+		</s:if>
+</html>
\ No newline at end of file
diff --git a/id/ConfigWebTool/src/main/webapp/jsp/usermanagement.jsp b/id/ConfigWebTool/src/main/webapp/jsp/usermanagement.jsp
new file mode 100644
index 000000000..a29780cff
--- /dev/null
+++ b/id/ConfigWebTool/src/main/webapp/jsp/usermanagement.jsp
@@ -0,0 +1,50 @@
+<%@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" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+	<head>
+		<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+		<link rel="stylesheet" type="text/css" href="../css/index.css">
+		<title><%=LanguageHelper.getGUIString("title", request) %></title>
+		<script type="text/javascript" src="../js/common.js"></script>
+		<script src="../js/jquery.js"></script>
+	</head>
+	
+	<body>
+		
+ 		<jsp:include page="snippets/header_userinfos.jsp"></jsp:include>
+
+		<jsp:include page="snippets/main_menu.jsp"></jsp:include>
+		
+		<div id="information_area">
+			<s:if test="hasActionErrors()">
+   			<div id="error_area">
+   				<label><%=LanguageHelper.getGUIString("error.title", request) %></label>
+      			<s:actionerror/>
+   			</div>
+			</s:if>	
+			
+			<h2><%=LanguageHelper.getGUIString("webpages.usermanagement.header", request) %></h2>
+			
+			<s:if test="authUser.isAdmin()">
+						
+				<jsp:include page="snippets/user_list.jsp"></jsp:include>
+			
+				<div id="list_area">
+					<s:form namespace="/secure" method="POST" enctype="multipart/form-data">
+						<div id="button_area">		
+							<s:submit key="webpages.usermanagement.newuser" action="createUser"/>
+						</div>
+					</s:form>
+				</div>
+			</s:if>
+				
+		</div>
+		
+		<jsp:include page="snippets/footer.jsp"></jsp:include>
+		
+	</body>
+</html>
\ No newline at end of file