Rechte entsprechend der Roll eim Hauptmenü bereits eingegrenzt und Funktionen ausgeblendet

9 files changed, 99 insertions, 50 deletions

diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class
index 71eae85a..a3601339 100644
--- a/Dozentenmodul/bin/gui/intro/Login_GUI.class
+++ b/Dozentenmodul/bin/gui/intro/Login_GUI.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class
deleted file mode 100644
index d6ba973f..00000000
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class
index 466c2d24..ad5c0897 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class
deleted file mode 100644
index 48192aaf..00000000
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class
deleted file mode 100644
index 9d9b8237..00000000
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class
deleted file mode 100644
index 230fc2ac..00000000
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
index 2b26093e..e0371b15 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java
index 777ac900..ede4bf27 100644
--- a/Dozentenmodul/src/gui/intro/Login_GUI.java
+++ b/Dozentenmodul/src/gui/intro/Login_GUI.java
@@ -306,7 +306,10 @@ public class Login_GUI extends JFrame {
 
 
 					//Sp�ter �ber result.getRole zum Beispiel die Rolle holen
-					person.verantwortlicher.setRole("Dozent");
+					//person.verantwortlicher.setRole("Dozent");
+					//person.verantwortlicher.setRole("Admin");
+					//person.verantwortlicher.setRole("Student");
+					person.verantwortlicher.setRole("GetToTheChopper!");
 
 
 					try {
diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
index 8f142c28..7d4fcdd2 100644
--- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
+++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
@@ -30,6 +30,7 @@ import javax.swing.JLabel;
 import javax.swing.JMenu;
 import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JRadioButton;
 import javax.swing.JSeparator;
@@ -80,49 +81,6 @@ public class MainMenue_GUI extends JFrame {
 		// Lesen
 		System.out.println("\n");
 
-		// for testing
-		System.out.println("Setze Rechte fuer Student");
-		ImageRights.rights.setRead(1);
-		ImageRights.rights.setWrite(0);
-		ImageRights.rights.setChangePermission(0);
-		ImageRights.rights.setAdmin(0);
-		ImageRights.rights.setLinkAllowed(0);
-		System.out.println("Rechte (r,w,cp,a,la): "
-				+ ImageRights.rights.getRead() + ","
-				+ ImageRights.rights.getWrite() + ","
-				+ ImageRights.rights.getChangePermission() + ","
-				+ ImageRights.rights.getAdmin() + ","
-				+ ImageRights.rights.getAdmin());
-
-		// for testing
-		/*
-		 * System.out.println("Setze Rechte für Dozent");
-		 * ImageRights.rights.setRead(1); ImageRights.rights.setWrite(1);
-		 * ImageRights.rights.setChangePermission(0);
-		 * ImageRights.rights.setAdmin(0); ImageRights.rights.setLinkAllowed(1);
-		 * System
-		 * .out.println("Rechte (r,w,cp,a,la): "+ImageRights.rights.getRead
-		 * ()+","
-		 * +ImageRights.rights.getWrite()+","+ImageRights.rights.getChangePermission
-		 * (
-		 * )+","+ImageRights.rights.getAdmin()+","+ImageRights.rights.getAdmin()
-		 * );
-		 */
-
-		/*
-		 * //for testing System.out.println("Setze Rechte für Admin");
-		 * ImageRights.rights.setRead(1); ImageRights.rights.setWrite(1);
-		 * ImageRights.rights.setChangePermission(1);
-		 * ImageRights.rights.setAdmin(1); ImageRights.rights.setLinkAllowed(1);
-		 * System
-		 * .out.println("Rechte (r,w,cp,a,la): "+ImageRights.rights.getRead
-		 * ()+","
-		 * +ImageRights.rights.getWrite()+","+ImageRights.rights.getChangePermission
-		 * (
-		 * )+","+ImageRights.rights.getAdmin()+","+ImageRights.rights.getAdmin()
-		 * );
-		 */
-
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
@@ -183,7 +141,6 @@ public class MainMenue_GUI extends JFrame {
 				.setToolTipText("Hier k\u00F6nnen Sie eine standard Laborvorlage downloaden");
 		rdbtnImageNew.setBounds(6, 22, 159, 23);
 		panelImage.add(rdbtnImageNew);
-		rdbtnImageNew.setSelected(true);
 		buttonGroup.add(rdbtnImageNew);
 		rdbtnImageNew.setBackground(SystemColor.menu);
 
@@ -301,7 +258,10 @@ public class MainMenue_GUI extends JFrame {
 		/*
 		 * Ber\u00fccksichtigen der Rechte für GUI
 		 */
+		// set the rights for this user
+		setRoleRights();
 		processRights();
+		setCorrectRadioButton();
 
 		/*
 		 * Funktion Texte f\u00fcr das Klicken der RadioButtons
@@ -438,7 +398,10 @@ public class MainMenue_GUI extends JFrame {
 							SearchLecture_GUI sl = new SearchLecture_GUI();
 							sl.setVisible(true);
 							dispose();
-						}
+						} else
+							JOptionPane.showMessageDialog(null,
+									"Keine Auswahl getroffen.",
+									"Auswahl fehlt", JOptionPane.ERROR_MESSAGE);
 					}
 				});
 				continueButton.setActionCommand("OK");
@@ -547,11 +510,94 @@ public class MainMenue_GUI extends JFrame {
 			rdbtnLectureDelete.setEnabled(true);
 			rdbtnLectureSearch.setEnabled(true);
 		} else {
-			rdbtnImageNew.setEnabled(false);
-			rdbtnImageEdit.setEnabled(false);
-			rdbtnImageDelete.setEnabled(false);
-			rdbtnImageSearchDownload.setEnabled(false);
+			rdbtnLectureNew.setEnabled(false);
+			rdbtnLectureEdit.setEnabled(false);
+			rdbtnLectureDelete.setEnabled(false);
+			rdbtnLectureSearch.setEnabled(false);
 		}
 
 	}// end processRights()
+
+	public void setRoleRights() {
+		// Set rights for user, depending on the role that is returned by the
+		// masterserver
+
+		System.out.println("Ihre Rolle ist nun: "
+				+ person.verantwortlicher.getRole());
+		// role==Student
+		if (person.verantwortlicher.getRole().equals("Student")) {
+			ImageRights.rights.setRead(1);
+			ImageRights.rights.setWrite(0);
+			ImageRights.rights.setChangePermission(0);
+			ImageRights.rights.setAdmin(0);
+			ImageRights.rights.setLinkAllowed(0);
+			System.out.println("Rechte (r,w,cp,a,la): "
+					+ ImageRights.rights.getRead() + ","
+					+ ImageRights.rights.getWrite() + ","
+					+ ImageRights.rights.getChangePermission() + ","
+					+ ImageRights.rights.getAdmin() + ","
+					+ ImageRights.rights.getLinkAllowed());
+
+		} else if (person.verantwortlicher.getRole().equals("Dozent")) { // role==Dozent
+			ImageRights.rights.setRead(1);
+			ImageRights.rights.setWrite(1);
+			ImageRights.rights.setChangePermission(0);
+			ImageRights.rights.setAdmin(0);
+			ImageRights.rights.setLinkAllowed(1);
+			System.out.println("Rechte (r,w,cp,a,la): "
+					+ ImageRights.rights.getRead() + ","
+					+ ImageRights.rights.getWrite() + ","
+					+ ImageRights.rights.getChangePermission() + ","
+					+ ImageRights.rights.getAdmin() + ","
+					+ ImageRights.rights.getLinkAllowed());
+		} else if (person.verantwortlicher.getRole().equals("Admin")) { // role==Admin
+			ImageRights.rights.setRead(1);
+			ImageRights.rights.setWrite(1);
+			ImageRights.rights.setChangePermission(1);
+			ImageRights.rights.setAdmin(1);
+			ImageRights.rights.setLinkAllowed(1);
+			System.out.println("Rechte (r,w,cp,a,la): "
+					+ ImageRights.rights.getRead() + ","
+					+ ImageRights.rights.getWrite() + ","
+					+ ImageRights.rights.getChangePermission() + ","
+					+ ImageRights.rights.getAdmin() + ","
+					+ ImageRights.rights.getLinkAllowed());
+		} else { // role==Nothing
+			ImageRights.rights.setRead(0);
+			ImageRights.rights.setWrite(0);
+			ImageRights.rights.setChangePermission(0);
+			ImageRights.rights.setAdmin(0);
+			ImageRights.rights.setLinkAllowed(0);
+			System.out.println("Rechte (r,w,cp,a,la): "
+					+ ImageRights.rights.getRead() + ","
+					+ ImageRights.rights.getWrite() + ","
+					+ ImageRights.rights.getChangePermission() + ","
+					+ ImageRights.rights.getAdmin() + ","
+					+ ImageRights.rights.getLinkAllowed());
+		}// end if else
+	}// end setRoleRights
+
+	public void setCorrectRadioButton() {
+		// get the first enabled RadioButton depending on role an rights. Start
+		// at top
+
+		if (rdbtnImageNew.isEnabled() == true) {
+			rdbtnImageNew.setSelected(true);
+		} else if (rdbtnImageEdit.isEnabled() == true) {
+			rdbtnImageEdit.setSelected(true);
+		} else if (rdbtnImageDelete.isEnabled() == true) {
+			rdbtnImageDelete.setSelected(true);
+		} else if (rdbtnImageSearchDownload.isEnabled() == true) {
+			rdbtnImageSearchDownload.setSelected(true);
+		} else if (rdbtnLectureNew.isEnabled() == true) {
+			rdbtnLectureNew.setSelected(true);
+		} else if (rdbtnLectureEdit.isEnabled() == true) {
+			rdbtnLectureEdit.setSelected(true);
+		} else if (rdbtnLectureDelete.isEnabled() == true) {
+			rdbtnLectureDelete.setSelected(true);
+		} else if (rdbtnLectureSearch.isEnabled() == true) {
+			rdbtnLectureSearch.setSelected(true);
+		}
+
+	}// end setCorrectRadioButton()
 }// end class