Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts: delete Image db and server
	Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
	Dozentenmodulserver/bin/server/ServerHandler.class
	Dozentenmodulserver/bin/sql/SQL.class
	Dozentenmodulserver/src/sql/SQL.java

1 files changed, 18 insertions, 11 deletions

diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
index c245ce79..c1fdec80 100644
--- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
@@ -63,7 +63,7 @@ public class EditLectureLink_GUI extends JFrame {
 	JTable tablePublicVorlagen = new JTable();
 	private JTextField textFieldName;
 	String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung",
-			"Verantwortlicher", "Letztes Update", "Schlagwort" };
+			"Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" };
 	ThriftConnection thrift = new ThriftConnection();
 	Client client = thrift.getThriftConnection();
 
@@ -355,7 +355,7 @@ public class EditLectureLink_GUI extends JFrame {
 			}
 			{
 				JButton cancelButton = new JButton(
-						"Veranstaltung erzeugen und abschlie\u00DFen");
+						"Veranstaltung ändern und abschlie\u00DFen");
 				cancelButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 
@@ -370,14 +370,16 @@ public class EditLectureLink_GUI extends JFrame {
 							String imagename = tableAllImages.getValueAt(
 									tableAllImages.getSelectedRow(), 0)
 									.toString();
+							System.out.println("ID: "+Lecture.lecture.getid());
+
 							try {
-								DateFormat formatter = new SimpleDateFormat(
-										"yyyy-MM-dd hh:mm:ss");
-								System.out.println(formatter.format(
-										Lecture.lecture.getStartdate())
+								
+								DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+								System.out.println(										formatter.format(
+										Lecture.lecture.getEnddate())
 										.toString());
-								client.writeLecturedata(
-										Lecture.lecture.getName(),
+								client.updateLecturedata(Lecture.lecture.getName(),
+										Lecture.lecture.getNewName(),
 										Lecture.lecture.getShortDesc(),
 										Lecture.lecture.getDesc(),
 										formatter.format(
@@ -393,7 +395,9 @@ public class EditLectureLink_GUI extends JFrame {
 										person.verantwortlicher.getHochschule(),
 										person.verantwortlicher.getEMail(),
 										person.verantwortlicher.getTel(),
-										person.verantwortlicher.getFakultät());
+										person.verantwortlicher.getFakultät(),
+										Lecture.lecture.getid());
+								
 							} catch (TException e1) {
 								// TODO Auto-generated catch block
 								e1.printStackTrace();
@@ -407,6 +411,8 @@ public class EditLectureLink_GUI extends JFrame {
 									JOptionPane.INFORMATION_MESSAGE);
 
 						}
+						MainMenue_GUI m = new MainMenue_GUI();
+						m.setVisible(true);
 						dispose();
 
 					}
@@ -459,8 +465,9 @@ public class EditLectureLink_GUI extends JFrame {
 						images.get(x).getLicenseRestriction(),
 						images.get(x).getOsName(),
 						images.get(x).getLectureName(),
-						images.get(x).getUpdateTime(),
-						images.get(x).getUserData() };
+						images.get(x).getUserData(),
+						images.get(x).getUpdateTime(), "", images.get(x).id,
+						images.get(x).getVersion() };
 				ListObj.add(obj);
 				model.addRow(ListObj.get(x));
 				x++;