From 2fd609195a4e872faf83231aaf9a4f11056e8cdc Mon Sep 17 00:00:00 2001 From: Michael Wilson Date: Thu, 16 Oct 2014 19:49:34 +0200 Subject: unterschieldiche kleinigkeiten --- .../java/gui/lecture/CreateLectureLink_GUI.java | 788 +++++++++------------ .../java/gui/lecture/EditLectureSearch_GUI.java | 16 +- .../gui/lecture/PermissionCreateLecture_GUI.java | 180 ++--- .../src/main/java/models/ImageRights.java | 4 +- .../src/main/java/models/LectureRights.java | 10 + .../src/main/java/util/ListAllOtherUsers.java | 239 +++++++ 6 files changed, 693 insertions(+), 544 deletions(-) create mode 100644 dozentenmodul/src/main/java/util/ListAllOtherUsers.java (limited to 'dozentenmodul/src') diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java index 3f1e5dfa..fd1a2c51 100644 --- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java @@ -74,7 +74,6 @@ public class CreateLectureLink_GUI extends JFrame { JRadioButton rdbtnInternetJa; JRadioButton rdbtnInternetNein; JComboBox comboBox; - JTabbedPane tabbedPane; JLabel labelName; JLabel labelUpdate; JLabel labelVerantwortlicher; @@ -90,44 +89,46 @@ public class CreateLectureLink_GUI extends JFrame { private JLabel labelOS; JTable tableAllImages = new JTable(); JTable tablemyImages = new JTable(); - JTable tableCoopImages = new JTable(); - JTable tablePublicVorlagen = new JTable(); - boolean activeSearch=false; + boolean activeSearch = false; Component c = null; private JTextField textFieldName; String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", - "Verantwortlicher", "Letztes Update", "ID", "Version","Template" }; + "Verantwortlicher", "Letztes Update", "ID", "Version", "Template" }; ThriftConnection con = new ThriftConnection(); Client client = models.Client.clientcon.getClient(); - - private static final String HELP_MESSAGE = "
" + - "Damit Ihre Veranstaltung geladen werden kann, muss sie mit einem Image verbunden werden.
" + - "Das Image liegt entweder schon vor, oder Sie haben es im Vorfeld hochgeladen.
" + - "Wählen Sie das Image aus, das zu Ihrer Veranstaltung passt und klicken Sie anschließend auf \"Veranstaltung erzeugen\"." + - "
"; - - final DefaultTableModel modelAll = new DefaultTableModel(titles, 0){ - public boolean isCellEditable(int rowIndex, int mColIndex) { - return false; - } + + private static final String HELP_MESSAGE = "
" + + "Damit Ihre Veranstaltung geladen werden kann, muss sie mit einem Image verbunden werden.
" + + "Das Image liegt entweder schon vor, oder Sie haben es im Vorfeld hochgeladen.
" + + "Wählen Sie das Image aus, das zu Ihrer Veranstaltung passt und klicken Sie anschließend auf \"Veranstaltung erzeugen\"." + + "
"; + + final DefaultTableModel modelAll = new DefaultTableModel(titles, 0) { + public boolean isCellEditable(int rowIndex, int mColIndex) { + return false; + } }; - final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0){ - public boolean isCellEditable(int rowIndex, int mColIndex) { - return false; - } + final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0) { + public boolean isCellEditable(int rowIndex, int mColIndex) { + return false; + } }; - final DefaultTableModel modelPublicVorlagen = new DefaultTableModel(titles, 0){ - public boolean isCellEditable(int rowIndex, int mColIndex) { - return false; - } + final DefaultTableModel modelPublicVorlagen = new DefaultTableModel(titles, + 0) { + public boolean isCellEditable(int rowIndex, int mColIndex) { + return false; + } }; - final TableRowSorter rowSorterAll = new TableRowSorter( - modelAll); + // final TableRowSorter rowSorterAll = new + // TableRowSorter( + // modelAll); final TableRowSorter rowSorterMyImages = new TableRowSorter( modelMyImages); - final TableRowSorter rowSorterPublicVorlagen = new TableRowSorter( - modelPublicVorlagen); - + + // final TableRowSorter rowSorterPublicVorlagen = new + // TableRowSorter( + // modelPublicVorlagen); + /** * Create the dialog. */ @@ -174,38 +175,53 @@ public class CreateLectureLink_GUI extends JFrame { tablemyImages.getColumnModel().getColumn(7).setWidth(0); tablemyImages.getColumnModel().getColumn(7).setMinWidth(0); tablemyImages.getColumnModel().getColumn(7).setMaxWidth(0); - - tablePublicVorlagen.getColumnModel().getColumn(1).setWidth(0); - tablePublicVorlagen.getColumnModel().getColumn(1).setMinWidth(0); - tablePublicVorlagen.getColumnModel().getColumn(1).setMaxWidth(0); - tablePublicVorlagen.getColumnModel().getColumn(3).setWidth(0); - tablePublicVorlagen.getColumnModel().getColumn(3).setMinWidth(0); - tablePublicVorlagen.getColumnModel().getColumn(3).setMaxWidth(0); - tablePublicVorlagen.getColumnModel().getColumn(8).setWidth(0); - tablePublicVorlagen.getColumnModel().getColumn(8).setMinWidth(0); - tablePublicVorlagen.getColumnModel().getColumn(8).setMaxWidth(0); - tablePublicVorlagen.getColumnModel().getColumn(6).setWidth(0); - tablePublicVorlagen.getColumnModel().getColumn(6).setMinWidth(0); - tablePublicVorlagen.getColumnModel().getColumn(6).setMaxWidth(0); - tablePublicVorlagen.getColumnModel().getColumn(7).setWidth(0); - tablePublicVorlagen.getColumnModel().getColumn(7).setMinWidth(0); - tablePublicVorlagen.getColumnModel().getColumn(7).setMaxWidth(0); - - tableAllImages.getColumnModel().getColumn(1).setWidth(0); - tableAllImages.getColumnModel().getColumn(1).setMinWidth(0); - tableAllImages.getColumnModel().getColumn(1).setMaxWidth(0); - tableAllImages.getColumnModel().getColumn(3).setWidth(0); - tableAllImages.getColumnModel().getColumn(3).setMinWidth(0); - tableAllImages.getColumnModel().getColumn(3).setMaxWidth(0); - tableAllImages.getColumnModel().getColumn(8).setWidth(0); - tableAllImages.getColumnModel().getColumn(8).setMinWidth(0); - tableAllImages.getColumnModel().getColumn(8).setMaxWidth(0); - tableAllImages.getColumnModel().getColumn(6).setWidth(0); - tableAllImages.getColumnModel().getColumn(6).setMinWidth(0); - tableAllImages.getColumnModel().getColumn(6).setMaxWidth(0); - tableAllImages.getColumnModel().getColumn(7).setWidth(0); - tableAllImages.getColumnModel().getColumn(7).setMinWidth(0); - tableAllImages.getColumnModel().getColumn(7).setMaxWidth(0); + /* + * tablePublicVorlagen.getColumnModel().getColumn(1).setWidth(0); + * tablePublicVorlagen + * .getColumnModel().getColumn(1).setMinWidth(0); + * tablePublicVorlagen + * .getColumnModel().getColumn(1).setMaxWidth(0); + * tablePublicVorlagen + * .getColumnModel().getColumn(3).setWidth(0); + * tablePublicVorlagen + * .getColumnModel().getColumn(3).setMinWidth(0); + * tablePublicVorlagen + * .getColumnModel().getColumn(3).setMaxWidth(0); + * tablePublicVorlagen + * .getColumnModel().getColumn(8).setWidth(0); + * tablePublicVorlagen + * .getColumnModel().getColumn(8).setMinWidth(0); + * tablePublicVorlagen + * .getColumnModel().getColumn(8).setMaxWidth(0); + * tablePublicVorlagen + * .getColumnModel().getColumn(6).setWidth(0); + * tablePublicVorlagen + * .getColumnModel().getColumn(6).setMinWidth(0); + * tablePublicVorlagen + * .getColumnModel().getColumn(6).setMaxWidth(0); + * tablePublicVorlagen + * .getColumnModel().getColumn(7).setWidth(0); + * tablePublicVorlagen + * .getColumnModel().getColumn(7).setMinWidth(0); + * tablePublicVorlagen + * .getColumnModel().getColumn(7).setMaxWidth(0); + * + * tableAllImages.getColumnModel().getColumn(1).setWidth(0); + * tableAllImages.getColumnModel().getColumn(1).setMinWidth(0); + * tableAllImages.getColumnModel().getColumn(1).setMaxWidth(0); + * tableAllImages.getColumnModel().getColumn(3).setWidth(0); + * tableAllImages.getColumnModel().getColumn(3).setMinWidth(0); + * tableAllImages.getColumnModel().getColumn(3).setMaxWidth(0); + * tableAllImages.getColumnModel().getColumn(8).setWidth(0); + * tableAllImages.getColumnModel().getColumn(8).setMinWidth(0); + * tableAllImages.getColumnModel().getColumn(8).setMaxWidth(0); + * tableAllImages.getColumnModel().getColumn(6).setWidth(0); + * tableAllImages.getColumnModel().getColumn(6).setMinWidth(0); + * tableAllImages.getColumnModel().getColumn(6).setMaxWidth(0); + * tableAllImages.getColumnModel().getColumn(7).setWidth(0); + * tableAllImages.getColumnModel().getColumn(7).setMinWidth(0); + * tableAllImages.getColumnModel().getColumn(7).setMaxWidth(0); + */ textFieldName.requestFocusInWindow(); } }); @@ -222,7 +238,6 @@ public class CreateLectureLink_GUI extends JFrame { setBounds(0, 0, 918, 722); setLocationRelativeTo(formerGUI); - final DefaultTableModel model = new DefaultTableModel(titles, 0); getContentPane().setLayout(null); @@ -233,7 +248,8 @@ public class CreateLectureLink_GUI extends JFrame { getContentPane().add(panel); panel.setLayout(null); { - JLabel lblNewLabel = new JLabel("Veranstaltung auf ein Image verlinken"); + JLabel lblNewLabel = new JLabel( + "Veranstaltung auf ein Image verlinken"); lblNewLabel.setBounds(10, 11, 509, 22); panel.add(lblNewLabel); lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); @@ -276,24 +292,24 @@ public class CreateLectureLink_GUI extends JFrame { String stext = textFieldName.getText(); // Wenn Textfield nicht leer if (stext != "") { - activeSearch=true; + activeSearch = true; // Filtere nach der Eingabe - rowSorterAll.setRowFilter(RowFilter.regexFilter( - textFieldName.getText(), 0)); + // rowSorterAll.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), + // 0)); rowSorterMyImages.setRowFilter(RowFilter.regexFilter( textFieldName.getText(), 0)); - rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter( - textFieldName.getText(), 0)); + // rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), + // 0)); - }else{ - activeSearch=false; + } else { + activeSearch = false; String username = person.verantwortlicher.getName() + " " + person.verantwortlicher.getVorname(); rowSorterMyImages.setRowFilter(RowFilter.regexFilter( username, 4)); - rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter( - "true", 8)); - rowSorterAll.setRowFilter(null); + // rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter("true", + // 8)); + // rowSorterAll.setRowFilter(null); } } @@ -304,7 +320,6 @@ public class CreateLectureLink_GUI extends JFrame { panel_1.add(textFieldName); textFieldName.setColumns(10); - comboBox = new JComboBox(); try { List list = client.getAllOS(); @@ -316,29 +331,29 @@ public class CreateLectureLink_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); JOptionPane.showMessageDialog(c, - e.getCause()+"\n"+e.getStackTrace(), - "Debug-Message", JOptionPane.ERROR_MESSAGE); + e.getCause() + "\n" + e.getStackTrace(), "Debug-Message", + JOptionPane.ERROR_MESSAGE); } comboBox.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { // Prueft das die Auswahl nicht leer ist if (comboBox.getSelectedItem().toString() != "") { - activeSearch=true; - rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox - .getSelectedItem().toString(), 2)); + activeSearch = true; + // rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem().toString(), + // 2)); rowSorterMyImages.setRowFilter(RowFilter.regexFilter( comboBox.getSelectedItem().toString(), 2)); - rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter( - comboBox.getSelectedItem().toString(), 2)); - }else{ - activeSearch=false; + // rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem().toString(), + // 2)); + } else { + activeSearch = false; String username = person.verantwortlicher.getName() + " " + person.verantwortlicher.getVorname(); rowSorterMyImages.setRowFilter(RowFilter.regexFilter( username, 4)); - rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter( - "true", 8)); - rowSorterAll.setRowFilter(null); + // rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter("true", + // 8)); + // rowSorterAll.setRowFilter(null); } } }); @@ -376,136 +391,23 @@ public class CreateLectureLink_GUI extends JFrame { lblNewLabel_1.setBounds(164, 11, 85, 14); contentPanel.add(lblNewLabel_1); - tabbedPane = new JTabbedPane(JTabbedPane.TOP); - tabbedPane.addChangeListener(new ChangeListener() { - public void stateChanged(ChangeEvent arg0) { - if (tabbedPane.getSelectedIndex() == 0 && activeSearch==false) { - - String username = person.verantwortlicher.getName() + " " - + person.verantwortlicher.getVorname(); - rowSorterMyImages.setRowFilter(RowFilter.regexFilter( - username, 4)); - }else if(tabbedPane.getSelectedIndex()==1 && activeSearch==false){ - rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter("true", 8)); - } else if(tabbedPane.getSelectedIndex()==2 && activeSearch==false){ - rowSorterAll.setRowFilter(null); - } - - } - - }); - - tabbedPane.setBounds(10, 152, 557, 345); - contentPanel.add(tabbedPane); - JScrollPane scrollPaneMyImage = new JScrollPane(); - tablemyImages.getSelectionModel().addListSelectionListener( new ListSelectionListener() - { - public void valueChanged(ListSelectionEvent e) - { - String imageid = modelMyImages - .getValueAt( + scrollPaneMyImage.setBounds(10, 158, 557, 339); + contentPanel.add(scrollPaneMyImage); + tablemyImages.getSelectionModel().addListSelectionListener( + new ListSelectionListener() { + public void valueChanged(ListSelectionEvent e) { + String imageid = modelMyImages.getValueAt( tablemyImages .convertRowIndexToModel(tablemyImages .getSelectedRow()), 6) - .toString(); - String version = modelMyImages - .getValueAt( + .toString(); + String version = modelMyImages.getValueAt( tablemyImages .convertRowIndexToModel(tablemyImages .getSelectedRow()), 7) - .toString(); - try { - writeImageData(imageid, version); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } catch (ParseException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - } - }); - tablemyImages.setModel(modelMyImages); - tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit(); - tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit(); - tablemyImages.setRowSorter(rowSorterMyImages); - - scrollPaneMyImage.setViewportView(tablemyImages); - tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); - - JScrollPane scrollPaneCoopImages = new JScrollPane(); - - tableCoopImages.setModel(model); - tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit(); - tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit(); - tableCoopImages.getColumnModel().getColumn(3).sizeWidthToFit(); - tableCoopImages.getColumnModel().getColumn(4).sizeWidthToFit(); - tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit(); - - - JScrollPane scrollPanePublicVorlagen = new JScrollPane(); - tablePublicVorlagen.getSelectionModel().addListSelectionListener( new ListSelectionListener() - { - public void valueChanged(ListSelectionEvent e) - { - String imageid = modelPublicVorlagen - .getValueAt( - tablePublicVorlagen - .convertRowIndexToModel(tablePublicVorlagen - .getSelectedRow()), 6) - .toString(); - String version = modelPublicVorlagen - .getValueAt( - tablePublicVorlagen - .convertRowIndexToModel(tablePublicVorlagen - .getSelectedRow()), 7) - .toString(); - try { - writeImageData(imageid, version); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } catch (ParseException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - } - }); - tablePublicVorlagen.setModel(modelPublicVorlagen); - tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit(); - tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit(); - tablePublicVorlagen.getColumnModel().getColumn(3).sizeWidthToFit(); - tablePublicVorlagen.getColumnModel().getColumn(4).sizeWidthToFit(); - tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit(); - tablePublicVorlagen.setRowSorter(rowSorterPublicVorlagen); - scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen); - tabbedPane.addTab("Vorlagen", null, - scrollPanePublicVorlagen, null); - - JScrollPane scrollPaneAllImages = new JScrollPane(); - tableAllImages = new JTable(); - tableAllImages.getSelectionModel().addListSelectionListener( new ListSelectionListener() - { - public void valueChanged(ListSelectionEvent e) - { - - String imageid = modelAll - .getValueAt( - tableAllImages - .convertRowIndexToModel(tableAllImages - .getSelectedRow()), 6) .toString(); - String version = modelAll - .getValueAt( - tableAllImages - .convertRowIndexToModel(tableAllImages - .getSelectedRow()), 7) - .toString(); - try { + try { writeImageData(imageid, version); } catch (TException e1) { // TODO Auto-generated catch block @@ -514,26 +416,17 @@ public class CreateLectureLink_GUI extends JFrame { // TODO Auto-generated catch block e1.printStackTrace(); } + } + }); + tablemyImages.setModel(modelMyImages); + tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit(); + tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit(); + tablemyImages.setRowSorter(rowSorterMyImages); - } - }); - tableAllImages.setModel(modelAll); - tableAllImages.getColumnModel().getColumn(1).sizeWidthToFit(); - tableAllImages.getColumnModel().getColumn(2).sizeWidthToFit(); - tableAllImages.getColumnModel().getColumn(3).sizeWidthToFit(); - tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit(); - tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit(); - tableAllImages.setRowSorter(rowSorterAll); - - scrollPaneAllImages.setViewportView(tableAllImages); - tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); - - - - scrollPaneCoopImages.setViewportView(tableCoopImages); - tabbedPane.addTab("bwLehrpool", null, scrollPaneCoopImages, - null); - tabbedPane.setEnabledAt(3, false); + scrollPaneMyImage.setViewportView(tablemyImages); { JPanel buttonPane = new JPanel(); @@ -545,8 +438,9 @@ public class CreateLectureLink_GUI extends JFrame { JButton cancelButton = new JButton("Zurück"); cancelButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - - PermissionCreateLecture_GUI eVAG = new PermissionCreateLecture_GUI(c); + + PermissionCreateLecture_GUI eVAG = new PermissionCreateLecture_GUI( + c); eVAG.setVisible(true); dispose(); } @@ -560,10 +454,10 @@ public class CreateLectureLink_GUI extends JFrame { "Veranstaltung erzeugen und abschließen"); doLinkButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - String username = person.verantwortlicher.getName() + " " - + person.verantwortlicher.getVorname(); + String username = person.verantwortlicher.getName() + + " " + person.verantwortlicher.getVorname(); // check if a row is selected - if (tablemyImages.getSelectedRow() != -1){ + if (tablemyImages.getSelectedRow() != -1) { // a row is selected, do operations String imagename = tablemyImages.getValueAt( @@ -591,115 +485,14 @@ public class CreateLectureLink_GUI extends JFrame { person.verantwortlicher.getEMail(), person.verantwortlicher.getTel(), person.verantwortlicher.getFakultaet()); - client.writeLectureRights(Lecture.lecture.getName(), person.verantwortlicher.getUsername(), person.verantwortlicher.getName(), person.verantwortlicher.getVorname(), person.verantwortlicher.getEMail(), person.verantwortlicher.getHochschule(), person.verantwortlicher.getRole()); - JOptionPane - .showMessageDialog( - c, - "Ihre Veranstaltung wurde erfolgreich angelegt. Sie kehren nun zum Hauptmenü zurück.", - "Veranstaltung angelegt", - JOptionPane.INFORMATION_MESSAGE); - // zurueck zum Menue - MainMenue_GUI m = new MainMenue_GUI(c); - m.setVisible(true); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - JOptionPane - .showMessageDialog( - c, - "Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.", - "Error", - JOptionPane.ERROR_MESSAGE); - JOptionPane.showMessageDialog(c, - e1.getCause()+"\n"+e1.getStackTrace(), - "Debug-Message", JOptionPane.ERROR_MESSAGE); - } - - dispose(); - - }else if (tablePublicVorlagen.getSelectedRow() != -1){ - - // a row is selected, do operations - String imagename = tablePublicVorlagen.getValueAt( - tablePublicVorlagen.getSelectedRow(), 0) - .toString(); - try { - DateFormat formatter = new SimpleDateFormat( - "yyyy-MM-dd hh:mm:ss"); - client.writeLecturedata( + client.writeLectureRights( Lecture.lecture.getName(), - Lecture.lecture.getShortDesc(), - Lecture.lecture.getDesc(), - formatter.format( - Lecture.lecture.getStartdate()) - .toString(), - formatter.format( - Lecture.lecture.getEnddate()) - .toString(), - Lecture.lecture.isActive(), - imagename, person.verantwortlicher.getUsername(), - person.verantwortlicher.getVorname(), person.verantwortlicher.getName(), - person.verantwortlicher.getHochschule(), - person.verantwortlicher.getEMail(), - person.verantwortlicher.getTel(), - person.verantwortlicher.getFakultaet()); - client.writeLectureRights(Lecture.lecture.getName(), person.verantwortlicher.getUsername(), person.verantwortlicher.getName(), person.verantwortlicher.getVorname(), person.verantwortlicher.getEMail(), person.verantwortlicher.getHochschule(), person.verantwortlicher.getRole()); - JOptionPane - .showMessageDialog( - c, - "Ihre Veranstaltung wurde erfolgreich angelegt. Sie kehren nun zum Hauptmenü zurück.", - "Veranstaltung angelegt", - JOptionPane.INFORMATION_MESSAGE); - // zurueck zum Menue - MainMenue_GUI m = new MainMenue_GUI(c); - m.setVisible(true); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - JOptionPane - .showMessageDialog( - c, - "Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.", - "Error", - JOptionPane.ERROR_MESSAGE); - JOptionPane.showMessageDialog(c, - e1.getCause()+"\n"+e1.getStackTrace(), - "Debug-Message", JOptionPane.ERROR_MESSAGE); - } - - dispose(); - - }else if (tableAllImages.getSelectedRow() != -1 &&tableAllImages.getValueAt(tableAllImages.getSelectedRow(), 4).toString().equals(username)){ - - // a row is selected, do operations - String imagename = tableAllImages.getValueAt( - tableAllImages.getSelectedRow(), 0) - .toString(); - try { - DateFormat formatter = new SimpleDateFormat( - "yyyy-MM-dd hh:mm:ss"); - client.writeLecturedata( - Lecture.lecture.getName(), - Lecture.lecture.getShortDesc(), - Lecture.lecture.getDesc(), - formatter.format( - Lecture.lecture.getStartdate()) - .toString(), - formatter.format( - Lecture.lecture.getEnddate()) - .toString(), - Lecture.lecture.isActive(), - imagename, - person.verantwortlicher.getUsername(), person.verantwortlicher.getVorname(), - person.verantwortlicher.getName(), - person.verantwortlicher.getHochschule(), person.verantwortlicher.getEMail(), - person.verantwortlicher.getTel(), - person.verantwortlicher.getFakultaet()); - client.writeLectureRights(Lecture.lecture.getName(), person.verantwortlicher.getUsername(), person.verantwortlicher.getName(), person.verantwortlicher.getVorname(), person.verantwortlicher.getEMail(), person.verantwortlicher.getHochschule(), person.verantwortlicher.getRole()); + person.verantwortlicher.getHochschule(), + person.verantwortlicher.getRole()); JOptionPane .showMessageDialog( c, @@ -718,15 +511,112 @@ public class CreateLectureLink_GUI extends JFrame { "Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.", "Error", JOptionPane.ERROR_MESSAGE); - JOptionPane.showMessageDialog(c, - e1.getCause()+"\n"+e1.getStackTrace(), - "Debug-Message", JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(c, e1.getCause() + + "\n" + e1.getStackTrace(), + "Debug-Message", + JOptionPane.ERROR_MESSAGE); } - + dispose(); - } - else { + /* + * }else if (tablePublicVorlagen.getSelectedRow() != + * -1){ + * + * // a row is selected, do operations String + * imagename = tablePublicVorlagen.getValueAt( + * tablePublicVorlagen.getSelectedRow(), 0) + * .toString(); try { DateFormat formatter = new + * SimpleDateFormat( "yyyy-MM-dd hh:mm:ss"); + * client.writeLecturedata( + * Lecture.lecture.getName(), + * Lecture.lecture.getShortDesc(), + * Lecture.lecture.getDesc(), formatter.format( + * Lecture.lecture.getStartdate()) .toString(), + * formatter.format( Lecture.lecture.getEnddate()) + * .toString(), Lecture.lecture.isActive(), + * imagename, person.verantwortlicher.getUsername(), + * person.verantwortlicher.getVorname(), + * person.verantwortlicher.getName(), + * person.verantwortlicher.getHochschule(), + * person.verantwortlicher.getEMail(), + * person.verantwortlicher.getTel(), + * person.verantwortlicher.getFakultaet()); + * client.writeLectureRights + * (Lecture.lecture.getName(), + * person.verantwortlicher.getUsername(), + * person.verantwortlicher.getName(), + * person.verantwortlicher.getVorname(), + * person.verantwortlicher.getEMail(), + * person.verantwortlicher.getHochschule(), + * person.verantwortlicher.getRole()); JOptionPane + * .showMessageDialog( c, + * "Ihre Veranstaltung wurde erfolgreich angelegt. Sie kehren nun zum Hauptmenü zurück." + * , "Veranstaltung angelegt", + * JOptionPane.INFORMATION_MESSAGE); // zurueck zum + * Menue MainMenue_GUI m = new MainMenue_GUI(c); + * m.setVisible(true); } catch (TException e1) { // + * TODO Auto-generated catch block + * e1.printStackTrace(); JOptionPane + * .showMessageDialog( c, + * "Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten." + * , "Error", JOptionPane.ERROR_MESSAGE); + * JOptionPane.showMessageDialog(c, + * e1.getCause()+"\n"+e1.getStackTrace(), + * "Debug-Message", JOptionPane.ERROR_MESSAGE); } + * + * dispose(); + * + * }else if (tableAllImages.getSelectedRow() != -1 + * &&tableAllImages.getValueAt(tableAllImages. + * getSelectedRow(), + * 4).toString().equals(username)){ + * + * // a row is selected, do operations String + * imagename = tableAllImages.getValueAt( + * tableAllImages.getSelectedRow(), 0) .toString(); + * try { DateFormat formatter = new + * SimpleDateFormat( "yyyy-MM-dd hh:mm:ss"); + * client.writeLecturedata( + * Lecture.lecture.getName(), + * Lecture.lecture.getShortDesc(), + * Lecture.lecture.getDesc(), formatter.format( + * Lecture.lecture.getStartdate()) .toString(), + * formatter.format( Lecture.lecture.getEnddate()) + * .toString(), Lecture.lecture.isActive(), + * imagename, person.verantwortlicher.getUsername(), + * person.verantwortlicher.getVorname(), + * person.verantwortlicher.getName(), + * person.verantwortlicher.getHochschule(), + * person.verantwortlicher.getEMail(), + * person.verantwortlicher.getTel(), + * person.verantwortlicher.getFakultaet()); + * client.writeLectureRights + * (Lecture.lecture.getName(), + * person.verantwortlicher.getUsername(), + * person.verantwortlicher.getName(), + * person.verantwortlicher.getVorname(), + * person.verantwortlicher.getEMail(), + * person.verantwortlicher.getHochschule(), + * person.verantwortlicher.getRole()); JOptionPane + * .showMessageDialog( c, + * "Ihre Veranstaltung wurde erfolgreich angelegt. Sie kehren nun zum Hauptmenü zurück." + * , "Veranstaltung angelegt", + * JOptionPane.INFORMATION_MESSAGE); // zurueck zum + * Menue MainMenue_GUI m = new MainMenue_GUI(c); + * m.setVisible(true); } catch (TException e1) { // + * TODO Auto-generated catch block + * e1.printStackTrace(); JOptionPane + * .showMessageDialog( c, + * "Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten." + * , "Error", JOptionPane.ERROR_MESSAGE); + * JOptionPane.showMessageDialog(c, + * e1.getCause()+"\n"+e1.getStackTrace(), + * "Debug-Message", JOptionPane.ERROR_MESSAGE); } + * + * dispose(); + */ + } else { // nothing selected JOptionPane.showMessageDialog(c, "Bitte wählen Sie ein Image aus.", @@ -753,128 +643,128 @@ public class CreateLectureLink_GUI extends JFrame { panel.setLayout(null); panel.setBorder(new TitledBorder(null, "Detailinformationen", - TitledBorder.LEADING, TitledBorder.TOP, null, null)); + TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel.setBackground(SystemColor.menu); panel.setBounds(586, 85, 316, 531); getContentPane().add(panel); - + JLabel lblName = new JLabel("Name:"); lblName.setBounds(10, 87, 130, 14); panel.add(lblName); - + labelName = new JLabel(""); labelName.setBounds(10, 102, 296, 14); panel.add(labelName); - + JLabel lblVerantwortlicher = new JLabel("Verantwortlicher:"); lblVerantwortlicher.setBounds(10, 259, 130, 14); panel.add(lblVerantwortlicher); - + labelOS = new JLabel(""); labelOS.setBounds(10, 216, 296, 14); panel.add(labelOS); - + JLabel lblWeitereVerantwortliche = new JLabel("Betriebssystem:"); lblWeitereVerantwortliche.setBounds(10, 202, 130, 14); panel.add(lblWeitereVerantwortliche); - + labelVerantwortlicher = new JLabel(""); labelVerantwortlicher.setBounds(10, 272, 296, 14); panel.add(labelVerantwortlicher); - + JLabel label = new JLabel("Weitere Verantwortliche:"); label.setBounds(10, 284, 130, 14); panel.add(label); - + labelWeitereVerantwortliche = new JLabel(""); labelWeitereVerantwortliche.setBounds(10, 297, 296, 14); panel.add(labelWeitereVerantwortliche); - + labelUpdate = new JLabel(""); labelUpdate.setBounds(10, 245, 296, 14); panel.add(labelUpdate); - + JLabel lblLetztesUpdate = new JLabel("Letztes Update:"); lblLetztesUpdate.setBounds(10, 231, 130, 14); panel.add(lblLetztesUpdate); - + JLabel lblImageIstVorlage = new JLabel("Image ist Vorlage:"); lblImageIstVorlage.setBounds(10, 336, 130, 14); panel.add(lblImageIstVorlage); - + labelVorlage = new JLabel(""); labelVorlage.setBounds(10, 350, 296, 14); panel.add(labelVorlage); - + labelLizenzSoftware = new JLabel(""); labelLizenzSoftware.setBounds(10, 383, 296, 14); panel.add(labelLizenzSoftware); - - JLabel lblLizenzpflichtigeSoftware = new JLabel("Lizenzpflichtige Software:"); + + JLabel lblLizenzpflichtigeSoftware = new JLabel( + "Lizenzpflichtige Software:"); lblLizenzpflichtigeSoftware.setBounds(10, 367, 130, 14); panel.add(lblLizenzpflichtigeSoftware); - + JLabel lblInternet = new JLabel("Internetsperre vorhanden:"); lblInternet.setBounds(10, 400, 130, 14); panel.add(lblInternet); - + labelInternet = new JLabel(""); labelInternet.setBounds(10, 417, 296, 14); panel.add(labelInternet); - + JLabel lblEmpfehlungRam = new JLabel("Empfehlung RAM:"); lblEmpfehlungRam.setBounds(10, 432, 130, 14); panel.add(lblEmpfehlungRam); - + labelRam = new JLabel(""); labelRam.setBounds(10, 455, 296, 14); panel.add(labelRam); - + JLabel lblEmpfehlungCpu = new JLabel("Empfehlung CPU:"); lblEmpfehlungCpu.setBounds(10, 469, 130, 14); panel.add(lblEmpfehlungCpu); - + labelCPU = new JLabel(""); labelCPU.setBounds(10, 487, 296, 14); panel.add(labelCPU); - + JLabel lblTechnischeDaten = new JLabel("Technische Daten:"); lblTechnischeDaten.setBounds(10, 322, 296, 14); panel.add(lblTechnischeDaten); - + JLabel lblId = new JLabel("ID:"); lblId.setBounds(10, 23, 296, 14); panel.add(lblId); - + labelID = new JLabel(""); labelID.setBounds(10, 37, 296, 14); panel.add(labelID); - + labelVersion = new JLabel(""); labelVersion.setBounds(10, 73, 296, 14); panel.add(labelVersion); - + JLabel lblVersion = new JLabel("Version:"); lblVersion.setBounds(10, 57, 296, 14); panel.add(lblVersion); - + JLabel lblBeschreibung = new JLabel("Beschreibung:"); lblBeschreibung.setBounds(10, 119, 130, 14); panel.add(lblBeschreibung); - + JScrollPane scrollPane = new JScrollPane(); scrollPane.setBounds(10, 135, 296, 65); panel.add(scrollPane); - + textAreadesc = new JTextArea(); textAreadesc.setLineWrap(true); textAreadesc.setBackground(SystemColor.menu); scrollPane.setViewportView(textAreadesc); - + JMenuBar menuBar = new JMenuBar(); setJMenuBar(menuBar); - JMenu mnNewMenu_1 = new JMenu("Hilfe"); menuBar.add(mnNewMenu_1); @@ -882,15 +772,15 @@ public class CreateLectureLink_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(); @@ -898,7 +788,6 @@ public class CreateLectureLink_GUI extends JFrame { } }); mnNewMenu_1.add(mntmFaq); - JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @@ -906,22 +795,22 @@ public class CreateLectureLink_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); - + JMenuItem mntmAbout = new JMenuItem("About"); mntmAbout.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -930,13 +819,14 @@ public class CreateLectureLink_GUI extends JFrame { } }); mnNewMenu_1.add(mntmAbout); - - + JMenu mnNewMenu_Info = new JMenu("Info"); mnNewMenu_Info.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - JOptionPane.showMessageDialog(c, HELP_MESSAGE, "Hilfe zu dieser Oberfläche", JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(c, HELP_MESSAGE, + "Hilfe zu dieser Oberfläche", + JOptionPane.INFORMATION_MESSAGE); } }); menuBar.add(mnNewMenu_Info); @@ -945,73 +835,73 @@ public class CreateLectureLink_GUI extends JFrame { } // Initiale Beffuelung eines Table models - public DefaultTableModel initTableModel(DefaultTableModel model) throws TException, ParseException { + public DefaultTableModel initTableModel(DefaultTableModel model) + throws TException, ParseException { List images; - - // Hole eine Liste der Images - images = client.getImageListPermissionLink(person.verantwortlicher.getUserID()); - - Iterator i = images.iterator(); - SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); - SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy hh:mm:ss"); - int x = 0; - - while (i.hasNext()) { - // erzeuge Objekte fuer die Tabelle - Object[] obj = { images.get(x).getImageName(), - images.get(x).getLicenseRestriction(), - images.get(x).getOsName(), - images.get(x).getLectureName(), - images.get(x).getUserData(), - out.format(in.parse(images.get(x).updateTime)), images.get(x).id, - images.get(x).getVersion(), - images.get(x).getIsTemplate()}; - // Fuege diese Objekte der Tabelle hinzu - - model.addRow(obj); - x++; - i.next(); - } + // Hole eine Liste der Images + // images = + // client.getImageListPermissionLink(person.verantwortlicher.getUserID()); + images = client.getImageListPermissionLink(person.verantwortlicher + .getUserID()); + + Iterator i = images.iterator(); + SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); + SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy hh:mm:ss"); + int x = 0; + + while (i.hasNext()) { + // erzeuge Objekte fuer die Tabelle + Object[] obj = { images.get(x).getImageName(), + images.get(x).getLicenseRestriction(), + images.get(x).getOsName(), images.get(x).getLectureName(), + images.get(x).getUserData(), + out.format(in.parse(images.get(x).updateTime)), + images.get(x).id, images.get(x).getVersion(), + images.get(x).getIsTemplate() }; + // Fuege diese Objekte der Tabelle hinzu + + model.addRow(obj); + x++; + i.next(); + + } - return model; + return model; - } - public void writeImageData(String id, String version) throws TException, ParseException{ - - SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); - SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy hh:mm:ss"); - Map res=client.getImageData(id,version); - labelName.setText(res.get("name")); - labelOS.setText(res.get("os")); - labelUpdate.setText(out.format(in.parse(res.get("lastupdate")))); - labelVerantwortlicher.setText(res.get("owner")); - labelWeitereVerantwortliche.setText("Noch nicht Verfügbar"); - if(res.get("template").equals("true")){ - labelVorlage.setText("Ja"); - }else{ - labelVorlage.setText("Nein"); - } - if(res.get("license").equals("1")){ - labelLizenzSoftware.setText("Ja"); - } - else - { - labelLizenzSoftware.setText("Nein"); - } - if(res.get("internet").equals("1")){ - labelInternet.setText("Ja"); - } - else - { - labelInternet.setText("Nein"); - } - labelRam.setText(res.get("ram")); - labelCPU.setText(res.get("cpu")); - labelID.setText(res.get("id")); - labelVersion.setText(res.get("version")); - textAreadesc.setText(res.get("desc")); + + public void writeImageData(String id, String version) throws TException, + ParseException { + + SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); + SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy hh:mm:ss"); + Map res = client.getImageData(id, version); + labelName.setText(res.get("name")); + labelOS.setText(res.get("os")); + labelUpdate.setText(out.format(in.parse(res.get("lastupdate")))); + labelVerantwortlicher.setText(res.get("owner")); + labelWeitereVerantwortliche.setText("Noch nicht Verfügbar"); + if (res.get("template").equals("true")) { + labelVorlage.setText("Ja"); + } else { + labelVorlage.setText("Nein"); + } + if (res.get("license").equals("1")) { + labelLizenzSoftware.setText("Ja"); + } else { + labelLizenzSoftware.setText("Nein"); + } + if (res.get("internet").equals("1")) { + labelInternet.setText("Ja"); + } else { + labelInternet.setText("Nein"); + } + labelRam.setText(res.get("ram")); + labelCPU.setText(res.get("cpu")); + labelID.setText(res.get("id")); + labelVersion.setText(res.get("version")); + textAreadesc.setText(res.get("desc")); } } diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java index c88f3f9b..e5727867 100644 --- a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java @@ -105,7 +105,6 @@ public class EditLectureSearch_GUI extends JFrame { modelAll); final TableRowSorter rowSorterMyLectures = new TableRowSorter( modelMyLectures); - private JTextField textField; /** * Create the dialog. @@ -232,8 +231,8 @@ public class EditLectureSearch_GUI extends JFrame { contentPanel.add(panel_1); panel_1.setLayout(null); - JLabel lblNewLabel_2 = new JLabel("Name:"); - lblNewLabel_2.setBounds(10, 30, 80, 20); + JLabel lblNewLabel_2 = new JLabel("Volltextsuche:"); + lblNewLabel_2.setBounds(30, 30, 80, 20); panel_1.add(lblNewLabel_2); textFieldName = new JTextField(); @@ -263,18 +262,9 @@ public class EditLectureSearch_GUI extends JFrame { } }); - textFieldName.setBounds(96, 30, 166, 20); + textFieldName.setBounds(133, 30, 400, 20); panel_1.add(textFieldName); textFieldName.setColumns(10); - - JLabel label = new JLabel("Beschreibung:"); - label.setBounds(291, 30, 80, 20); - panel_1.add(label); - - textField = new JTextField(); - textField.setColumns(10); - textField.setBounds(381, 30, 166, 20); - panel_1.add(textField); JLabel lblHauptmen = new JLabel("Hauptmenü"); lblHauptmen.addMouseListener(new MouseAdapter() { diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java index eee1ebe5..761dd406 100644 --- a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java @@ -19,6 +19,7 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.net.URI; import java.net.URISyntaxException; +import java.text.ParseException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -47,18 +48,22 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; import javax.swing.table.DefaultTableModel; import javax.swing.table.JTableHeader; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; import javax.swing.table.TableColumnModel; +import javax.swing.table.TableModel; +import javax.swing.table.TableRowSorter; +import models.Links; +import models.RightsManagement; +import models.person; import org.apache.log4j.Logger; import org.apache.thrift.TException; -import models.Links; -import models.RightsManagement; -import models.person; import server.generated.Person; import server.generated.Server.Client; import util.CheckIntegrity; @@ -75,7 +80,9 @@ public class PermissionCreateLecture_GUI extends JFrame { Client client = models.Client.clientcon.getClient(); String[] result; private Class[] classes; - private JTable table = null; + //private JTable table = null; + private JTable tablePermittedUsers = null; + private final ButtonGroup buttonGroup = new ButtonGroup(); Object[] titles = { "Name", "Read", "Write", "Admin", "userID" }; // Object[] titles = { "Name", "Read", "Write", "Link", "Admin", "userID" }; Component c = null; @@ -85,6 +92,23 @@ public class PermissionCreateLecture_GUI extends JFrame { + "und/oder ob die Veranstaltung auch im VMChooser angezeigt wird." + ""; private List map = null; // List of people who have rights + + final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0) { + public boolean isCellEditable(int rowIndex, int mColIndex) { + return false; + } + }; + + final TableRowSorter rowSorterMyImages = new TableRowSorter( + modelMyImages); + + + + + + + + final DefaultTableModel model = new DefaultTableModel(titles, 0) { @@ -105,8 +129,8 @@ public class PermissionCreateLecture_GUI extends JFrame { } }; - private JTextField textField; - private final ButtonGroup buttonGroup = new ButtonGroup(); + + //private JTable tablePermittedUsers; public PermissionCreateLecture_GUI(Component formerGUI) { addWindowListener(new WindowAdapter() { @@ -138,7 +162,7 @@ public class PermissionCreateLecture_GUI extends JFrame { panel.setLayout(null); { JLabel lblNewLabel = new JLabel( - "Veranstaltung - Berechtigungen (Nur zur Veranschaulichung)"); + "Veranstaltung - Berechtigungen"); lblNewLabel.setBounds(10, 11, 509, 22); panel.add(lblNewLabel); lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); @@ -157,26 +181,30 @@ public class PermissionCreateLecture_GUI extends JFrame { contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); getContentPane().add(contentPanel); contentPanel.setLayout(null); - Object[] rowdata = { "Max Mustermann", new Boolean(false), - new Boolean(false), new Boolean(false), new Boolean(false) }; - model.addRow(rowdata); - table = new JTable(); - table.addMouseListener(new MouseAdapter() { + + + + + + + + //tablePermittedUsers = new JTable(); + tablePermittedUsers = new JTable(); + tablePermittedUsers.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent e) { checkIntegrity(-1); } - }); - table.setModel(model); - table.setSelectionForeground(Color.WHITE); + tablePermittedUsers.setModel(model); + tablePermittedUsers.setSelectionForeground(Color.WHITE); // invisible attribute userID for identifying selected user - table.getColumnModel().getColumn(4).setWidth(0); - table.getColumnModel().getColumn(4).setMinWidth(0); - table.getColumnModel().getColumn(4).setMaxWidth(0); + tablePermittedUsers.getColumnModel().getColumn(4).setWidth(0); + tablePermittedUsers.getColumnModel().getColumn(4).setMinWidth(0); + tablePermittedUsers.getColumnModel().getColumn(4).setMaxWidth(0); // if new session, get values for table from database if (RightsManagement.rightsManagement.getPermittedUserList().size() <= 0) { @@ -186,7 +214,8 @@ public class PermissionCreateLecture_GUI extends JFrame { // person.verantwortlicher.getUserID(); // System.out.println("Current userID: " // +person.verantwortlicher.getUserID()); - + + /* try { map = client.getAllOtherSatelliteUsers(person.verantwortlicher .getUserID()); @@ -217,6 +246,7 @@ public class PermissionCreateLecture_GUI extends JFrame { // TODO Auto-generated catch block e1.printStackTrace(); } + */ } else // read from model { System.out.println("reading from model"); @@ -253,23 +283,24 @@ public class PermissionCreateLecture_GUI extends JFrame { }// end set list of permitted users // table wird hier nie initialisiert und ist entsprechend null - if (table == null) + + if (tablePermittedUsers == null) LOGGER.error("NPE incoming..."); - TableColumn tc1 = table.getColumnModel().getColumn(1); - tc1.setCellEditor(table.getDefaultEditor(Boolean.class)); - tc1.setCellRenderer(table.getDefaultRenderer(Boolean.class)); + TableColumn tc1 = tablePermittedUsers.getColumnModel().getColumn(1); + tc1.setCellEditor(tablePermittedUsers.getDefaultEditor(Boolean.class)); + tc1.setCellRenderer(tablePermittedUsers.getDefaultRenderer(Boolean.class)); tc1.setHeaderRenderer(new CheckBoxHeader(new MyItemListener1(), (String) titles[1])); - TableColumn tc2 = table.getColumnModel().getColumn(2); - tc2.setCellEditor(table.getDefaultEditor(Boolean.class)); - tc2.setCellRenderer(table.getDefaultRenderer(Boolean.class)); + TableColumn tc2 = tablePermittedUsers.getColumnModel().getColumn(2); + tc2.setCellEditor(tablePermittedUsers.getDefaultEditor(Boolean.class)); + tc2.setCellRenderer(tablePermittedUsers.getDefaultRenderer(Boolean.class)); tc2.setHeaderRenderer(new CheckBoxHeader(new MyItemListener2(), (String) titles[2])); - TableColumn tc3 = table.getColumnModel().getColumn(3); - tc3.setCellEditor(table.getDefaultEditor(Boolean.class)); - tc3.setCellRenderer(table.getDefaultRenderer(Boolean.class)); + TableColumn tc3 = tablePermittedUsers.getColumnModel().getColumn(3); + tc3.setCellEditor(tablePermittedUsers.getDefaultEditor(Boolean.class)); + tc3.setCellRenderer(tablePermittedUsers.getDefaultRenderer(Boolean.class)); tc3.setHeaderRenderer(new CheckBoxHeader(new MyItemListener3(), (String) titles[3])); @@ -311,26 +342,6 @@ public class PermissionCreateLecture_GUI extends JFrame { lblNewLabel_1.setBounds(194, 11, 95, 14); contentPanel.add(lblNewLabel_1); - JLabel lblName = new JLabel("Name:"); - lblName.setBounds(10, 36, 46, 20); - contentPanel.add(lblName); - - textField = new JTextField(); - textField.setBounds(69, 36, 171, 20); - contentPanel.add(textField); - textField.setColumns(10); - - JLabel lblHochschule = new JLabel("Hochschule:"); - lblHochschule.setBounds(275, 36, 80, 20); - contentPanel.add(lblHochschule); - - JComboBox comboBox = new JComboBox(); - comboBox.setModel(new DefaultComboBoxModel(new String[] { - "Hochschule Offenburg", "Hochschule Reutlingen", - "Universität Freiburg" })); - comboBox.setBounds(365, 36, 202, 20); - contentPanel.add(comboBox); - JPanel panel = new JPanel(); panel.setBounds(10, 67, 557, 148); contentPanel.add(panel); @@ -382,14 +393,21 @@ public class PermissionCreateLecture_GUI extends JFrame { panel_1.setBounds(10, 226, 311, 294); contentPanel.add(panel_1); - JScrollPane scrollPane = new JScrollPane(); - scrollPane + JScrollPane scrollPaneMyImage = new JScrollPane(); + scrollPaneMyImage .setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); - scrollPane.setBounds(10, 28, 291, 223); - panel_1.add(scrollPane); + scrollPaneMyImage.setBounds(10, 28, 291, 223); + panel_1.add(scrollPaneMyImage); + + + tablePermittedUsers.setBounds(0, 0, 555, 1); + //panel_1.add(tablePermittedUsers); + + scrollPaneMyImage.setViewportView(tablePermittedUsers); + + JButton button = new JButton("Hinzufügen"); - button.setEnabled(false); button.setBounds(10, 260, 89, 23); panel_1.add(button); @@ -557,7 +575,7 @@ public class PermissionCreateLecture_GUI extends JFrame { int selectedRow; if (row == -1) { - selectedRow = table.getSelectedRow(); + selectedRow = tablePermittedUsers.getSelectedRow(); } else { selectedRow = row; } @@ -565,18 +583,18 @@ public class PermissionCreateLecture_GUI extends JFrame { boolean isRead, isWrite, isLink, isAdmin; // collect all row data - isRead = (boolean) table.getValueAt(selectedRow, 1); - isWrite = (boolean) table.getValueAt(selectedRow, 2); - isLink = (boolean) table.getValueAt(selectedRow, 3); - isAdmin = (boolean) table.getValueAt(selectedRow, 4); + isRead = (boolean) tablePermittedUsers.getValueAt(selectedRow, 1); + isWrite = (boolean) tablePermittedUsers.getValueAt(selectedRow, 2); + isLink = (boolean) tablePermittedUsers.getValueAt(selectedRow, 3); + isAdmin = (boolean) tablePermittedUsers.getValueAt(selectedRow, 4); boolean[] checkedVals = CheckIntegrity.isIntegre(isRead, isWrite, isLink, isAdmin); - table.setValueAt(checkedVals[0], selectedRow, 1); - table.setValueAt(checkedVals[1], selectedRow, 2); - table.setValueAt(checkedVals[2], selectedRow, 3); - table.setValueAt(checkedVals[3], selectedRow, 4); + tablePermittedUsers.setValueAt(checkedVals[0], selectedRow, 1); + tablePermittedUsers.setValueAt(checkedVals[1], selectedRow, 2); + tablePermittedUsers.setValueAt(checkedVals[2], selectedRow, 3); + tablePermittedUsers.setValueAt(checkedVals[3], selectedRow, 4); }// end checkIntegrity() // Column 0 == Concat user name @@ -588,8 +606,8 @@ public class PermissionCreateLecture_GUI extends JFrame { if (source instanceof AbstractButton == false) return; boolean checked = e.getStateChange() == ItemEvent.SELECTED; - for (int x = 0, y = table.getRowCount(); x < y; x++) { - table.setValueAt(new Boolean(checked), x, 1); + for (int x = 0, y = tablePermittedUsers.getRowCount(); x < y; x++) { + tablePermittedUsers.setValueAt(new Boolean(checked), x, 1); } } } @@ -601,8 +619,8 @@ public class PermissionCreateLecture_GUI extends JFrame { if (source instanceof AbstractButton == false) return; boolean checked = e.getStateChange() == ItemEvent.SELECTED; - for (int x = 0, y = table.getRowCount(); x < y; x++) { - table.setValueAt(new Boolean(checked), x, 2); + for (int x = 0, y = tablePermittedUsers.getRowCount(); x < y; x++) { + tablePermittedUsers.setValueAt(new Boolean(checked), x, 2); } } } @@ -614,8 +632,8 @@ public class PermissionCreateLecture_GUI extends JFrame { if (source instanceof AbstractButton == false) return; boolean checked = e.getStateChange() == ItemEvent.SELECTED; - for (int x = 0, y = table.getRowCount(); x < y; x++) { - table.setValueAt(new Boolean(checked), x, 3); + for (int x = 0, y = tablePermittedUsers.getRowCount(); x < y; x++) { + tablePermittedUsers.setValueAt(new Boolean(checked), x, 3); } } } @@ -627,8 +645,8 @@ public class PermissionCreateLecture_GUI extends JFrame { if (source instanceof AbstractButton == false) return; boolean checked = e.getStateChange() == ItemEvent.SELECTED; - for (int x = 0, y = table.getRowCount(); x < y; x++) { - table.setValueAt(new Boolean(checked), x, 4); + for (int x = 0, y = tablePermittedUsers.getRowCount(); x < y; x++) { + tablePermittedUsers.setValueAt(new Boolean(checked), x, 4); } } } @@ -647,27 +665,27 @@ public class PermissionCreateLecture_GUI extends JFrame { System.out.println("Error: map is null"); // for (int i = 0; i < map.size(); i++) { - for (int i = 0; i < table.getRowCount(); i++) { + for (int i = 0; i < tablePermittedUsers.getRowCount(); i++) { // System.out.println("in for, rowcount="+table.getRowCount()); person temp = new person(); // table.getModel().setValueAt(map.get, i, 5); - temp.setUserID(table.getModel().getValueAt(i, 5).toString()); // get + temp.setUserID(tablePermittedUsers.getModel().getValueAt(i, 5).toString()); // get // userID - temp.setImageAdmin(Boolean.parseBoolean(table.getModel() + temp.setImageAdmin(Boolean.parseBoolean(tablePermittedUsers.getModel() .getValueAt(i, 4).toString())); // get Admin - temp.setImageLinkAllowed(Boolean.parseBoolean(table.getModel() + temp.setImageLinkAllowed(Boolean.parseBoolean(tablePermittedUsers.getModel() .getValueAt(i, 3).toString()));// get Link - temp.setImageWrite(Boolean.parseBoolean(table.getModel() + temp.setImageWrite(Boolean.parseBoolean(tablePermittedUsers.getModel() .getValueAt(i, 2).toString()));// get Write - temp.setImageRead(Boolean.parseBoolean(table.getModel().getValueAt(i, 1) + temp.setImageRead(Boolean.parseBoolean(tablePermittedUsers.getModel().getValueAt(i, 1) .toString()));// get Read - seperatorIndex = table.getModel().getValueAt(i, 0).toString() + seperatorIndex = tablePermittedUsers.getModel().getValueAt(i, 0).toString() .indexOf(","); - temp.setName(table.getModel().getValueAt(i, 0).toString() + temp.setName(tablePermittedUsers.getModel().getValueAt(i, 0).toString() .substring(0, seperatorIndex)); - temp.setVorname(table.getModel().getValueAt(i, 0).toString() + temp.setVorname(tablePermittedUsers.getModel().getValueAt(i, 0).toString() .substring(seperatorIndex + 2)); // check if at least one checkbox is checked. If yes, save this @@ -682,7 +700,7 @@ public class PermissionCreateLecture_GUI extends JFrame { } System.out.println("Setting list information.\tTable size: " - + table.getRowCount() + "\t List length (=selected users): " + + tablePermittedUsers.getRowCount() + "\t List length (=selected users): " + list.size()); for (int y = 0; y < list.size(); y++) { System.out.println("" + list.get(y).getName()); diff --git a/dozentenmodul/src/main/java/models/ImageRights.java b/dozentenmodul/src/main/java/models/ImageRights.java index c5b5efbb..71148359 100644 --- a/dozentenmodul/src/main/java/models/ImageRights.java +++ b/dozentenmodul/src/main/java/models/ImageRights.java @@ -2,12 +2,14 @@ package models; public class ImageRights { + + private String userID; private boolean read; private boolean write; private boolean changePermission; private boolean admin; private boolean linkAllowed; - private String userID; + public String getUserID() { return userID; diff --git a/dozentenmodul/src/main/java/models/LectureRights.java b/dozentenmodul/src/main/java/models/LectureRights.java index c136141f..d5b3b163 100644 --- a/dozentenmodul/src/main/java/models/LectureRights.java +++ b/dozentenmodul/src/main/java/models/LectureRights.java @@ -1,13 +1,23 @@ package models; public class LectureRights { + + private String userID; private int recRead; private int recWrite; private int recChangePermission; private int recAdmin; + public static LectureRights rights =new LectureRights(); + public String getUserID() { + return userID; + } + public void setUserID(String userID) { + this.userID = userID; + } + public int getRecRead() { return recRead; } diff --git a/dozentenmodul/src/main/java/util/ListAllOtherUsers.java b/dozentenmodul/src/main/java/util/ListAllOtherUsers.java new file mode 100644 index 00000000..98b26e03 --- /dev/null +++ b/dozentenmodul/src/main/java/util/ListAllOtherUsers.java @@ -0,0 +1,239 @@ +package util; + +import gui.image.CreateImageAllgemein_GUI; +import gui.image.DeleteImage_GUI; +import gui.image.SearchEditImage_GUI; +import gui.image.SearchImage_GUI; +import gui.intro.About_GUI; +import gui.intro.MainMenue_GUI; +import gui.lecture.CreateLectureAllgemein_GUI; +import gui.lecture.DeleteLecture_GUI; +import gui.lecture.EditLectureSearch_GUI; +import gui.lecture.SearchLecture_GUI; + +import java.awt.Component; +import java.awt.FlowLayout; +import java.awt.Font; +import java.awt.ScrollPane; +import java.awt.SystemColor; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.net.URI; +import java.net.URISyntaxException; + +import javax.swing.ButtonGroup; +import javax.swing.JButton; +import javax.swing.JFrame; +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; +import javax.swing.JTextArea; +import javax.swing.JTextPane; +import javax.swing.SwingConstants; +import javax.swing.ToolTipManager; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; +import javax.swing.border.TitledBorder; + +import models.GUIRights; +import models.ImageRights; +import models.Links; +import models.RightsManagement; +import models.SessionData; +import models.person; + +import org.apache.log4j.Logger; +import javax.swing.JScrollPane; +import javax.swing.ScrollPaneConstants; +import javax.swing.JTable; +import java.awt.Color; + + +public class ListAllOtherUsers extends JFrame { + + + private final static Logger LOGGER = Logger.getLogger(MainMenue_GUI.class); + + private final JPanel contentPanel = new JPanel(); + + private JMenuItem mntmAbout; + Component c = null; + private JTable table; + + + /** + * Create the dialog. + */ + public ListAllOtherUsers(Component formerGUI) { + + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent arg0) { + System.exit(0); + } + }); + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (ClassNotFoundException | InstantiationException + | IllegalAccessException | UnsupportedLookAndFeelException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + setTitle("bwLehrpool Suite - Connected Server: " + + SessionData.session.getServerAdress()); + setBounds(0, 0, 603, 722); + this.setLocationRelativeTo(formerGUI); + + getContentPane().setLayout(null); + { + JPanel panel = new JPanel(); + panel.setBackground(SystemColor.menu); + panel.setBounds(10, 11, 567, 69); + getContentPane().add(panel); + panel.setLayout(null); + { + JLabel lblNewLabel = new JLabel("Liste aller Benutzer"); + lblNewLabel.setBounds(10, 11, 509, 22); + panel.add(lblNewLabel); + lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); + } + + JTextPane txtpnBitteWhlenSie = new JTextPane(); + txtpnBitteWhlenSie.setEditable(false); + txtpnBitteWhlenSie.setBackground(SystemColor.menu); + txtpnBitteWhlenSie + .setText("Bitte markeiren Sie Benutzer, denen Sie bestimmte Rechte vergeben möchten."); + txtpnBitteWhlenSie.setBounds(10, 36, 509, 22); + panel.add(txtpnBitteWhlenSie); + } + + //reset the list of permissions every time the user goes back to the main menu + RightsManagement.rightsManagement.getPermittedUserList().clear(); + + contentPanel.setBounds(10, 104, 567, 502); + contentPanel.setBackground(SystemColor.menu); + + contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); + getContentPane().add(contentPanel); + contentPanel.setLayout(null); + + JScrollPane scrollPane = new JScrollPane(); + scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); + scrollPane.setBounds(0, 0, 567, 491); + contentPanel.add(scrollPane); + + table = new JTable(); + table.setSelectionForeground(Color.WHITE); + table.setBounds(0, 0, 535, 1); + //contentPanel.add(table); + scrollPane.setViewportView(table); + + // ToolTipp lange anzeigen - 60sec + ToolTipManager.sharedInstance().setDismissDelay(60000); + { + JPanel buttonPane = new JPanel(); + buttonPane.setBounds(0, 630, 587, 33); + buttonPane.setBackground(SystemColor.menu); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane); + { + JButton continueButton = new JButton("Speichern"); + + + continueButton.setActionCommand("OK"); + buttonPane.add(continueButton); + getRootPane().setDefaultButton(continueButton); + } + } + { + JSeparator separator = new JSeparator(); + separator.setBounds(0, 617, 587, 2); + getContentPane().add(separator); + } + { + JSeparator separator = new JSeparator(); + separator.setBounds(0, 91, 587, 2); + getContentPane().add(separator); + } + + JMenuBar menuBar = new JMenuBar(); + setJMenuBar(menuBar); + + JMenu mnNewMenu_1 = new JMenu("Hilfe"); + menuBar.add(mnNewMenu_1); + + //Template for Help-Buttons + /* + JMenu mnNewMenu_Info = new JMenu("Info"); + mnNewMenu_Info.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + JOptionPane.showMessageDialog(null, HELP_MESSAGE, "Hilfe zu dieser Oberfläche", JOptionPane.INFORMATION_MESSAGE); + } + }); + menuBar.add(mnNewMenu_Info); + * + */ + + + JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + URI windows; + try { + windows = new URI(Links.getFAQ()); + OpenLinks.openWebpage(windows); + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); + + JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + URI windows; + try { + windows = new URI(Links.getOTRS()); + OpenLinks.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) { + About_GUI ab = new About_GUI(); + ab.setVisible(true); + } + }); + mnNewMenu_1.add(mntmAbout); + + c = this; + }// end main + + /** + * Enables/disables radio button given the user's rights + */ + + + +} -- cgit v1.2.3-55-g7522