Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
Conflicts:
	.gitignore
	STS/.gitignore
	STS/eshop/WebContent/WEB-INF/E-Shop.jsp
	STS/eshop/WebContent/WEB-INF/InsertData.jsp
	STS/eshop/WebContent/WEB-INF/SelectDataTable.jsp
	STS/eshop/WebContent/WEB-INF/spring-dispatcher-servlet.xml
	STS/eshop/WebContent/WEB-INF/web.xml
	STS/eshop/src/com/eshop/controller/AppController.java
	STS/eshop/src/com/eshop/model/BackupDB.java
	STS/eshop/src/com/eshop/model/CreateDataTable.java
	STS/eshop/src/com/eshop/model/DeleteDataTable.java
	STS/eshop/src/com/eshop/model/DescribeTableInfoColumns.java
	STS/eshop/src/com/eshop/model/InsertDataTable.java
	STS/eshop/src/com/eshop/model/SelectDataTable.java
	STS/eshop/src/com/eshop/model/ShrinkDataDB.java
  • Loading branch information
SKuznet committed Dec 22, 2015
2 parents 257943e + a909280 commit 1717b7b
Show file tree
Hide file tree
Showing 37 changed files with 1,286 additions and 138 deletions.
75 changes: 0 additions & 75 deletions .classpath

This file was deleted.

18 changes: 0 additions & 18 deletions .gitignore

This file was deleted.

11 changes: 0 additions & 11 deletions .project

This file was deleted.

31 changes: 0 additions & 31 deletions STS/.gitignore

This file was deleted.

2 changes: 0 additions & 2 deletions STS/eshop/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion STS/eshop/WebContent/.gitignore

This file was deleted.

2 changes: 2 additions & 0 deletions STS/eshop/WebContent/WEB-INF/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/lib/
/tld/
20 changes: 20 additions & 0 deletions STS/eshop/WebContent/WEB-INF/E-Shop.jsp
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<LINK REL="stylesheet" TYPE="text/css"
HREF="<%=request.getContextPath()%>/css/style.css" TITLE="style" />
<title>E-Shop project</title>
</head>
<body>
<%@ include file="/WEB-INF/header.jsp"%>
<div class="container">
<%@ include file="/WEB-INF/leftMenu.jsp"%>
<div class="content" align="center">
<h1>${result}</h1>
</div>
</div>
</body>
</html>
34 changes: 34 additions & 0 deletions STS/eshop/WebContent/WEB-INF/InsertData.jsp
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<LINK REL="stylesheet" TYPE="text/css"
HREF="<%=request.getContextPath()%>/css/style.css" TITLE="style" />
<title>E-Shop project</title>
</head>
<body>
<%@ include file="/WEB-INF/header.jsp"%>
<div class="container">
<%@ include file="/WEB-INF/leftMenu.jsp"%>
<div class="content" align="center">
<h1>${result}</h1>
Insert data<br>
<form action="insertDataTable" method="post">
<p>
Table name <input type="text" id="tableName" name="tableName" />
</p>
<p>
Name <input type="text" id="name" name="name" />
</p>
<p>
Amount <input type="text" id="amount" name="amount" />
</p>
<p></p>
<input type="submit" value="Insert"></input>
</form>
</div>
</div>
</body>
</html>
50 changes: 50 additions & 0 deletions STS/eshop/WebContent/WEB-INF/SelectDataTable.jsp
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
<%@ page import="java.util.ArrayList"%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<LINK REL="stylesheet" TYPE="text/css"
HREF="<%=request.getContextPath()%>/css/style.css" TITLE="style" />
<title>E-Shop project</title>
</head>
<body>
<%@ include file="/WEB-INF/header.jsp"%>
<div class="container">
<%@ include file="/WEB-INF/leftMenu.jsp"%>
<div class="content" align="center">
<h1>${result}</h1>
<form action="selectDataTable" method="post">
Select table <input type="text" id="tableName" name="tableName" />
<input type="submit" value="Select"></input>
</form>
<%
ArrayList<String> list = (ArrayList<String>) request.getAttribute("list");
if (list != null) {
%>
<table class="selecttable" border="1">
<tr class="titleTR">
<td>Id</td>
<td>Name</td>
<td>Amount</td>
</tr>
<%
for (int i = 0; i < list.size(); i += 3) {
%>
<tr>
<td><%=list.get(i)%></td>
<td><%=list.get(i + 1)%></td>
<td><%=list.get(i + 2)%></td>
</tr>
<%
}
%>
</table>
<%
}
%>
</div>
</div>
</body>
</html>
40 changes: 40 additions & 0 deletions STS/eshop/WebContent/WEB-INF/ShowTables.jsp
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>

<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<LINK REL="stylesheet" TYPE="text/css"
HREF="<%=request.getContextPath()%>/css/style.css" TITLE="style" />
<title>shrink</title>
</head>
<body>
<div class="header">E-Shop project:Shrink</div>
<div class="container">
<%@ include file="/WEB-INF/leftMenu.jsp"%>
<div class="content" align="center">
<p align=center>Select a table for shrink:</p>
<form:form action="ShrinkDataDB" modelAttribute="OptimizedTables">
<table border="1">
<tr>
<th>Table name</th>
<th>&nbsp;
</tr>
<c:forEach var="tableName" items="${listTables}">
<tr>
<td>${tableName}</td>
<td><form:checkbox path="tablesList" value="${tableName}" checked="checked"/></td>
</tr>
</c:forEach>
<tr>
<td colspan="2" align=""><input type="submit" value="OK"></td>
</tr>
</table>
</form:form>
</div>
</div>
</body>
</html>
15 changes: 15 additions & 0 deletions STS/eshop/WebContent/WEB-INF/backup.jsp
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Insert title here</title>
</head>
<body>
<form method="post" action="BackupDB">
Path <input type="text" name="path" id="path" value="C:\\backup.sql">
<input type="submit" value="ok">
</form>
</body>
</html>
24 changes: 24 additions & 0 deletions STS/eshop/WebContent/WEB-INF/createtable.jsp
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<LINK REL="stylesheet" TYPE="text/css"
HREF="<%=request.getContextPath()%>/css/style.css" TITLE="style" />
<title>E-Shop project</title>
</head>
<body>
<%@ include file="/WEB-INF/header.jsp"%>
<div class="container">
<%@ include file="/WEB-INF/leftMenu.jsp"%>
<div class="content" align="center">
<h1>${result}</h1>
<form action="createDataTable" method="post">
Create table <input type="text" id="tableName" name="tableName" />
<input type="submit" value="Create table"></input>
</form>
</div>
</div>
</body>
</html>
24 changes: 24 additions & 0 deletions STS/eshop/WebContent/WEB-INF/deletetable.jsp
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<LINK REL="stylesheet" TYPE="text/css"
HREF="<%=request.getContextPath()%>/css/style.css" TITLE="style" />
<title>E-Shop project</title>
</head>
<body>
<%@ include file="/WEB-INF/header.jsp"%>
<div class="container">
<%@ include file="/WEB-INF/leftMenu.jsp"%>
<div class="content" align="center">
<h1>${result}</h1>
<form action="deleteDataTable" method="post">
Delete table <input type="text" id="tableName" name="tableName" />
<input type="submit" value="Delete table"></input>
</form>
</div>
</div>
</body>
</html>
Loading

0 comments on commit 1717b7b

Please sign in to comment.