Es ist nun möglich auf der Datenbank basierend VLs sowie Veranstaltungen neu anzulegen

6 files changed, 127 insertions, 7 deletions

diff --git a/Dozentenmodulserver/bin/server/ServerInterface.class b/Dozentenmodulserver/bin/server/ServerInterface.class
index 146aa871..9c9c08d8 100644
--- a/Dozentenmodulserver/bin/server/ServerInterface.class
+++ b/Dozentenmodulserver/bin/server/ServerInterface.class
diff --git a/Dozentenmodulserver/bin/server/ServerMethod.class b/Dozentenmodulserver/bin/server/ServerMethod.class
index 01b5288c..a60a23f9 100644
--- a/Dozentenmodulserver/bin/server/ServerMethod.class
+++ b/Dozentenmodulserver/bin/server/ServerMethod.class
diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class
index cb55c2de..45162648 100644
--- a/Dozentenmodulserver/bin/sql/SQL.class
+++ b/Dozentenmodulserver/bin/sql/SQL.class
diff --git a/Dozentenmodulserver/src/server/ServerInterface.java b/Dozentenmodulserver/src/server/ServerInterface.java
index 49d7adb9..fffcb064 100644
--- a/Dozentenmodulserver/src/server/ServerInterface.java
+++ b/Dozentenmodulserver/src/server/ServerInterface.java
@@ -2,7 +2,9 @@ package server;
 import java.rmi.*;

 import java.sql.ResultSet;

 import java.util.ArrayList;

+import java.util.Date;

 import java.util.List;

+import java.util.Map;

 

 import Models.User;

 

@@ -15,4 +17,8 @@ public interface ServerInterface extends Remote
         public boolean writeVLdata(String imagename, String firstname, String lastname,String university, String Mail, String Tel, String Fak, boolean license, boolean internet, int ram, int cpu) throws RemoteException;

         public List<Object[]> getImageList() throws RemoteException;

         public List<String> getAllOS() throws RemoteException;

+        public Map<String,String> getPersonData(String Vorname, String Nachname) throws RemoteException;

+        public boolean writeLecturedata(String name, String shortdesc, String desc,Date start, Date end, boolean isActive, String imagename,String firstname,

+    			String lastname, String university, String Mail, String Tel,

+    			String Fak) throws RemoteException;

 }

diff --git a/Dozentenmodulserver/src/server/ServerMethod.java b/Dozentenmodulserver/src/server/ServerMethod.java
index 1f66fb6b..aa4dcae8 100644
--- a/Dozentenmodulserver/src/server/ServerMethod.java
+++ b/Dozentenmodulserver/src/server/ServerMethod.java
@@ -11,9 +11,13 @@ import java.sql.ResultSetMetaData;
 import java.sql.SQLException;

 import java.util.ArrayList;

 import java.util.Date;

+import java.util.HashMap;

 import java.util.List;

+import java.util.Map;

 import java.util.UUID;

-import Models.*;

+

+import Models.User;

+

 import sql.SQL;

 

 @SuppressWarnings("serial")

@@ -133,16 +137,17 @@ public class ServerMethod extends UnicastRemoteObject implements ServerInterface
 			String Fak, boolean license, boolean internet, int ram, int cpu)

 			throws RemoteException {

 		String login="tete";

-		System.out.println("1");

+		

 		int pk_institution=sql.setInstitution(con, university);

-		System.out.println("2");

+		

 		int pk_person=sql.setPerson(con, login, lastname, firstname, Mail, new Date(), pk_institution);

-		System.out.println("3");

+		

 		sql.setImageData(con, pk_person, license, internet, cpu, ram, imagename);

-		System.out.println("4");

+		

 		// TODO Auto-generated method stub

 		return true;

 	}

+	

 

 

 

@@ -156,6 +161,7 @@ public class ServerMethod extends UnicastRemoteObject implements ServerInterface
 			List<Object[]> listWith = ResSetToObject(resWith);

 			List<Object[]> listWithout=ResSetToObject(resWithout);

 			listWith.addAll(listWith.size(), listWithout);

+			

 			return listWith;

 		} catch (SQLException e1) {

 			// TODO Auto-generated catch block

@@ -200,4 +206,64 @@ public class ServerMethod extends UnicastRemoteObject implements ServerInterface
 		}

 		return null;

 	}

+

+

+

+	@Override

+	public Map<String,String> getPersonData(String Vorname, String Nachname)

+			throws RemoteException {

+		Map<String,String> map=new HashMap<String, String>();

+		System.out.println(Vorname+Nachname);

+		ResultSet rs=sql.getPersonData(con, Vorname, Nachname);

+		try {

+			while(rs.next())

+			{

+				

+				map.put("mail", rs.getString("mail"));

+				map.put("Nachname", rs.getString("Nachname"));

+				map.put("Vorname", rs.getString("Vorname"));

+				map.put("Hochschule", rs.getString("name"));

+				map.put("tel", "009909");

+				map.put("fak", "E+I");

+				

+			}

+			return map;

+		} catch (SQLException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

+		return null;

+	}

+

+

+	@Override

+	public boolean writeLecturedata(String name, String shortdesc, String desc,

+			Date start, Date end, boolean isActive, String imagename,

+			String firstname, String lastname, String university, String Mail,

+			String Tel, String Fak) throws RemoteException {

+		int pk_image = 0;

+		String login="tete";

+		int imageversion = 0;

+		int pk_institution=sql.setInstitution(con, university);

+		int pk_person=sql.setPerson(con, login, lastname, firstname, Mail, new Date(), pk_institution);

+		System.out.println(imagename);

+		ResultSet image=sql.getImageIDandVersion(con, imagename);

+

+			try {

+				while(image.next())

+				{

+				pk_image=image.getInt("GUID_imageID");

+				imageversion=image.getInt("imageVersion");

+				}

+			} catch (SQLException e) {

+				// TODO Auto-generated catch block

+				e.printStackTrace();

+			}

+			

+			

+			

+			sql.setLectureData(con, pk_person, pk_image, imageversion, name, desc, shortdesc, start, end, isActive);

+		

+		return false;

+	}

 }
\ No newline at end of file
diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java
index af99b36b..eb5021c4 100644
--- a/Dozentenmodulserver/src/sql/SQL.java
+++ b/Dozentenmodulserver/src/sql/SQL.java
@@ -195,7 +195,7 @@ public class SQL {
 		try {

 			Statement stm=con.createStatement();

 			

-			return stm.executeQuery("SELECT distinct vl.image_name, vl.cond_hasLicenseRestriction, os.name,  vl.image_update_time, '', Concat(u.Nachname,' ',u.Vorname) FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_VLData_lecture lect, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and lect.lectureID!=vl.GUID_imageID and vl.image_owner=u.userID;");

+			return stm.executeQuery("SELECT distinct vl.image_name, vl.cond_hasLicenseRestriction, os.name, '',vl.image_update_time,  Concat(u.Nachname,' ',u.Vorname) FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and vl.image_owner=u.userID;");

 			

 			

 		} catch (SQLException e) {

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

 			Statement stm=con.createStatement();

 			

-			return stm.executeQuery("SELECT vl.image_name, vl.cond_hasLicenseRestriction, os.name,  vl.image_update_time, lect.name, Concat(u.Nachname,' ',u.Vorname) FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_VLData_lecture lect, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and lect.imageID=vl.GUID_imageID and vl.image_owner=u.userID;");

+			return stm.executeQuery("SELECT vl.image_name, vl.cond_hasLicenseRestriction, os.name, lect.name,  vl.image_update_time, Concat(u.Nachname,' ',u.Vorname) FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_VLData_lecture lect, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and lect.imageID=vl.GUID_imageID and vl.image_owner=u.userID;");

 			

 			

 		} catch (SQLException e) {

@@ -236,4 +236,52 @@ public class SQL {
 		return null;

 		

 	}

+	

+	public ResultSet getPersonData(Connection con,String Vorname, String Nachname)

+	{

+		try {

+			Statement stm=con.createStatement();

+			return stm.executeQuery("SELECT u.Nachname, u.Vorname, u.mail, i.name FROM bwLehrpool.m_user u, bwLehrpool.m_institution i where u.Nachname like '"+Nachname+"' and u.Vorname like '"+Vorname+"' and u.institution=i.institutionID;");

+		} catch (SQLException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

+		return null;

+	}

+	

+	public int setLectureData(Connection con, int pk_person, int pk_image,int imageversion, String name, String desc, String shortdesc,Date start, Date end, boolean isactive)

+	{

+		

+		DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");

+		int active_bol=0;

+		if(isactive==true)

+		{

+			active_bol=1;

+		}

+		try {

+			Statement stm=con.createStatement();

+			Random random=new Random();

+			int uid=random.nextInt();

+			stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_VLData_lecture`(`lectureID`,`name`,`isActive`,`startTime`,`endTime`,`lastUsed`,`shortDescription`,`description`,`imageID`,`imageVersion`,`admin_createTime`,`admin_changeTime`,`admin_owner`,`admin_change_by`)VALUES('"+uid+"','"+name+"','"+active_bol+"','"+formatter.format(start)+"','"+formatter.format(end)+"','"+formatter.format(new Date())+"','"+shortdesc+"','"+desc+"','"+pk_image+"','"+imageversion+"','"+formatter.format(new Date())+"','"+formatter.format(new Date())+"','"+pk_person+"','"+pk_person+"');");

+			con.commit();

+			

+		} catch (SQLException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

+		return 0;

+		

+	}

+	

+	public ResultSet getImageIDandVersion(Connection con,String name)

+	{

+		try {

+			Statement stm=con.createStatement();

+			return stm.executeQuery("SELECT GUID_imageID, imageVersion FROM bwLehrpool.m_VLData_imageInfo where image_name like '"+name+"';");

+		} catch (SQLException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

+		return null;

+	}

 }