From c27d50c575ff5867aef8f10ccf2b5f2ac43dae08 Mon Sep 17 00:00:00 2001 From: Nino Breuer Date: Fri, 28 Nov 2014 16:07:58 +0100 Subject: • changed implementation of user authentication. • changed position of class file • fixed some little things (not necessary to mention) Important Notes: •organizationID in token returns "wrong" values, therefore university is still set by client. To be fixed someday. • userID is the value with which the user starts his log in. this value is not represented in the token! (as it is not(!) the email). To be implemented someday, as this value is represented in the masterserver. • Feature isn't well tested. --- .../main/java/gui/lecture/DeleteLecture_GUI.java | 63 +++++++++++++--------- 1 file changed, 37 insertions(+), 26 deletions(-) (limited to 'dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java') diff --git a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java index 58fadc72..6d908413 100644 --- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java @@ -107,20 +107,13 @@ public class DeleteLecture_GUI extends JFrame { + ""; RowFilter rf = null; - List> filters = new ArrayList>( - 2); + List> filters = new ArrayList>(2); /** * Create the dialog. */ public DeleteLecture_GUI(Component formerGUI) { - try { - client.setTokenForSession(SessionData.session.getAuthToken()); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } filters.add(RowFilter.regexFilter(".", 0)); rf = RowFilter.orFilter(filters); @@ -129,6 +122,12 @@ public class DeleteLecture_GUI extends JFrame { @Override public void windowClosing(WindowEvent arg0) { // Beendet die Anwendung nach klick auf X + try { + client.setSessionInvalid(SessionData.session.getAuthToken()); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } con.closeThriftConnection(); System.exit(0); } @@ -152,6 +151,7 @@ public class DeleteLecture_GUI extends JFrame { // 6=Image // 7=Schlagwort // 8=ID + tablemyLectures.getColumnModel().getColumn(1).setWidth(0); tablemyLectures.getColumnModel().getColumn(1).setMinWidth(0); tablemyLectures.getColumnModel().getColumn(1).setMaxWidth(0); @@ -176,10 +176,12 @@ public class DeleteLecture_GUI extends JFrame { tablemyLectures.addMouseListener(new MouseAdapter() { @Override - public void mouseReleased(MouseEvent e) { + public void mouseReleased(MouseEvent e) + { tablemyLectures.clearSelection(); //just one row is selectablemyLectures tablemyLectures.setRowSelectionInterval(tablemyLectures.rowAtPoint(e.getPoint()), tablemyLectures.rowAtPoint(e.getPoint())); + System.out.println(tablemyLectures.getSelectedRow()); } }); @@ -201,7 +203,7 @@ public class DeleteLecture_GUI extends JFrame { // Zentriert das Fenster in die Bildmitte setBounds(0, 0, 842, 722); setLocationRelativeTo(formerGUI); - + getContentPane().setLayout(null); { JPanel panel = new JPanel(); @@ -210,8 +212,7 @@ public class DeleteLecture_GUI extends JFrame { getContentPane().add(panel); panel.setLayout(null); { - JLabel lblNewLabel = new JLabel( - "Zu löschende Veranstaltung wählen"); + JLabel lblNewLabel = new JLabel("Zu löschende Veranstaltung wählen"); lblNewLabel.setBounds(10, 11, 509, 22); panel.add(lblNewLabel); lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); @@ -238,7 +239,7 @@ public class DeleteLecture_GUI extends JFrame { panel_1.setBounds(10, 49, 557, 64); contentPanel.add(panel_1); panel_1.setLayout(null); - + JLabel lblNewLabel_2 = new JLabel("Volltextsuche:"); lblNewLabel_2.setBounds(30, 30, 80, 20); panel_1.add(lblNewLabel_2); @@ -379,14 +380,22 @@ public class DeleteLecture_GUI extends JFrame { lectureID = modelMyLectures .getValueAt( tablemyLectures - .convertColumnIndexToModel(tablemyLectures - .getSelectedRow()), 8) - .toString(); + .convertRowIndexToModel(tablemyLectures + .getSelectedRow()), + 8).toString(); + + //int test = tablemyLectures.convertColumnIndexToModel(tablemyLectures.getSelectedRow()); + + // LOGGER.info("Lösche Veranstaltung: " + lectureID); try { - if (client.deleteLecture(lectureID, - person.verantwortlicher.getHochschule(), - person.verantwortlicher.getUsername())) { + if (client.deleteLecture( + lectureID, + SessionData.session.getAuthToken(), + person.verantwortlicher.getHochschule() + ) + ) + { // delete successful LOGGER.info("Veranstaltung erfolgreich '"+lectureID+"' gelöscht."); @@ -615,15 +624,17 @@ public class DeleteLecture_GUI extends JFrame { throws ParseException { List lectures; try { - // Hole eine Liste der erlaubten Images für die diese Person - if(person.verantwortlicher.getRole()=="Admin"){ + if(person.verantwortlicher.getRole()=="Admin") + { //get complete list - lectures = client.getLectureList(); - } else { + lectures = client.getLectureList(SessionData.session.getAuthToken()); + } + else + { //get permitted list - lectures = client.getLectureListPermissionAdmin(person.verantwortlicher.getUserID()); + lectures = client.getLectureListPermissionAdmin(SessionData.session.getAuthToken()); } Iterator i = lectures.iterator(); @@ -648,12 +659,12 @@ public class DeleteLecture_GUI extends JFrame { i.next(); } - return model; } catch (TException e1) { e1.printStackTrace(); } + return model; } @@ -677,7 +688,7 @@ public class DeleteLecture_GUI extends JFrame { SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); - Map res = client.getLectureData(id); + Map res = client.getLectureData(id,SessionData.session.getAuthToken()); labelName.setText(res.get("name")); labelAktiv.setText(res.get("isActive")); labeldesc.setText(res.get("desc")); -- cgit v1.2.3-55-g7522