diff options
Diffstat (limited to 'Dozentenmodul/src/main/java/gui/intro')
5 files changed, 323 insertions, 99 deletions
diff --git a/Dozentenmodul/src/main/java/gui/intro/About_GUI.java b/Dozentenmodul/src/main/java/gui/intro/About_GUI.java index 3e10d1d9..a97a217b 100644 --- a/Dozentenmodul/src/main/java/gui/intro/About_GUI.java +++ b/Dozentenmodul/src/main/java/gui/intro/About_GUI.java @@ -16,6 +16,8 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; +import models.Version; + import util.GuiOrganizer; @SuppressWarnings("serial") @@ -39,11 +41,11 @@ public class About_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); JOptionPane.showMessageDialog(null, - e.getCause() + "\n" + e.getMessage(), "Debug-Message", + e.getCause() + "\n" + e.getStackTrace(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } // Titel des Fensters setzen - setTitle("Dozentenmodul *Prototyp* - About"); + setTitle("Dozentenmodul - About"); // Aktion die beim Schliessen durchgefuehrt werden soll setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); // Groesse des Fensters definieren @@ -86,7 +88,7 @@ public class About_GUI extends JFrame { txtpnVersionVBuilddate = new JTextPane(); txtpnVersionVBuilddate - .setText("Version: v0.1\r\nBuild-Date: 03.06.2014\r\n\r\nContact: michael.wilson@hs-offenburg.de\r\nWebsite: http://bwlehrpool.hs-offenburg.de/"); + .setText("Version: "+Version.getVersion()+"\r\nBuild-Date: "+Version.getBuildDate()+"\r\n\r\nContact: michael.wilson@hs-offenburg.de\r\nWebsite: http://bwlehrpool.hs-offenburg.de/"); txtpnVersionVBuilddate.setEditable(false); txtpnVersionVBuilddate.setBackground(SystemColor.menu); txtpnVersionVBuilddate.setBounds(62, 95, 224, 90); diff --git a/Dozentenmodul/src/main/java/gui/intro/BillOfRights_GUI.java b/Dozentenmodul/src/main/java/gui/intro/BillOfRights_GUI.java index 21d15d40..b11dc746 100644 --- a/Dozentenmodul/src/main/java/gui/intro/BillOfRights_GUI.java +++ b/Dozentenmodul/src/main/java/gui/intro/BillOfRights_GUI.java @@ -75,7 +75,7 @@ public class BillOfRights_GUI extends JFrame { e.printStackTrace(); } //Setzt den Fenstertitel - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite"); //Zentiert das Fenster in der Bildschirmmitte setBounds(0, 0, 603, 722); @@ -136,13 +136,13 @@ public class BillOfRights_GUI extends JFrame { // TODO Auto-generated catch block e1.printStackTrace(); JOptionPane.showMessageDialog(null, - e1.getCause()+"\n"+e1.getMessage(), + e1.getCause()+"\n"+e1.getStackTrace(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } catch (IOException e1) { // TODO Auto-generated catch block e1.printStackTrace(); JOptionPane.showMessageDialog(null, - e1.getCause()+"\n"+e1.getMessage(), + e1.getCause()+"\n"+e1.getStackTrace(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } VmWareLink_GUI ac=new VmWareLink_GUI(); diff --git a/Dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/Dozentenmodul/src/main/java/gui/intro/Login_GUI.java index e07bfd7d..b27c7179 100644 --- a/Dozentenmodul/src/main/java/gui/intro/Login_GUI.java +++ b/Dozentenmodul/src/main/java/gui/intro/Login_GUI.java @@ -28,6 +28,7 @@ import models.SessionData; import models.person; import org.apache.thrift.TException; +import org.ini4j.InvalidFileFormatException; import org.ini4j.Wini; import org.openslx.imagemaster.thrift.iface.ImageServer.Client; @@ -36,6 +37,7 @@ import thrift.ThriftConnection; import org.openslx.imagemaster.thrift.iface.UserInfo; import util.GuiOrganizer; import config.config_file; +import javax.swing.JCheckBox; @SuppressWarnings("serial") public class Login_GUI extends JFrame { @@ -50,7 +52,8 @@ public class Login_GUI extends JFrame { MasterThriftConnection thrift; Client client; String token; - + JCheckBox chckbxBenutzernameSpeichern; + /** * Launch the application. */ @@ -101,12 +104,9 @@ public class Login_GUI extends JFrame { | IllegalAccessException | UnsupportedLookAndFeelException e) { // TODO Auto-generated catch block e.printStackTrace(); - JOptionPane.showMessageDialog(null, - e.getCause() + "\n" + e.getMessage(), "Debug-Message", - JOptionPane.ERROR_MESSAGE); } // Titel des Fensters setzen - setTitle("Dozentenmodul *Prototyp*"); + setTitle("bwLehrpool Suite"); // Aktion die beim Schliessen durchgefuehrt werden soll setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); @@ -114,6 +114,8 @@ public class Login_GUI extends JFrame { setBounds(0, 0, 603, 400); GuiOrganizer.centerGUI(this); + + // Erzeugen eines Panels contentPane = new JPanel(); // Hintergrund Farbe des Panels setzen @@ -136,16 +138,55 @@ public class Login_GUI extends JFrame { imgLabel.setIcon(new ImageIcon(scaled)); // Hinzufuegen des Logos in das Fenster contentPane.add(imgLabel); + + chckbxBenutzernameSpeichern = new JCheckBox("Benutzername speichern"); + chckbxBenutzernameSpeichern.setBounds(292, 222, 237, 23); + contentPane.add(chckbxBenutzernameSpeichern); // Erzeugen und Hinzufuegen des Labels JLabel LabelUser = new JLabel("bwIDM-Benutzername:"); LabelUser.setBounds(111, 164, 134, 20); contentPane.add(LabelUser); + + // Erzeugen und Hinzufuegen des Passwortfeldes + lblpass = new JPasswordField(); + lblpass.setToolTipText("Bitte geben Sie Ihr bwIDM-Passwort ein."); + lblpass.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + performLogin(); + } + }); + lblpass.setBounds(292, 195, 237, 20); + contentPane.add(lblpass); // Erzeugen und Hinzufuegen des Textfeldes lblusername = new JTextField(); lblusername .setToolTipText("Bitte geben Sie Ihren bwIDM-Benutzernamen ein."); + try { + Wini ini = new Wini( + new File( + "C:\\Users\\" + + System.getProperty("user.name") + + "\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini")); + if(ini.get("main", "Benutzername").isEmpty()){ + + }else{ + lblusername.setText(ini.get("main", "Benutzername").toString()); + + } + + if(ini.get("main", "Benutzername speichern", Boolean.class)==true){ + chckbxBenutzernameSpeichern.setSelected(true); + + } + } catch (InvalidFileFormatException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (IOException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } lblusername.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { performLogin(); @@ -159,32 +200,31 @@ public class Login_GUI extends JFrame { JLabel LabelPass = new JLabel("bwIDM-Passwort:"); LabelPass.setBounds(111, 195, 134, 20); contentPane.add(LabelPass); - + + lblConnectionInfo.setHorizontalAlignment(SwingConstants.LEFT); + lblConnectionInfo.setBounds(111, 290, 418, 20); + lblConnectionInfo.setEnabled(true); + lblConnectionInfo.setText("Info: Bereit f\u00FCr Login"); + + contentPane.add(lblConnectionInfo); + // Erzeugen, Hinzufuegen und definierung der Aktion des Buttons JButton BtnLogin = new JButton("Login"); BtnLogin.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { + performLogin(); }// end actionPerformed }); - BtnLogin.setBounds(292, 244, 237, 23); + BtnLogin.setBounds(292, 252, 237, 23); contentPane.add(BtnLogin); - // Erzeugen und Hinzufuegen des Passwortfeldes - lblpass = new JPasswordField(); - lblpass.setToolTipText("Bitte geben Sie Ihr bwIDM-Passwort ein."); - lblpass.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - performLogin(); - } - }); - lblpass.setBounds(292, 195, 237, 20); - contentPane.add(lblpass); - lblConnectionInfo.setHorizontalAlignment(SwingConstants.LEFT); - lblConnectionInfo.setBounds(292, 290, 237, 20); - contentPane.add(lblConnectionInfo); + + + + //GuiOrganizer.centerGUI(this); }// end LoginGUI() @@ -198,26 +238,49 @@ public class Login_GUI extends JFrame { org.openslx.imagemaster.thrift.iface.SessionData result = null; try { + login = true; String passText = new String(lblpass.getPassword()); // check if client has received a connection with information or a // null package if (checkClientPackage() == true) { - // package has information - System.out.println("Auth"); + + // package has information + //User-Info + + System.out.println("Authentifiziere - warte auf Masterserver"); + lblConnectionInfo.setForeground(Color.black); + + lblConnectionInfo.setText("Authentifiziere - warte auf Antwort von Server..."); + result = client.authenticate(lblusername.getText(), passText); - System.out.println("Succes Auth"); + + //User-Info + System.out.println("Authentifizierung erfolgreich"); + lblConnectionInfo.setForeground(Color.green); + lblConnectionInfo.setText("Authentifizierung erfolgreich"); + + //set Information SessionData.session.setAuthToken(result.authToken); SessionData.session.setSessionID(result.sessionId); SessionData.session.setServerAdress(result.serverAddress); - System.out.println("Master"); + + + //User-Info + lblConnectionInfo.setForeground(Color.black); + lblConnectionInfo.setText("Hole Verbindungsdaten von Server..."); + System.out.println("warte auf Masterserver"); // set connection to bwLehrpoolSuiteServer ThriftConnection bwthrift = new ThriftConnection(); server.Server.Client bwClient = bwthrift.getThriftConnection(); models.Client.clientcon.setClient(bwClient); - System.out.println("Client"); + + //User-Info + System.out.println("Client macht weiter"); System.out.println("Session-ID: " + result.sessionId + "\nToken: " + result.authToken); + lblConnectionInfo.setForeground(Color.green); + lblConnectionInfo.setText("Daten erhalten."); if (login == true) { //Daten speichern @@ -227,7 +290,7 @@ public class Login_GUI extends JFrame { "Error: Token ist null", "Token defekt", JOptionPane.ERROR_MESSAGE); } - System.out.println("Hole jetzt Infos aus SessionData..."); + System.out.println("Arbeite ab jetzt mit Infos aus SessionData."); UserInfo user = client.getUserFromToken(SessionData.session .getAuthToken()); @@ -241,6 +304,14 @@ public class Login_GUI extends JFrame { person.verantwortlicher.setEMail(user.eMail); person.verantwortlicher.setHochschule(hochschule); + + //Sp�ter �ber result.getRole zum Beispiel die Rolle holen + person.verantwortlicher.setRole("Dozent"); + //person.verantwortlicher.setRole("Admin"); + //person.verantwortlicher.setRole("Student"); + //person.verantwortlicher.setRole("GetToTheChopper!"); + + try { // Lege config File an und entscheide welches Fenster // als naechstes geoeffnet wird @@ -249,6 +320,35 @@ public class Login_GUI extends JFrame { "C:\\Users\\" + System.getProperty("user.name") + "\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini")); + if(lblusername.getText().equals(ini.get("main","Benutzername",String.class))==true){ + if(chckbxBenutzernameSpeichern.isSelected()){ + ini.put("main", "Benutzername", lblusername.getText()); + ini.put("main", "Benutzername speichern", true); + ini.store(); + } + else{ + ini.put("main", "Benutzername", ""); + ini.put("main", "Benutzername speichern", false); + ini.store(); + } + }else{ + + if(chckbxBenutzernameSpeichern.isSelected()){ + ini.put("main", "Benutzername", lblusername.getText()); + ini.put("main", "Benutzername speichern", true); + ini.put("main", "BillOfRights",false); + ini.put("main", "vmware",false); + ini.store(); + } + else{ + ini.put("main", "Benutzername", ""); + ini.put("main", "Benutzername speichern", false); + ini.put("main", "BillOfRights",false); + ini.put("main", "vmware",false); + ini.store(); + } + } + // Pruefe ob Bills Of Rights schon akzeptiert wurden, // wenn // nicht zeige diese an @@ -273,12 +373,11 @@ public class Login_GUI extends JFrame { setVisible(false); } } + } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); - JOptionPane.showMessageDialog(null, e.getCause() + "\n" - + e.getMessage(), "Debug-Message", - JOptionPane.ERROR_MESSAGE); + } } else { @@ -296,6 +395,9 @@ public class Login_GUI extends JFrame { } } catch (org.openslx.imagemaster.thrift.iface.AuthenticationException e) { + lblConnectionInfo.setForeground(Color.red); + lblConnectionInfo + .setText("Fehler: Falscher Benutzername oder Passwort."); System.out .println("Authentifizierung fehlgeschlagen: " + e.message); JOptionPane @@ -305,26 +407,21 @@ public class Login_GUI extends JFrame { "Anmeldung fehlgeschlagen", JOptionPane.ERROR_MESSAGE); e.printStackTrace(); - JOptionPane.showMessageDialog(null, - e.getCause() + "\n" + e.getMessage(), "Message", - JOptionPane.ERROR_MESSAGE); return; } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); - JOptionPane.showMessageDialog(null, - e.getCause() + "\n" + e.getMessage(), "Debug-Message", - JOptionPane.ERROR_MESSAGE); - return; + } }// end performLogin public boolean checkClientPackage() { // check if client is null or has been returned with information + System.out.println("Prüfe Eingangsdaten"); if (client != null) { // client contains information isClientReturnedCorrectly = true; - System.out.println("Verbindungsinformationen erhalten"); + System.out.println("Verbindungsdaten erhalten"); } else { // client has returned with error isClientReturnedCorrectly = false; @@ -334,5 +431,4 @@ public class Login_GUI extends JFrame { return isClientReturnedCorrectly; }// end checkServerConnection() - }// end class diff --git a/Dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java index 7a57cd90..956ca63d 100644 --- a/Dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java +++ b/Dozentenmodul/src/main/java/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; @@ -42,8 +43,10 @@ import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; +import models.ImageRights; import models.Links; import models.SessionData; +import models.person; import util.GuiOrganizer; import util.OpenLinks; @@ -66,11 +69,18 @@ public class MainMenue_GUI extends JFrame { private final ButtonGroup buttonGroup = new ButtonGroup(); private JMenuItem mntmAbout; + // for testing + ImageRights imageRights = new ImageRights(); /** * Create the dialog. */ public MainMenue_GUI() { + + // Leerzeile auf Konsole bei Rueckkehr ins Hauptmenue fuer leichteres + // Lesen + System.out.println("\n"); + addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { @@ -84,7 +94,8 @@ public class MainMenue_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp* - Connected Server: "+SessionData.session.getServerAdress()); + setTitle("bwLehrpool Suite - Connected Server: " + + SessionData.session.getServerAdress()); setBounds(0, 0, 603, 722); GuiOrganizer.centerGUI(this); @@ -119,25 +130,24 @@ public class MainMenue_GUI extends JFrame { JPanel panelImage = new JPanel(); panelImage.setBackground(SystemColor.menu); - panelImage.setBorder(new TitledBorder(null, "VL-Image", + panelImage.setBorder(new TitledBorder(null, "Image", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panelImage.setBounds(10, 146, 270, 170); + panelImage.setBounds(10, 221, 270, 133); contentPanel.add(panelImage); panelImage.setLayout(null); rdbtnImageNew = new JRadioButton("Neu"); rdbtnImageNew .setToolTipText("Hier k\u00F6nnen Sie eine standard Laborvorlage downloaden"); - rdbtnImageNew.setBounds(6, 22, 159, 23); + rdbtnImageNew.setBounds(20, 22, 159, 23); panelImage.add(rdbtnImageNew); - rdbtnImageNew.setSelected(true); buttonGroup.add(rdbtnImageNew); rdbtnImageNew.setBackground(SystemColor.menu); rdbtnImageEdit = new JRadioButton("Bearbeiten"); rdbtnImageEdit .setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden"); - rdbtnImageEdit.setBounds(6, 48, 185, 23); + rdbtnImageEdit.setBounds(20, 48, 185, 23); panelImage.add(rdbtnImageEdit); buttonGroup.add(rdbtnImageEdit); rdbtnImageEdit.setHorizontalAlignment(SwingConstants.LEFT); @@ -150,7 +160,7 @@ public class MainMenue_GUI extends JFrame { .setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden"); rdbtnImageDelete.setHorizontalAlignment(SwingConstants.LEFT); rdbtnImageDelete.setBackground(SystemColor.menu); - rdbtnImageDelete.setBounds(6, 74, 185, 23); + rdbtnImageDelete.setBounds(20, 74, 185, 23); panelImage.add(rdbtnImageDelete); rdbtnImageSearchDownload = new JRadioButton("Suche und Download"); @@ -159,7 +169,7 @@ public class MainMenue_GUI extends JFrame { .setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden"); rdbtnImageSearchDownload.setHorizontalAlignment(SwingConstants.LEFT); rdbtnImageSearchDownload.setBackground(SystemColor.menu); - rdbtnImageSearchDownload.setBounds(6, 100, 185, 23); + rdbtnImageSearchDownload.setBounds(20, 100, 185, 23); panelImage.add(rdbtnImageSearchDownload); JPanel panelDesc = new JPanel(); @@ -168,12 +178,14 @@ public class MainMenue_GUI extends JFrame { .getBorder("TitledBorder.border"), "Erkl\u00e4rung", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panelDesc.setBackground(SystemColor.menu); - panelDesc.setBounds(290, 146, 270, 170); + panelDesc.setBounds(10, 364, 270, 133); contentPanel.add(panelDesc); ScrollPane scrollPaneDesc = new ScrollPane(); - scrollPaneDesc.setBounds(10, 15, 250, 145); + scrollPaneDesc.setBounds(10, 15, 250, 110); final JTextArea txtDesc = new JTextArea(); + txtDesc.setEditable(false); + txtDesc.setBounds(280, 211, 10, 10); txtDesc.setLineWrap(true); txtDesc.setWrapStyleWord(true); txtDesc.setFont(new Font("Tahoma", Font.PLAIN, 11)); @@ -189,21 +201,21 @@ public class MainMenue_GUI extends JFrame { .getBorder("TitledBorder.border"), "Veranstaltung (VMChooser)", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panelVeranstaltung.setBackground(SystemColor.menu); - panelVeranstaltung.setBounds(10, 327, 270, 170); + panelVeranstaltung.setBounds(290, 221, 270, 133); contentPanel.add(panelVeranstaltung); rdbtnLectureNew = new JRadioButton("Neu"); buttonGroup.add(rdbtnLectureNew); rdbtnLectureNew .setToolTipText("Hier k\u00F6nnen Sie Ihre Labordaten eingeben"); - rdbtnLectureNew.setBounds(6, 24, 185, 23); + rdbtnLectureNew.setBounds(20, 24, 185, 23); panelVeranstaltung.add(rdbtnLectureNew); rdbtnLectureNew.setBackground(SystemColor.menu); rdbtnLectureEdit = new JRadioButton("Bearbeiten"); rdbtnLectureEdit .setToolTipText("Hier k\u00F6nnen Sie einen Link auf ein bestehendes Labor erzeugen"); - rdbtnLectureEdit.setBounds(6, 50, 230, 23); + rdbtnLectureEdit.setBounds(20, 50, 230, 23); panelVeranstaltung.add(rdbtnLectureEdit); buttonGroup.add(rdbtnLectureEdit); rdbtnLectureEdit.setBackground(SystemColor.menu); @@ -211,7 +223,7 @@ public class MainMenue_GUI extends JFrame { rdbtnLectureDelete = new JRadioButton("L\u00F6schen"); rdbtnLectureDelete .setToolTipText("Hier k\u00F6nnen Sie ein Labor l\u00F6schen"); - rdbtnLectureDelete.setBounds(6, 76, 175, 23); + rdbtnLectureDelete.setBounds(20, 76, 175, 23); panelVeranstaltung.add(rdbtnLectureDelete); buttonGroup.add(rdbtnLectureDelete); rdbtnLectureDelete.setBackground(SystemColor.menu); @@ -221,7 +233,7 @@ public class MainMenue_GUI extends JFrame { rdbtnLectureSearch .setToolTipText("Hier k\u00F6nnen Sie ein Labor l\u00F6schen"); rdbtnLectureSearch.setBackground(SystemColor.menu); - rdbtnLectureSearch.setBounds(6, 102, 175, 23); + rdbtnLectureSearch.setBounds(20, 102, 175, 23); panelVeranstaltung.add(rdbtnLectureSearch); JPanel panelNews = new JPanel(); @@ -230,22 +242,30 @@ public class MainMenue_GUI extends JFrame { .getBorder("TitledBorder.border"), "News", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panelNews.setBackground(SystemColor.menu); - panelNews.setBounds(290, 327, 270, 170); + panelNews.setBounds(290, 364, 270, 133); contentPanel.add(panelNews); ScrollPane scrollPaneNews = new ScrollPane(); - // scrollPaneDesc.setBounds(10, 15, 250, 145); - scrollPaneNews.setBounds(10, 15, 250, 145); + scrollPaneNews.setBounds(10, 15, 250, 110); JTextArea txtNews = new JTextArea(); + txtNews.setEditable(false); txtNews.setFont(new Font("Tahoma", Font.PLAIN, 11)); txtNews.setBackground(SystemColor.menu); txtNews.setWrapStyleWord(true); txtNews.setLineWrap(true); - txtNews.setText("Hier werden mal die Neuigkeiten stehen. Diese kommen direkt vom Satelliten, sind als HS-spezifisch :)"); + 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 + */ + // set the rights for this user + setRoleRights(); + processRights(); + setCorrectRadioButton(); + + /* * Funktion Texte f\u00fcr das Klicken der RadioButtons */ rdbtnImageNew.addActionListener(new ActionListener() { @@ -318,11 +338,12 @@ public class MainMenue_GUI extends JFrame { + "Intelligenz\" lauten und referenzieren dabei auf das allgemeine Image <br>" + "\"Programmieren\".</html>"); lblGrafik.setIcon(new ImageIcon(MainMenue_GUI.class - .getResource("/img/Image_zu_Veranstaltung_HDD.png"))); + .getResource("/e4_n_imgs2_bwl_vmc_v2.png"))); + // ToolTipp lange anzeigen - 60sec ToolTipManager.sharedInstance().setDismissDelay(60000); ToolTipManager.sharedInstance().registerComponent(lblGrafik); - lblGrafik.setBounds(82, 3, 391, 110); + lblGrafik.setBounds(10, -12, 547, 189); contentPanel.add(lblGrafik); JTextPane txtpnUmDetaillierteInformationen = new JTextPane(); @@ -330,7 +351,7 @@ public class MainMenue_GUI extends JFrame { .setText("Um detaillierte Informationen zu erhalten, fahren Sie bitte mit der Maus \u00FCber die Grafik."); txtpnUmDetaillierteInformationen.setEditable(false); txtpnUmDetaillierteInformationen.setBackground(SystemColor.menu); - txtpnUmDetaillierteInformationen.setBounds(10, 113, 509, 22); + txtpnUmDetaillierteInformationen.setBounds(10, 188, 509, 22); contentPanel.add(txtpnUmDetaillierteInformationen); { JPanel buttonPane = new JPanel(); @@ -380,7 +401,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"); @@ -409,15 +433,11 @@ 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(); @@ -425,30 +445,24 @@ public class MainMenue_GUI extends JFrame { } }); mnNewMenu_1.add(mntmFaq); - JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override 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) { @@ -459,4 +473,134 @@ public class MainMenue_GUI extends JFrame { mnNewMenu_1.add(mntmAbout); }// end main + + 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); + rdbtnImageEdit.setEnabled(false); + 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); + } + + // 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 { + 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 diff --git a/Dozentenmodul/src/main/java/gui/intro/VmWareLink_GUI.java b/Dozentenmodul/src/main/java/gui/intro/VmWareLink_GUI.java index 87c6b2a2..d5350fbd 100644 --- a/Dozentenmodul/src/main/java/gui/intro/VmWareLink_GUI.java +++ b/Dozentenmodul/src/main/java/gui/intro/VmWareLink_GUI.java @@ -68,7 +68,7 @@ public class VmWareLink_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("Dozentenmodul *Prototyp*"); + setTitle("bwLehrpool Suite"); setBounds(0, 0, 603, 722); GuiOrganizer.centerGUI(this); @@ -105,24 +105,6 @@ public class VmWareLink_GUI extends JFrame { contentPanel.add(txtpnUmIhreVmdk); JLabel lblNewLabel_1 = new JLabel("<html><b>Windows: </b></html>"); - lblNewLabel_1.addMouseListener(new MouseAdapter() { - @Override - public void mouseReleased(MouseEvent arg0) { - URI url; - try { - url = new URI("https://my.vmware.com/web/vmware/free#desktop_end_user_computing/vmware_player/6_0"); - Desktop.getDesktop().browse(url); - } catch (URISyntaxException | IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - JOptionPane.showMessageDialog(null, - e.getCause()+"\n"+e.getMessage(), - "Debug-Message", JOptionPane.ERROR_MESSAGE); - } - - } - }); - lblNewLabel_1.setBounds(10, 93, 499, 14); contentPanel.add(lblNewLabel_1); @@ -139,13 +121,13 @@ public class VmWareLink_GUI extends JFrame { // TODO Auto-generated catch block e1.printStackTrace(); JOptionPane.showMessageDialog(null, - e1.getCause()+"\n"+e1.getMessage(), + e1.getCause()+"\n"+e1.getStackTrace(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } catch (IOException e1) { // TODO Auto-generated catch block e1.printStackTrace(); JOptionPane.showMessageDialog(null, - e1.getCause()+"\n"+e1.getMessage(), + e1.getCause()+"\n"+e1.getStackTrace(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } } |