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

12 files changed, 94 insertions, 83 deletions

diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
index 18b00f77..a15ca0fe 100644
--- a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
index 8051fcb8..0a129b98 100644
--- a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class
index 8173d4ba..d59c5e1b 100644
--- a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class
+++ b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class
deleted file mode 100644
index d6b99925..00000000
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class
index 97d4800a..d6ba973f 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class
index 02d5a631..466c2d24 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$5.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class
deleted file mode 100644
index 93784d1a..00000000
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class
index bb9c8ff4..48192aaf 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class
index 123d5023..9d9b8237 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class
index 145e938e..230fc2ac 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class
diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
index e99a3af8..d3e2f24a 100644
--- a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
+++ b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
index 2670b2bd..faf24528 100644
--- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
+++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java
@@ -45,6 +45,7 @@ import javax.swing.border.TitledBorder;
 import models.ImageRights;
 import models.Links;
 import models.SessionData;
+import models.person;
 import util.GuiOrganizer;
 import util.OpenLinks;
 
@@ -66,51 +67,62 @@ public class MainMenue_GUI extends JFrame {
 	JRadioButton rdbtnLectureSearch;
 	private final ButtonGroup buttonGroup = new ButtonGroup();
 	private JMenuItem mntmAbout;
-	
-	//for testing
-	ImageRights imageRights = new ImageRights();
 
+	// for testing
+	ImageRights imageRights = new ImageRights();
 
 	/**
 	 * Create the dialog.
 	 */
 	public MainMenue_GUI() {
-		
-		//Leerzeile auf Konsole bei Rueckkehr ins Hauptmenue fuer leichteres Lesen
+
+		// Leerzeile auf Konsole bei Rueckkehr ins Hauptmenue fuer leichteres
+		// Lesen
 		System.out.println("\n");
-		
-		//for testing
+
+		// for testing
 		System.out.println("Setze Rechte für 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());
-		*/
-		
-		
-		
+		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) {
@@ -124,7 +136,8 @@ public class MainMenue_GUI extends JFrame {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		setTitle("bwLehrpool Suite - Connected Server: "+SessionData.session.getServerAdress());
+		setTitle("bwLehrpool Suite - Connected Server: "
+				+ SessionData.session.getServerAdress());
 		setBounds(0, 0, 603, 722);
 		GuiOrganizer.centerGUI(this);
 
@@ -284,17 +297,11 @@ public class MainMenue_GUI extends JFrame {
 		txtNews.setText("Hier werden mal die Neuigkeiten stehen. Diese kommen direkt vom Satelliten und sind HS-spezifisch.");
 		scrollPaneNews.add(txtNews);
 		panelNews.add(scrollPaneNews);
-		
-		
-		
+
 		/*
 		 * Ber\u00fccksichtigen der Rechte für GUI
 		 */
 		processRights();
-		
-		
-		
-		
 
 		/*
 		 * Funktion Texte f\u00fcr das Klicken der RadioButtons
@@ -460,15 +467,15 @@ public class MainMenue_GUI extends JFrame {
 		mntmFaq.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
-				
+
 				OpenLinks open = new OpenLinks();
-				
+
 				URI windows;
 				try {
 					windows = new URI(Links.getFAQ());
-					
+
 					open.openWebpage(windows);
-					
+
 				} catch (URISyntaxException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
@@ -476,7 +483,6 @@ public class MainMenue_GUI extends JFrame {
 			}
 		});
 		mnNewMenu_1.add(mntmFaq);
-		
 
 		JMenuItem mntmOtrs = new JMenuItem("OTRS");
 		mntmOtrs.addMouseListener(new MouseAdapter() {
@@ -484,22 +490,22 @@ public class MainMenue_GUI extends JFrame {
 			public void mousePressed(MouseEvent arg0) {
 
 				OpenLinks open = new OpenLinks();
-				
+
 				URI windows;
 				try {
 					windows = new URI(Links.getOTRS());
-					
+
 					open.openWebpage(windows);
-					
+
 				} catch (URISyntaxException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
-				
+
 			}
 		});
 		mnNewMenu_1.add(mntmOtrs);
-		
+
 		mntmAbout = new JMenuItem("About");
 		mntmAbout.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent arg0) {
@@ -510,46 +516,51 @@ public class MainMenue_GUI extends JFrame {
 		mnNewMenu_1.add(mntmAbout);
 
 	}// end main
-	
-	private void processRights(){
-		//Image anlegen
-		System.out.println("ImageRights.rights.getWrite()="+ImageRights.rights.getWrite());
-		if(ImageRights.rights.getWrite()== 1){
-			rdbtnImageNew.setEnabled(true);
-		} else {
+
+	private void processRights() {
+
+		/*
+		 * Legt anhand der Rolle fest, welche Operationen der user machen darf.
+		 * Rolle kommt vom Masterserver
+		 */
+
+		// Image
+		if (person.verantwortlicher.getRole().equals("Student")) {
 			rdbtnImageNew.setEnabled(false);
-		}
-		
-		//Image bearbeiten
-		System.out.println("ImageRights.rights.getWrite()="+ImageRights.rights.getWrite());
-		if(ImageRights.rights.getWrite()== 1){
-			rdbtnImageEdit.setEnabled(true);
-		} else {
 			rdbtnImageEdit.setEnabled(false);
-		}
-		
-		//Image l\o00fcschen
-		System.out.println("ImageRights.rights.getWrite()="+ImageRights.rights.getWrite());
-		if(ImageRights.rights.getWrite()== 1){
+			rdbtnImageDelete.setEnabled(false);
+			rdbtnImageSearchDownload.setEnabled(true);
+		} else if (person.verantwortlicher.getRole().equals("Dozent")
+				|| person.verantwortlicher.getRole().equals("Admin")) {
+			rdbtnImageNew.setEnabled(true);
+			rdbtnImageEdit.setEnabled(true);
 			rdbtnImageDelete.setEnabled(true);
+			rdbtnImageSearchDownload.setEnabled(true);
 		} else {
+			rdbtnImageNew.setEnabled(false);
+			rdbtnImageEdit.setEnabled(false);
 			rdbtnImageDelete.setEnabled(false);
+			rdbtnImageSearchDownload.setEnabled(false);
 		}
-			
-		
-		//Image Suchen/Download
-		System.out.println("ImageRights.rights.getRead()="+ImageRights.rights.getRead());
-		if(ImageRights.rights.getRead()== 1){
-			rdbtnImageSearchDownload.setEnabled(true);
+
+		// Veranstaltung
+		if (person.verantwortlicher.getRole().equals("Student")) {
+			rdbtnLectureNew.setEnabled(false);
+			rdbtnLectureEdit.setEnabled(false);
+			rdbtnLectureDelete.setEnabled(false);
+			rdbtnLectureSearch.setEnabled(true);
+		} else if (person.verantwortlicher.getRole().equals("Dozent")
+				|| person.verantwortlicher.getRole().equals("Admin")) {
+			rdbtnLectureNew.setEnabled(true);
+			rdbtnLectureEdit.setEnabled(true);
+			rdbtnLectureDelete.setEnabled(true);
+			rdbtnLectureSearch.setEnabled(true);
 		} else {
+			rdbtnImageNew.setEnabled(false);
+			rdbtnImageEdit.setEnabled(false);
+			rdbtnImageDelete.setEnabled(false);
 			rdbtnImageSearchDownload.setEnabled(false);
 		}
-		
-		//Veranstaltung anlegen
-		
-		
-		
-		
-		
-	}//end processRights()
+
+	}// end processRights()
 }// end class