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

9 files changed, 55 insertions, 25 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
index 974ab860..22344d2f 100644
--- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
@@ -755,7 +755,7 @@ public class DeleteImage_GUI extends JFrame {
 		List<server.generated.Image> images;
 		try {
 			// Hole eine Liste der Images
-			images = client.getImageListPermissionWrite(person.verantwortlicher.getUserID());
+			images = client.getImageListPermissionAdmin(person.verantwortlicher.getUserID());
 
 			Iterator<server.generated.Image> i = images.iterator();
 
diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
index b222b7ed..8db64f4f 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -697,6 +697,16 @@ public class FTPCreateUploader_GUI extends JFrame implements
 						RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageLinkAllowed(),
 						RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageAdmin()
 						);
+				/*
+				LOGGER.info(
+						"Name: "+Image.image.getImagename()
+						+"\tUserID: "+RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID()
+						+"\tisImageRead: "+RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageRead()
+						+"\tisImageWrite: "+RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageWrite()
+						+"\tisImageLInkAllowed: "+RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageLinkAllowed()
+						+"\tisImageAdmin: "+RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageAdmin()
+						);
+						*/
 			
 			}//end for
 			
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
index 736530de..70fd2025 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
@@ -577,7 +577,7 @@ public class PermissionCreateImage_GUI extends JFrame {
 		isLink = (boolean) table.getValueAt(selectedRow, 3);
 		isAdmin = (boolean) table.getValueAt(selectedRow, 4);
 
-		boolean[] checkedVals = CheckIntegrity.isIntegre(isRead, isWrite,
+		boolean[] checkedVals = CheckIntegrity.isIntegreForImage(isRead, isWrite,
 				isLink, isAdmin);
 
 		table.setValueAt(checkedVals[0], selectedRow, 1);
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
index 8de41289..c80d5a52 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
@@ -634,7 +634,7 @@ public class PermissionEditImage_GUI extends JFrame {
 		isLink = (boolean) table.getValueAt(selectedRow, 3);
 		isAdmin = (boolean) table.getValueAt(selectedRow, 4);
 
-		boolean[] checkedVals = CheckIntegrity.isIntegre(isRead, isWrite,
+		boolean[] checkedVals = CheckIntegrity.isIntegreForImage(isRead, isWrite,
 				isLink, isAdmin);
 
 		table.setValueAt(checkedVals[0], selectedRow, 1);
diff --git a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
index 49a2c7a0..b2bd4ac8 100644
--- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
@@ -642,7 +642,7 @@ public class DeleteLecture_GUI extends JFrame {
 			// Hole eine Liste der erlaubten Images für die diese Person
 			// lectures = client.getLectureList();
 			lectures = client
-					.getLectureListPermissionWrite(person.verantwortlicher
+					.getLectureListPermissionAdmin(person.verantwortlicher
 							.getUserID());
 			Iterator<server.generated.Lecture> i = lectures.iterator();
 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
index 2fa014b8..ab52626f 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
@@ -341,11 +341,22 @@ public class EditLectureAllgemein_GUI extends JFrame {
 		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);
-
+		
+		//set button value
+		if(Lecture.lecture.isActive()==true){
+			radioButtonyes.setSelected(true);
+			radioButtonno.setSelected(false);
+		} else {
+			radioButtonyes.setSelected(false);
+			radioButtonno.setSelected(true);
+		}
+		
 		radioButtonyes.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent arg0) {
 				radioButtonyes.setSelected(true);
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
index 478c1bc0..af2ef7e6 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
@@ -521,8 +521,8 @@ public class EditLectureLink_GUI extends JFrame {
 			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
 			getContentPane().add(buttonPane);
 			{
-				JButton okButton = new JButton("Zurück");
-				okButton.addActionListener(new ActionListener() {
+				JButton btnBack = new JButton("Zurück");
+				btnBack.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 
 						PermissionEditLecture_GUI el = new PermissionEditLecture_GUI(
@@ -531,14 +531,14 @@ public class EditLectureLink_GUI extends JFrame {
 						dispose();
 					}
 				});
-				okButton.setActionCommand("OK");
-				buttonPane.add(okButton);
-				getRootPane().setDefaultButton(okButton);
+				btnBack.setActionCommand("OK");
+				buttonPane.add(btnBack);
+				getRootPane().setDefaultButton(btnBack);
 			}
 			{
-				JButton cancelButton = new JButton(
+				JButton btnFinish = new JButton(
 						"Veranstaltung ändern und abschließen");
-				cancelButton.addActionListener(new ActionListener() {
+				btnFinish.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 						String username = person.verantwortlicher.getName()
 								+ " " + person.verantwortlicher.getVorname();
@@ -607,7 +607,12 @@ public class EditLectureLink_GUI extends JFrame {
 													+ "/"
 													+ RightsManagement.rightsManagement
 															.getPermittedUserList()
-															.size());
+															.size()
+													+", r="+RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_read()
+													+", w="+RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_write()
+													+", a="+RightsManagement.rightsManagement.getPermittedUserList().get(i).isLecture_admin()
+															);
+									
 									client.writeAdditionalLectureRights(
 											Lecture.lecture.getName(),
 											RightsManagement.rightsManagement
@@ -615,13 +620,13 @@ public class EditLectureLink_GUI extends JFrame {
 													.get(i).getUserID(), // userID
 											RightsManagement.rightsManagement
 													.getPermittedUserList()
-													.get(i).isImageRead(),// read
+													.get(i).isLecture_read(),// read
 											RightsManagement.rightsManagement
 													.getPermittedUserList()
-													.get(i).isImageWrite(),// write
+													.get(i).isLecture_write(),// write
 											RightsManagement.rightsManagement
 													.getPermittedUserList()
-													.get(i).isImageAdmin()// admin
+													.get(i).isLecture_admin()// admin
 									);
 
 								}// end for
@@ -883,8 +888,8 @@ public class EditLectureLink_GUI extends JFrame {
 
 					}
 				});
-				cancelButton.setActionCommand("Cancel");
-				buttonPane.add(cancelButton);
+				btnFinish.setActionCommand("Cancel");
+				buttonPane.add(btnFinish);
 			}
 		}
 
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
index 378273b3..d4d49ec2 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
@@ -562,12 +562,11 @@ public class PermissionCreateLecture_GUI extends JFrame {
 		isWrite = (boolean) tablePermittedUsers.getValueAt(selectedRow, 2);
 		isAdmin = (boolean) tablePermittedUsers.getValueAt(selectedRow, 3);
 
-		boolean[] checkedVals = CheckIntegrity.isIntegre(isRead, isWrite,isAdmin, false);
+		boolean[] checkedVals = CheckIntegrity.isIntegreForLecture(isRead, isWrite,isAdmin);
 
 		tablePermittedUsers.setValueAt(checkedVals[0], selectedRow, 1);
 		tablePermittedUsers.setValueAt(checkedVals[1], selectedRow, 2);
-		tablePermittedUsers.setValueAt(checkedVals[3], selectedRow, 3);
-		// tablePermittedUsers.setValueAt(checkedVals[3], selectedRow, 4);
+		tablePermittedUsers.setValueAt(checkedVals[2], selectedRow, 3);
 	}// end checkIntegrity()
 
 	// Column 0 == Concat user name
@@ -711,8 +710,6 @@ class CheckBoxHeader extends JCheckBox implements TableCellRenderer,
 			}
 		}
 		setColumn(column);
-		// rendererComponent.setText("Check All");
-		// setBorder(UIManager.getBorder("TableHeader.cellBorder"));
 
 		return rendererComponent;
 	}
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
index cb01d824..05b7959e 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
@@ -203,6 +203,13 @@ public class PermissionEditLecture_GUI extends JFrame {
 		panel_1.add(scrollPane);
 
 		table = new JTable();
+		table.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent e) {
+				checkIntegrity(-1);
+			}
+		});
+		
 		table.setModel(model);
 		table.setSelectionForeground(Color.WHITE);
 
@@ -573,11 +580,11 @@ public class PermissionEditLecture_GUI extends JFrame {
 		isWrite = (boolean) table.getValueAt(selectedRow, 2);
 		isAdmin = (boolean) table.getValueAt(selectedRow, 3);
 
-		boolean[] checkedVals = CheckIntegrity.isIntegre(isRead, isWrite,isAdmin, false);
+		boolean[] checkedVals = CheckIntegrity.isIntegreForLecture(isRead, isWrite,isAdmin);
 
 		table.setValueAt(checkedVals[0], selectedRow, 1);
 		table.setValueAt(checkedVals[1], selectedRow, 2);
-		table.setValueAt(checkedVals[3], selectedRow, 3);
+		table.setValueAt(checkedVals[2], selectedRow, 3);
 	}// end checkIntegrity()
 
 	// save the entered rights into the model and prepare them to be written to