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

12 files changed, 27 insertions, 16 deletions

diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
index 18b00f77..a15ca0fe 100644
--- a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
index 8051fcb8..0a129b98 100644
--- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class
index 8173d4ba..d59c5e1b 100644
--- a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class
diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class
index 7d58f1a2..6f2112b6 100644
--- a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class
+++ b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class
diff --git a/Dozentenmodul/src/gui/intro/About_GUI.java b/Dozentenmodul/src/gui/intro/About_GUI.java
index 12ab22fa..03ca2d16 100644
--- a/Dozentenmodul/src/gui/intro/About_GUI.java
+++ b/Dozentenmodul/src/gui/intro/About_GUI.java
@@ -86,7 +86,7 @@ public class About_GUI extends JFrame {
 
 		txtpnVersionVBuilddate = new JTextPane();
 		txtpnVersionVBuilddate
-				.setText("Version: v1.0\r\nBuild-Date: 20.08.2014\r\n\r\nContact: michael.wilson@hs-offenburg.de\r\nWebsite: http://bwlehrpool.hs-offenburg.de/");
+				.setText("Version: v1.0\r\nBuild-Date: 22.08.2014\r\n\r\nContact: michael.wilson@hs-offenburg.de\r\nWebsite: http://bwlehrpool.hs-offenburg.de/");
 		txtpnVersionVBuilddate.setEditable(false);
 		txtpnVersionVBuilddate.setBackground(SystemColor.menu);
 		txtpnVersionVBuilddate.setBounds(62, 95, 224, 90);
diff --git a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java
index d3c3d538..48cbedc9 100644
--- a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java
@@ -287,6 +287,13 @@ public class EditLectureAllgemein_GUI extends JFrame {
 		
 		radioButtonyes = new JRadioButton("Ja");
 		buttonGroup.add(radioButtonyes);
+		radioButtonyes.setBounds(240, 225, 109, 23);
+		panel_2.add(radioButtonyes);
+		radioButtonno = new JRadioButton("Nein");
+		buttonGroup.add(radioButtonno);
+		radioButtonno.setBounds(385, 225, 109, 23);
+		panel_2.add(radioButtonno);
+		
 		if(Lecture.lecture.isActive()==true)
 		{
 			radioButtonyes.setSelected(true);
@@ -295,13 +302,9 @@ public class EditLectureAllgemein_GUI extends JFrame {
 			radioButtonno.setSelected(true);
 		}
 		
-		radioButtonyes.setBounds(240, 225, 109, 23);
-		panel_2.add(radioButtonyes);
 		
-		radioButtonno = new JRadioButton("Nein");
-		buttonGroup.add(radioButtonno);
-		radioButtonno.setBounds(385, 225, 109, 23);
-		panel_2.add(radioButtonno);
+		
+		
 		
 		JLabel label_12 = new JLabel("(Im VMChooser sichtbar)");
 		label_12.setBounds(10, 254, 250, 14);
@@ -316,6 +319,7 @@ public class EditLectureAllgemein_GUI extends JFrame {
 				JButton okButton = new JButton("Zur\u00FCck");
 				okButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
+						
 						if(radioButtonyes.isSelected()==true)
 						{
 							Lecture.lecture.setActive(true);
diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class
index 9b71d36e..3d436d78 100644
--- a/Dozentenmodulserver/bin/sql/SQL.class
+++ b/Dozentenmodulserver/bin/sql/SQL.class
diff --git a/Dozentenmodulserver/bin/util/XMLCreator.class b/Dozentenmodulserver/bin/util/XMLCreator.class
index 6d7673fb..f9ab989a 100644
--- a/Dozentenmodulserver/bin/util/XMLCreator.class
+++ b/Dozentenmodulserver/bin/util/XMLCreator.class
diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java
index c1ba8254..12985219 100644
--- a/Dozentenmodulserver/src/server/ServerHandler.java
+++ b/Dozentenmodulserver/src/server/ServerHandler.java
@@ -181,7 +181,7 @@ public class ServerHandler implements Server.Iface {
 				new Date(), pk_institution);
 		
 		//OS impl Select and write
-		
+		//ACHTUNG: Anzahl der Leerzeichen muss eingehalten werden: 'Windows 7 32 bit"
 		String pk_os=sql.getOSpk(os.substring(0, nthIndexOf(os, " ", 2)),os.substring(nthIndexOf(os," ", 2), os.lastIndexOf(" ")).replace(" ", ""));
 		
 		sql.setImageData(pk_person, license, internet, cpu, ram, imagename,desc,
diff --git a/Dozentenmodulserver/src/server/startServer.java b/Dozentenmodulserver/src/server/startServer.java
index 99189780..eb34d3a1 100644
--- a/Dozentenmodulserver/src/server/startServer.java
+++ b/Dozentenmodulserver/src/server/startServer.java
@@ -32,7 +32,7 @@ public class startServer {
 	public static void main(String[] args) {
 
 		String version = "Version: 1.0";
-		String buildDate = "Build Date: 21.08.2014";
+		String buildDate = "Build Date: 22.08.2014";
 
 		//get going and show basic information in logfile
 		BasicConfigurator.configure();
diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java
index f763eacd..a60cef59 100644
--- a/Dozentenmodulserver/src/sql/SQL.java
+++ b/Dozentenmodulserver/src/sql/SQL.java
@@ -760,7 +760,7 @@ public class SQL {
 			return 0;

 		} catch (SQLException e) {

 			// TODO Auto-generated catch block

-			log.info(new Date() + " - Failed to UpdateImageData.");

+			log.info(new Date() + " - Failed to UpdateImagePath.");

 			e.printStackTrace();

 		}

 		return -1;

@@ -793,7 +793,7 @@ public class SQL {
 		try {

 			Connection con=getConnection();

 			Statement stm = con.createStatement();

-			//log.info(new Date() + " - OS: "+os+" architecture: "+architecture);

+			log.info(new Date() + " - Getting PrimaryKey for OS: "+os+" architecture: "+architecture);

 			ResultSet rs=stm

 					.executeQuery("SELECT operatingSystemID FROM bwLehrpool.m_operatingSystem where name like '"

 							+ os

@@ -802,12 +802,13 @@ public class SQL {
 							+ "';");

 			rs.first();

 			String pkos=rs.getString("operatingSystemID");

+			log.info(new Date() + " - Key is "+pkos);

 			con.close();

 			return  pkos;

 

 		} catch (SQLException e) {

 			// TODO Auto-generated catch block

-			log.info(new Date() + " - Failed to getPathOfImage.");

+			log.info(new Date() + " - Failed to getOSpk.");

 			e.printStackTrace();

 		}

 

@@ -830,7 +831,7 @@ public class SQL {
 

 		} catch (SQLException e) {

 			// TODO Auto-generated catch block

-			log.info(new Date() + " - Failed to getPathOfImage.");

+			log.info(new Date() + " - Failed to getOS.");

 			e.printStackTrace();

 		}

 

@@ -861,7 +862,7 @@ public class SQL {
 			return map;

 		} catch (SQLException e) {

 			// TODO Auto-generated catch block

-			log.info(new Date() + " - Failed to getImageData.");

+			log.info(new Date() + " - Failed to getLectureData.");

 			e.printStackTrace();

 		}

 		return null;

diff --git a/Dozentenmodulserver/src/util/XMLCreator.java b/Dozentenmodulserver/src/util/XMLCreator.java
index e900be94..a39a415e 100644
--- a/Dozentenmodulserver/src/util/XMLCreator.java
+++ b/Dozentenmodulserver/src/util/XMLCreator.java
@@ -46,7 +46,7 @@ public class XMLCreator {
 	
 
 	// phone param not existing
-	private String query = "SELECT m_VLData_imageInfo.image_path ,vorname, nachname, mail, shortdescription, description, m_operatingSystem.guestOS as os, m_VLData_lecture.admin_changeTime as time, m_VLData_lecture.name as lectureName, m_user.institution as userInstitution, m_user.loginName as loginName,  m_institution.name as institutionName "
+	private String query = "SELECT m_VLData_imageInfo.image_path ,vorname, nachname, mail, shortdescription, description, m_operatingSystem.guestOS as os, m_VLData_lecture.admin_changeTime as time, m_VLData_lecture.name as lectureName, m_user.institution as userInstitution, m_user.loginName as loginName, m_VLData_lecture.isActive,  m_institution.name as institutionName "
 			+ "FROM bwLehrpool.m_VLData_lecture, bwLehrpool.m_VLData_imageInfo, bwLehrpool.m_user, bwLehrpool.m_operatingSystem, bwLehrpool.m_institution "
 			+ "WHERE m_user.userID = m_VLData_lecture.admin_owner "
 			+ "AND m_VLData_imageInfo.GUID_imageID = m_VLData_lecture.imageID "
@@ -189,7 +189,13 @@ public class XMLCreator {
 
 		Element active = doc.createElement("active");
 		entry.appendChild(active);
-		active.setAttribute("param", "true");
+		
+		//set activity
+		if(rs.getString("isActive").equals("1")){
+			active.setAttribute("param", "true");
+		} else if(rs.getString("isActive").equals("0")){
+			active.setAttribute("param", "false");
+		}
 
 		Element pools = doc.createElement("pools");
 		entry.appendChild(pools);