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

4 files changed, 208 insertions, 8 deletions

diff --git a/Dozentenmodul/src/gui/image/PermissionCreateImage_GUI.java b/Dozentenmodul/src/gui/image/PermissionCreateImage_GUI.java
index 356c9825..ebaa8484 100644
--- a/Dozentenmodul/src/gui/image/PermissionCreateImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/PermissionCreateImage_GUI.java
@@ -96,6 +96,16 @@ public class PermissionCreateImage_GUI extends JFrame {
 
 	};
 	private JTextField textField;
+	private JLabel lblRead;
+	private JLabel lblWrite;
+	private JLabel lblChangepermission;
+	private JLabel lblAdmin;
+	private JLabel lblLinkallowed;
+	private JLabel lblReadDesc;
+	private JLabel lblWriteDesc;
+	private JLabel lblBerechtigungenFrDas;
+	private JLabel lblAdminDesc;
+	private JLabel lblLinkallowedDesc;
 
 	public PermissionCreateImage_GUI() {
 		addWindowListener(new WindowAdapter() {
@@ -148,13 +158,13 @@ public class PermissionCreateImage_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, 75, 557, 445);
+		panel_1.setBounds(10, 207, 557, 313);
 		contentPanel.add(panel_1);
 		panel_1.setLayout(null);
 		
 		JScrollPane scrollPane = new JScrollPane();
 		scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-		scrollPane.setBounds(10, 21, 537, 413);
+		scrollPane.setBounds(10, 21, 537, 281);
 		panel_1.add(scrollPane);
 		
 		table = new JTable();
@@ -240,6 +250,55 @@ public class PermissionCreateImage_GUI extends JFrame {
 		comboBox.setModel(new DefaultComboBoxModel(new String[] {"Hochschule Offenburg", "Universit\u00E4t Freiburg"}));
 		comboBox.setBounds(365, 36, 202, 20);
 		contentPanel.add(comboBox);
+		
+		JPanel panel_2 = new JPanel();
+		panel_2.setBackground(SystemColor.menu);
+		panel_2.setBorder(new TitledBorder(null, "Beschreibung", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_2.setBounds(10, 67, 557, 129);
+		contentPanel.add(panel_2);
+		panel_2.setLayout(null);
+		
+		
+		
+		lblRead = new JLabel("Read");
+		lblRead.setBounds(20, 18, 90, 20);
+		panel_2.add(lblRead);
+		
+		lblWrite = new JLabel("Write");
+		lblWrite.setBounds(20, 38, 90, 20);
+		panel_2.add(lblWrite);
+		
+		lblChangepermission = new JLabel("ChangePermission");
+		lblChangepermission.setBounds(20, 58, 90, 20);
+		panel_2.add(lblChangepermission);
+		
+		lblAdmin = new JLabel("Admin");
+		lblAdmin.setBounds(20, 78, 90, 20);
+		panel_2.add(lblAdmin);
+		
+		lblLinkallowed = new JLabel("Link_allowed");
+		lblLinkallowed.setBounds(20, 98, 90, 20);
+		panel_2.add(lblLinkallowed);
+		
+		lblReadDesc = new JLabel("Image darf gelesen und gestartet werden und ist in Suchfenster sichtbar.");
+		lblReadDesc.setBounds(120, 18, 380, 20);
+		panel_2.add(lblReadDesc);
+		
+		lblWriteDesc = new JLabel("Image darf angepasst und überschrieben, jedoch nicht gelöscht werden.");
+		lblWriteDesc.setBounds(120, 38, 380, 20);
+		panel_2.add(lblWriteDesc);
+		
+		lblBerechtigungenFrDas = new JLabel("Berechtigungen für das Image dürfen geändert werden.");
+		lblBerechtigungenFrDas.setBounds(120, 58, 380, 20);
+		panel_2.add(lblBerechtigungenFrDas);
+		
+		lblAdminDesc = new JLabel("Volle Rechte: write + changePermission + löschen.");
+		lblAdminDesc.setBounds(120, 78, 380, 20);
+		panel_2.add(lblAdminDesc);
+		
+		lblLinkallowedDesc = new JLabel("Erzeugung einer Veranstaltung auf ein Image ist erlaubt.");
+		lblLinkallowedDesc.setBounds(120, 98, 380, 20);
+		panel_2.add(lblLinkallowedDesc);
 		{
 			JPanel buttonPane = new JPanel();
 			buttonPane.setBounds(0, 640, 597, 33);
diff --git a/Dozentenmodul/src/gui/image/PermissionEditImage_GUI.java b/Dozentenmodul/src/gui/image/PermissionEditImage_GUI.java
index f8b4a496..633df4c9 100644
--- a/Dozentenmodul/src/gui/image/PermissionEditImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/PermissionEditImage_GUI.java
@@ -148,13 +148,13 @@ public class PermissionEditImage_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, 75, 557, 445);
+		panel_1.setBounds(10, 207, 557, 313);
 		contentPanel.add(panel_1);
 		panel_1.setLayout(null);
 		
 		JScrollPane scrollPane = new JScrollPane();
 		scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-		scrollPane.setBounds(10, 21, 537, 413);
+		scrollPane.setBounds(10, 21, 537, 281);
 		panel_1.add(scrollPane);
 		
 		table = new JTable();
@@ -240,6 +240,53 @@ public class PermissionEditImage_GUI extends JFrame {
 		comboBox.setModel(new DefaultComboBoxModel(new String[] {"Hochschule Offenburg", "Universit\u00E4t Freiburg"}));
 		comboBox.setBounds(365, 36, 202, 20);
 		contentPanel.add(comboBox);
+		
+		JPanel panel = new JPanel();
+		panel.setBounds(10, 67, 557, 129);
+		contentPanel.add(panel);
+		panel.setLayout(null);
+		panel.setBorder(new TitledBorder(null, "Beschreibung", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel.setBackground(SystemColor.menu);
+		
+		JLabel label = new JLabel("Read");
+		label.setBounds(20, 18, 90, 20);
+		panel.add(label);
+		
+		JLabel label_3 = new JLabel("Write");
+		label_3.setBounds(20, 38, 90, 20);
+		panel.add(label_3);
+		
+		JLabel label_4 = new JLabel("ChangePermission");
+		label_4.setBounds(20, 58, 90, 20);
+		panel.add(label_4);
+		
+		JLabel label_5 = new JLabel("Admin");
+		label_5.setBounds(20, 78, 90, 20);
+		panel.add(label_5);
+		
+		JLabel label_6 = new JLabel("Link_allowed");
+		label_6.setBounds(20, 98, 90, 20);
+		panel.add(label_6);
+		
+		JLabel label_7 = new JLabel("Image darf gelesen und gestartet werden und ist in Suchfenster sichtbar.");
+		label_7.setBounds(120, 18, 380, 20);
+		panel.add(label_7);
+		
+		JLabel label_8 = new JLabel("Image darf angepasst und überschrieben, jedoch nicht gelöscht werden.");
+		label_8.setBounds(120, 38, 380, 20);
+		panel.add(label_8);
+		
+		JLabel label_9 = new JLabel("Berechtigungen für das Image dürfen geändert werden.");
+		label_9.setBounds(120, 58, 380, 20);
+		panel.add(label_9);
+		
+		JLabel label_10 = new JLabel("Volle Rechte: write + changePermission + löschen.");
+		label_10.setBounds(120, 78, 380, 20);
+		panel.add(label_10);
+		
+		JLabel label_11 = new JLabel("Erzeugung einer Veranstaltung auf ein Image ist erlaubt.");
+		label_11.setBounds(120, 98, 380, 20);
+		panel.add(label_11);
 		{
 			JPanel buttonPane = new JPanel();
 			buttonPane.setBounds(0, 640, 597, 33);
diff --git a/Dozentenmodul/src/gui/lecture/PermissionCreateLecture_GUI.java b/Dozentenmodul/src/gui/lecture/PermissionCreateLecture_GUI.java
index 446a5017..6b42cda2 100644
--- a/Dozentenmodul/src/gui/lecture/PermissionCreateLecture_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/PermissionCreateLecture_GUI.java
@@ -148,13 +148,13 @@ public class PermissionCreateLecture_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, 75, 557, 445);
+		panel_1.setBounds(10, 207, 557, 313);
 		contentPanel.add(panel_1);
 		panel_1.setLayout(null);
 		
 		JScrollPane scrollPane = new JScrollPane();
 		scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-		scrollPane.setBounds(10, 21, 537, 413);
+		scrollPane.setBounds(10, 21, 537, 281);
 		panel_1.add(scrollPane);
 		
 		table = new JTable();
@@ -236,6 +236,53 @@ public class PermissionCreateLecture_GUI extends JFrame {
 		comboBox.setModel(new DefaultComboBoxModel(new String[] {"Hochschule Offenburg", "Universit\u00E4t Freiburg"}));
 		comboBox.setBounds(365, 36, 202, 20);
 		contentPanel.add(comboBox);
+		
+		JPanel panel = new JPanel();
+		panel.setBounds(10, 67, 557, 129);
+		contentPanel.add(panel);
+		panel.setLayout(null);
+		panel.setBorder(new TitledBorder(null, "Beschreibung", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel.setBackground(SystemColor.menu);
+		
+		JLabel label = new JLabel("Read");
+		label.setBounds(20, 18, 90, 20);
+		panel.add(label);
+		
+		JLabel label_3 = new JLabel("Write");
+		label_3.setBounds(20, 38, 90, 20);
+		panel.add(label_3);
+		
+		JLabel label_4 = new JLabel("ChangePermission");
+		label_4.setBounds(20, 58, 90, 20);
+		panel.add(label_4);
+		
+		JLabel label_5 = new JLabel("Admin");
+		label_5.setBounds(20, 78, 90, 20);
+		panel.add(label_5);
+		
+		JLabel label_6 = new JLabel("Link_allowed");
+		label_6.setBounds(20, 98, 90, 20);
+		panel.add(label_6);
+		
+		JLabel label_7 = new JLabel("Image darf gelesen und gestartet werden und ist in Suchfenster sichtbar.");
+		label_7.setBounds(120, 18, 380, 20);
+		panel.add(label_7);
+		
+		JLabel label_8 = new JLabel("Image darf angepasst und überschrieben, jedoch nicht gelöscht werden.");
+		label_8.setBounds(120, 38, 380, 20);
+		panel.add(label_8);
+		
+		JLabel label_9 = new JLabel("Berechtigungen für das Image dürfen geändert werden.");
+		label_9.setBounds(120, 58, 380, 20);
+		panel.add(label_9);
+		
+		JLabel label_10 = new JLabel("Volle Rechte: write + changePermission + löschen.");
+		label_10.setBounds(120, 78, 380, 20);
+		panel.add(label_10);
+		
+		JLabel label_11 = new JLabel("Erzeugung einer Veranstaltung auf ein Image ist erlaubt.");
+		label_11.setBounds(120, 98, 380, 20);
+		panel.add(label_11);
 		{
 			JPanel buttonPane = new JPanel();
 			buttonPane.setBounds(0, 640, 597, 33);
diff --git a/Dozentenmodul/src/gui/lecture/PermissionEditLecture_GUI.java b/Dozentenmodul/src/gui/lecture/PermissionEditLecture_GUI.java
index 10dafdf0..e5470a9f 100644
--- a/Dozentenmodul/src/gui/lecture/PermissionEditLecture_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/PermissionEditLecture_GUI.java
@@ -145,16 +145,63 @@ public class PermissionEditLecture_GUI extends JFrame {
 		getContentPane().add(contentPanel);
 		contentPanel.setLayout(null);
 		
+		JPanel panel = new JPanel();
+		panel.setLayout(null);
+		panel.setBorder(new TitledBorder(null, "Beschreibung", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel.setBackground(SystemColor.menu);
+		panel.setBounds(10, 67, 557, 129);
+		contentPanel.add(panel);
+		
+		JLabel label = new JLabel("Read");
+		label.setBounds(20, 18, 90, 20);
+		panel.add(label);
+		
+		JLabel label_3 = new JLabel("Write");
+		label_3.setBounds(20, 38, 90, 20);
+		panel.add(label_3);
+		
+		JLabel label_4 = new JLabel("ChangePermission");
+		label_4.setBounds(20, 58, 90, 20);
+		panel.add(label_4);
+		
+		JLabel label_5 = new JLabel("Admin");
+		label_5.setBounds(20, 78, 90, 20);
+		panel.add(label_5);
+		
+		JLabel label_6 = new JLabel("Link_allowed");
+		label_6.setBounds(20, 98, 90, 20);
+		panel.add(label_6);
+		
+		JLabel label_7 = new JLabel("Image darf gelesen und gestartet werden und ist in Suchfenster sichtbar.");
+		label_7.setBounds(120, 18, 380, 20);
+		panel.add(label_7);
+		
+		JLabel label_8 = new JLabel("Image darf angepasst und überschrieben, jedoch nicht gelöscht werden.");
+		label_8.setBounds(120, 38, 380, 20);
+		panel.add(label_8);
+		
+		JLabel label_9 = new JLabel("Berechtigungen für das Image dürfen geändert werden.");
+		label_9.setBounds(120, 58, 380, 20);
+		panel.add(label_9);
+		
+		JLabel label_10 = new JLabel("Volle Rechte: write + changePermission + löschen.");
+		label_10.setBounds(120, 78, 380, 20);
+		panel.add(label_10);
+		
+		JLabel label_11 = new JLabel("Erzeugung einer Veranstaltung auf ein Image ist erlaubt.");
+		label_11.setBounds(120, 98, 380, 20);
+		panel.add(label_11);
+		
 		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, 75, 557, 445);
+		panel_1.setBounds(10, 207, 557, 313);
 		contentPanel.add(panel_1);
 		panel_1.setLayout(null);
 		
 		JScrollPane scrollPane = new JScrollPane();
 		scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-		scrollPane.setBounds(10, 21, 537, 413);
+		scrollPane.setBounds(10, 21, 537, 281);
 		panel_1.add(scrollPane);
 		
 		table = new JTable();