From 1bf162c2febeb48b5343e7c2db24caf4f0c4194b Mon Sep 17 00:00:00 2001
From: tspitzer
Date: Wed, 21 Aug 2013 11:42:51 +0200
Subject: new Version
---
Dozentenmodul_V1/WebContent/GUI/de/AddOS.jsp | 47 +++++
Dozentenmodul_V1/WebContent/GUI/de/Home.jsp | 28 ++-
Dozentenmodul_V1/WebContent/GUI/de/VL_erzeugen.jsp | 233 ---------------------
Dozentenmodul_V1/WebContent/GUI/de/createLabor.jsp | 232 --------------------
.../WebContent/GUI/de/createVL_Software.jsp | 35 +++-
.../WebContent/GUI/de/createVL_System.jsp | 78 +++++--
.../WebContent/GUI/de/createVL_allgemein.jsp | 97 +++++++++
.../WebContent/GUI/de/createVL_allgemine.jsp | 97 ---------
Dozentenmodul_V1/WebContent/GUI/de/footer.html | 1 +
Dozentenmodul_V1/WebContent/GUI/de/header.html | 1 +
.../WebContent/GUI/de/men\303\274.html" | 11 +-
Dozentenmodul_V1/WebContent/WEB-INF/web.xml | 2 +-
Dozentenmodul_V1/WebContent/js/functions.js | 34 +--
Dozentenmodul_V1/build/classes/db/DB_Access.class | Bin 2576 -> 1648 bytes
Dozentenmodul_V1/build/classes/db/MySQL.class | Bin 3646 -> 5318 bytes
Dozentenmodul_V1/build/classes/db/SaveOS.class | Bin 0 -> 2080 bytes
.../build/classes/ftpupload/Ftpupload.class | Bin 1111 -> 0 bytes
Dozentenmodul_V1/src/db/DB_Access.java | 31 +--
Dozentenmodul_V1/src/db/MySQL.java | 79 ++++++-
Dozentenmodul_V1/src/db/SaveOS.java | 66 ++++++
Dozentenmodul_V1/src/ftpupload/Ftpupload.java | 87 --------
21 files changed, 438 insertions(+), 721 deletions(-)
create mode 100644 Dozentenmodul_V1/WebContent/GUI/de/AddOS.jsp
delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/VL_erzeugen.jsp
delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/createLabor.jsp
create mode 100644 Dozentenmodul_V1/WebContent/GUI/de/createVL_allgemein.jsp
delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/createVL_allgemine.jsp
create mode 100644 Dozentenmodul_V1/build/classes/db/SaveOS.class
delete mode 100644 Dozentenmodul_V1/build/classes/ftpupload/Ftpupload.class
create mode 100644 Dozentenmodul_V1/src/db/SaveOS.java
delete mode 100644 Dozentenmodul_V1/src/ftpupload/Ftpupload.java
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 @@
+
+
+
+
Aktive VLs
- <%
+ <%
MySQL sql=new MySQL();
Connection con= sql.getConnection();
@@ -41,8 +41,8 @@
while(rs.next()){
%>
- <%=rs.getString("Laborname") %>
- <%
+ <%=rs.getString("Laborname") %>
+ <%
}
}
}
@@ -51,10 +51,30 @@
Inaktive VLs
+ <%
+ while(u.next())
+ {
+ ResultSet v=sql.getVMpk(con, u.getString("pk"));
+
+ while(v.next())
+ {
+
-
+ ResultSet rs=sql.getInactiveVLs(con, v.getString("VM_pk"));
+ while(rs.next()){
+
+ %>
+
+ <%=rs.getString("Laborname") %>
+
+ <%
+ }
+ }
+ }
+
+ %>
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 @@
-
-
-
-
-
-<%@ page language="java" import="db.MySQL"%>
-<%@ page language="java" import="java.sql.*"%>
-
-
-
- Login Dozentenmodul
-
-
-
-
-
-
-
-
-
-
-
-
- Sprache:
de |
-
us
-
-
-
-
-
- Sie sind hier: Login
-
-
-
-
-
Herzlich Willkommen im Dozentenmodul des bwLehrpools
-
-
-
-
-
-
-
-
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.*" %>
-
-
-
-
-
-
-
-Dozentenmodul V1
-
-
-
-
-
-
- Sie sind hier: Home -> Labor
- erzeugen
-
-
-
-
-
-
-
-
-
\ 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 @@
+
+
+ <%
+ 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);
+ %>
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.*"%>
@@ -9,11 +12,53 @@
Insert title here
+
+
+
+
+ <%
+ 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 );
+ %>