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

2 files changed, 91 insertions, 15 deletions

diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
index b62ed49d..a1cf16a0 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
@@ -128,7 +128,7 @@ public class PermissionCreateLecture_GUI extends JFrame {
 			getContentPane().add(panel);
 			panel.setLayout(null);
 			{
-				JLabel lblNewLabel = new JLabel("Veranstaltungen - Berechtigungen (Nur zur Veranschaulichung)");
+				JLabel lblNewLabel = new JLabel("Veranstaltung - Berechtigungen (Nur zur Veranschaulichung)");
 				lblNewLabel.setBounds(10, 11, 509, 22);
 				panel.add(lblNewLabel);
 				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
@@ -287,7 +287,7 @@ public class PermissionCreateLecture_GUI extends JFrame {
 		panel_2.setBorder(new TitledBorder(null, "Sichtbarkeit im VMChooser", TitledBorder.LEADING, TitledBorder.TOP, null, null));
 		panel_2.setBackground(SystemColor.menu);
 		
-		JScrollPane scrollPane_1 = new JScrollPane();
+		final JScrollPane scrollPane_1 = new JScrollPane();
 		scrollPane_1.setEnabled(false);
 		scrollPane_1.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
 		scrollPane_1.setBounds(23, 83, 203, 185);
@@ -297,27 +297,25 @@ public class PermissionCreateLecture_GUI extends JFrame {
 		scrollPane_1.setViewportView(table_1);
 		
 		JRadioButton rdbtnAlle = new JRadioButton("Sichtbar fĂĽr alle");
-		rdbtnAlle.setEnabled(false);
 		rdbtnAlle.setSelected(true);
 		buttonGroup.add(rdbtnAlle);
 		rdbtnAlle.setBounds(6, 27, 109, 23);
 		panel_2.add(rdbtnAlle);
 		
 		JRadioButton rdbtnIndividuell = new JRadioButton("Individuell");
-		rdbtnIndividuell.setEnabled(false);
 		buttonGroup.add(rdbtnIndividuell);
 		rdbtnIndividuell.setBounds(6, 53, 109, 23);
 		panel_2.add(rdbtnIndividuell);
 		
-		JButton btnHinzufgen = new JButton("HinzufĂĽgen");
-		btnHinzufgen.setEnabled(false);
-		btnHinzufgen.setBounds(23, 279, 89, 23);
-		panel_2.add(btnHinzufgen);
+		final JButton btnAddVmUser = new JButton("HinzufĂĽgen");
+		btnAddVmUser.setEnabled(false);
+		btnAddVmUser.setBounds(23, 279, 89, 23);
+		panel_2.add(btnAddVmUser);
 		
-		JButton btnLschen = new JButton("Löschen");
-		btnLschen.setEnabled(false);
-		btnLschen.setBounds(122, 279, 89, 23);
-		panel_2.add(btnLschen);
+		final JButton btnDelVmUser = new JButton("Löschen");
+		btnDelVmUser.setEnabled(false);
+		btnDelVmUser.setBounds(122, 279, 89, 23);
+		panel_2.add(btnDelVmUser);
 		{
 			JPanel buttonPane = new JPanel();
 			buttonPane.setBounds(0, 640, 597, 33);
@@ -356,6 +354,22 @@ public class PermissionCreateLecture_GUI extends JFrame {
 			}
 		}
 		
+		rdbtnAlle.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				scrollPane_1.setEnabled(false);
+				btnAddVmUser.setEnabled(false);
+				btnDelVmUser.setEnabled(false);
+			}
+		});
+		
+		rdbtnIndividuell.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				scrollPane_1.setEnabled(true);
+				btnAddVmUser.setEnabled(true);
+				btnDelVmUser.setEnabled(true);				
+			}
+		});
+		
 		JSeparator separator = new JSeparator();
 		separator.setBounds(0, 78, 597, 2);
 		getContentPane().add(separator);
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
index e66a2929..9c78b6d2 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
@@ -62,6 +62,7 @@ import javax.swing.JTextField;
 import org.eclipse.jface.viewers.CheckboxCellEditor;
 
 import java.awt.Choice;
+import javax.swing.JRadioButton;
 
 @SuppressWarnings("serial")
 public class PermissionEditLecture_GUI extends JFrame {
@@ -177,14 +178,14 @@ public class PermissionEditLecture_GUI extends JFrame {
 		
 		JPanel panel_1 = new JPanel();
 		panel_1.setBackground(SystemColor.menu);
-		panel_1.setBorder(new TitledBorder(null, "Berechtigungen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel_1.setBounds(10, 207, 557, 313);
+		panel_1.setBorder(new TitledBorder(null, "Suite-Berechtigungen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_1.setBounds(10, 207, 311, 313);
 		contentPanel.add(panel_1);
 		panel_1.setLayout(null);
 		
 		JScrollPane scrollPane = new JScrollPane();
 		scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-		scrollPane.setBounds(10, 21, 537, 281);
+		scrollPane.setBounds(10, 21, 291, 249);
 		panel_1.add(scrollPane);
 		
 		table = new JTable();
@@ -218,6 +219,16 @@ public class PermissionEditLecture_GUI extends JFrame {
 	    */
 		scrollPane.setViewportView(table);
 		
+		JButton button = new JButton("HinzufĂĽgen");
+		button.setEnabled(false);
+		button.setBounds(10, 279, 89, 23);
+		panel_1.add(button);
+		
+		JButton button_1 = new JButton("Löschen");
+		button_1.setEnabled(false);
+		button_1.setBounds(109, 279, 89, 23);
+		panel_1.add(button_1);
+		
 		JLabel lblHauptmen = new JLabel("HauptmenĂĽ");
 		lblHauptmen.addMouseListener(new MouseAdapter() {
 			@Override
@@ -266,6 +277,40 @@ public class PermissionEditLecture_GUI extends JFrame {
 		comboBox.setModel(new DefaultComboBoxModel(new String[] {"Hochschule Offenburg", "Hochschule Reutlingen", "Universität Freiburg"}));
 		comboBox.setBounds(365, 36, 202, 20);
 		contentPanel.add(comboBox);
+		
+		JPanel panel_2 = new JPanel();
+		panel_2.setLayout(null);
+		panel_2.setBorder(new TitledBorder(null, "Sichtbarkeit im VMChooser", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_2.setBackground(SystemColor.menu);
+		panel_2.setBounds(331, 207, 236, 313);
+		contentPanel.add(panel_2);
+		
+		final JScrollPane scrollPane_1 = new JScrollPane();
+		scrollPane_1.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+		scrollPane_1.setEnabled(false);
+		scrollPane_1.setBounds(23, 83, 203, 185);
+		panel_2.add(scrollPane_1);
+		
+		JRadioButton rdbtnAlle = new JRadioButton("Sichtbar fĂĽr alle");
+		rdbtnAlle.setSelected(true);
+		rdbtnAlle.setEnabled(false);
+		rdbtnAlle.setBounds(6, 27, 109, 23);
+		panel_2.add(rdbtnAlle);
+		
+		JRadioButton rdbtnIndividuell = new JRadioButton("Individuell");
+		rdbtnIndividuell.setEnabled(false);
+		rdbtnIndividuell.setBounds(6, 53, 109, 23);
+		panel_2.add(rdbtnIndividuell);
+		
+		final JButton btnAddVmUser = new JButton("HinzufĂĽgen");
+		btnAddVmUser.setEnabled(false);
+		btnAddVmUser.setBounds(23, 279, 89, 23);
+		panel_2.add(btnAddVmUser);
+		
+		final JButton btnDelVmUser = new JButton("Löschen");
+		btnDelVmUser.setEnabled(false);
+		btnDelVmUser.setBounds(122, 279, 89, 23);
+		panel_2.add(btnDelVmUser);
 		{
 			JPanel buttonPane = new JPanel();
 			buttonPane.setBounds(0, 640, 597, 33);
@@ -304,6 +349,23 @@ public class PermissionEditLecture_GUI extends JFrame {
 			}
 		}
 		
+		
+		rdbtnAlle.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				scrollPane_1.setEnabled(false);
+				btnAddVmUser.setEnabled(false);
+				btnDelVmUser.setEnabled(false);
+			}
+		});
+		
+		rdbtnIndividuell.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent e) {
+				scrollPane_1.setEnabled(true);
+				btnAddVmUser.setEnabled(true);
+				btnDelVmUser.setEnabled(true);				
+			}
+		});
+		
 		JSeparator separator = new JSeparator();
 		separator.setBounds(0, 78, 597, 2);
 		getContentPane().add(separator);