11 files changed, 27 insertions, 12 deletions

diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class
index e45c4bb5..d25020ec 100644
--- a/Dozentenmodul/bin/gui/intro/Login_GUI.class
+++ b/Dozentenmodul/bin/gui/intro/Login_GUI.class
diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class
index 808b6d99..f7dab652 100644
--- a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class
+++ b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class
diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class
index c412ac7b..0d19affe 100644
--- a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class
+++ b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class
diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class
index 81bbec82..2c29082d 100644
--- a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class
+++ b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class
diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java
index 3d882da0..75320b58 100644
--- a/Dozentenmodul/src/gui/intro/Login_GUI.java
+++ b/Dozentenmodul/src/gui/intro/Login_GUI.java
@@ -216,12 +216,14 @@ public class Login_GUI extends JFrame {
 								+ ", mein Token für den Satelliten "
 								+ result.authToken);
 
+				/*
 				// show received information
 				JOptionPane.showMessageDialog(null, "Freiburg liefert:"
 						+ "\nSession-ID = " + result.sessionId + "\nToken = "
 						+ result.authToken + "\nSatellit = "
 						+ result.serverAddress, "Rückgabewerte aus Freiburg",
 						JOptionPane.INFORMATION_MESSAGE);
+				*/
 
 				if (login == true) {
 					/*
@@ -251,6 +253,7 @@ public class Login_GUI extends JFrame {
 					person.verantwortlicher.setEMail(user.eMail);
 					person.verantwortlicher.setHochschule(hochschule);
 
+					/*
 					// show processed information
 					JOptionPane
 							.showMessageDialog(
@@ -292,6 +295,7 @@ public class Login_GUI extends JFrame {
 													.getEMail(),
 									"Werte vergleichen",
 									JOptionPane.INFORMATION_MESSAGE);
+					*/
 
 					try {
 						//Lege config File an und entscheide welches Fenster als nächstes geöffnet wird
diff --git a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java
index 348b1c77..8758600d 100644
--- a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java
@@ -242,6 +242,7 @@ public class EditLectureAllgemein_GUI extends JFrame {
 		panel_2.add(textFieldLaborname);
 		
 		JTextArea textArea = new JTextArea();
+		textArea.setEditable(false);
 		textArea.setWrapStyleWord(true);
 		textArea.setText("Geben Sie bitte einen sprechenden Namen f\u00FCr das Image an. Dieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Programmieren 1\"");
 		textArea.setLineWrap(true);
@@ -258,6 +259,7 @@ public class EditLectureAllgemein_GUI extends JFrame {
 		scrollPane.setBounds(200, 104, 347, 78);
 		panel_2.add(scrollPane);
 		description = new JTextArea();
+		description.setFont(new Font("Tahoma", Font.PLAIN, 11));
 		description.setText(Lecture.lecture.getDesc());
 		description.setLineWrap(true);
 		scrollPane.add(description);
diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
index 4160f855..59558854 100644
--- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
@@ -116,8 +116,7 @@ public class EditLectureLink_GUI extends JFrame {
 			getContentPane().add(panel);
 			panel.setLayout(null);
 			{
-				JLabel lblNewLabel = new JLabel(
-						"Image verlinken");
+				JLabel lblNewLabel = new JLabel("Image verlinken");
 				lblNewLabel.setBounds(10, 11, 509, 22);
 				panel.add(lblNewLabel);
 				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
@@ -372,9 +371,11 @@ public class EditLectureLink_GUI extends JFrame {
 									.toString();
 
 							try {
-								
-								DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-								client.updateLecturedata(Lecture.lecture.getName(),
+
+								DateFormat formatter = new SimpleDateFormat(
+										"yyyy-MM-dd hh:mm:ss");
+								client.updateLecturedata(
+										Lecture.lecture.getName(),
 										Lecture.lecture.getNewName(),
 										Lecture.lecture.getShortDesc(),
 										Lecture.lecture.getDesc(),
@@ -393,7 +394,14 @@ public class EditLectureLink_GUI extends JFrame {
 										person.verantwortlicher.getTel(),
 										person.verantwortlicher.getFakultät(),
 										Lecture.lecture.getid());
-								
+
+								JOptionPane
+										.showMessageDialog(
+												null,
+												"Ihre Veranstaltung wurde erfolgreich angelegt. Sie kehren nun zum Hauptmenü zurück.",
+												"Veranstaltung angelegt",
+												JOptionPane.INFORMATION_MESSAGE);
+
 							} catch (TException e1) {
 								// TODO Auto-generated catch block
 								e1.printStackTrace();
@@ -407,6 +415,7 @@ public class EditLectureLink_GUI extends JFrame {
 									JOptionPane.INFORMATION_MESSAGE);
 
 						}
+						thrift.closeThriftConnection();
 						MainMenue_GUI m = new MainMenue_GUI();
 						m.setVisible(true);
 						dispose();
diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class
index a0493c4c..04a01201 100644
--- a/Dozentenmodulserver/bin/server/ServerHandler.class
+++ b/Dozentenmodulserver/bin/server/ServerHandler.class
diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class
index 602532c8..a1bd5139 100644
--- a/Dozentenmodulserver/bin/sql/SQL.class
+++ b/Dozentenmodulserver/bin/sql/SQL.class
diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java
index 67514c39..059862a1 100644
--- a/Dozentenmodulserver/src/server/ServerHandler.java
+++ b/Dozentenmodulserver/src/server/ServerHandler.java
@@ -330,13 +330,13 @@ public class ServerHandler implements Server.Iface {
 			boolean isActive, String imagename, String firstname,
 			String lastname, String university, String Mail, String Tel,
 			String Fak, String id) throws TException {
-		int pk_image = 0;
+		String pk_image = "";
 		int imageversion = 0;
 		ResultSet image = sql.getImageIDandVersion(con, imagename);
 
 		try {
 			while (image.next()) {
-				pk_image = image.getInt("GUID_imageID");
+				pk_image = image.getString("GUID_imageID");
 				imageversion = image.getInt("imageVersion");
 			}
 		} catch (SQLException e) {
@@ -355,9 +355,8 @@ public class ServerHandler implements Server.Iface {
 			e.printStackTrace();
 		}
 
-		sql.updateLectureData(con, pk_image, imageversion, lastname, newName,
-				desc, shortdesc, startDate, endDate, isActive, id);
-		log.info(new Date() + " - Failed to execute updateLecturedata.");
+		//sql.updateLectureData(con, pk_image, imageversion, lastname, newName,
+		//		desc, shortdesc, startDate, endDate, isActive, id);
 		return false;
 	}
 
diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java
index a5eeb83e..36aadd89 100644
--- a/Dozentenmodulserver/src/sql/SQL.java
+++ b/Dozentenmodulserver/src/sql/SQL.java
@@ -473,7 +473,7 @@ public class SQL {
 		return false;

 	}

 

-	public int updateLectureData(Connection con, int pk_image,

+	public int updateLectureData(Connection con, String pk_image,

 			int imageversion, String name, String newName, String desc,

 			String shortdesc, String start, String end, boolean isactive,

 			String id) {

@@ -504,6 +504,7 @@ public class SQL {
 					+ formatter.format(new Date())

 					+ "'WHERE `lectureID` = '" + id + "';");

 			con.commit();

+			log.info(new Date() + " - Succeeded to updateLectureData.");

 

 		} catch (SQLException e) {

 			// TODO Auto-generated catch block