diff options
| author | tspitzer | 2013-08-21 11:42:51 +0200 |
|---|---|---|
| committer | tspitzer | 2013-08-21 11:42:51 +0200 |
| commit | 1bf162c2febeb48b5343e7c2db24caf4f0c4194b (patch) | |
| tree | 601aea4fc4df5f69d90da5c73da3c7acfc74e2fc | |
| parent | new (diff) | |
| download | tutor-module-1bf162c2febeb48b5343e7c2db24caf4f0c4194b.tar.gz tutor-module-1bf162c2febeb48b5343e7c2db24caf4f0c4194b.tar.xz tutor-module-1bf162c2febeb48b5343e7c2db24caf4f0c4194b.zip | |
new Version
20 files changed, 341 insertions, 624 deletions
diff --git a/Dozentenmodul_V1/WebContent/GUI/de/AddOS.jsp b/Dozentenmodul_V1/WebContent/GUI/de/AddOS.jsp new file mode 100644 index 00000000..58e83fe6 --- /dev/null +++ b/Dozentenmodul_V1/WebContent/GUI/de/AddOS.jsp @@ -0,0 +1,47 @@ +<!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="/Dozentenmodul_V1/css/Layout.css"></link>
+<title>Betriebssystem hinzufügen</title>
+</head>
+<body>
+<h1>Betriebssystem hinzufügen</h1>
+<form action="/Dozentenmodul_V1/SaveOS" method="post">
+<table>
+<tr>
+<td>Hersteller des Betriebssystems:</td>
+<td><input name="Hersteller" type="text" size="30"></input></td>
+</tr>
+<tr>
+<td>Name des Betriebssystems:</td>
+<td><input name="Name" type="text" size="30"></input></td>
+</tr>
+<tr>
+<td>Version des Betriebssystems:</td>
+<td><input name="Version" type="text" size="30"></input></td>
+</tr>
+<tr>
+<td>Architektur des Betriebssystems:</td>
+<td><select name="Architektur" style="width:200px;">
+<option>32-Bit</option>
+<option>64-Bit</option>
+</select></td>
+</tr>
+<tr>
+<td>Art des Betriebssystems:</td>
+<td><select name="Kosten" style="width:200px;">
+<option>Kostenpflichtig</option>
+<option>Kostenfrei</option>
+</select></td>
+</tr>
+<tr>
+<td></td>
+<td><button type="submit" style="width:200px;">Speichern</button></td>
+</tr>
+</table>
+
+</form>
+</body>
+</html>
\ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/Home.jsp b/Dozentenmodul_V1/WebContent/GUI/de/Home.jsp index cdeda876..138f7094 100644 --- a/Dozentenmodul_V1/WebContent/GUI/de/Home.jsp +++ b/Dozentenmodul_V1/WebContent/GUI/de/Home.jsp @@ -20,7 +20,7 @@ <div id="content">
<h2>Aktive VLs</h2>
<ul>
- <%
+ <%
MySQL sql=new MySQL();
Connection con= sql.getConnection();
@@ -41,8 +41,8 @@ while(rs.next()){
%>
- <li><%=rs.getString("Laborname") %></li>
- <%
+ <li><%=rs.getString("Laborname") %> <img src="/Dozentenmodul_V1/img/Pencil3.png" alt="Bearbeiten"></img> <img src="/Dozentenmodul_V1/img/Shutdown_Box_Red.png" alt="Deaktivieren" onclick="alert('Hello')"></img> <img src="/Dozentenmodul_V1/img/DeleteRed.png" alt="Löschen"></img></li>
+ <%
}
}
}
@@ -51,10 +51,30 @@ <h2>Inaktive VLs</h2>
<ul>
+ <%
+ while(u.next())
+ {
+ ResultSet v=sql.getVMpk(con, u.getString("pk"));
+
+ while(v.next())
+ {
+
- <li><img src="/Dozentenmodul_V1/img/Pencil3.png" alt="Bearbeiten"></img></li>
+ ResultSet rs=sql.getInactiveVLs(con, v.getString("VM_pk"));
+ while(rs.next()){
+
+ %>
+
+ <li><%=rs.getString("Laborname") %> <img src="/Dozentenmodul_V1/img/Pencil3.png" alt="Bearbeiten"></img> <img src="/Dozentenmodul_V1/img/Shutdown_Box_Red.png" alt="Deaktivieren"></img> <img src="/Dozentenmodul_V1/img/DeleteRed.png" alt="Löschen"></img></li>
+
+ <%
+ }
+ }
+ }
+
+ %>
</ul>
diff --git a/Dozentenmodul_V1/WebContent/GUI/de/VL_erzeugen.jsp b/Dozentenmodul_V1/WebContent/GUI/de/VL_erzeugen.jsp deleted file mode 100644 index a48cd370..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/VL_erzeugen.jsp +++ /dev/null @@ -1,233 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<%@ page language="java" import="db.MySQL"%>
-<%@ page language="java" import="java.sql.*"%>
-<link rel="stylesheet" type="text/css"
- href="/Dozentenmodul_V1/css/Layout.css"></link>
-<script type="text/javascript" src="/Dozentenmodul_V1/js/tabcontent.js"></script>
-<script type="text/javascript" src="/Dozentenmodul_V1/js/datetimepicker_css.js"></script>
- <title>Login Dozentenmodul</title>
-</head>
-<body>
- <div id="left">
- <div>
- <img src="/Dozentenmodul_V1/img/openslx-logo.png" alt="bwLehrpool" />
- </div>
- <div>
- <ul>
- <li><a href="Home.html">Home</a></li>
- <li><a href="VL_erzeugen.html">VL erzeugen</a></li>
- <li>Logout</li>
- </ul>
- </div>
- </div>
- <div id="right">
- <div id="header">
- <h1 id="Ueberschrift">Dozentenmodul</h1>
- </div>
- <hr></hr>
- <div>
- Sprache: <img alt="de" src="/Dozentenmodul_V1/img/de.png"></img> de |
- <img alt="en" src="/Dozentenmodul_V1/img/us.png"></img> us
- </div>
- <hr></hr>
-
- <div id="breadcrumb">
- <p>
- Sie sind hier: <a href="Loginseite.html">Login</a>
- </p>
- </div>
- <hr></hr>
- <div id="Content">
- <h2>Herzlich Willkommen im Dozentenmodul des bwLehrpools</h2>
- <hr></hr>
- <ul class="tabs" persist="true">
- <li><a href="#" rel="allgemein">Allgemein</a></li>
- <li><a href="#" rel="system">System</a></li>
- <li><a href="#" rel="software">Software</a></li>
- </ul>
- <form>
- <div class="tabcontents">
- <div id="allgemein" class="tabcontent">
- <fieldset>
- <legend>Allgemeine Informationen zum Verantwortlichen</legend>
- <table>
- <tr>
- <td>Vorname: *</td>
- <td><input name="Vorname_V" type="text" /></td>
- </tr>
- <tr>
- <td>Nachname: *</td>
- <td><input name="Nachname_V" type="text" /></td>
- </tr>
- <tr>
- <td>Hochschule: *</td>
- <td><input name="Hochschule_V" type="text" /></td>
- </tr>
- <tr>
- <td>E-Mail: *</td>
- <td><input name="Email_V" type="text" /></td>
- </tr>
- <tr>
- <td>Tel.-Nummer:</td>
- <td><input name="Tel_V" type="text" /></td>
- </tr>
- <tr>
- <td>Fakultät:</td>
- <td><input name="Fakultät_V" type="text" /></td>
- </tr>
- </table>
- </fieldset>
- <br></br>
- <fieldset>
- <legend>Allgemeine Informationen zum Ersteller</legend>
- <table>
- <tr>
- <td>Vorname: *</td>
- <td><input name="Vorname_E" type="text" /></td>
- </tr>
- <tr>
- <td>Nachname: *</td>
- <td><input name="Nachname_E" type="text" /></td>
- </tr>
- <tr>
- <td>Hochschule: *</td>
- <td><input name="Hochschule_E" type="text" /></td>
- </tr>
- <tr>
- <td>E-Mail: *</td>
- <td><input name="Email_E" type="text" /></td>
- </tr>
- <tr>
- <td>Tel.-Nummer:</td>
- <td><input name="Tel_E" type="text" /></td>
- </tr>
- <tr>
- <td>Fakultät:</td>
- <td><input name="Fakultät_E" type="text" /></td>
- </tr>
- </table>
- </fieldset>
- </div>
- <div id="system" class="tabcontent">
- <fieldset>
- <legend>Systeminformationen</legend>
- <table>
- <tr>
- <td>Laborname (Anzeigename): *</td>
- <td><input name="Laborname" type="text" /></td>
- </tr>
- <tr>
- <td>Kurzbeschreibung: *</td>
- <td><input name="shortDesc" type="text" /></td>
- </tr>
- <tr>
- <td>Langbeschreibung: *</td>
- <td><textarea name="TextArea1" cols="20" rows="5"></textarea></td>
- </tr>
- <tr>
- <td>Kommentar:</td>
- <td><textarea name="TextArea1" cols="20" rows="5"></textarea></td>
- </tr>
- <tr>
- <td>Betriebssystem: *</td>
- <td><select name="OS">
- <%
- MySQL sql = new MySQL();
- Connection con = sql.getConnection();
- ResultSet OS = sql.getOSList(con);
-
- while (OS.next()) {
- %>
- <option><%=OS.getString("OS")%></option>
-
- <%
- }
- %>
- </select></td>
- </tr>
- <tr>
- <td>Gültigkeitsdatum: *</td>
- <td>von: <input type="text" id="von_date" maxlength="25"
- size="25" readonly="readonly" /> <img
- src="/Dozentenmodul_V1/img/Calendar/cal.gif"
- onclick="javascript:NewCssCal ('von_date','yyyyMMdd','arrow',true,'24',true)"
- style="cursor: pointer" /> bis: <input type="text"
- id="bis_date" maxlength="25" size="25" readonly="readonly" />
- <img src="/Dozentenmodul_V1/img/Calendar/cal.gif"
- onclick="javascript:NewCssCal ('bis_date','yyyyMMdd','arrow',true,'24',true)"
- style="cursor: pointer" />
- </td>
- </tr>
- <tr>
- <td>Labor sichtbar: *</td>
- <td><input name="sichtbar" type="radio" value="ja" />Ja<br></br>
- <input name="sichtbar" type="radio" value="nein" />Nein</td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- </tr>
- </table>
- </fieldset>
- </div>
- <div id="software" class="tabcontent">
- <p>
- Sortierung nach: <select name="sort">
- <option>Hersteller</option>
- <option>Lizenzpflichtig/-frei</option>
- </select>
- </p>
- <fieldset id="sw_chooser">
- <legend>Verfügbare Software</legend>
- <div class="container">
- <%
- //out.println("<h1>"+request.getParameterValues("sort")+"</h1>");
-
- ResultSet rs = sql.getHersteller(con);
-
- while (rs.next()) {
- ResultSet sw = sql.getSoftware(con, rs.getString("Hersteller"));
- %>
- <label><b><%=rs.getString("Hersteller")%></b></label><br />
-
-
-
- <%
- while (sw.next()) {
- %>
-
- <input type="checkbox"><%=rs.getString("Hersteller") + " "
- + sw.getString("Produktname")%></input>
- <br />
-
- <%
- }
- }
- %>
- </div>
- </fieldset>
- <fieldset id="sw_choosed">
- <legend>Ausgewählte Software</legend>
- <div class="container">
- <label>dasjhdja</label>
- </div>
- </fieldset>
- <br></br>
- <button name="addSW">Software hinzufügen</button>
- </div>
- <hr></hr>
- </div>
- </div>
- </form>
- </div>
-</body>
-
-</html>
diff --git a/Dozentenmodul_V1/WebContent/GUI/de/createLabor.jsp b/Dozentenmodul_V1/WebContent/GUI/de/createLabor.jsp deleted file mode 100644 index 26b846d9..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/createLabor.jsp +++ /dev/null @@ -1,232 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
- pageEncoding="ISO-8859-1"%>
- <%@ page language="java" import="db.MySQL" %>
- <%@ page language="java" import="java.sql.*" %>
-<!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="${pageContext.request.contextPath}/css/Input.css">
-<SCRIPT LANGUAGE="JavaScript"
- SRC="${pageContext.request.contextPath}/js/login.js">
-</SCRIPT>
-<script
- src="${pageContext.request.contextPath}/js/datetimepicker_css.js"></script>
-<title>Dozentenmodul V1</title>
-</head>
-<body onload="location.href='#allgemein'">
- <img id="Logo" alt="bwLehrpool"
- src="${pageContext.request.contextPath}/img/openslx-logo.png">
-
- <form>
- <p>
- Sie sind hier: <a
- href="${pageContext.request.contextPath}/GUI/Home.jsp">Home</a> -> <a
- href="${pageContext.request.contextPath}/GUI/createLabor.jsp">Labor
- erzeugen</a> <input id="englisch" type="image"
- src="${pageContext.request.contextPath}/img/grossbritannien.gif"
- onclick="changeToEnglish();return false;"> <input
- id="deutsch" type="image"
- src="${pageContext.request.contextPath}/img/deutsch.gif"
- onclick="changeToDeutsch();return false;">
- </p>
- </form>
- <form action="/Dozentenmodul_V1/DB_Access" method="post">
- <article class="input"> <section id="allgemein">
- <h2>
- <a href="#allgemein">Allgemein</a>
- </h2>
- <fieldset>
- <legend>Informationen zum Verantwortlichen</legend>
- <div>
- <table>
- <tr>
- <td>Vorname: *</td>
- <td><input type="text" name="Verantwortlicher_Vorname"
- size="60" required="required" ></td>
- </tr>
- <tr>
- <td>Nachname: *</td>
- <td><input type="text" name="Verantwortlicher_Nachname"
- size="60" required="required" ></td>
- </tr>
- <tr>
- <td>Hochschule: *</td>
- <td><input type="text" name="Verantwortlicher_Hochschule"
- size="60" required="required" ></td>
- </tr>
- <tr>
- <td>E-Mail: *</td>
- <td><input type="text" name="Verantwortlicher_Email"
- size="60" required="required"></td>
- </tr>
- <tr>
- <td>Tel.-Nummer: *</td>
- <td><input type="text" name="Verantwortlicher_Tel" size="60" required="required"></td>
- </tr>
- <tr>
- <td>Fakultät: *</td>
- <td><input type="text" name="Verantwortlicher_Fakultät"
- size="60" required="required" ></td>
- </tr>
- </table>
- </div>
- </fieldset>
- <fieldset>
- <legend>Informationen zum Ersteller</legend>
- <div>
- <table>
- <tr>
- <td>Vorname: *</td>
- <td><input type="text" name="Ersteller_Vorname" size="60" required="required"></td>
- </tr>
- <tr>
- <td>Nachname: *</td>
- <td><input type="text" name="Ersteller_Nachname" size="60" required="required"></td>
- </tr>
- <tr>
- <td>Hochschule: *</td>
- <td><input type="text" name="Ersteller_Hochschule" size="60" required="required"></td>
- </tr>
- <tr>
- <td>E-Mail: *</td>
- <td><input type="text" name="Ersteller_Email" size="60" required="required"></td>
- </tr>
- <tr>
- <td>Tel.-Nummer: *</td>
- <td><input type="text" name="Ersteller_Tel" size="60" required="required"></td>
- </tr>
- <tr>
- <td>Fakultät: *</td>
- <td><input type="text" name="Ersteller_Fakultät" size="60" required="required"></td>
- </tr>
- </table>
- </div>
- </fieldset>
- <input id="save" type="submit" value="Speichern"> </section> <section
- id="system">
- <h2>
- <a href="#system">System</a>
- </h2>
- <fieldset>
- <legend>Allgemein</legend>
- <div>
- <table>
- <tr>
- <td>Laborname (Anzeigename): *</td>
- <td><input type="text" name="Laborname" size="60" required="required"></td>
- </tr>
- <tr>
- <td>Kurzbeschreibung: *</td>
- <td><input type="text" name="Kurzbeschreibung" size="60" required="required"></td>
- </tr>
- <tr>
- <td valign="top">Langbeschreibung: *</td>
- <td><textarea rows="10" cols="60" name="Langbeschreibung" required="required"></textarea></td>
- </tr>
- <tr>
- <td valign="top">Kommentar:</td>
- <td><textarea rows="10" cols="60" name="Kommentar"></textarea></td>
- </tr>
- <tr>
- <td>Betriebssystem: *</td>
- <td><select size="1" name="OS" required="required">
- <option>WIN 7</option>
- <option>LINUX</option>
- </select></td>
- </tr>
- <tr>
- <td>Gültigkeitsdatum: *</td>
- <td><p>Gültig von:</p> <input type="Text" id="von_date"
- maxlength="25" size="25" readonly="readonly" required="required" /> <img
- src="/Dozentenmodul_V1/img/Calendar/cal.gif"
- onclick="javascript:NewCssCal ('von_date','yyyyMMdd','arrow',true,'24',true)"
- style="cursor: pointer" /></td>
- </tr>
- <tr>
- <td></td>
- <td><p>Gültig bis:</p> <input type="Text" id="bis_date"
- maxlength="25" size="25" readonly="readonly" required="required" /> <img
- src="/Dozentenmodul_V1/img/Calendar/cal.gif"
- onclick="javascript:NewCssCal ('bis_date','yyyyMMdd','arrow',true,'24',true)"
- style="cursor: pointer" /></td>
- </tr>
- <tr>
- <td>Labor jetzt aktivieren: *</td>
- <td>Ja<input id="aktiv_ja" type="radio" name="aktiv"
- value="Ja">Nein<input id="aktiv_nein" type="radio"
- name="aktiv" value="Nein">
- </td>
- </tr>
- </table>
- </div>
- </fieldset>
- <input id="save" type="submit" value="Speichern"> </section> <section
- id="software">
- <h2>
- <a href="#software">Software</a>
- </h2>
- <p id="sort">
- Sortierung nach: <select size="1" name="sort"><option value="Hersteller" selected="selected">Hersteller</option>
- <option value="Lizenzfrei/-pflichtig">Lizenzfrei/-pflichtig</option></select>
- <fieldset>
- <legend>Verwendete Software</legend>
- <table>
- <tr>
- <td>
- <div class="container">
- <%
- //out.println("<h1>"+request.getParameterValues("sort")+"</h1>");
- MySQL sql=new MySQL();
- Connection con=sql.getConnection();
- ResultSet rs=sql.getHersteller(con);
-
-
-
- while(rs.next())
- {
- ResultSet sw=sql.getSoftware(con,rs.getString("Hersteller"));
- %>
- <label><b><%=rs.getString("Hersteller") %></b></label><br/>
-
-
-
- <%
- while(sw.next())
- {
- %>
-
- <input id="SW_list" type="checkbox" ><%=sw.getString("Produktname") %> <br/>
-
- <%
- }
- }
-
- %>
- </div>
- </td>
- <td>
-
- <fieldset>
- <legend>Ausgewählte Software</legend>
- <select id="SW" size="10" disabled="disabled">
- <option>test</option>
- </select>
- </fieldset>
- </td>
- </tr>
- <tr>
- <td></td>
- <td><input id="buttonAddSW" type="button"
- value="Software Hinzufügen"></td>
- </tr>
-
- </table>
- </fieldset>
- <input id="save" type="submit" value="Speichern"> </section> </article>
- </form>
-
-
-</body>
-</html>
\ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/createVL_Software.jsp b/Dozentenmodul_V1/WebContent/GUI/de/createVL_Software.jsp index 69377ab2..979ca401 100644 --- a/Dozentenmodul_V1/WebContent/GUI/de/createVL_Software.jsp +++ b/Dozentenmodul_V1/WebContent/GUI/de/createVL_Software.jsp @@ -18,6 +18,30 @@ <jsp:include page="header.html" />
<jsp:include page="menü.html" />
<jsp:include page="news.jsp" />
+
+ <!-- Speichern der Formulardaten aus createVL_System.jsp in die Session Variable -->
+ <%
+ String Laborname=request.getParameter("Laborname");
+ session.setAttribute("Laborname", Laborname);
+
+ String shortDesc=request.getParameter("shortDesc");
+ session.setAttribute("shortDesc", shortDesc);
+
+ String longDesc=request.getParameter("longDesc");
+ session.setAttribute("longDesc", longDesc);
+
+ String comment=request.getParameter("comment");
+ session.setAttribute("comment", comment);
+
+ String OS=request.getParameter("OS");
+ session.setAttribute("OS", OS);
+
+ String von_date=request.getParameter("von_date");
+ session.setAttribute("von_date", von_date);
+
+ String bis_date=request.getParameter("bis_date");
+ session.setAttribute("bis_date", bis_date);
+ %>
<div id="content">
<div id="bread">
Sie sind hier:
@@ -28,7 +52,7 @@ <a href="#" rel="software">Software</a>
</div>
<br \>
- <form>
+ <form action="/Dozentenmodul_V1/DB_Access" method="post">
<p>
Sortierung nach: <select name="sort">
<option>Hersteller</option>
@@ -48,14 +72,15 @@ {
ResultSet sw=sql.getSoftware(con, h.getString("Name"));
-
+
%>
<label><b><%=h.getString("Name") %></b></label><br />
<%
while(sw.next())
{
+ int id=i++;
%>
- <input name="checkbox" type="checkbox" onChange="refresh();"><%=h.getString("Name")%> <%=sw.getString("Produktname")%> <%=sw.getString("Version") %> <%=sw.getString("Architektur") %>
+ <input name="<%=id %>" type="checkbox" onChange="refresh(<%=id%>);"><%=h.getString("Name")%> <%=sw.getString("Produktname")%> <%=sw.getString("Version") %> <%=sw.getString("Architektur") %>
<br />
<%
}
@@ -67,13 +92,13 @@ <fieldset id="sw_choosed">
<legend>Ausgewählte Software</legend>
<div id="sw" class="container">
- <label></label>
+
</div>
</fieldset>
<br>
<button id="buttonAddSW" name="addSW" onclick="saveSW()">Software hinzufügen</button><br><br>
<button id="buttonBackSW" type="submit">Zurück</button>
- <button id="buttonReady" type="submit">Weiter zur VL Erzeugung</button>
+ <button id="buttonReady" type="submit">Speichere Daten und gehe zu VL Upload</button>
</form>
</div>
diff --git a/Dozentenmodul_V1/WebContent/GUI/de/createVL_System.jsp b/Dozentenmodul_V1/WebContent/GUI/de/createVL_System.jsp index 97e8aa94..f780302f 100644 --- a/Dozentenmodul_V1/WebContent/GUI/de/createVL_System.jsp +++ b/Dozentenmodul_V1/WebContent/GUI/de/createVL_System.jsp @@ -1,5 +1,8 @@ +<%@page import="org.apache.catalina.Session"%>
<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
pageEncoding="ISO-8859-1"%>
+ <%@ page language="java" import="db.MySQL"%>
+<%@ page language="java" import="java.sql.*"%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
@@ -9,11 +12,53 @@ <link rel="stylesheet" type="text/css"
href="/Dozentenmodul_V1/css/Input.css"></link>
<title>Insert title here</title>
+<script language="JavaScript" src="/Dozentenmodul_V1/js/functions.js">
+</script>
+<script type="text/javascript" src="/Dozentenmodul_V1/js/datetimepicker_css.js"></script>
</head>
<body>
<jsp:include page="header.html" />
<jsp:include page="menü.html" />
<jsp:include page="news.jsp" />
+
+ <!-- Speichern der Formulardaten createVL_allgemein.jsp in eine Session Variable -->
+ <%
+ String Vorname_V=request.getParameter("Vorname_V");
+ session.setAttribute("Vorname_V",Vorname_V );
+
+ String Nachname_V=request.getParameter("Nachname_V");
+ session.setAttribute("Nachname_V",Nachname_V );
+
+ String Hochschule_V=request.getParameter("Hochschule_V");
+ session.setAttribute("Hochschule_V",Hochschule_V );
+
+ String Email_V=request.getParameter("Email_V");
+ session.setAttribute("Email_V",Email_V );
+
+ String Tel_V=request.getParameter("Tel_V");
+ session.setAttribute("Tel_V",Tel_V );
+
+ String Fakultät_V=request.getParameter("Fakultät_V");
+ session.setAttribute("Fakultät_V",Fakultät_V );
+
+ String Vorname_E=request.getParameter("Vorname_E");
+ session.setAttribute("Vorname_E",Vorname_E );
+
+ String Nachname_E=request.getParameter("Nachname_E");
+ session.setAttribute("Nachname_E",Nachname_E );
+
+ String Hochschule_E=request.getParameter("Hochschule_E");
+ session.setAttribute("Hochschule_E",Hochschule_E );
+
+ String Email_E=request.getParameter("Email_E");
+ session.setAttribute("Email_E",Email_E );
+
+ String Tel_E=request.getParameter("Tel_E");
+ session.setAttribute("Tel_E",Tel_E );
+
+ String Fakultät_E=request.getParameter("Fakultät_E");
+ session.setAttribute("Fakultät_E",Fakultät_E );
+ %>
<div id="content">
<div id="bread">
Sie sind hier:
@@ -38,40 +83,47 @@ </tr>
<tr>
<td>Langbeschreibung: *</td>
- <td><textarea name="TextArea1" cols="20" rows="5"></textarea></td>
+ <td><textarea name="longDesc" cols="20" rows="5"></textarea></td>
</tr>
<tr>
<td>Kommentar:</td>
- <td><textarea name="TextArea1" cols="20" rows="5"></textarea></td>
+ <td><textarea name="comment" cols="20" rows="5"></textarea></td>
</tr>
<tr>
<td>Betriebssystem: *</td>
- <td><select name="OS">
+ <td><div id="test"><select id="OS" name="OS" onclick="javascript:refreshSelect();">
+ <%
+ MySQL sql=new MySQL();
+ Connection con=sql.getConnection();
+
+ ResultSet rs=sql.getOSList(con);
+
+ while(rs.next())
+ {
+ %>
+ <option><%=rs.getString("Produktname")%> <%=rs.getString("Version")%> <%=rs.getString("Architektur") %></option>
+ <%
+ }
+ %>
- <option>WIN</option>
-
- </select></td>
+ </select><input type=button value="Hinzufügen" onclick="javascript:openAddOS()"></div></td>
+
</tr>
<tr>
<td>Gültigkeitsdatum: *</td>
- <td>von: <input type="text" id="von_date" maxlength="25"
+ <td>von: <input type="text" id="von_date" name="von_date" maxlength="25"
size="25" readonly="readonly" /> <img
src="/Dozentenmodul_V1/img/Calendar/cal.gif"
onclick="javascript:NewCssCal ('von_date','yyyyMMdd','arrow',true,'24',true)"
style="cursor: pointer" /> bis: <input type="text"
- id="bis_date" maxlength="25" size="25" readonly="readonly" />
+ id="bis_date" name="bis_date" maxlength="25" size="25" readonly="readonly" />
<img src="/Dozentenmodul_V1/img/Calendar/cal.gif"
onclick="javascript:NewCssCal ('bis_date','yyyyMMdd','arrow',true,'24',true)"
style="cursor: pointer" />
</td>
</tr>
<tr>
- <td>Labor sichtbar: *</td>
- <td><input name="sichtbar" type="radio" value="ja" />Ja<br></br>
- <input name="sichtbar" type="radio" value="nein" />Nein</td>
- </tr>
- <tr>
<td></td>
<td></td>
</tr>
diff --git a/Dozentenmodul_V1/WebContent/GUI/de/createVL_allgemine.jsp b/Dozentenmodul_V1/WebContent/GUI/de/createVL_allgemein.jsp index 6e099ed9..6e099ed9 100644 --- a/Dozentenmodul_V1/WebContent/GUI/de/createVL_allgemine.jsp +++ b/Dozentenmodul_V1/WebContent/GUI/de/createVL_allgemein.jsp diff --git a/Dozentenmodul_V1/WebContent/GUI/de/footer.html b/Dozentenmodul_V1/WebContent/GUI/de/footer.html index cb53a696..ce63d776 100644 --- a/Dozentenmodul_V1/WebContent/GUI/de/footer.html +++ b/Dozentenmodul_V1/WebContent/GUI/de/footer.html @@ -1,3 +1,4 @@ +<!-- Erzeugt den Footer für die Webanwendung -->
<div id="footer">
<a id="link" href="bla">Kontakt</a>
<a id="link" href="bla">FAQ</a>
diff --git a/Dozentenmodul_V1/WebContent/GUI/de/header.html b/Dozentenmodul_V1/WebContent/GUI/de/header.html index 072487c8..83b3ab26 100644 --- a/Dozentenmodul_V1/WebContent/GUI/de/header.html +++ b/Dozentenmodul_V1/WebContent/GUI/de/header.html @@ -1,3 +1,4 @@ +<!-- Erzeugt den Header, Logo und Überschrift für die Webanwendung -->
<div id="lang">
<img alt="de" src="/Dozentenmodul_V1/img/de.png"> de | <img alt="en" src="/Dozentenmodul_V1/img/us.png"> us
</div>
diff --git a/Dozentenmodul_V1/WebContent/GUI/de/menü.html b/Dozentenmodul_V1/WebContent/GUI/de/menü.html index 8e93f674..ee5f3f96 100644 --- a/Dozentenmodul_V1/WebContent/GUI/de/menü.html +++ b/Dozentenmodul_V1/WebContent/GUI/de/menü.html @@ -1,8 +1,9 @@ +<!-- Erzeugt das Navigationsmenü für die Webanwendung -->
<ul class="vertical-list">
- <li><a href='/' class='button'>Home</a></li>
- <li><a href='/' class='button'>VL erzeugen</a></li>
- <li><a href='/' class='button'>VL bearbeiten</a></li>
- <li><a href='/' class='button'>Einstellungen</a></li>
- <li><a href='OTRS.jsp' class='button'>Wartung</a></li>
+ <li><a href='/Dozentenmodul_V1/GUI/de/Home.jsp' class='button'>Home</a></li>
+ <li><a href='/Dozentenmodul_V1/GUI/de/createVL_allgemein.jsp' class='button'>VL erzeugen</a></li>
+ <!--<li><a href='/' class='button'>VL bearbeiten</a></li>
+ <li><a href='/' class='button'>Einstellungen</a></li>-->
+ <li><a href='/Dozentenmodul_V1/GUI/de/OTRS.jsp' class='button'>Wartung</a></li>
<li><a href='/' class='button'>Logout</a></li>
</ul>
diff --git a/Dozentenmodul_V1/WebContent/WEB-INF/web.xml b/Dozentenmodul_V1/WebContent/WEB-INF/web.xml index 65421878..55db46a3 100644 --- a/Dozentenmodul_V1/WebContent/WEB-INF/web.xml +++ b/Dozentenmodul_V1/WebContent/WEB-INF/web.xml @@ -2,6 +2,6 @@ <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
<display-name>Dozentenmodul_V1</display-name>
<welcome-file-list>
- <welcome-file>/de/GUI/Login.jsp</welcome-file>
+ <welcome-file>Login.jsp</welcome-file>
</welcome-file-list>
</web-app>
\ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/js/functions.js b/Dozentenmodul_V1/WebContent/js/functions.js index fc4cd849..3b25e746 100644 --- a/Dozentenmodul_V1/WebContent/js/functions.js +++ b/Dozentenmodul_V1/WebContent/js/functions.js @@ -1,23 +1,31 @@ -function refresh(){
-
- var checkbox=document.getElementsByName("checkbox");
+function refresh(id){
+ alert('dsfdsa');
+ var checkbox=document.getElementsByName(id);
+ alert(id);
var pointToAppend=document.getElementById("sw");
- var label=document.createElement("label");
- for(var i=0; i<checkbox.length;i++)
- {
- if(checkbox[i].checked){
+
+ //for(var i=0; i<checkbox.length;i++)
+ //{
+ if(checkbox[0].checked==true){
label.innerHTML="sdaas";
- pointToAppend.appendChild(label);
+ pointToAppend
}
- else{
- pointToAppend.removeChild(label);
- }
+
+ if(checkbox[0].checked==false)
+ {
+ label.innerHTML="";
+ pointToAppend.appendChild(label);
}
+
}
-function saveSW(){
-
+function openAddOS(){
+ window.open('/Dozentenmodul_V1/GUI/de/AddOS.jsp','Text Titelbar','toolbar=0,location=0,directories=0,menubar=0,scrollbars=1,resizable=0,width=500,height=470');
+}
+
+function refreshSelect(){
+ location.reload();
}
\ No newline at end of file diff --git a/Dozentenmodul_V1/build/classes/db/DB_Access.class b/Dozentenmodul_V1/build/classes/db/DB_Access.class Binary files differindex 3484ea31..03075d17 100644 --- a/Dozentenmodul_V1/build/classes/db/DB_Access.class +++ b/Dozentenmodul_V1/build/classes/db/DB_Access.class diff --git a/Dozentenmodul_V1/build/classes/db/MySQL.class b/Dozentenmodul_V1/build/classes/db/MySQL.class Binary files differindex 09075e54..5bb994e5 100644 --- a/Dozentenmodul_V1/build/classes/db/MySQL.class +++ b/Dozentenmodul_V1/build/classes/db/MySQL.class diff --git a/Dozentenmodul_V1/build/classes/db/SaveOS.class b/Dozentenmodul_V1/build/classes/db/SaveOS.class Binary files differnew file mode 100644 index 00000000..7a861604 --- /dev/null +++ b/Dozentenmodul_V1/build/classes/db/SaveOS.class diff --git a/Dozentenmodul_V1/build/classes/ftpupload/Ftpupload.class b/Dozentenmodul_V1/build/classes/ftpupload/Ftpupload.class Binary files differdeleted file mode 100644 index 28c25b2a..00000000 --- a/Dozentenmodul_V1/build/classes/ftpupload/Ftpupload.class +++ /dev/null diff --git a/Dozentenmodul_V1/src/db/DB_Access.java b/Dozentenmodul_V1/src/db/DB_Access.java index 99bdca06..820535f6 100644 --- a/Dozentenmodul_V1/src/db/DB_Access.java +++ b/Dozentenmodul_V1/src/db/DB_Access.java @@ -16,9 +16,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse;
import java.sql.*;
-
-import authentifizierung.Ldap;
-
/**
* Servlet implementation class mySQLServlet
*/
@@ -46,31 +43,13 @@ public class DB_Access extends HttpServlet { */
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
response.setContentType("text/html;charset=UTF-8");
- PrintWriter out = response.getWriter();
- try {
- Class.forName("com.mysql.jdbc.Driver").newInstance();
- } catch (InstantiationException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (IllegalAccessException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (ClassNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ MySQL sql=new MySQL();
+ Connection con=sql.getConnection();
- try {
- Connection con=DriverManager.getConnection("jdbc:mysql://141.79.128.121/bwLehrpool?user=root&password=!N4ye,04u.");
-
-
- RequestDispatcher disp= getServletContext().getRequestDispatcher("/GUI/de/Login_Error.jsp");
- disp.forward(request, response);
- } catch (SQLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+
+ RequestDispatcher disp= getServletContext().getRequestDispatcher("/GUI/de/VLUpload.jsp");
+ disp.forward(request, response);
}
diff --git a/Dozentenmodul_V1/src/db/MySQL.java b/Dozentenmodul_V1/src/db/MySQL.java index ac02d8c4..45e11f36 100644 --- a/Dozentenmodul_V1/src/db/MySQL.java +++ b/Dozentenmodul_V1/src/db/MySQL.java @@ -19,7 +19,7 @@ public class MySQL { }
try {
- Connection con=DriverManager.getConnection("jdbc:mysql://141.79.128.121/bwLehrpool?user=root&password=!N4ye,04u.");
+ Connection con=DriverManager.getConnection("jdbc:mysql://127.0.0.1/bwLehrpool?user=root&password=root");
return con;
} catch (SQLException e) {
// TODO Auto-generated catch block
@@ -35,7 +35,7 @@ public class MySQL { {
try {
Statement stm=con.createStatement();
- return stm.executeQuery("SELECT Name FROM bwLehrpool.SWHersteller order by Name asc;");
+ return stm.executeQuery("SELECT pk,Name FROM bwLehrpool.SWHersteller order by Name asc;");
} catch (SQLException e) {
@@ -105,12 +105,12 @@ public class MySQL { }
- public ResultSet getInactiveVLs(Connection con, String Mail)
+ public ResultSet getInactiveVLs(Connection con, String VMpk)
{
Statement stm;
try {
stm = con.createStatement();
- return stm.executeQuery("Select Laborname from bwLehrpool.VM where IstAktiv=0 and pk=(SELECT VM_pk FROM bwLehrpool.Benutzer_has_VM where Benutzer_pk=(SELECT pk FROM bwLehrpool.Benutzer where EMail like '"+Mail+"'));");
+ return stm.executeQuery("Select Laborname from bwLehrpool.VM where IstAktiv=0 and pk="+VMpk+";");
} catch (SQLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
@@ -123,12 +123,81 @@ public class MySQL { Statement stm;
try {
stm = con.createStatement();
- return stm.executeQuery("SELECT distinct OS FROM bwLehrpool.VM;");
+ return stm.executeQuery("SELECT distinct Produktname, Version, Architektur FROM bwlehrpool.betriebssystem order by Produktname asc;");
} catch (SQLException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
return null;
}
+
+ public int AddOS(Connection con, String name, String Version, String Architektur,int Kosten, String Hersteller)
+ {
+ Statement stm;
+
+
+ try {
+ stm=con.createStatement();
+
+ int pk_Hersteller=HerstellerExists(con, Hersteller);
+
+ if(pk_Hersteller==-1)
+ {
+ addHersteller(con, Hersteller);
+ }
+
+
+ int ret=stm.executeUpdate("INSERT INTO `bwlehrpool`.`betriebssystem`(`Produktname`,`Version`,`Architektur`,`IstKostenlos`,`SWHersteller_pk`)VALUES('"+name+"','"+Version+"','"+Architektur+"',"+Kosten+","+pk_Hersteller+");");
+ return ret;
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return -1;
+
+ }
+
+ public int HerstellerExists(Connection con, String Hersteller)
+ {
+ Statement stm;
+ int pk_Hersteller=-1;
+
+
+ try {
+ stm=con.createStatement();
+ ResultSet rs=getHersteller(con);
+
+ while(rs.next())
+ {
+ if(rs.getString("Name").equals(Hersteller))
+ {
+ pk_Hersteller=Integer.parseInt(rs.getString("pk"));
+ }
+ }
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ return pk_Hersteller;
+
+ }
+
+ public int addHersteller(Connection con, String Name){
+
+ Statement stm;
+ int ret=-1;
+ try {
+ stm=con.createStatement();
+ ret=stm.executeUpdate("INSERT INTO `bwlehrpool`.`swhersteller`(`Name`)VALUES('"+Name+"');");
+ con.commit();
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+
+ e.printStackTrace();
+ }
+ return ret;
+
+ }
}
diff --git a/Dozentenmodul_V1/src/db/SaveOS.java b/Dozentenmodul_V1/src/db/SaveOS.java new file mode 100644 index 00000000..8bdeda1f --- /dev/null +++ b/Dozentenmodul_V1/src/db/SaveOS.java @@ -0,0 +1,66 @@ +package db;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import com.mysql.jdbc.Connection;
+
+import db.MySQL;
+/**
+ * Servlet implementation class SaveOS
+ */
+@WebServlet("/SaveOS")
+public class SaveOS extends HttpServlet {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * @see HttpServlet#HttpServlet()
+ */
+ public SaveOS() {
+ super();
+ // TODO Auto-generated constructor stub
+ }
+
+ /**
+ * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
+ */
+ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ doPost(request,response);
+ }
+
+ /**
+ * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
+ */
+ protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ response.setContentType("text/html");
+ PrintWriter out = response.getWriter();
+ int Kosten=0;
+
+ if(request.getParameter("Kosten").equals("Kostenpflichtig"))
+ {
+ Kosten=1;
+ }
+
+ MySQL sql=new MySQL();
+ java.sql.Connection con=sql.getConnection();
+
+ int ret=sql.AddOS(con, request.getParameter("Name"), request.getParameter("Version"), request.getParameter("Architektur"), Kosten, request.getParameter("Hersteller"));
+
+ if(ret==1)
+ {
+ out.println("Eingabe erfolgreich gespeichert");
+ }
+ else
+ {
+ out.println("Bei der Speicherung der Daten ist ein Fehler aufgetreten, bitte wenden Sie sich an den Support");
+ }
+
+ }
+
+}
diff --git a/Dozentenmodul_V1/src/ftpupload/Ftpupload.java b/Dozentenmodul_V1/src/ftpupload/Ftpupload.java deleted file mode 100644 index 92f65517..00000000 --- a/Dozentenmodul_V1/src/ftpupload/Ftpupload.java +++ /dev/null @@ -1,87 +0,0 @@ -package ftpupload;
-
-import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-
-import org.apache.commons.net.ftp.FTP;
-import org.apache.commons.net.ftp.FTPClient;
-import org.apache.commons.net.ftp.FTPReply;
-/**
- * Servlet implementation class Ftpupload
- */
-@WebServlet("/Ftpupload")
-public class Ftpupload extends HttpServlet {
- private static final long serialVersionUID = 1L;
-
- /**
- * @see HttpServlet#HttpServlet()
- */
- public Ftpupload() {
- super();
- // TODO Auto-generated constructor stub
- }
-
- /**
- * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
- */
- protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- doPost(request, response);
- }
-
- /**
- * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
- */
- protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-
- String hostName = "openslx-nfs.rz.hs-offenburg.de";
- String username = "tspitzer";
- String password = "";
- String location = request.getParameter("file");
-
- System.out.println(location);
- FTPClient ftp = null;
-
- InputStream in = null;
- try {
- ftp = new FTPClient();
- ftp.
- ftp.connect(hostName);
- ftp.login(username, password);
-
- ftp.setFileType(FTP.BINARY_FILE_TYPE);
- ftp.
- ftp.changeWorkingDirectory("/ei");
-
- int reply = ftp.getReplyCode();
- System.out.println("Received Reply from FTP Connection:" + reply);
-
- if(FTPReply.isPositiveCompletion(reply)){
- System.out.println("Connected Success");
- }
-
- System.out.println(location);
-
- File f1 = new File("C:\\Users\\tspitzer\\Pictures\\"+location);
- in = new FileInputStream(f1);
-
- ftp.storeFile("test.vmdk",in);
-
-
- System.out.println("SUCCESS");
-
- ftp.logout();
- ftp.disconnect();
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- }
-
-}
|