1 files changed, 55 insertions, 5 deletions

diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
index a92b2dec..001f1b44 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
@@ -167,9 +167,8 @@ public class EditLectureLink_GUI extends JFrame {
 			@Override
 			public void windowOpened(WindowEvent arg0) {
 				try {
-					initTableModel(modelAll);
+					initTableModelAll(modelAll);
 					initTableModel(modelMyImages);
-					//initTableModel(modelPublicVorlagen);
 					initTableModelTemplates(modelPublicVorlagen);
 				} catch (TException e) {
 					
@@ -292,7 +291,7 @@ public class EditLectureLink_GUI extends JFrame {
 			
 			e.printStackTrace();
 		}
-		setTitle("bwLehrpool Suite - Veranstaltung bearbeiten");
+		setTitle("bwLehrpool Suite - Veranstaltung bearbeiten - "+person.verantwortlicher.getUserID());
 
 		setBounds(0, 0, 918, 722);
 		setLocationRelativeTo(formerGUI);
@@ -630,7 +629,9 @@ public class EditLectureLink_GUI extends JFrame {
 						
 						//check which GUI to open
 						try {
-							if(client.userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid(),SessionData.session.getAuthToken())){
+
+							if(client.userIsLectureAdmin(person.verantwortlicher.getUserID(), Lecture.lecture.getid(),SessionData.session.getAuthToken()) || (person.verantwortlicher.getRole().equals("Admin"))){
+
 								//user is admin of the lecture
 								PermissionEditLecture_GUI ev = new PermissionEditLecture_GUI(c);
 								ev.setVisible(true);
@@ -1134,6 +1135,7 @@ public class EditLectureLink_GUI extends JFrame {
 		textAreadesc = new JTextArea();
 		textAreadesc.setLineWrap(true);
 		textAreadesc.setBackground(SystemColor.menu);
+		textAreadesc.setFont(new Font("Tahoma", Font.PLAIN, 11));
 		scrollPane.setViewportView(textAreadesc);
 
 		JMenuBar menuBar = new JMenuBar();
@@ -1217,7 +1219,50 @@ public class EditLectureLink_GUI extends JFrame {
 		// Hole eine Liste der Images
 		if(person.verantwortlicher.getRole()=="Admin"){
 			//get complete list
-			images = client.getImageList(person.verantwortlicher.getUserID());
+			images = client.getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
+		} else {
+			//get permitted list
+			images = client.getImageListPermissionLink(person.verantwortlicher
+				.getUserID(),SessionData.session.getAuthToken());
+		}
+
+		Iterator<server.generated.Image> i = images.iterator();
+		SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
+		int x = 0;
+
+		while (i.hasNext()) {
+			// erzeuge Objekte fuer die Tabelle
+			Object[] obj = { images.get(x).getImageName(),
+					images.get(x).getLicenseRestriction(),
+					images.get(x).getOsName(), images.get(x).getLectureName(),
+					images.get(x).getUserData(),
+					out.format(in.parse(images.get(x).updateTime)),
+					images.get(x).id, images.get(x).getVersion(),
+					images.get(x).getIsTemplate(),
+					images.get(x).getDescription()};
+			// Fuege diese Objekte der Tabelle hinzu
+			model.addRow(obj);
+			x++;
+			i.next();
+		}
+		
+		//show number of rows in GUI
+		tabbedPane.setTitleAt(0, tabbedPane.getTitleAt(0)+" ("+model.getRowCount()+") ");
+
+		return model;
+
+	}
+	
+	
+	public DefaultTableModel initTableModelAll(DefaultTableModel model)
+			throws TException, ParseException {
+		List<server.generated.Image> images;
+
+		// Hole eine Liste der Images
+		if(person.verantwortlicher.getRole()=="Admin"){
+			//get complete list
+			images = client.getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
 		} else {
 			//get permitted list
 			images = client.getImageListPermissionLink(person.verantwortlicher
@@ -1244,6 +1289,9 @@ public class EditLectureLink_GUI extends JFrame {
 			x++;
 			i.next();
 		}
+		
+		//show number of rows in GUI
+		tabbedPane.setTitleAt(2, tabbedPane.getTitleAt(2)+" ("+model.getRowCount()+") ");
 
 		return model;
 
@@ -1280,6 +1328,8 @@ public class EditLectureLink_GUI extends JFrame {
 				i.next();
 
 			}
+			//show number of rows in GUI
+			tabbedPane.setTitleAt(1, tabbedPane.getTitleAt(1)+" ("+model.getRowCount()+") ");
 
 			return model;