From 0fbe8c2ce5354de8a2725003e9d259a7d722c184 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 10 Apr 2014 13:13:21 +0200 Subject: Update der Datenbank beim Update der Veranstaltung funktioniert nun --- Dozentenmodul/src/Models/Lecture.java | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'Dozentenmodul/src/Models') diff --git a/Dozentenmodul/src/Models/Lecture.java b/Dozentenmodul/src/Models/Lecture.java index 069946b3..6b7e6fa1 100644 --- a/Dozentenmodul/src/Models/Lecture.java +++ b/Dozentenmodul/src/Models/Lecture.java @@ -6,6 +6,7 @@ public class Lecture { private String name; + private String newName; private String shortDesc; private String desc; private Date startdate; @@ -18,6 +19,14 @@ public class Lecture { public static Lecture lecture =new Lecture(); + public String getNewName() { + return newName; + } + + public void setNewName(String newName) { + this.newName = newName; + } + public String getLinkedImagename() { return linkedImagename; } -- cgit v1.2.3-55-g7522 From 558baa3fa1a2855af2950b6be59d91b197781817 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 10 Apr 2014 16:45:48 +0200 Subject: bfg --- Dozentenmodul/src/GUI/SearchImage_GUI.java | 906 ++++++------- Dozentenmodul/src/Models/person.java | 124 +- Dozentenmodul/src/Models/vm.java | 138 +- Dozentenmodul_V1/.classpath | 17 - Dozentenmodul_V1/.project | 36 - Dozentenmodul_V1/.settings/.jsdtscope | 12 - .../.settings/org.eclipse.jdt.core.prefs | 11 - .../.settings/org.eclipse.wst.common.component | 8 - .../org.eclipse.wst.common.project.facet.core.xml | 10 - .../org.eclipse.wst.jsdt.ui.superType.container | 1 - .../org.eclipse.wst.jsdt.ui.superType.name | 1 - Dozentenmodul_V1/WebContent/GUI/de/AddOS.jsp | 47 - .../WebContent/GUI/de/ESXI_Redirection.jsp | 37 - Dozentenmodul_V1/WebContent/GUI/de/Home.jsp | 87 -- Dozentenmodul_V1/WebContent/GUI/de/Login.jsp | 34 - Dozentenmodul_V1/WebContent/GUI/de/Login_Error.jsp | 12 - Dozentenmodul_V1/WebContent/GUI/de/OTRS.jsp | 20 - Dozentenmodul_V1/WebContent/GUI/de/VLUpload.jsp | 41 - .../WebContent/GUI/de/VL_bearbeiten.jsp | 12 - .../WebContent/GUI/de/createVL_Software.jsp | 109 -- .../WebContent/GUI/de/createVL_System.jsp | 146 --- .../WebContent/GUI/de/createVL_allgemein.jsp | 97 -- Dozentenmodul_V1/WebContent/GUI/de/footer.html | 7 - Dozentenmodul_V1/WebContent/GUI/de/header.html | 7 - Dozentenmodul_V1/WebContent/GUI/de/news.jsp | 15 - Dozentenmodul_V1/WebContent/GUI/en/Home.jsp | 12 - Dozentenmodul_V1/WebContent/GUI/en/Login.jsp | 42 - Dozentenmodul_V1/WebContent/GUI/en/Login_Error.jsp | 12 - Dozentenmodul_V1/WebContent/META-INF/MANIFEST.MF | 3 - .../WebContent/UbuntuFonts/Ubuntu-B.ttf | Bin 333616 -> 0 bytes .../WebContent/UbuntuFonts/Ubuntu-BI.ttf | Bin 356980 -> 0 bytes .../WebContent/UbuntuFonts/Ubuntu-C.ttf | Bin 350420 -> 0 bytes .../WebContent/UbuntuFonts/Ubuntu-L.ttf | Bin 415552 -> 0 bytes .../WebContent/UbuntuFonts/Ubuntu-LI.ttf | Bin 409608 -> 0 bytes .../WebContent/UbuntuFonts/Ubuntu-M.ttf | Bin 341324 -> 0 bytes .../WebContent/UbuntuFonts/Ubuntu-MI.ttf | Bin 366992 -> 0 bytes .../WebContent/UbuntuFonts/Ubuntu-R.ttf | Bin 353824 -> 0 bytes .../WebContent/UbuntuFonts/Ubuntu-RI.ttf | Bin 386440 -> 0 bytes .../WebContent/UbuntuFonts/UbuntuMono-B.ttf | Bin 191400 -> 0 bytes .../WebContent/UbuntuFonts/UbuntuMono-BI.ttf | Bin 216208 -> 0 bytes .../WebContent/UbuntuFonts/UbuntuMono-R.ttf | Bin 205748 -> 0 bytes .../WebContent/UbuntuFonts/UbuntuMono-RI.ttf | Bin 210216 -> 0 bytes Dozentenmodul_V1/WebContent/WEB-INF/web.xml | 7 - Dozentenmodul_V1/WebContent/css/Input.css | 124 -- Dozentenmodul_V1/WebContent/css/Layout.css | 196 --- Dozentenmodul_V1/WebContent/css/Login.css | 116 -- Dozentenmodul_V1/WebContent/img/Calendar/cal.gif | Bin 127 -> 0 bytes .../WebContent/img/Calendar/cal_close.gif | Bin 874 -> 0 bytes .../WebContent/img/Calendar/cal_fastforward.gif | Bin 62 -> 0 bytes .../WebContent/img/Calendar/cal_fastreverse.gif | Bin 63 -> 0 bytes .../WebContent/img/Calendar/cal_forward.gif | Bin 57 -> 0 bytes .../WebContent/img/Calendar/cal_minus.gif | Bin 48 -> 0 bytes .../WebContent/img/Calendar/cal_plus.gif | Bin 47 -> 0 bytes .../WebContent/img/Calendar/cal_reverse.gif | Bin 57 -> 0 bytes Dozentenmodul_V1/WebContent/img/DeleteRed.png | Bin 928 -> 0 bytes .../WebContent/img/Logo_bwLehrpool.png | Bin 29052 -> 0 bytes Dozentenmodul_V1/WebContent/img/Pencil3.png | Bin 800 -> 0 bytes .../WebContent/img/Shutdown_Box_Red.png | Bin 3581 -> 0 bytes Dozentenmodul_V1/WebContent/img/bg.png | Bin 273 -> 0 bytes Dozentenmodul_V1/WebContent/img/de.png | Bin 545 -> 0 bytes Dozentenmodul_V1/WebContent/img/tabbg.gif | Bin 68 -> 0 bytes Dozentenmodul_V1/WebContent/img/tabbg2.gif | Bin 252 -> 0 bytes Dozentenmodul_V1/WebContent/img/us.png | Bin 609 -> 0 bytes .../WebContent/jar/jakarta-commons-net.jar | Bin 239350 -> 0 bytes .../WebContent/jar/jakarta-commons-oro.jar | Bin 73481 -> 0 bytes Dozentenmodul_V1/WebContent/jar/wjhk.jupload.jar | Bin 343591 -> 0 bytes .../WebContent/js/datetimepicker_css.js | 1341 -------------------- Dozentenmodul_V1/WebContent/js/functions.js | 31 - Dozentenmodul_V1/WebContent/js/login.js | 9 - Dozentenmodul_V1/WebContent/js/tabcontent.js | 171 --- Dozentenmodul_V1/bin/WebContent/GUI/de/AddOS.jsp | 47 - .../bin/WebContent/GUI/de/ESXI_Redirection.jsp | 37 - Dozentenmodul_V1/bin/WebContent/GUI/de/Home.jsp | 87 -- Dozentenmodul_V1/bin/WebContent/GUI/de/Login.jsp | 34 - .../bin/WebContent/GUI/de/Login_Error.jsp | 12 - Dozentenmodul_V1/bin/WebContent/GUI/de/OTRS.jsp | 20 - .../bin/WebContent/GUI/de/VLUpload.jsp | 41 - .../bin/WebContent/GUI/de/VL_bearbeiten.jsp | 12 - .../bin/WebContent/GUI/de/createVL_Software.jsp | 109 -- .../bin/WebContent/GUI/de/createVL_System.jsp | 146 --- .../bin/WebContent/GUI/de/createVL_allgemein.jsp | 97 -- Dozentenmodul_V1/bin/WebContent/GUI/de/footer.html | 7 - Dozentenmodul_V1/bin/WebContent/GUI/de/header.html | 7 - Dozentenmodul_V1/bin/WebContent/GUI/de/news.jsp | 15 - .../build/classes/authentifizierung/Ldap.class | Bin 3578 -> 0 bytes Dozentenmodul_V1/build/classes/db/DB_Access.class | Bin 1648 -> 0 bytes Dozentenmodul_V1/build/classes/db/MySQL.class | Bin 5318 -> 0 bytes Dozentenmodul_V1/build/classes/db/SaveOS.class | Bin 2080 -> 0 bytes Dozentenmodul_V1/build/classes/news/News.class | Bin 1577 -> 0 bytes Dozentenmodul_V1/src/authentifizierung/Ldap.java | 98 -- Dozentenmodul_V1/src/db/DB_Access.java | 57 - Dozentenmodul_V1/src/db/MySQL.java | 203 --- Dozentenmodul_V1/src/db/SaveOS.java | 66 - Dozentenmodul_V1/src/news/News.java | 43 - 94 files changed, 584 insertions(+), 4553 deletions(-) delete mode 100644 Dozentenmodul_V1/.classpath delete mode 100644 Dozentenmodul_V1/.project delete mode 100644 Dozentenmodul_V1/.settings/.jsdtscope delete mode 100644 Dozentenmodul_V1/.settings/org.eclipse.jdt.core.prefs delete mode 100644 Dozentenmodul_V1/.settings/org.eclipse.wst.common.component delete mode 100644 Dozentenmodul_V1/.settings/org.eclipse.wst.common.project.facet.core.xml delete mode 100644 Dozentenmodul_V1/.settings/org.eclipse.wst.jsdt.ui.superType.container delete mode 100644 Dozentenmodul_V1/.settings/org.eclipse.wst.jsdt.ui.superType.name delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/AddOS.jsp delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/ESXI_Redirection.jsp delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/Home.jsp delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/Login.jsp delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/Login_Error.jsp delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/OTRS.jsp delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/VLUpload.jsp delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/VL_bearbeiten.jsp delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/createVL_Software.jsp delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/createVL_System.jsp delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/createVL_allgemein.jsp delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/footer.html delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/header.html delete mode 100644 Dozentenmodul_V1/WebContent/GUI/de/news.jsp delete mode 100644 Dozentenmodul_V1/WebContent/GUI/en/Home.jsp delete mode 100644 Dozentenmodul_V1/WebContent/GUI/en/Login.jsp delete mode 100644 Dozentenmodul_V1/WebContent/GUI/en/Login_Error.jsp delete mode 100644 Dozentenmodul_V1/WebContent/META-INF/MANIFEST.MF delete mode 100644 Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-B.ttf delete mode 100644 Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-BI.ttf delete mode 100644 Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-C.ttf delete mode 100644 Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-L.ttf delete mode 100644 Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-LI.ttf delete mode 100644 Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-M.ttf delete mode 100644 Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-MI.ttf delete mode 100644 Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-R.ttf delete mode 100644 Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-RI.ttf delete mode 100644 Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-B.ttf delete mode 100644 Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-BI.ttf delete mode 100644 Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-R.ttf delete mode 100644 Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-RI.ttf delete mode 100644 Dozentenmodul_V1/WebContent/WEB-INF/web.xml delete mode 100644 Dozentenmodul_V1/WebContent/css/Input.css delete mode 100644 Dozentenmodul_V1/WebContent/css/Layout.css delete mode 100644 Dozentenmodul_V1/WebContent/css/Login.css delete mode 100644 Dozentenmodul_V1/WebContent/img/Calendar/cal.gif delete mode 100644 Dozentenmodul_V1/WebContent/img/Calendar/cal_close.gif delete mode 100644 Dozentenmodul_V1/WebContent/img/Calendar/cal_fastforward.gif delete mode 100644 Dozentenmodul_V1/WebContent/img/Calendar/cal_fastreverse.gif delete mode 100644 Dozentenmodul_V1/WebContent/img/Calendar/cal_forward.gif delete mode 100644 Dozentenmodul_V1/WebContent/img/Calendar/cal_minus.gif delete mode 100644 Dozentenmodul_V1/WebContent/img/Calendar/cal_plus.gif delete mode 100644 Dozentenmodul_V1/WebContent/img/Calendar/cal_reverse.gif delete mode 100644 Dozentenmodul_V1/WebContent/img/DeleteRed.png delete mode 100644 Dozentenmodul_V1/WebContent/img/Logo_bwLehrpool.png delete mode 100644 Dozentenmodul_V1/WebContent/img/Pencil3.png delete mode 100644 Dozentenmodul_V1/WebContent/img/Shutdown_Box_Red.png delete mode 100644 Dozentenmodul_V1/WebContent/img/bg.png delete mode 100644 Dozentenmodul_V1/WebContent/img/de.png delete mode 100644 Dozentenmodul_V1/WebContent/img/tabbg.gif delete mode 100644 Dozentenmodul_V1/WebContent/img/tabbg2.gif delete mode 100644 Dozentenmodul_V1/WebContent/img/us.png delete mode 100644 Dozentenmodul_V1/WebContent/jar/jakarta-commons-net.jar delete mode 100644 Dozentenmodul_V1/WebContent/jar/jakarta-commons-oro.jar delete mode 100644 Dozentenmodul_V1/WebContent/jar/wjhk.jupload.jar delete mode 100644 Dozentenmodul_V1/WebContent/js/datetimepicker_css.js delete mode 100644 Dozentenmodul_V1/WebContent/js/functions.js delete mode 100644 Dozentenmodul_V1/WebContent/js/login.js delete mode 100644 Dozentenmodul_V1/WebContent/js/tabcontent.js delete mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/AddOS.jsp delete mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/ESXI_Redirection.jsp delete mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/Home.jsp delete mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/Login.jsp delete mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/Login_Error.jsp delete mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/OTRS.jsp delete mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/VLUpload.jsp delete mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/VL_bearbeiten.jsp delete mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_Software.jsp delete mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_System.jsp delete mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_allgemein.jsp delete mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/footer.html delete mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/header.html delete mode 100644 Dozentenmodul_V1/bin/WebContent/GUI/de/news.jsp delete mode 100644 Dozentenmodul_V1/build/classes/authentifizierung/Ldap.class delete mode 100644 Dozentenmodul_V1/build/classes/db/DB_Access.class delete mode 100644 Dozentenmodul_V1/build/classes/db/MySQL.class delete mode 100644 Dozentenmodul_V1/build/classes/db/SaveOS.class delete mode 100644 Dozentenmodul_V1/build/classes/news/News.class delete mode 100644 Dozentenmodul_V1/src/authentifizierung/Ldap.java delete mode 100644 Dozentenmodul_V1/src/db/DB_Access.java delete mode 100644 Dozentenmodul_V1/src/db/MySQL.java delete mode 100644 Dozentenmodul_V1/src/db/SaveOS.java delete mode 100644 Dozentenmodul_V1/src/news/News.java (limited to 'Dozentenmodul/src/Models') diff --git a/Dozentenmodul/src/GUI/SearchImage_GUI.java b/Dozentenmodul/src/GUI/SearchImage_GUI.java index ad474768..4225a295 100644 --- a/Dozentenmodul/src/GUI/SearchImage_GUI.java +++ b/Dozentenmodul/src/GUI/SearchImage_GUI.java @@ -1,453 +1,453 @@ -package gui; - - -import java.awt.Color; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Font; -import java.awt.SystemColor; -import java.awt.Toolkit; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.util.Iterator; -import java.util.List; - -import javax.swing.JButton; -import javax.swing.JComboBox; -import javax.swing.JDialog; -import javax.swing.JFrame; -import javax.swing.JLabel; -import javax.swing.JMenu; -import javax.swing.JMenuBar; -import javax.swing.JMenuItem; -import javax.swing.JPanel; -import javax.swing.JRadioButton; -import javax.swing.JScrollPane; -import javax.swing.JSeparator; -import javax.swing.JTabbedPane; -import javax.swing.JTable; -import javax.swing.JTextField; -import javax.swing.JTextPane; -import javax.swing.RowFilter; -import javax.swing.UIManager; -import javax.swing.UnsupportedLookAndFeelException; -import javax.swing.border.EmptyBorder; -import javax.swing.border.TitledBorder; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; -import javax.swing.table.DefaultTableModel; -import javax.swing.table.TableModel; -import javax.swing.table.TableRowSorter; - -import org.apache.thrift.TException; - -import server.Server.Client; -import thrift.ThriftConnection; - -@SuppressWarnings("serial") -public class SearchImage_GUI extends JFrame { - - private final JPanel contentPanel = new JPanel(); - String[] result; - JRadioButton rdbtnInternetJa; - JRadioButton rdbtnInternetNein; - JComboBox comboBox; - JTable tableAllImages; - JTable tablemyImages; - private JTextField textFieldName; - JTabbedPane tabbedPane; - String[] titles= {"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"}; - ThriftConnection con=new ThriftConnection(); - Client client=con.getThriftConnection(); - final DefaultTableModel modelAll = new DefaultTableModel( titles, 0 ); - final DefaultTableModel modelMyImages = new DefaultTableModel( titles, 0 ); - final TableRowSorter rowSorterAll = new TableRowSorter( modelAll ); - final TableRowSorter rowSorterMyImages = new TableRowSorter( modelMyImages ); - - /** - * Launch the application. - */ - public static void main(String[] args) { - try { - SearchImage_GUI dialog = new SearchImage_GUI(); - dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); - dialog.setVisible(true); - } catch (Exception e) { - e.printStackTrace(); - } - } - - /** - * Create the dialog. - */ - public SearchImage_GUI() { - addWindowListener(new WindowAdapter() { - @Override - public void windowClosing(WindowEvent arg0) { - //Beendet die Anwendung nach klick auf X - System.exit(0); - } - }); - //Verhindert das Vergrößern Des Fensters - setResizable(false); - - try { - //Setzt das Look & Feel auf System - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (ClassNotFoundException | InstantiationException - | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - //Setzt den Fenstertitel - setTitle("bwLehrpool Suite *Prototyp*"); - //Zentriert das Fenster in die Bildmitte - Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width - 603) / 2; - setBounds(left, top, 603, 722); - - - - final DefaultTableModel model = new DefaultTableModel( titles, 0 ); - - - getContentPane().setLayout(null); - { - JPanel panel = new JPanel(); - panel.setBackground(SystemColor.menu); - panel.setBounds(10, 11, 577, 57); - getContentPane().add(panel); - panel.setLayout(null); - { - JLabel lblNewLabel = new JLabel("Suche nach VL-Image"); - 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("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen"); - txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); - panel.add(txtpnBitteWhlenSie); - } - contentPanel.setBounds(10, 85, 577, 531); - contentPanel.setBackground(SystemColor.menu); - contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); - getContentPane().add(contentPanel); - contentPanel.setLayout(null); - - JPanel panel_1 = new JPanel(); - panel_1.setBackground(SystemColor.menu); - panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_1.setBounds(10, 49, 557, 131); - contentPanel.add(panel_1); - panel_1.setLayout(null); - - JLabel lblNewLabel_2 = new JLabel("Anzeigename:"); - lblNewLabel_2.setBounds(10, 30, 250, 20); - panel_1.add(lblNewLabel_2); - - JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:"); - lblInternetIstInnerhalb.setBounds(10, 58, 250, 20); - panel_1.add(lblInternetIstInnerhalb); - - textFieldName = new JTextField(); - //Key Listener der Tastatureingabe registriert - textFieldName.addKeyListener(new KeyAdapter() { - @Override - public void keyReleased(KeyEvent e) { - //Textfield eingabe auslesen - String stext=textFieldName.getText(); - - //Wenn Textfield nicht leer - if(stext!="") - { - //Filtere nach der Eingabe - rowSorterAll.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0)); - rowSorterMyImages.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0)); - - } - }}); - - - textFieldName.setBounds(270, 30, 250, 20); - panel_1.add(textFieldName); - textFieldName.setColumns(10); - - JLabel lblErweiterteSuche = new JLabel("Erweiterte Suche"); - lblErweiterteSuche.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent arg0) { - //Öffnet das Fenster Extended GUI - ExtendedSearch_GUI es=new ExtendedSearch_GUI(); - es.setVisible(true); - } - }); - lblErweiterteSuche.setForeground(Color.BLUE); - - lblErweiterteSuche.setBounds(431, 106, 89, 14); - panel_1.add(lblErweiterteSuche); - - comboBox = new JComboBox(); - try { - //Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server - List list=client.getAllOS(); - //Leeres Item hinzufügen - comboBox.addItem(""); - for(int i=0;i"); - label_1.setBounds(69, 11, 13, 14); - contentPanel.add(label_1); - - JLabel lblVlimage = new JLabel("VL-Image"); - lblVlimage.setForeground(Color.BLUE); - lblVlimage.setBounds(81, 11, 45, 14); - contentPanel.add(lblVlimage); - - JLabel label_2 = new JLabel(">"); - label_2.setBounds(133, 11, 13, 14); - contentPanel.add(label_2); - - JLabel lblNewLabel_1 = new JLabel("Imageauswahl"); - lblNewLabel_1.setBounds(146, 11, 85, 14); - contentPanel.add(lblNewLabel_1); - - tabbedPane = new JTabbedPane(JTabbedPane.TOP); - tabbedPane.addChangeListener(new ChangeListener() { - public void stateChanged(ChangeEvent arg0) { - System.out.println(tabbedPane.getSelectedIndex()); - if(tabbedPane.getSelectedIndex()==0){ - - - - } - else if(tabbedPane.getSelectedIndex()==1){ - String username="Spitzer Tobias"; - rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4)); - //rowSorterMyImages.toggleSortOrder(0); - } - - } - }); - - tabbedPane.setBounds(10, 197, 557, 300); - contentPanel.add(tabbedPane); - - JScrollPane scrollPaneMyImage = new JScrollPane(); - tablemyImages=new JTable(); - 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(); - initTableModel(modelMyImages); - tablemyImages.setRowSorter(rowSorterMyImages); - - JScrollPane scrollPaneAllImages = new JScrollPane(); - tableAllImages=new JTable(); - 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(); - initTableModel(modelAll); - tableAllImages.setRowSorter(rowSorterAll); - - scrollPaneAllImages.setViewportView(tableAllImages); - tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); - - scrollPaneMyImage.setViewportView(tablemyImages); - tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); - - JScrollPane scrollPaneCoopImages = new JScrollPane(); - JTable tableCoopImages=new JTable(); - 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(); - - scrollPaneCoopImages.setViewportView(tableCoopImages); - tabbedPane.addTab("Kooperative Images", null, scrollPaneCoopImages, null); - tabbedPane.setEnabledAt(2, false); - - JScrollPane scrollPanePublicImages = new JScrollPane(); - JTable tablePublicImages=new JTable(); - tablePublicImages.setModel(model); - tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit(); - tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit(); - tablePublicImages.getColumnModel().getColumn(3).sizeWidthToFit(); - tablePublicImages.getColumnModel().getColumn(4).sizeWidthToFit(); - tablePublicImages.getColumnModel().getColumn(5).sizeWidthToFit(); - - scrollPanePublicImages.setViewportView(tablePublicImages); - tabbedPane.addTab("\u00D6ffentliche Images", null, scrollPanePublicImages, null); - tabbedPane.setEnabledAt(3, false); - - JScrollPane scrollPanePublicVorlagen = new JScrollPane(); - JTable tablePublicVorlagen=new JTable(); - tablePublicVorlagen.setModel(model); - 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(); - - scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen); - tabbedPane.addTab("\u00D6ffentliche Vorlagen", null, scrollPanePublicVorlagen, null); - tabbedPane.setEnabledAt(4, false); - - - - - JButton btnDownload = new JButton("Download"); - btnDownload.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent arg0) { - //Öffnet den Downloader - FTPDownloader_GUI down=new FTPDownloader_GUI("Test"); - down.setVisible(true); - SearchImage_GUI.this.setVisible(false); - } - }); - btnDownload.setBounds(449, 508, 118, 23); - contentPanel.add(btnDownload); - { - JPanel buttonPane = new JPanel(); - buttonPane.setBounds(0, 640, 597, 33); - buttonPane.setBackground(SystemColor.menu); - buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); - getContentPane().add(buttonPane); - { - JButton okButton = new JButton("Zur\u00FCck"); - okButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - //Öffnet das Hauptmenü - MainMenue_GUI main=new MainMenue_GUI(); - main.setVisible(true); - dispose(); - } - }); - okButton.setActionCommand("OK"); - buttonPane.add(okButton); - getRootPane().setDefaultButton(okButton); - } - { - JButton cancelButton = new JButton("Weiter"); - cancelButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - - EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI(); - ea.setVisible(true); - dispose(); - - } - }); - cancelButton.setActionCommand("Cancel"); - buttonPane.add(cancelButton); - } - } - - JSeparator separator = new JSeparator(); - separator.setBounds(0, 78, 597, 2); - getContentPane().add(separator); - - JSeparator separator_1 = new JSeparator(); - separator_1.setBounds(0, 627, 597, 2); - getContentPane().add(separator_1); - - JMenuBar menuBar = new JMenuBar(); - setJMenuBar(menuBar); - - JMenu mnNewMenu_1 = new JMenu("Hilfe"); - menuBar.add(mnNewMenu_1); - - JMenuItem mntmFaq = new JMenuItem("FAQ"); - mnNewMenu_1.add(mntmFaq); - - JMenuItem mntmOtrs = new JMenuItem("OTRS"); - mnNewMenu_1.add(mntmOtrs); - - } - //Initiale Beffülung eines Table models - public DefaultTableModel initTableModel(DefaultTableModel model){ - List images; - try { - //Hole eine Liste der Images - - images = client.getImageList(); - Iterator i=images.iterator(); - - int x=0; - - while(i.hasNext()) - { - //erzeuge Objekte für die Tabelle - Object [] obj={images.get(x).getImageName(),images.get(x).getLicenseRestriction(),images.get(x).getOsName(),images.get(x).getLectureName(),images.get(x).getUserData(),images.get(x).getUpdateTime()}; - //Füge diese Objekte der Tabelle hinzu - model.addRow(obj); - x++; - i.next(); - - } - - return model; - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - return model; - } - - } - - +package gui; + + +import java.awt.Color; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Font; +import java.awt.SystemColor; +import java.awt.Toolkit; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.util.Iterator; +import java.util.List; + +import javax.swing.JButton; +import javax.swing.JComboBox; +import javax.swing.JDialog; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; +import javax.swing.JPanel; +import javax.swing.JRadioButton; +import javax.swing.JScrollPane; +import javax.swing.JSeparator; +import javax.swing.JTabbedPane; +import javax.swing.JTable; +import javax.swing.JTextField; +import javax.swing.JTextPane; +import javax.swing.RowFilter; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; +import javax.swing.border.TitledBorder; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import javax.swing.table.DefaultTableModel; +import javax.swing.table.TableModel; +import javax.swing.table.TableRowSorter; + +import org.apache.thrift.TException; + +import server.Server.Client; +import thrift.ThriftConnection; + +@SuppressWarnings("serial") +public class SearchImage_GUI extends JFrame { + + private final JPanel contentPanel = new JPanel(); + String[] result; + JRadioButton rdbtnInternetJa; + JRadioButton rdbtnInternetNein; + JComboBox comboBox; + JTable tableAllImages; + JTable tablemyImages; + private JTextField textFieldName; + JTabbedPane tabbedPane; + String[] titles= {"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"}; + ThriftConnection con=new ThriftConnection(); + Client client=con.getThriftConnection(); + final DefaultTableModel modelAll = new DefaultTableModel( titles, 0 ); + final DefaultTableModel modelMyImages = new DefaultTableModel( titles, 0 ); + final TableRowSorter rowSorterAll = new TableRowSorter( modelAll ); + final TableRowSorter rowSorterMyImages = new TableRowSorter( modelMyImages ); + + /** + * Launch the application. + */ + public static void main(String[] args) { + try { + SearchImage_GUI dialog = new SearchImage_GUI(); + dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + dialog.setVisible(true); + } catch (Exception e) { + e.printStackTrace(); + } + } + + /** + * Create the dialog. + */ + public SearchImage_GUI() { + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent arg0) { + //Beendet die Anwendung nach klick auf X + System.exit(0); + } + }); + //Verhindert das Vergrößern Des Fensters + setResizable(false); + + try { + //Setzt das Look & Feel auf System + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (ClassNotFoundException | InstantiationException + | IllegalAccessException | UnsupportedLookAndFeelException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + //Setzt den Fenstertitel + setTitle("bwLehrpool Suite *Prototyp*"); + //Zentriert das Fenster in die Bildmitte + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + int top=(screenSize.height - 722) / 2; + int left=(screenSize.width - 603) / 2; + setBounds(left, top, 603, 722); + + + + final DefaultTableModel model = new DefaultTableModel( titles, 0 ); + + + getContentPane().setLayout(null); + { + JPanel panel = new JPanel(); + panel.setBackground(SystemColor.menu); + panel.setBounds(10, 11, 577, 57); + getContentPane().add(panel); + panel.setLayout(null); + { + JLabel lblNewLabel = new JLabel("Suche nach VL-Image"); + 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("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen"); + txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); + panel.add(txtpnBitteWhlenSie); + } + contentPanel.setBounds(10, 85, 577, 531); + contentPanel.setBackground(SystemColor.menu); + contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); + getContentPane().add(contentPanel); + contentPanel.setLayout(null); + + JPanel panel_1 = new JPanel(); + panel_1.setBackground(SystemColor.menu); + panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_1.setBounds(10, 49, 557, 131); + contentPanel.add(panel_1); + panel_1.setLayout(null); + + JLabel lblNewLabel_2 = new JLabel("Anzeigename:"); + lblNewLabel_2.setBounds(10, 30, 250, 20); + panel_1.add(lblNewLabel_2); + + JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:"); + lblInternetIstInnerhalb.setBounds(10, 58, 250, 20); + panel_1.add(lblInternetIstInnerhalb); + + textFieldName = new JTextField(); + //Key Listener der Tastatureingabe registriert + textFieldName.addKeyListener(new KeyAdapter() { + @Override + public void keyReleased(KeyEvent e) { + //Textfield eingabe auslesen + String stext=textFieldName.getText(); + + //Wenn Textfield nicht leer + if(stext!="") + { + //Filtere nach der Eingabe + rowSorterAll.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0)); + rowSorterMyImages.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0)); + + } + }}); + + + textFieldName.setBounds(270, 30, 250, 20); + panel_1.add(textFieldName); + textFieldName.setColumns(10); + + JLabel lblErweiterteSuche = new JLabel("Erweiterte Suche"); + lblErweiterteSuche.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + //Öffnet das Fenster Extended GUI + ExtendedSearch_GUI es=new ExtendedSearch_GUI(); + es.setVisible(true); + } + }); + lblErweiterteSuche.setForeground(Color.BLUE); + + lblErweiterteSuche.setBounds(431, 106, 89, 14); + panel_1.add(lblErweiterteSuche); + + comboBox = new JComboBox(); + try { + //Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server + List list=client.getAllOS(); + //Leeres Item hinzufügen + comboBox.addItem(""); + for(int i=0;i"); + label_1.setBounds(69, 11, 13, 14); + contentPanel.add(label_1); + + JLabel lblVlimage = new JLabel("VL-Image"); + lblVlimage.setForeground(Color.BLUE); + lblVlimage.setBounds(81, 11, 45, 14); + contentPanel.add(lblVlimage); + + JLabel label_2 = new JLabel(">"); + label_2.setBounds(133, 11, 13, 14); + contentPanel.add(label_2); + + JLabel lblNewLabel_1 = new JLabel("Imageauswahl"); + lblNewLabel_1.setBounds(146, 11, 85, 14); + contentPanel.add(lblNewLabel_1); + + tabbedPane = new JTabbedPane(JTabbedPane.TOP); + tabbedPane.addChangeListener(new ChangeListener() { + public void stateChanged(ChangeEvent arg0) { + System.out.println(tabbedPane.getSelectedIndex()); + if(tabbedPane.getSelectedIndex()==0){ + + + + } + else if(tabbedPane.getSelectedIndex()==1){ + String username="Spitzer Tobias"; + rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4)); + //rowSorterMyImages.toggleSortOrder(0); + } + + } + }); + + tabbedPane.setBounds(10, 197, 557, 300); + contentPanel.add(tabbedPane); + + JScrollPane scrollPaneMyImage = new JScrollPane(); + tablemyImages=new JTable(); + 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(); + initTableModel(modelMyImages); + tablemyImages.setRowSorter(rowSorterMyImages); + + JScrollPane scrollPaneAllImages = new JScrollPane(); + tableAllImages=new JTable(); + 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(); + initTableModel(modelAll); + tableAllImages.setRowSorter(rowSorterAll); + + scrollPaneAllImages.setViewportView(tableAllImages); + tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); + + scrollPaneMyImage.setViewportView(tablemyImages); + tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); + + JScrollPane scrollPaneCoopImages = new JScrollPane(); + JTable tableCoopImages=new JTable(); + 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(); + + scrollPaneCoopImages.setViewportView(tableCoopImages); + tabbedPane.addTab("Kooperative Images", null, scrollPaneCoopImages, null); + tabbedPane.setEnabledAt(2, false); + + JScrollPane scrollPanePublicImages = new JScrollPane(); + JTable tablePublicImages=new JTable(); + tablePublicImages.setModel(model); + tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit(); + tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit(); + tablePublicImages.getColumnModel().getColumn(3).sizeWidthToFit(); + tablePublicImages.getColumnModel().getColumn(4).sizeWidthToFit(); + tablePublicImages.getColumnModel().getColumn(5).sizeWidthToFit(); + + scrollPanePublicImages.setViewportView(tablePublicImages); + tabbedPane.addTab("\u00D6ffentliche Images", null, scrollPanePublicImages, null); + tabbedPane.setEnabledAt(3, false); + + JScrollPane scrollPanePublicVorlagen = new JScrollPane(); + JTable tablePublicVorlagen=new JTable(); + tablePublicVorlagen.setModel(model); + 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(); + + scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen); + tabbedPane.addTab("\u00D6ffentliche Vorlagen", null, scrollPanePublicVorlagen, null); + tabbedPane.setEnabledAt(4, false); + + + + + JButton btnDownload = new JButton("Download"); + btnDownload.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent arg0) { + //Öffnet den Downloader + FTPDownloader_GUI down=new FTPDownloader_GUI("Test"); + down.setVisible(true); + SearchImage_GUI.this.setVisible(false); + } + }); + btnDownload.setBounds(449, 508, 118, 23); + contentPanel.add(btnDownload); + { + JPanel buttonPane = new JPanel(); + buttonPane.setBounds(0, 640, 597, 33); + buttonPane.setBackground(SystemColor.menu); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane); + { + JButton okButton = new JButton("Zur\u00FCck"); + okButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + //Öffnet das Hauptmenü + MainMenue_GUI main=new MainMenue_GUI(); + main.setVisible(true); + dispose(); + } + }); + okButton.setActionCommand("OK"); + buttonPane.add(okButton); + getRootPane().setDefaultButton(okButton); + } + { + JButton cancelButton = new JButton("Weiter"); + cancelButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + + EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI(); + ea.setVisible(true); + dispose(); + + } + }); + cancelButton.setActionCommand("Cancel"); + buttonPane.add(cancelButton); + } + } + + JSeparator separator = new JSeparator(); + separator.setBounds(0, 78, 597, 2); + getContentPane().add(separator); + + JSeparator separator_1 = new JSeparator(); + separator_1.setBounds(0, 627, 597, 2); + getContentPane().add(separator_1); + + JMenuBar menuBar = new JMenuBar(); + setJMenuBar(menuBar); + + JMenu mnNewMenu_1 = new JMenu("Hilfe"); + menuBar.add(mnNewMenu_1); + + JMenuItem mntmFaq = new JMenuItem("FAQ"); + mnNewMenu_1.add(mntmFaq); + + JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mnNewMenu_1.add(mntmOtrs); + + } + //Initiale Beffülung eines Table models + public DefaultTableModel initTableModel(DefaultTableModel model){ + List images; + try { + //Hole eine Liste der Images + + images = client.getImageList(); + Iterator i=images.iterator(); + + int x=0; + + while(i.hasNext()) + { + //erzeuge Objekte für die Tabelle + Object [] obj={images.get(x).getImageName(),images.get(x).getLicenseRestriction(),images.get(x).getOsName(),images.get(x).getLectureName(),images.get(x).getUserData(),images.get(x).getUpdateTime()}; + //Füge diese Objekte der Tabelle hinzu + model.addRow(obj); + x++; + i.next(); + + } + + return model; + } catch (TException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + return model; + } + + } + + diff --git a/Dozentenmodul/src/Models/person.java b/Dozentenmodul/src/Models/person.java index c106ec12..f4dd5c22 100644 --- a/Dozentenmodul/src/Models/person.java +++ b/Dozentenmodul/src/Models/person.java @@ -1,62 +1,62 @@ -package models; - - -public class person{ - - private String Name; - private String Vorname; - private String Hochschule; - private String EMail; - private String Tel; - private String Fakultät; - private boolean ischecked; - - - public static person verantowrtlicher=new person(); - public static person ersteller=new person(); - - public String getName() { - return Name; - } - public void setName(String name) { - Name = name; - } - public String getVorname() { - return Vorname; - } - public void setVorname(String vorname) { - Vorname = vorname; - } - public String getHochschule() { - return Hochschule; - } - public void setHochschule(String hochschule) { - Hochschule = hochschule; - } - public String getEMail() { - return EMail; - } - public void setEMail(String eMail) { - EMail = eMail; - } - public String getTel() { - return Tel; - } - public void setTel(String tel) { - Tel = tel; - } - public String getFakultät() { - return Fakultät; - } - public void setFakultät(String fakultät) { - Fakultät = fakultät; - } - public boolean isIschecked() { - return ischecked; - } - public void setIschecked(boolean ischecked) { - this.ischecked = ischecked; - } - - -} +package models; + + +public class person{ + + private String Name; + private String Vorname; + private String Hochschule; + private String EMail; + private String Tel; + private String Fakultät; + private boolean ischecked; + + + public static person verantowrtlicher=new person(); + public static person ersteller=new person(); + + public String getName() { + return Name; + } + public void setName(String name) { + Name = name; + } + public String getVorname() { + return Vorname; + } + public void setVorname(String vorname) { + Vorname = vorname; + } + public String getHochschule() { + return Hochschule; + } + public void setHochschule(String hochschule) { + Hochschule = hochschule; + } + public String getEMail() { + return EMail; + } + public void setEMail(String eMail) { + EMail = eMail; + } + public String getTel() { + return Tel; + } + public void setTel(String tel) { + Tel = tel; + } + public String getFakultät() { + return Fakultät; + } + public void setFakultät(String fakultät) { + Fakultät = fakultät; + } + public boolean isIschecked() { + return ischecked; + } + public void setIschecked(boolean ischecked) { + this.ischecked = ischecked; + } + + +} diff --git a/Dozentenmodul/src/Models/vm.java b/Dozentenmodul/src/Models/vm.java index 07074cf9..34f9ffaa 100644 --- a/Dozentenmodul/src/Models/vm.java +++ b/Dozentenmodul/src/Models/vm.java @@ -1,69 +1,69 @@ -package models; - -import java.awt.List; -import java.util.Date; - - -public class vm { - - private String Laborname; - private String shortDesc; - private String longDesc; - private String comment; - private String OS; - private Date begin; - private Date end; - private List software; - - public static vm vl=new vm(); - public String getLaborname() { - return Laborname; - } - public void setLaborname(String laborname) { - Laborname = laborname; - } - public String getShortDesc() { - return shortDesc; - } - public void setShortDesc(String shortDesc) { - this.shortDesc = shortDesc; - } - public String getLongDesc() { - return longDesc; - } - public void setLongDesc(String longDesc) { - this.longDesc = longDesc; - } - public String getComment() { - return comment; - } - public void setComment(String comment) { - this.comment = comment; - } - public String getOS() { - return OS; - } - public void setOS(String oS) { - OS = oS; - } - public Date getBegin() { - return begin; - } - public void setBegin(Date begin) { - this.begin = begin; - } - public Date getEnd() { - return end; - } - public void setEnd(Date end) { - this.end = end; - } - public List getSoftware() { - return software; - } - public void setSoftware(List software) { - this.software = software; - } - - -} +package models; + +import java.awt.List; +import java.util.Date; + + +public class vm { + + private String Laborname; + private String shortDesc; + private String longDesc; + private String comment; + private String OS; + private Date begin; + private Date end; + private List software; + + public static vm vl=new vm(); + public String getLaborname() { + return Laborname; + } + public void setLaborname(String laborname) { + Laborname = laborname; + } + public String getShortDesc() { + return shortDesc; + } + public void setShortDesc(String shortDesc) { + this.shortDesc = shortDesc; + } + public String getLongDesc() { + return longDesc; + } + public void setLongDesc(String longDesc) { + this.longDesc = longDesc; + } + public String getComment() { + return comment; + } + public void setComment(String comment) { + this.comment = comment; + } + public String getOS() { + return OS; + } + public void setOS(String oS) { + OS = oS; + } + public Date getBegin() { + return begin; + } + public void setBegin(Date begin) { + this.begin = begin; + } + public Date getEnd() { + return end; + } + public void setEnd(Date end) { + this.end = end; + } + public List getSoftware() { + return software; + } + public void setSoftware(List software) { + this.software = software; + } + + +} diff --git a/Dozentenmodul_V1/.classpath b/Dozentenmodul_V1/.classpath deleted file mode 100644 index 146da894..00000000 --- a/Dozentenmodul_V1/.classpath +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/Dozentenmodul_V1/.project b/Dozentenmodul_V1/.project deleted file mode 100644 index 29247cd1..00000000 --- a/Dozentenmodul_V1/.project +++ /dev/null @@ -1,36 +0,0 @@ - - - Dozentenmodul_V1 - - - - - - org.eclipse.wst.jsdt.core.javascriptValidator - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - org.eclipse.wst.validation.validationbuilder - - - - - - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.jdt.core.javanature - org.eclipse.wst.jsdt.core.jsNature - - diff --git a/Dozentenmodul_V1/.settings/.jsdtscope b/Dozentenmodul_V1/.settings/.jsdtscope deleted file mode 100644 index 887f573a..00000000 --- a/Dozentenmodul_V1/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/Dozentenmodul_V1/.settings/org.eclipse.jdt.core.prefs b/Dozentenmodul_V1/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 838bd9d6..00000000 --- a/Dozentenmodul_V1/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,11 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/Dozentenmodul_V1/.settings/org.eclipse.wst.common.component b/Dozentenmodul_V1/.settings/org.eclipse.wst.common.component deleted file mode 100644 index 4bb00e74..00000000 --- a/Dozentenmodul_V1/.settings/org.eclipse.wst.common.component +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/Dozentenmodul_V1/.settings/org.eclipse.wst.common.project.facet.core.xml b/Dozentenmodul_V1/.settings/org.eclipse.wst.common.project.facet.core.xml deleted file mode 100644 index 518a3cac..00000000 --- a/Dozentenmodul_V1/.settings/org.eclipse.wst.common.project.facet.core.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/Dozentenmodul_V1/.settings/org.eclipse.wst.jsdt.ui.superType.container b/Dozentenmodul_V1/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a4..00000000 --- a/Dozentenmodul_V1/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/Dozentenmodul_V1/.settings/org.eclipse.wst.jsdt.ui.superType.name b/Dozentenmodul_V1/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b6..00000000 --- a/Dozentenmodul_V1/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/AddOS.jsp b/Dozentenmodul_V1/WebContent/GUI/de/AddOS.jsp deleted file mode 100644 index 58e83fe6..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/AddOS.jsp +++ /dev/null @@ -1,47 +0,0 @@ - - - - - -Betriebssystem hinzufügen - - -

Betriebssystem hinzufügen

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
Hersteller des Betriebssystems:
Name des Betriebssystems:
Version des Betriebssystems:
Architektur des Betriebssystems:
Art des Betriebssystems:
- -
- - \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/ESXI_Redirection.jsp b/Dozentenmodul_V1/WebContent/GUI/de/ESXI_Redirection.jsp deleted file mode 100644 index 06223d4b..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/ESXI_Redirection.jsp +++ /dev/null @@ -1,37 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - - - -Dozentenmodul V1 - - - - -
-

Sie sind hier: Home - -

-
-

Zur weiteren Bearbeitung ihrer virtuellen Laborumgebung benötigen Sie die Anwendung "vSphere Client".

-

Diese finden Sie unter folgendem Link:

-

vSphere CLient

-
-

Ist die Software bereits installiert, starten Sie diese und geben Sie folgende Verbindungsdaten ein:

- - - - - - - - - - -
Benutzername: <Ihr BWIDM-Benutzername>
Passwort: <Ihr BWIDM-Passwort>
- - \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/Home.jsp b/Dozentenmodul_V1/WebContent/GUI/de/Home.jsp deleted file mode 100644 index 138f7094..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/Home.jsp +++ /dev/null @@ -1,87 +0,0 @@ - - -<%@ page language="java" import="db.MySQL"%> -<%@ page language="java" import="java.sql.*"%> - - - -Home - - - - - - - - - - -
-

Aktive VLs

-
    - <% - MySQL sql=new MySQL(); - Connection con= sql.getConnection(); - - ResultSet u=sql.getUserpk(con, "tobias.spitzer@hs-offenburg.de"); - - while(u.next()) - { - - ResultSet v=sql.getVMpk(con, u.getString("pk")); - - while(v.next()) - { - - - - ResultSet rs=sql.getActiveVLs(con, v.getString("VM_pk")); - - while(rs.next()){ - - %> -
  • <%=rs.getString("Laborname") %> Bearbeiten Deaktivieren Löschen
    • - <% - } - } - } - %> -
-

Inaktive VLs

-
    - - <% - while(u.next()) - { - ResultSet v=sql.getVMpk(con, u.getString("pk")); - - while(v.next()) - { - - - - ResultSet rs=sql.getInactiveVLs(con, v.getString("VM_pk")); - - while(rs.next()){ - - %> - -
  • <%=rs.getString("Laborname") %> Bearbeiten Deaktivieren Löschen
    • - - <% - } - } - } - - %> - - -
-
- - - - - - diff --git a/Dozentenmodul_V1/WebContent/GUI/de/Login.jsp b/Dozentenmodul_V1/WebContent/GUI/de/Login.jsp deleted file mode 100644 index e5fc6ec1..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/Login.jsp +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - -Login Dozentenmodul - - -
-de de | en us -
- - - -
-
- - - - - - - - - - -
-
- - - - - diff --git a/Dozentenmodul_V1/WebContent/GUI/de/Login_Error.jsp b/Dozentenmodul_V1/WebContent/GUI/de/Login_Error.jsp deleted file mode 100644 index d3e01215..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/Login_Error.jsp +++ /dev/null @@ -1,12 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - -Insert title here - - -

Error

- - \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/OTRS.jsp b/Dozentenmodul_V1/WebContent/GUI/de/OTRS.jsp deleted file mode 100644 index bec3f28e..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/OTRS.jsp +++ /dev/null @@ -1,20 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - - -OTRS - - - - - - - - - \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/VLUpload.jsp b/Dozentenmodul_V1/WebContent/GUI/de/VLUpload.jsp deleted file mode 100644 index 328f6efb..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/VLUpload.jsp +++ /dev/null @@ -1,41 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - - -VL Upload Bereich - - - - - - -
-
- Sie sind hier: Allgemein - > - System - > - Software - > - Upload -
-

-

Upload Tool

- - - - - - - -
- - - \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/VL_bearbeiten.jsp b/Dozentenmodul_V1/WebContent/GUI/de/VL_bearbeiten.jsp deleted file mode 100644 index 79087358..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/VL_bearbeiten.jsp +++ /dev/null @@ -1,12 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - -Insert title here - - - - - \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/createVL_Software.jsp b/Dozentenmodul_V1/WebContent/GUI/de/createVL_Software.jsp deleted file mode 100644 index 979ca401..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/createVL_Software.jsp +++ /dev/null @@ -1,109 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - <%@ page language="java" import="db.MySQL"%> -<%@ page language="java" import="java.sql.*"%> - - - - - - - Insert title here - - - - - - - - - - <% - String Laborname=request.getParameter("Laborname"); - session.setAttribute("Laborname", Laborname); - - String shortDesc=request.getParameter("shortDesc"); - session.setAttribute("shortDesc", shortDesc); - - String longDesc=request.getParameter("longDesc"); - session.setAttribute("longDesc", longDesc); - - String comment=request.getParameter("comment"); - session.setAttribute("comment", comment); - - String OS=request.getParameter("OS"); - session.setAttribute("OS", OS); - - String von_date=request.getParameter("von_date"); - session.setAttribute("von_date", von_date); - - String bis_date=request.getParameter("bis_date"); - session.setAttribute("bis_date", bis_date); - %> -
-
- Sie sind hier: - Allgemein - > - System - > - Software -
-
-
-

- Sortierung nach: -

-
- Verfügbare Software -
- - <% - MySQL sql=new MySQL(); - Connection con=sql.getConnection(); - ResultSet h=sql.getHersteller(con); - int i=0; - while(h.next()) - { - ResultSet sw=sql.getSoftware(con, h.getString("Name")); - - - %> -
- <% - while(sw.next()) - { - int id=i++; - %> - <%=h.getString("Name")%> <%=sw.getString("Produktname")%> <%=sw.getString("Version") %> <%=sw.getString("Architektur") %> -
- <% - } - } - %> - -
-
-
- Ausgewählte Software -
- -
-
-
-

- - -
-
- - - - - - \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/createVL_System.jsp b/Dozentenmodul_V1/WebContent/GUI/de/createVL_System.jsp deleted file mode 100644 index f780302f..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/createVL_System.jsp +++ /dev/null @@ -1,146 +0,0 @@ -<%@page import="org.apache.catalina.Session"%> -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - <%@ page language="java" import="db.MySQL"%> -<%@ page language="java" import="java.sql.*"%> - - - - - - -Insert title here - - - - - - - - - - <% - String Vorname_V=request.getParameter("Vorname_V"); - session.setAttribute("Vorname_V",Vorname_V ); - - String Nachname_V=request.getParameter("Nachname_V"); - session.setAttribute("Nachname_V",Nachname_V ); - - String Hochschule_V=request.getParameter("Hochschule_V"); - session.setAttribute("Hochschule_V",Hochschule_V ); - - String Email_V=request.getParameter("Email_V"); - session.setAttribute("Email_V",Email_V ); - - String Tel_V=request.getParameter("Tel_V"); - session.setAttribute("Tel_V",Tel_V ); - - String Fakultät_V=request.getParameter("Fakultät_V"); - session.setAttribute("Fakultät_V",Fakultät_V ); - - String Vorname_E=request.getParameter("Vorname_E"); - session.setAttribute("Vorname_E",Vorname_E ); - - String Nachname_E=request.getParameter("Nachname_E"); - session.setAttribute("Nachname_E",Nachname_E ); - - String Hochschule_E=request.getParameter("Hochschule_E"); - session.setAttribute("Hochschule_E",Hochschule_E ); - - String Email_E=request.getParameter("Email_E"); - session.setAttribute("Email_E",Email_E ); - - String Tel_E=request.getParameter("Tel_E"); - session.setAttribute("Tel_E",Tel_E ); - - String Fakultät_E=request.getParameter("Fakultät_E"); - session.setAttribute("Fakultät_E",Fakultät_E ); - %> -
-
- Sie sind hier: - Allgemein - > - System - -
-
-
-
- Systeminformationen - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Laborname (Anzeigename): *
Kurzbeschreibung: *
Langbeschreibung: *
Kommentar:
Betriebssystem: *
Gültigkeitsdatum: *von: bis: - -
-
-
- - - - - - - - - - \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/createVL_allgemein.jsp b/Dozentenmodul_V1/WebContent/GUI/de/createVL_allgemein.jsp deleted file mode 100644 index 6e099ed9..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/createVL_allgemein.jsp +++ /dev/null @@ -1,97 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - - - -Insert title here - - - - - -
-
- Sie sind hier: - Allgemein - -
-
-
-
- Allgemeine Informationen zum Verantwortlichen - - - - - - - - - - - - - - - - - - - - - - - - - -
Vorname: *
Nachname: *
Hochschule: *
E-Mail: *
Tel.-Nummer:
Fakultät:
-
-

-
- Allgemeine Informationen zum Ersteller - - - - - - - - - - - - - - - - - - - - - - - - - -
Vorname: *
Nachname: *
Hochschule: *
E-Mail: *
Tel.-Nummer:
Fakultät:
-
-
- - -
-
- - - - - - \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/footer.html b/Dozentenmodul_V1/WebContent/GUI/de/footer.html deleted file mode 100644 index ce63d776..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/footer.html +++ /dev/null @@ -1,7 +0,0 @@ - - \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/header.html b/Dozentenmodul_V1/WebContent/GUI/de/header.html deleted file mode 100644 index 83b3ab26..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/header.html +++ /dev/null @@ -1,7 +0,0 @@ - -
-de de | en us -
- - -
\ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/de/news.jsp b/Dozentenmodul_V1/WebContent/GUI/de/news.jsp deleted file mode 100644 index 0104164d..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/de/news.jsp +++ /dev/null @@ -1,15 +0,0 @@ -<%@ page language="java" import="news.News" %> -
-<% - News news=new News(); -String text=""; - - text=news.refreshNews(); - -%> -

News

-

-<%=text.toString() %> -

- -
\ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/en/Home.jsp b/Dozentenmodul_V1/WebContent/GUI/en/Home.jsp deleted file mode 100644 index d3bec631..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/en/Home.jsp +++ /dev/null @@ -1,12 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - -Insert title here - - -

test

- - \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/en/Login.jsp b/Dozentenmodul_V1/WebContent/GUI/en/Login.jsp deleted file mode 100644 index f3568c67..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/en/Login.jsp +++ /dev/null @@ -1,42 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - - - -Dozentenmodul V1 - - - - -
-

Sie sind hier: Login - -

-
-

Herzlich Willkommen im Dozentenmodul des bwLerhpools!

-

blablabla

- -
- - - - - - - - - - - - - -
Passwort:
-
- - - - \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/GUI/en/Login_Error.jsp b/Dozentenmodul_V1/WebContent/GUI/en/Login_Error.jsp deleted file mode 100644 index d3e01215..00000000 --- a/Dozentenmodul_V1/WebContent/GUI/en/Login_Error.jsp +++ /dev/null @@ -1,12 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - -Insert title here - - -

Error

- - \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/META-INF/MANIFEST.MF b/Dozentenmodul_V1/WebContent/META-INF/MANIFEST.MF deleted file mode 100644 index 5e949512..00000000 --- a/Dozentenmodul_V1/WebContent/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: - diff --git a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-B.ttf b/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-B.ttf deleted file mode 100644 index c0142fea..00000000 Binary files a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-B.ttf and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-BI.ttf b/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-BI.ttf deleted file mode 100644 index 12e4c7df..00000000 Binary files a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-BI.ttf and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-C.ttf b/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-C.ttf deleted file mode 100644 index 8d3e8676..00000000 Binary files a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-C.ttf and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-L.ttf b/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-L.ttf deleted file mode 100644 index 7b7ac7dd..00000000 Binary files a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-L.ttf and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-LI.ttf b/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-LI.ttf deleted file mode 100644 index e36de452..00000000 Binary files a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-LI.ttf and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-M.ttf b/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-M.ttf deleted file mode 100644 index 443ec8b7..00000000 Binary files a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-M.ttf and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-MI.ttf b/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-MI.ttf deleted file mode 100644 index 321eccf7..00000000 Binary files a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-MI.ttf and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-R.ttf b/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-R.ttf deleted file mode 100644 index 45a038ba..00000000 Binary files a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-R.ttf and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-RI.ttf b/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-RI.ttf deleted file mode 100644 index 6f819f69..00000000 Binary files a/Dozentenmodul_V1/WebContent/UbuntuFonts/Ubuntu-RI.ttf and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-B.ttf b/Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-B.ttf deleted file mode 100644 index 7bd66657..00000000 Binary files a/Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-B.ttf and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-BI.ttf b/Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-BI.ttf deleted file mode 100644 index 6c5b8ba0..00000000 Binary files a/Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-BI.ttf and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-R.ttf b/Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-R.ttf deleted file mode 100644 index fdd309d7..00000000 Binary files a/Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-R.ttf and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-RI.ttf b/Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-RI.ttf deleted file mode 100644 index 18f81a29..00000000 Binary files a/Dozentenmodul_V1/WebContent/UbuntuFonts/UbuntuMono-RI.ttf and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/WEB-INF/web.xml b/Dozentenmodul_V1/WebContent/WEB-INF/web.xml deleted file mode 100644 index 55db46a3..00000000 --- a/Dozentenmodul_V1/WebContent/WEB-INF/web.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - Dozentenmodul_V1 - - Login.jsp - - \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/css/Input.css b/Dozentenmodul_V1/WebContent/css/Input.css deleted file mode 100644 index 7a29a5e7..00000000 --- a/Dozentenmodul_V1/WebContent/css/Input.css +++ /dev/null @@ -1,124 +0,0 @@ -@CHARSET "ISO-8859-1"; - -@font-face { - font-family: 'Ubuntu'; - src: url(/Dozentenmodul_V1/UbuntuFonts/Ubuntu-L.ttf); -} - - - -article.input section { - position: absolute; - display: block; - width: 80%; - height: 120%; - top: 200px; - left: 50%; - margin-left: -30%; - background-color: #c5d2de; -} - -article.input section h2 { - position: absolute; - left: 0; - top: -30px; - width: 124px; - height: 29px; - font-family: Ubuntu; - font-size: 15px; - margin: 0; - background-color: #194b7d; - border-radius: 15px 15px 0 0; - border: solid #ffffff; - border-width: 1px 1px 0 0; - z-index: 1; -} - -article.input section:nth-child(2) h2 { - left: 120px; - z-index: 0; -} - -article.input section:nth-child(3) h2 { - left: 240px; - z-index: -1; -} - -article.input section:nth-child(4) h2 { - left: 360px; - z-index: -2; -} - - -article.input section h2 a { - display: block; - margin: 5px 0 0 0; - text-align: center; - text-decoration: none; - color: #c5d2de; -} - -article.input section:target, article.input section:target h2 { - color: #000000; - background-color: #c5d2de; - z-index: 1; -} - -article.input section:target h2 a { - color: #194b7d; -} - -article.input section div{ - z-index: 1; -} - -article.input section input{ - width: 100%; -} - - - -article.input section input{ - width: 320px; -} - -article.input section textarea{ - width: 320px; - resize:none; -} -article.input section select{ - width: 325px; -} -td{ - -font-family:Ubuntu; -} -legend{ -font-family:Ubuntu; -} -p{ -font-family:Ubuntu; -} -#von_date, #bis_date{ - width: 300px; -} - -#aktiv_ja, #aktiv_nein{ - width: 50px; -} - - - - -#SW_list{ - width: 30px; -} - - - -} -#save{ - float:right; - margin-right: 30px; - width: 100px; -} \ No newline at end of file diff --git a/Dozentenmodul_V1/WebContent/css/Layout.css b/Dozentenmodul_V1/WebContent/css/Layout.css deleted file mode 100644 index 75703ac4..00000000 --- a/Dozentenmodul_V1/WebContent/css/Layout.css +++ /dev/null @@ -1,196 +0,0 @@ -@CHARSET "ISO-8859-1"; -@font-face { - font-family: 'Ubuntu'; - src: url(/Dozentenmodul_V1/UbuntuFonts/Ubuntu-L.ttf); -} - -html,body{ - - background-image:url('../img/bg.png'); - background-repeat:repeat-x; - font-family: 'Ubuntu'; -} - -button{ - font-family: 'Ubuntu'; -} - -#lang{ - position: absolute; - top: 0px; - right: 10px; -} - -#logo{ - width: 220px; -} - -#news{ - position:relative; - left: 0px; - list-style: none; - padding: 10px; - width: 200px; - border-radius: 5px; - border-width: 1px; - border-style: solid; - border-color: black; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - background: white; -} - -#newstext{ - position:relative; - margin-top: 10px; -} -/* Vertical List: */ -.vertical-list { - list-style: none; - padding: 10px; - width: 200px; - border-radius: 5px; - border-width: 1px; - border-style: solid; - border-color: black; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - background: white; /* old browsers */ - -} -.vertical-list .button { - outline: 0; - padding: 5px 12px; - display: block; - color: white; - font-family: 'Ubuntu'; - font-weight: bold; - text-shadow: 1px 1px #1f272b; - text-decoration: none; - border: 1px solid #1c252b; - border-radius: 3px; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - background: rgb(117,117,117); - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - background: background: rgb(117,117,117); /* old browsers */ -} -.vertical-list .button:hover { - background: rgb(255,166,38); /* old browsers */ - -} -.vertical-list .button:active { - background-position: 0 top; - position: relative; - top: 1px; - color: #fff; - padding: 6px 12px 4px; - background: rgb(255,166,38); - -} -#footer{ - width:80%; - height:3%; - background-color: #757575; - position: absolute; - bottom: 0px; - left: 300px; - -moz-border-radius: 25px 25px 0px 0px; - -webkit-border-radius: 25px 25px 0px 0px; - border-radius: 25px 25px 0px 0px; -} - - -#link{ - color:white; - font-family: 'Ubuntu'; - position: relative; - margin-left: 30px; -} - -#link:hover{ - color: #FFA626; -} -#content{ - position:absolute; - left: 300px; - top: 100px; - width:80%; - height:80%; - overflow-y: scroll; - -} - -#bread a:hover { - text-decoration:none; -} - -#bread a:hover { - text-decoration:underline; -} - -#buttonweiterAllg{ - position: absolute; - left: 200px; - width: 200px; -} - -#buttonweiterSys{ - position: absolute; - left: 500px; - width: 200px; -} - -#buttonReady{ - position: absolute; - left: 200px; - width: 200px; -} -#buttonBackAllg{ - position: absolute; - left: 0px; - width: 200px; -} -#buttonBackSys{ - position: absolute; - left: 300px; - width: 200px; -} -#buttonAddSW{ - left: 0px; - width: 200px; -} -#buttonBackSW{ - position: absolute; - left: 0px; - width: 200px; -} -#sw_chooser{ - width: 310px; -} -#sw_choosed{ - position: relative; - margin-left: 350px; - margin-top: -593px; - width:310px; - - -} - -#sort{ - margin-left: 10px; - margin-top: 10px; -} - -fieldset{ - margin-top: 10px; - -} -.container { - border:2px solid #ccc; - width:300px; - height: 550px; - overflow-y: scroll; -} diff --git a/Dozentenmodul_V1/WebContent/css/Login.css b/Dozentenmodul_V1/WebContent/css/Login.css deleted file mode 100644 index 3e85c647..00000000 --- a/Dozentenmodul_V1/WebContent/css/Login.css +++ /dev/null @@ -1,116 +0,0 @@ -@CHARSET "ISO-8859-1"; - -@font-face { - font-family: 'Ubuntu'; - src: url(/Dozentenmodul_V1/UbuntuFonts/Ubuntu-L.ttf); -} - -#lang{ - position: absolute; - top: 0px; - right: 0px; -} - -#logo{ - width:50%; - height: 10%; - display:block; - margin-left: auto; - margin-right: auto; - margin-top: 5%; - -} - -#login{ - width:500px; - height:200px; - background-color: #757575; - display:block; - margin-left: auto; - margin-right: auto; - margin-top: 5%; - color: white; - font-family: 'Ubuntu'; - -moz-border-radius: 25px; - -webkit-border-radius: 25px; - border-radius: 25px; -} - -input{ - width:145px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - border-radius: 5px; -} - -button{ - width:150px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - border-radius: 5px; -} - -#lefttop{ - position:relative; - float:left; - margin-top: 25px; - margin-left: 15px; - -} - -#righttop{ - position: relative; - width:250px; - float:right; - margin-top: 25px; - margin-right: 15px; -} - -#leftbottom{ - position:relative; - float:left; - margin-top: 15px; - margin-left: 15px; - -} - -#rightbottom{ - position: relative; - width:250px; - float:right; - margin-top: 15px; - margin-right: 15px; -} - -#buttoncenter{ - position: absolute; - width:150px; - right:auto; - left:auto; - - margin-top:125px; -} -#footer{ - width:80%; - height:3%; - background-color: #757575; - position: absolute; - bottom: 0px; - left:50%; - margin-left:-40%; - -moz-border-radius: 25px 25px 0px 0px; - -webkit-border-radius: 25px 25px 0px 0px; - border-radius: 25px 25px 0px 0px; -} - -a{ - color:white; - font-family: 'Ubuntu'; - position: relative; - margin-left: 30px; -} -a:hover{ - color: #FFA626; -} - - diff --git a/Dozentenmodul_V1/WebContent/img/Calendar/cal.gif b/Dozentenmodul_V1/WebContent/img/Calendar/cal.gif deleted file mode 100644 index 8526cf5d..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/Calendar/cal.gif and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/Calendar/cal_close.gif b/Dozentenmodul_V1/WebContent/img/Calendar/cal_close.gif deleted file mode 100644 index 22b71eaf..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/Calendar/cal_close.gif and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/Calendar/cal_fastforward.gif b/Dozentenmodul_V1/WebContent/img/Calendar/cal_fastforward.gif deleted file mode 100644 index 885781bd..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/Calendar/cal_fastforward.gif and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/Calendar/cal_fastreverse.gif b/Dozentenmodul_V1/WebContent/img/Calendar/cal_fastreverse.gif deleted file mode 100644 index db858c50..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/Calendar/cal_fastreverse.gif and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/Calendar/cal_forward.gif b/Dozentenmodul_V1/WebContent/img/Calendar/cal_forward.gif deleted file mode 100644 index 4d9c2333..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/Calendar/cal_forward.gif and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/Calendar/cal_minus.gif b/Dozentenmodul_V1/WebContent/img/Calendar/cal_minus.gif deleted file mode 100644 index 2861f59f..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/Calendar/cal_minus.gif and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/Calendar/cal_plus.gif b/Dozentenmodul_V1/WebContent/img/Calendar/cal_plus.gif deleted file mode 100644 index 5dc1a52c..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/Calendar/cal_plus.gif and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/Calendar/cal_reverse.gif b/Dozentenmodul_V1/WebContent/img/Calendar/cal_reverse.gif deleted file mode 100644 index 6d51e3f1..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/Calendar/cal_reverse.gif and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/DeleteRed.png b/Dozentenmodul_V1/WebContent/img/DeleteRed.png deleted file mode 100644 index 03e31706..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/DeleteRed.png and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/Logo_bwLehrpool.png b/Dozentenmodul_V1/WebContent/img/Logo_bwLehrpool.png deleted file mode 100644 index b897d9f1..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/Logo_bwLehrpool.png and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/Pencil3.png b/Dozentenmodul_V1/WebContent/img/Pencil3.png deleted file mode 100644 index 1686cc8c..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/Pencil3.png and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/Shutdown_Box_Red.png b/Dozentenmodul_V1/WebContent/img/Shutdown_Box_Red.png deleted file mode 100644 index 9477e47e..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/Shutdown_Box_Red.png and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/bg.png b/Dozentenmodul_V1/WebContent/img/bg.png deleted file mode 100644 index 6df2510e..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/bg.png and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/de.png b/Dozentenmodul_V1/WebContent/img/de.png deleted file mode 100644 index ac4a9773..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/de.png and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/tabbg.gif b/Dozentenmodul_V1/WebContent/img/tabbg.gif deleted file mode 100644 index ab5606de..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/tabbg.gif and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/tabbg2.gif b/Dozentenmodul_V1/WebContent/img/tabbg2.gif deleted file mode 100644 index c46e39cc..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/tabbg2.gif and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/img/us.png b/Dozentenmodul_V1/WebContent/img/us.png deleted file mode 100644 index 10f451fe..00000000 Binary files a/Dozentenmodul_V1/WebContent/img/us.png and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/jar/jakarta-commons-net.jar b/Dozentenmodul_V1/WebContent/jar/jakarta-commons-net.jar deleted file mode 100644 index a2880ab9..00000000 Binary files a/Dozentenmodul_V1/WebContent/jar/jakarta-commons-net.jar and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/jar/jakarta-commons-oro.jar b/Dozentenmodul_V1/WebContent/jar/jakarta-commons-oro.jar deleted file mode 100644 index 3a1cc642..00000000 Binary files a/Dozentenmodul_V1/WebContent/jar/jakarta-commons-oro.jar and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/jar/wjhk.jupload.jar b/Dozentenmodul_V1/WebContent/jar/wjhk.jupload.jar deleted file mode 100644 index 0409e153..00000000 Binary files a/Dozentenmodul_V1/WebContent/jar/wjhk.jupload.jar and /dev/null differ diff --git a/Dozentenmodul_V1/WebContent/js/datetimepicker_css.js b/Dozentenmodul_V1/WebContent/js/datetimepicker_css.js deleted file mode 100644 index 882601db..00000000 --- a/Dozentenmodul_V1/WebContent/js/datetimepicker_css.js +++ /dev/null @@ -1,1341 +0,0 @@ -//Javasript name: My Date Time Picker -//Date created: 16-Nov-2003 23:19 -//Creator: TengYong Ng -//Website: http://www.rainforestnet.com -//Copyright (c) 2003 TengYong Ng -//FileName: DateTimePicker_css.js -//Version: 2.2.4 -// Note: Permission given to use and modify this script in ANY kind of applications if -// header lines are left unchanged. -//Permission is granted to redistribute and modify this javascript under a FreeBSD License. -//New Css style version added by Yvan Lavoie (Québec, Canada) 29-Jan-2009 -//Formatted for JSLint compatibility by Labsmedia.com (30-Dec-2010) - - -//Global variables - -var winCal; -var dtToday; -var Cal; -var MonthName; -var WeekDayName1; -var WeekDayName2; -var exDateTime;//Existing Date and Time -var selDate;//selected date. version 1.7 -var calSpanID = "calBorder"; // span ID -var domStyle = null; // span DOM object with style -var cnLeft = "0";//left coordinate of calendar span -var cnTop = "0";//top coordinate of calendar span -var xpos = 0; // mouse x position -var ypos = 0; // mouse y position -var calHeight = 0; // calendar height -var CalWidth = 208;// calendar width -var CellWidth = 30;// width of day cell. -var TimeMode = 24;// TimeMode value. 12 or 24 -var StartYear = 2013; //First Year in drop down year selection -var EndYear = 5; // The last year of pickable date. if current year is 2011, the last year that still picker will be 2016 (2011+5) -var CalPosOffsetX = -1; //X position offset relative to calendar icon, can be negative value -var CalPosOffsetY = 0; //Y position offset relative to calendar icon, can be negative value - -//Configurable parameters start -var SpanBorderColor = "#000000";//span border color -var SpanBgColor = "#FFFFFF"; //span background color -var MonthYearColor = "#cc0033"; //Font Color of Month and Year in Calendar header. -var WeekHeadColor = "#18861B"; //var WeekHeadColor="#18861B";//Background Color in Week header. -var SundayColor = "#C0F64F"; //var SundayColor="#C0F64F";//Background color of Sunday. -var SaturdayColor = "#C0F64F"; //Background color of Saturday. -var WeekDayColor = "#FFEDA6"; //Background color of weekdays. -var FontColor = "blue"; //color of font in Calendar day cell. -var TodayColor = "#ffbd35"; //var TodayColor="#FFFF33";//Background color of today. -var SelDateColor = "#8DD53C"; //var SelDateColor = "#8DD53C";//Backgrond color of selected date in textbox. -var YrSelColor = "#cc0033"; //color of font of Year selector. -var MthSelColor = "#cc0033"; //color of font of Month selector if "MonthSelector" is "arrow". -var HoverColor = "#E0FF38"; //color when mouse move over. -var DisableColor = "#999966"; //color of disabled cell. -var CalBgColor = "#ffffff"; //Background color of Calendar window. - -var WeekChar = 2;//number of character for week day. if 2 then Mo,Tu,We. if 3 then Mon,Tue,Wed. -var DateSeparator = "-";//Date Separator, you can change it to "-" if you want. -var ShowLongMonth = true;//Show long month name in Calendar header. example: "January". -var ShowMonthYear = true;//Show Month and Year in Calendar header. -var ThemeBg = "";//Background image of Calendar window. -var PrecedeZero = true;//Preceding zero [true|false] -var MondayFirstDay = true;//true:Use Monday as first day; false:Sunday as first day. [true|false] //added in version 1.7 -var UseImageFiles = true;//Use image files with "arrows" and "close" button -var imageFilesPath = "/Dozentenmodul_V1/img/Calendar/"; -//Configurable parameters end - -//use the Month and Weekday in your preferred language. -var MonthName = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]; -var WeekDayName1 = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]; -var WeekDayName2 = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]; - - -//end Configurable parameters - -//end Global variable - - -// Calendar prototype -function Calendar(pDate, pCtrl) -{ - //Properties - this.Date = pDate.getDate();//selected date - this.Month = pDate.getMonth();//selected month number - this.Year = pDate.getFullYear();//selected year in 4 digits - this.Hours = pDate.getHours(); - - if (pDate.getMinutes() < 10) - { - this.Minutes = "0" + pDate.getMinutes(); - } - else - { - this.Minutes = pDate.getMinutes(); - } - - if (pDate.getSeconds() < 10) - { - this.Seconds = "0" + pDate.getSeconds(); - } - else - { - this.Seconds = pDate.getSeconds(); - } - this.MyWindow = winCal; - this.Ctrl = pCtrl; - this.Format = "ddMMyyyy"; - this.Separator = DateSeparator; - this.ShowTime = false; - this.Scroller = "DROPDOWN"; - if (pDate.getHours() < 12) - { - this.AMorPM = "AM"; - } - else - { - this.AMorPM = "PM"; - } - this.ShowSeconds = false; - this.EnableDateMode = "" -} - -Calendar.prototype.GetMonthIndex = function (shortMonthName) -{ - for (var i = 0; i < 12; i += 1) - { - if (MonthName[i].substring(0, 3).toUpperCase() === shortMonthName.toUpperCase()) - { - return i; - } - } -}; - -Calendar.prototype.IncYear = function () { - if (Cal.Year <= dtToday.getFullYear()+EndYear) - Cal.Year += 1; -}; - -Calendar.prototype.DecYear = function () { - if (Cal.Year > StartYear) - Cal.Year -= 1; -}; - -Calendar.prototype.IncMonth = function() { - if (Cal.Year <= dtToday.getFullYear() + EndYear) { - Cal.Month += 1; - if (Cal.Month >= 12) { - Cal.Month = 0; - Cal.IncYear(); - } - } -}; - -Calendar.prototype.DecMonth = function() { - if (Cal.Year >= StartYear) { - Cal.Month -= 1; - if (Cal.Month < 0) { - Cal.Month = 11; - Cal.DecYear(); - } - } -}; - -Calendar.prototype.SwitchMth = function (intMth) -{ - Cal.Month = parseInt(intMth, 10); -}; - -Calendar.prototype.SwitchYear = function (intYear) -{ - Cal.Year = parseInt(intYear, 10); -}; - -Calendar.prototype.SetHour = function(intHour) { - var MaxHour, - MinHour, - HourExp = new RegExp("^\\d\\d"), - SingleDigit = new RegExp("^\\d{1}$"); - - if (TimeMode === 24) { - MaxHour = 23; - MinHour = 0; - } - else if (TimeMode === 12) { - MaxHour = 12; - MinHour = 1; - } - else { - alert("TimeMode can only be 12 or 24"); - } - - if ((HourExp.test(intHour) || SingleDigit.test(intHour)) && (parseInt(intHour, 10) > MaxHour)) { - intHour = MinHour; - } - - else if ((HourExp.test(intHour) || SingleDigit.test(intHour)) && (parseInt(intHour, 10) < MinHour)) { - intHour = MaxHour; - } - - intHour = parseInt(intHour, 10); - if (SingleDigit.test(intHour)) { - intHour = "0" + intHour; - } - - if (HourExp.test(intHour) && (parseInt(intHour, 10) <= MaxHour) && (parseInt(intHour, 10) >= MinHour)) { - if ((TimeMode === 12) && (Cal.AMorPM === "PM")) { - if (parseInt(intHour, 10) === 12) { - Cal.Hours = 12; - } - else { - Cal.Hours = parseInt(intHour, 10) + 12; - } - } - - else if ((TimeMode === 12) && (Cal.AMorPM === "AM")) { - if (intHour === 12) { - intHour -= 12; - } - - Cal.Hours = parseInt(intHour, 10); - } - - else if (TimeMode === 24) { - Cal.Hours = parseInt(intHour, 10); - } - } - -}; - -Calendar.prototype.SetMinute = function (intMin) -{ - var MaxMin = 59, - MinMin = 0, - - SingleDigit = new RegExp("\\d"), - SingleDigit2 = new RegExp("^\\d{1}$"), - MinExp = new RegExp("^\\d{2}$"), - - strMin = 0; - - if ((MinExp.test(intMin) || SingleDigit.test(intMin)) && (parseInt(intMin, 10) > MaxMin)) - { - intMin = MinMin; - } - - else if ((MinExp.test(intMin) || SingleDigit.test(intMin)) && (parseInt(intMin, 10) < MinMin)) - { - intMin = MaxMin; - } - - strMin = intMin + ""; - if (SingleDigit2.test(intMin)) - { - strMin = "0" + strMin; - } - - if ((MinExp.test(intMin) || SingleDigit.test(intMin)) && (parseInt(intMin, 10) <= 59) && (parseInt(intMin, 10) >= 0)) - { - Cal.Minutes = strMin; - } -}; - -Calendar.prototype.SetSecond = function (intSec) -{ - var MaxSec = 59, - MinSec = 0, - - SingleDigit = new RegExp("\\d"), - SingleDigit2 = new RegExp("^\\d{1}$"), - SecExp = new RegExp("^\\d{2}$"), - - strSec = 0; - - if ((SecExp.test(intSec) || SingleDigit.test(intSec)) && (parseInt(intSec, 10) > MaxSec)) - { - intSec = MinSec; - } - - else if ((SecExp.test(intSec) || SingleDigit.test(intSec)) && (parseInt(intSec, 10) < MinSec)) - { - intSec = MaxSec; - } - - strSec = intSec + ""; - if (SingleDigit2.test(intSec)) - { - strSec = "0" + strSec; - } - - if ((SecExp.test(intSec) || SingleDigit.test(intSec)) && (parseInt(intSec, 10) <= 59) && (parseInt(intSec, 10) >= 0)) - { - Cal.Seconds = strSec; - } - -}; - -Calendar.prototype.SetAmPm = function (pvalue) -{ - this.AMorPM = pvalue; - if (pvalue === "PM") - { - this.Hours = parseInt(this.Hours, 10) + 12; - if (this.Hours === 24) - { - this.Hours = 12; - } - } - - else if (pvalue === "AM") - { - this.Hours -= 12; - } -}; - -Calendar.prototype.getShowHour = function() { - var finalHour; - - if (TimeMode === 12) { - if (parseInt(this.Hours, 10) === 0) { - this.AMorPM = "AM"; - finalHour = parseInt(this.Hours, 10) + 12; - } - - else if (parseInt(this.Hours, 10) === 12) { - this.AMorPM = "PM"; - finalHour = 12; - } - - else if (this.Hours > 12) { - this.AMorPM = "PM"; - if ((this.Hours - 12) < 10) { - finalHour = "0" + ((parseInt(this.Hours, 10)) - 12); - } - else { - finalHour = parseInt(this.Hours, 10) - 12; - } - } - else { - this.AMorPM = "AM"; - if (this.Hours < 10) { - finalHour = "0" + parseInt(this.Hours, 10); - } - else { - finalHour = this.Hours; - } - } - } - - else if (TimeMode === 24) { - if (this.Hours < 10) { - finalHour = "0" + parseInt(this.Hours, 10); - } - else { - finalHour = this.Hours; - } - } - - return finalHour; -}; - -Calendar.prototype.getShowAMorPM = function () -{ - return this.AMorPM; -}; - -Calendar.prototype.GetMonthName = function (IsLong) -{ - var Month = MonthName[this.Month]; - if (IsLong) - { - return Month; - } - else - { - return Month.substr(0, 3); - } -}; - -Calendar.prototype.GetMonDays = function() { //Get number of days in a month - - var DaysInMonth = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]; - if (Cal.IsLeapYear()) { - DaysInMonth[1] = 29; - } - - return DaysInMonth[this.Month]; -}; - -Calendar.prototype.IsLeapYear = function () -{ - if ((this.Year % 4) === 0) - { - if ((this.Year % 100 === 0) && (this.Year % 400) !== 0) - { - return false; - } - else - { - return true; - } - } - else - { - return false; - } -}; - -Calendar.prototype.FormatDate = function (pDate) -{ - var MonthDigit = this.Month + 1; - if (PrecedeZero === true) - { - if ((pDate < 10) && String(pDate).length===1) //length checking added in version 2.2 - { - pDate = "0" + pDate; - } - if (MonthDigit < 10) - { - MonthDigit = "0" + MonthDigit; - } - } - - switch (this.Format.toUpperCase()) - { - case "DDMMYYYY": - return (pDate + DateSeparator + MonthDigit + DateSeparator + this.Year); - case "DDMMMYYYY": - return (pDate + DateSeparator + this.GetMonthName(false) + DateSeparator + this.Year); - case "MMDDYYYY": - return (MonthDigit + DateSeparator + pDate + DateSeparator + this.Year); - case "MMMDDYYYY": - return (this.GetMonthName(false) + DateSeparator + pDate + DateSeparator + this.Year); - case "YYYYMMDD": - return (this.Year + DateSeparator + MonthDigit + DateSeparator + pDate); - case "YYMMDD": - return (String(this.Year).substring(2, 4) + DateSeparator + MonthDigit + DateSeparator + pDate); - case "YYMMMDD": - return (String(this.Year).substring(2, 4) + DateSeparator + this.GetMonthName(false) + DateSeparator + pDate); - case "YYYYMMMDD": - return (this.Year + DateSeparator + this.GetMonthName(false) + DateSeparator + pDate); - default: - return (pDate + DateSeparator + (this.Month + 1) + DateSeparator + this.Year); - } -}; - -// end Calendar prototype - -function GenCell(pValue, pHighLight, pColor, pClickable) -{ //Generate table cell with value - var PValue, - PCellStr, - PClickable, - vTimeStr; - - if (!pValue) - { - PValue = ""; - } - else - { - PValue = pValue; - } - - if (pColor === undefined) - pColor = CalBgColor; - - if (pClickable !== undefined){ - PClickable = pClickable; - } - else{ - PClickable = true; - } - - if (Cal.ShowTime) - { - vTimeStr = ' ' + Cal.Hours + ':' + Cal.Minutes; - if (Cal.ShowSeconds) - { - vTimeStr += ':' + Cal.Seconds; - } - if (TimeMode === 12) - { - vTimeStr += ' ' + Cal.AMorPM; - } - } - - else - { - vTimeStr = ""; - } - - if (PValue !== "") - { - if (PClickable === true) { - if (Cal.ShowTime === true) - { PCellStr = "" + PValue + ""; } - else { PCellStr = "" + PValue + ""; } - } - else - { PCellStr = ""+PValue+""; } - } - else - { PCellStr = " "; } - - return PCellStr; -} - -function RenderCssCal(bNewCal) -{ - if (typeof bNewCal === "undefined" || bNewCal !== true) - { - bNewCal = false; - } - var vCalHeader, - vCalData, - vCalTime = "", - vCalClosing = "", - winCalData = "", - CalDate, - - i, - j, - - SelectStr, - vDayCount = 0, - vFirstDay, - - WeekDayName = [],//Added version 1.7 - strCell, - - showHour, - ShowArrows = false, - HourCellWidth = "35px", //cell width with seconds. - - SelectAm, - SelectPm, - - funcCalback, - - headID, - e, - cssStr, - style, - cssText, - span; - - calHeight = 0; // reset the window height on refresh - - // Set the default cursor for the calendar - - winCalData = ""; - vCalHeader = ""; - - //Table for Month & Year Selector - - vCalHeader += ""; - - //******************End Month and Year selector in arrow****************************** - - //Calendar header shows Month and Year - if (ShowMonthYear && Cal.Scroller === "DROPDOWN") - { - vCalHeader += ""; - calHeight += 19; - } - - //Week day header - - vCalHeader += ""; - - - //Time picker - if (Cal.ShowTime === true) - { - showHour = Cal.getShowHour(); - - if (Cal.ShowSeconds === false && TimeMode === 24) - { - ShowArrows = true; - HourCellWidth = "10px"; - } - - vCalTime = ""; - calHeight += 31; - vCalClosing += "
"; - //******************Month and Year selector in dropdown list************************ - - if (Cal.Scroller === "DROPDOWN") - { - vCalHeader += ""; - //Year selector - - vCalHeader += "\n"; - calHeight += 30; - } - - //******************End Month and Year selector in dropdown list********************* - - //******************Month and Year selector in arrow********************************* - - else if (Cal.Scroller === "ARROW") - { - if (UseImageFiles) - { - vCalHeader += "\n";//Year scroller (decrease 1 year) - vCalHeader += "\n"; //Month scroller (decrease 1 month) - vCalHeader += ""; //Month and Year - vCalHeader += "\n"; //Month scroller (increase 1 month) - vCalHeader += "\n"; //Year scroller (increase 1 year) - calHeight += 22; - } - else - { - vCalHeader += "";//Year scroller (decrease 1 year) - vCalHeader += "\n";//Month scroller (decrease 1 month) - vCalHeader += "\n"; //Month and Year - vCalHeader += "\n";//Month scroller (increase 1 month) - vCalHeader += "\n";//Year scroller (increase 1 year) - calHeight += 22; - } - } - - vCalHeader += "
"+ Cal.GetMonthName(ShowLongMonth) + " " + Cal.Year + "-<" + Cal.GetMonthName(ShowLongMonth) + " " + Cal.Year + ">+
" + Cal.GetMonthName(ShowLongMonth) + " " + Cal.Year + "
"; - if (MondayFirstDay === true) - { - WeekDayName = WeekDayName2; - } - else - { - WeekDayName = WeekDayName1; - } - for (i = 0; i < 7; i += 1) - { - vCalHeader += ""; - } - - calHeight += 19; - vCalHeader += ""; - //Calendar detail - CalDate = new Date(Cal.Year, Cal.Month); - CalDate.setDate(1); - - vFirstDay = CalDate.getDay(); - - //Added version 1.7 - if (MondayFirstDay === true) - { - vFirstDay -= 1; - if (vFirstDay === -1) - { - vFirstDay = 6; - } - } - - //Added version 1.7 - vCalData = ""; - calHeight += 19; - for (i = 0; i < vFirstDay; i += 1) - { - vCalData = vCalData + GenCell(); - vDayCount = vDayCount + 1; - } - - //Added version 1.7 - for (j = 1; j <= Cal.GetMonDays(); j += 1) - { - if ((vDayCount % 7 === 0) && (j > 1)) - { - vCalData = vCalData + ""; - } - - vDayCount = vDayCount + 1; - //added version 2.1.2 - if (Cal.EnableDateMode === "future" && ((j < dtToday.getDate()) && (Cal.Month === dtToday.getMonth()) && (Cal.Year === dtToday.getFullYear()) || (Cal.Month < dtToday.getMonth()) && (Cal.Year === dtToday.getFullYear()) || (Cal.Year < dtToday.getFullYear()))) - { - strCell = GenCell(j, false, DisableColor, false); //Before today's date is not clickable - } - else if (Cal.EnableDateMode === "past" && ((j >= dtToday.getDate()) && (Cal.Month === dtToday.getMonth()) && (Cal.Year === dtToday.getFullYear()) || (Cal.Month > dtToday.getMonth()) && (Cal.Year === dtToday.getFullYear()) || (Cal.Year > dtToday.getFullYear()))) { - strCell = GenCell(j, false, DisableColor, false); //After today's date is not clickable - } - //if End Year + Current Year = Cal.Year. Disable. - else if (Cal.Year > (dtToday.getFullYear()+EndYear)) - { - strCell = GenCell(j, false, DisableColor, false); - } - else if ((j === dtToday.getDate()) && (Cal.Month === dtToday.getMonth()) && (Cal.Year === dtToday.getFullYear())) - { - strCell = GenCell(j, true, TodayColor);//Highlight today's date - } - else - { - if ((j === selDate.getDate()) && (Cal.Month === selDate.getMonth()) && (Cal.Year === selDate.getFullYear())){ - //modified version 1.7 - strCell = GenCell(j, true, SelDateColor); - } - else - { - if (MondayFirstDay === true) - { - if (vDayCount % 7 === 0) - { - strCell = GenCell(j, false, SundayColor); - } - else if ((vDayCount + 1) % 7 === 0) - { - strCell = GenCell(j, false, SaturdayColor); - } - else - { - strCell = GenCell(j, null, WeekDayColor); - } - } - else - { - if (vDayCount % 7 === 0) - { - strCell = GenCell(j, false, SaturdayColor); - } - else if ((vDayCount + 6) % 7 === 0) - { - strCell = GenCell(j, false, SundayColor); - } - else - { - strCell = GenCell(j, null, WeekDayColor); - } - } - } - } - - vCalData = vCalData + strCell; - - if ((vDayCount % 7 === 0) && (j < Cal.GetMonDays())) - { - vCalData = vCalData + ""; - calHeight += 19; - } - } - - // finish the table proper - - if (vDayCount % 7 !== 0) - { - while (vDayCount % 7 !== 0) - { - vCalData = vCalData + GenCell(); - vDayCount = vDayCount + 1; - } - } - - vCalData = vCalData + "
" + WeekDayName[i].substr(0, WeekChar) + "
"; - - if (ShowArrows && UseImageFiles) //this is where the up and down arrow control the hour. - { - vCalTime += "\n"; - } - - vCalTime += "\n\n"; - vCalTime += ""; - } - else //if not to show time. - { - vCalTime += "\n\n"; - } - else { - vCalClosing += "x"; - } - vCalClosing += ""; - } - vCalClosing += "
 
"; - vCalTime += ":"; - vCalTime += ""; - - if (Cal.ShowSeconds) - { - vCalTime += ":"; - vCalTime += ""; - } - - if (TimeMode === 12) - { - SelectAm = (Cal.AMorPM === "AM") ? "Selected" : ""; - SelectPm = (Cal.AMorPM === "PM") ? "Selected" : ""; - - vCalTime += ""; - vCalTime += ""; - } - - if (ShowArrows && UseImageFiles) //this is where the up and down arrow to change the "Minute". - { - vCalTime += "
"; - } - - vCalTime += "
 
"; - //close button - if (UseImageFiles) { - vCalClosing += "
\n"; - - //end time picker - funcCalback = "function callback(id, datum) {"; - funcCalback += " var CalId = document.getElementById(id);if (datum=== 'undefined') { var d = new Date(); datum = d.getDate() + '/' +(d.getMonth()+1) + '/' + d.getFullYear(); } window.calDatum=datum;CalId.value=datum;"; - funcCalback += " if(Cal.ShowTime){"; - funcCalback += " CalId.value+=' '+Cal.getShowHour()+':'+Cal.Minutes;"; - funcCalback += " if (Cal.ShowSeconds) CalId.value+=':'+Cal.Seconds;"; - funcCalback += " if (TimeMode === 12) CalId.value+=''+Cal.getShowAMorPM();"; - funcCalback += "}if(CalId.onchange!=undefined) CalId.onchange();CalId.focus();winCal.style.visibility='hidden';}"; - - - // determines if there is enough space to open the cal above the position where it is called - if (ypos > calHeight) - { - ypos = ypos - calHeight; - } - - if (!winCal) - { - headID = document.getElementsByTagName("head")[0]; - - // add javascript function to the span cal - e = document.createElement("script"); - e.type = "text/javascript"; - e.language = "javascript"; - e.text = funcCalback; - headID.appendChild(e); - // add stylesheet to the span cal - - cssStr = ".calTD {font-family: verdana; font-size: 12px; text-align: center; border:0; }\n"; - cssStr += ".calR {font-family: verdana; font-size: 12px; text-align: center; font-weight: bold;}"; - - style = document.createElement("style"); - style.type = "text/css"; - style.rel = "stylesheet"; - if (style.styleSheet) - { // IE - style.styleSheet.cssText = cssStr; - } - - else - { // w3c - cssText = document.createTextNode(cssStr); - style.appendChild(cssText); - } - - headID.appendChild(style); - // create the outer frame that allows the cal. to be moved - span = document.createElement("span"); - span.id = calSpanID; - span.style.position = "absolute"; - span.style.left = (xpos + CalPosOffsetX) + 'px'; - span.style.top = (ypos - CalPosOffsetY) + 'px'; - span.style.width = CalWidth + 'px'; - span.style.border = "solid 1pt " + SpanBorderColor; - span.style.padding = "0"; - span.style.cursor = "move"; - span.style.backgroundColor = SpanBgColor; - span.style.zIndex = 100; - document.body.appendChild(span); - winCal = document.getElementById(calSpanID); - } - - else - { - winCal.style.visibility = "visible"; - winCal.style.Height = calHeight; - - // set the position for a new calendar only - if (bNewCal === true) - { - winCal.style.left = (xpos + CalPosOffsetX) + 'px'; - winCal.style.top = (ypos - CalPosOffsetY) + 'px'; - } - } - - winCal.innerHTML = winCalData + vCalHeader + vCalData + vCalTime + vCalClosing; - return true; -} - - -function NewCssCal(pCtrl, pFormat, pScroller, pShowTime, pTimeMode, pShowSeconds, pEnableDateMode) -{ - // get current date and time - - dtToday = new Date(); - Cal = new Calendar(dtToday); - - if (pShowTime !== undefined) - { - if (pShowTime) { - Cal.ShowTime = true; - } - else { - Cal.ShowTime = false; - } - - if (pTimeMode) - { - pTimeMode = parseInt(pTimeMode, 10); - } - if (pTimeMode === 12 || pTimeMode === 24) - { - TimeMode = pTimeMode; - } - else - { - TimeMode = 24; - } - - if (pShowSeconds !== undefined) - { - if (pShowSeconds) - { - Cal.ShowSeconds = true; - } - else - { - Cal.ShowSeconds = false; - } - } - else - { - Cal.ShowSeconds = false; - } - - } - - if (pCtrl !== undefined) - { - Cal.Ctrl = pCtrl; - } - - if (pFormat!== undefined && pFormat !=="") - { - Cal.Format = pFormat.toUpperCase(); - } - else - { - Cal.Format = "MMDDYYYY"; - } - - if (pScroller!== undefined && pScroller!=="") - { - if (pScroller.toUpperCase() === "ARROW") - { - Cal.Scroller = "ARROW"; - } - else - { - Cal.Scroller = "DROPDOWN"; - } - } - - if (pEnableDateMode !== undefined && (pEnableDateMode === "future" || pEnableDateMode === "past")) { - Cal.EnableDateMode= pEnableDateMode; - } - - exDateTime = document.getElementById(pCtrl).value; //Existing Date Time value in textbox. - - if (exDateTime) - { //Parse existing Date String - var Sp1 = exDateTime.indexOf(DateSeparator, 0),//Index of Date Separator 1 - Sp2 = exDateTime.indexOf(DateSeparator, parseInt(Sp1, 10) + 1),//Index of Date Separator 2 - tSp1,//Index of Time Separator 1 - tSp2,//Index of Time Separator 2 - strMonth, - strDate, - strYear, - intMonth, - YearPattern, - strHour, - strMinute, - strSecond, - winHeight, - offset = parseInt(Cal.Format.toUpperCase().lastIndexOf("M"), 10) - parseInt(Cal.Format.toUpperCase().indexOf("M"), 10) - 1, - strAMPM = ""; - //parse month - - if (Cal.Format.toUpperCase() === "DDMMYYYY" || Cal.Format.toUpperCase() === "DDMMMYYYY") - { - if (DateSeparator === "") - { - strMonth = exDateTime.substring(2, 4 + offset); - strDate = exDateTime.substring(0, 2); - strYear = exDateTime.substring(4 + offset, 8 + offset); - } - else - { - if (exDateTime.indexOf("D*") !== -1) - { //DTG - strMonth = exDateTime.substring(8, 11); - strDate = exDateTime.substring(0, 2); - strYear = "20" + exDateTime.substring(11, 13); //Hack, nur für Jahreszahlen ab 2000 - } - else - { - strMonth = exDateTime.substring(Sp1 + 1, Sp2); - strDate = exDateTime.substring(0, Sp1); - strYear = exDateTime.substring(Sp2 + 1, Sp2 + 5); - } - } - } - - else if (Cal.Format.toUpperCase() === "MMDDYYYY" || Cal.Format.toUpperCase() === "MMMDDYYYY"){ - if (DateSeparator === ""){ - strMonth = exDateTime.substring(0, 2 + offset); - strDate = exDateTime.substring(2 + offset, 4 + offset); - strYear = exDateTime.substring(4 + offset, 8 + offset); - } - else{ - strMonth = exDateTime.substring(0, Sp1); - strDate = exDateTime.substring(Sp1 + 1, Sp2); - strYear = exDateTime.substring(Sp2 + 1, Sp2 + 5); - } - } - - else if (Cal.Format.toUpperCase() === "YYYYMMDD" || Cal.Format.toUpperCase() === "YYYYMMMDD") - { - if (DateSeparator === ""){ - strMonth = exDateTime.substring(4, 6 + offset); - strDate = exDateTime.substring(6 + offset, 8 + offset); - strYear = exDateTime.substring(0, 4); - } - else{ - strMonth = exDateTime.substring(Sp1 + 1, Sp2); - strDate = exDateTime.substring(Sp2 + 1, Sp2 + 3); - strYear = exDateTime.substring(0, Sp1); - } - } - - else if (Cal.Format.toUpperCase() === "YYMMDD" || Cal.Format.toUpperCase() === "YYMMMDD") - { - if (DateSeparator === "") - { - strMonth = exDateTime.substring(2, 4 + offset); - strDate = exDateTime.substring(4 + offset, 6 + offset); - strYear = exDateTime.substring(0, 2); - } - else - { - strMonth = exDateTime.substring(Sp1 + 1, Sp2); - strDate = exDateTime.substring(Sp2 + 1, Sp2 + 3); - strYear = exDateTime.substring(0, Sp1); - } - } - - if (isNaN(strMonth)){ - intMonth = Cal.GetMonthIndex(strMonth); - } - else{ - intMonth = parseInt(strMonth, 10) - 1; - } - if ((parseInt(intMonth, 10) >= 0) && (parseInt(intMonth, 10) < 12)) { - Cal.Month = intMonth; - } - //end parse month - - //parse year - YearPattern = /^\d{4}$/; - if (YearPattern.test(strYear)) { - if ((parseInt(strYear, 10)>=StartYear) && (parseInt(strYear, 10)<= (dtToday.getFullYear()+EndYear))) - Cal.Year = parseInt(strYear, 10); - } - //end parse year - - //parse Date - if ((parseInt(strDate, 10) <= Cal.GetMonDays()) && (parseInt(strDate, 10) >= 1)) { - Cal.Date = strDate; - } - //end parse Date - - //parse time - - if (Cal.ShowTime === true) - { - //parse AM or PM - if (TimeMode === 12) - { - strAMPM = exDateTime.substring(exDateTime.length - 2, exDateTime.length); - Cal.AMorPM = strAMPM; - } - - tSp1 = exDateTime.indexOf(":", 0); - tSp2 = exDateTime.indexOf(":", (parseInt(tSp1, 10) + 1)); - if (tSp1 > 0) - { - strHour = exDateTime.substring(tSp1, tSp1 - 2); - Cal.SetHour(strHour); - - strMinute = exDateTime.substring(tSp1 + 1, tSp1 + 3); - Cal.SetMinute(strMinute); - - strSecond = exDateTime.substring(tSp2 + 1, tSp2 + 3); - Cal.SetSecond(strSecond); - - } - else if (exDateTime.indexOf("D*") !== -1) - { //DTG - strHour = exDateTime.substring(2, 4); - Cal.SetHour(strHour); - strMinute = exDateTime.substring(4, 6); - Cal.SetMinute(strMinute); - - } - } - - } - selDate = new Date(Cal.Year, Cal.Month, Cal.Date);//version 1.7 - RenderCssCal(true); -} - -function closewin(id) { - if (Cal.ShowTime === true) { - var MaxYear = dtToday.getFullYear() + EndYear; - var beforeToday = - (Cal.Date < dtToday.getDate()) && - (Cal.Month === dtToday.getMonth()) && - (Cal.Year === dtToday.getFullYear()) - || - (Cal.Month < dtToday.getMonth()) && - (Cal.Year === dtToday.getFullYear()) - || - (Cal.Year < dtToday.getFullYear()); - - if ((Cal.Year <= MaxYear) && (Cal.Year >= StartYear) && (Cal.Month === selDate.getMonth()) && (Cal.Year === selDate.getFullYear())) { - if (Cal.EnableDateMode === "future") { - if (beforeToday === false) { - callback(id, Cal.FormatDate(Cal.Date)); - } - } - else - callback(id, Cal.FormatDate(Cal.Date)); - } - } - - var CalId = document.getElementById(id); - CalId.focus(); - winCal.style.visibility = 'hidden'; -} - -function changeBorder(element, col, oldBgColor) -{ - if (col === 0) - { - element.style.background = HoverColor; - element.style.borderColor = "black"; - element.style.cursor = "pointer"; - } - - else - { - if (oldBgColor) - { - element.style.background = oldBgColor; - } - else - { - element.style.background = "white"; - } - element.style.borderColor = "white"; - element.style.cursor = "auto"; - } -} - -function selectDate(element, date) { - Cal.Date = date; - selDate = new Date(Cal.Year, Cal.Month, Cal.Date); - element.style.background = SelDateColor; - RenderCssCal(); -} - -function pickIt(evt) -{ - var objectID, - dom, - de, - b; - // accesses the element that generates the event and retrieves its ID - if (document.addEventListener) - { // w3c - objectID = evt.target.id; - if (objectID.indexOf(calSpanID) !== -1) - { - dom = document.getElementById(objectID); - cnLeft = evt.pageX; - cnTop = evt.pageY; - - if (dom.offsetLeft) - { - cnLeft = (cnLeft - dom.offsetLeft); - cnTop = (cnTop - dom.offsetTop); - } - } - - // get mouse position on click - xpos = (evt.pageX); - ypos = (evt.pageY); - } - - else - { // IE - objectID = event.srcElement.id; - cnLeft = event.offsetX; - cnTop = (event.offsetY); - - // get mouse position on click - de = document.documentElement; - b = document.body; - - xpos = event.clientX + (de.scrollLeft || b.scrollLeft) - (de.clientLeft || 0); - ypos = event.clientY + (de.scrollTop || b.scrollTop) - (de.clientTop || 0); - } - - // verify if this is a valid element to pick - if (objectID.indexOf(calSpanID) !== -1) - { - domStyle = document.getElementById(objectID).style; - } - - if (domStyle) - { - domStyle.zIndex = 100; - return false; - } - - else - { - domStyle = null; - return; - } -} - - - -function dragIt(evt) -{ - if (domStyle) - { - if (document.addEventListener) - { //for IE - domStyle.left = (event.clientX - cnLeft + document.body.scrollLeft) + 'px'; - domStyle.top = (event.clientY - cnTop + document.body.scrollTop) + 'px'; - } - else - { //Firefox - domStyle.left = (evt.clientX - cnLeft + document.body.scrollLeft) + 'px'; - domStyle.top = (evt.clientY - cnTop + document.body.scrollTop) + 'px'; - } - } -} - -// performs a single increment or decrement -function nextStep(whatSpinner, direction) -{ - if (whatSpinner === "Hour") - { - if (direction === "plus") - { - Cal.SetHour(Cal.Hours + 1); - RenderCssCal(); - } - else if (direction === "minus") - { - Cal.SetHour(Cal.Hours - 1); - RenderCssCal(); - } - } - else if (whatSpinner === "Minute") - { - if (direction === "plus") - { - Cal.SetMinute(parseInt(Cal.Minutes, 10) + 1); - RenderCssCal(); - } - else if (direction === "minus") - { - Cal.SetMinute(parseInt(Cal.Minutes, 10) - 1); - RenderCssCal(); - } - } - -} - -// starts the time spinner -function startSpin(whatSpinner, direction) -{ - document.thisLoop = setInterval(function () - { - nextStep(whatSpinner, direction); - }, 125); //125 ms -} - -//stops the time spinner -function stopSpin() -{ - clearInterval(document.thisLoop); -} - -function dropIt() -{ - stopSpin(); - - if (domStyle) - { - domStyle = null; - } -} - -// Default events configuration - -document.onmousedown = pickIt; -document.onmousemove = dragIt; -document.onmouseup = dropIt; diff --git a/Dozentenmodul_V1/WebContent/js/functions.js b/Dozentenmodul_V1/WebContent/js/functions.js deleted file mode 100644 index 3b25e746..00000000 --- a/Dozentenmodul_V1/WebContent/js/functions.js +++ /dev/null @@ -1,31 +0,0 @@ -function refresh(id){ - alert('dsfdsa'); - var checkbox=document.getElementsByName(id); - alert(id); - var pointToAppend=document.getElementById("sw"); - - //for(var i=0; i 20) - a = a.substring(a.length - 19); - return a - }, d = e(), c = function(a) { - this.a = 0; - this.b = []; - this.c = []; - this.d = []; - this.e = 0; - this.f(a) - }; - c.prototype = { - g : function(b) { - var c = new RegExp(d + b + "=(\\d+)"), a = document.cookie.match(c); - return a ? a[1] : this.h() - }, - h : function() { - for ( var a = 0, c = this.d.length; a < c; a++) - if (b(this.d[a], "selected")) - return a; - return 0 - }, - j : function(d, c) { - for ( var b = d.getAttribute("rel"), a = 0; a < this.b.length; a++) - if (this.b[a].getAttribute("rel") == b) { - j(this.b[a].parentNode, "selected"); - c && this.e && this.k(this.a, a) - } else - h(this.b[a].parentNode, "selected"); - this.l(b) - }, - k : function(a, b) { - document.cookie = d + a + "=" + b + "; path=/" - }, - l : function(b) { - for ( var a = 0; a < this.c.length; a++) - this.c[a].style.display = this.c[a].id == b ? "block" : "none" - }, - m : function(a) { - if (a.id) - for ( var b = 0; b < this.b.length; b++) - if (this.b[b].getAttribute("rel") == a.id) - return this.b[b]; - return a.parentNode.nodeName != "BODY" ? this.m(a.parentNode) - : null - }, - n : function(d, c) { - var a = document.getElementById(d); - if (a) { - var b = this.m(a); - if (b) { - this.j(b, 0); - if (!c) - setTimeout(function() { - a.scrollIntoView(); - g(a, -120) - }, 0); - else - setTimeout(function() { - window.scrollTo(0, 0) - }, 0); - return 1 - } else - return 0 - } - }, - f : function(a) { - this.a = a.i; - this.b = a.getElementsByTagName("a"); - this.d = a.getElementsByTagName("li"); - for ( var b = 0; b < this.b.length; b++) - if (this.b[b].getAttribute("rel")) { - this.c.push(document.getElementById(this.b[b] - .getAttribute("rel"))); - var f = this; - this.b[b].onclick = function() { - f.j(this, 1); - return false - } - } - var e = a.getAttribute("persist") || ""; - this.e = e.toLowerCase() == "true" ? 1 : 0; - var d = window.location.hash; - if (d && d.length > 1) - if (this.n(d.substring(1), window.location.search - .indexOf("noscroll=true") > -1)) - return; - var c = this.e ? parseInt(this.g(a.i)) : this.h(); - if (c >= this.b.length) - c = 0; - this.j(this.b[c], 0) - } - }; - var a = [], i = function(d) { - var b = false; - function a() { - if (b) - return; - b = true; - setTimeout(d, 4) - } - if (document.addEventListener) - document.addEventListener("DOMContentLoaded", a, false); - else if (document.attachEvent) { - try { - var e = window.frameElement != null - } catch (f) { - } - if (document.documentElement.doScroll && !e) { - function c() { - if (b) - return; - try { - document.documentElement.doScroll("left"); - a() - } catch (d) { - setTimeout(c, 10) - } - } - c() - } - document.attachEvent("onreadystatechange", function() { - document.readyState === "complete" && a() - }) - } - if (window.addEventListener) - window.addEventListener("load", a, false); - else - window.attachEvent && window.attachEvent("onload", a) - }, f = function() { - for ( var e = document.getElementsByTagName("ul"), d = 0, f = e.length; d < f; d++) - if (b(e[d], "tabs")) { - e[d].i = a.length; - a.push(new c(e[d])) - } - }; - i(f); - return { - open : function(c, d) { - for ( var b = 0; b < a.length; b++) - a[b].n(c, d) - } - } -}() \ No newline at end of file diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/AddOS.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/AddOS.jsp deleted file mode 100644 index f3547acf..00000000 --- a/Dozentenmodul_V1/bin/WebContent/GUI/de/AddOS.jsp +++ /dev/null @@ -1,47 +0,0 @@ - - - - - -Betriebssystem hinzufügen - - -

Betriebssystem hinzufügen

-
- - - - - - - - - - - - - - - - - - - - - - - - - -
Hersteller des Betriebssystems:
Name des Betriebssystems:
Version des Betriebssystems:
Architektur des Betriebssystems:
Art des Betriebssystems:
- -
- - \ No newline at end of file diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/ESXI_Redirection.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/ESXI_Redirection.jsp deleted file mode 100644 index 2aede85c..00000000 --- a/Dozentenmodul_V1/bin/WebContent/GUI/de/ESXI_Redirection.jsp +++ /dev/null @@ -1,37 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - - - -Dozentenmodul V1 - - - - -
-

Sie sind hier: Home - -

-
-

Zur weiteren Bearbeitung ihrer virtuellen Laborumgebung benötigen Sie die Anwendung "vSphere Client".

-

Diese finden Sie unter folgendem Link:

-

vSphere CLient

-
-

Ist die Software bereits installiert, starten Sie diese und geben Sie folgende Verbindungsdaten ein:

- - - - - - - - - - -
Benutzername: <Ihr BWIDM-Benutzername>
Passwort: <Ihr BWIDM-Passwort>
- - \ No newline at end of file diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/Home.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/Home.jsp deleted file mode 100644 index d50d73b8..00000000 --- a/Dozentenmodul_V1/bin/WebContent/GUI/de/Home.jsp +++ /dev/null @@ -1,87 +0,0 @@ - - -<%@ page language="java" import="db.MySQL"%> -<%@ page language="java" import="java.sql.*"%> - - - -Home - - - - - - - - - - -
-

Aktive VLs

-
    - <% - MySQL sql=new MySQL(); - Connection con= sql.getConnection(); - - ResultSet u=sql.getUserpk(con, "tobias.spitzer@hs-offenburg.de"); - - while(u.next()) - { - - ResultSet v=sql.getVMpk(con, u.getString("pk")); - - while(v.next()) - { - - - - ResultSet rs=sql.getActiveVLs(con, v.getString("VM_pk")); - - while(rs.next()){ - - %> -
  • <%=rs.getString("Laborname") %> Bearbeiten Deaktivieren Löschen
    • - <% - } - } - } - %> -
-

Inaktive VLs

-
    - - <% - while(u.next()) - { - ResultSet v=sql.getVMpk(con, u.getString("pk")); - - while(v.next()) - { - - - - ResultSet rs=sql.getInactiveVLs(con, v.getString("VM_pk")); - - while(rs.next()){ - - %> - -
  • <%=rs.getString("Laborname") %> Bearbeiten Deaktivieren Löschen
    • - - <% - } - } - } - - %> - - -
-
- - - - - - diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/Login.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/Login.jsp deleted file mode 100644 index 8d148386..00000000 --- a/Dozentenmodul_V1/bin/WebContent/GUI/de/Login.jsp +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - -Login Dozentenmodul - - -
-de de | en us -
- - - -
-
- - - - - - - - - - -
-
- - - - - diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/Login_Error.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/Login_Error.jsp deleted file mode 100644 index febf794b..00000000 --- a/Dozentenmodul_V1/bin/WebContent/GUI/de/Login_Error.jsp +++ /dev/null @@ -1,12 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - -Insert title here - - -

Error

- - \ No newline at end of file diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/OTRS.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/OTRS.jsp deleted file mode 100644 index 8e09c34b..00000000 --- a/Dozentenmodul_V1/bin/WebContent/GUI/de/OTRS.jsp +++ /dev/null @@ -1,20 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - - -OTRS - - - - - - - - - \ No newline at end of file diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/VLUpload.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/VLUpload.jsp deleted file mode 100644 index db2806bc..00000000 --- a/Dozentenmodul_V1/bin/WebContent/GUI/de/VLUpload.jsp +++ /dev/null @@ -1,41 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - - -VL Upload Bereich - - - - - - -
-
- Sie sind hier: Allgemein - > - System - > - Software - > - Upload -
-

-

Upload Tool

- - - - - - - -
- - - \ No newline at end of file diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/VL_bearbeiten.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/VL_bearbeiten.jsp deleted file mode 100644 index 4956d7ea..00000000 --- a/Dozentenmodul_V1/bin/WebContent/GUI/de/VL_bearbeiten.jsp +++ /dev/null @@ -1,12 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - -Insert title here - - - - - \ No newline at end of file diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_Software.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_Software.jsp deleted file mode 100644 index f942ff77..00000000 --- a/Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_Software.jsp +++ /dev/null @@ -1,109 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - <%@ page language="java" import="db.MySQL"%> -<%@ page language="java" import="java.sql.*"%> - - - - - - - Insert title here - - - - - - - - - - <% - String Laborname=request.getParameter("Laborname"); - session.setAttribute("Laborname", Laborname); - - String shortDesc=request.getParameter("shortDesc"); - session.setAttribute("shortDesc", shortDesc); - - String longDesc=request.getParameter("longDesc"); - session.setAttribute("longDesc", longDesc); - - String comment=request.getParameter("comment"); - session.setAttribute("comment", comment); - - String OS=request.getParameter("OS"); - session.setAttribute("OS", OS); - - String von_date=request.getParameter("von_date"); - session.setAttribute("von_date", von_date); - - String bis_date=request.getParameter("bis_date"); - session.setAttribute("bis_date", bis_date); - %> -
-
- Sie sind hier: - Allgemein - > - System - > - Software -
-
-
-

- Sortierung nach: -

-
- Verfügbare Software -
- - <% - MySQL sql=new MySQL(); - Connection con=sql.getConnection(); - ResultSet h=sql.getHersteller(con); - int i=0; - while(h.next()) - { - ResultSet sw=sql.getSoftware(con, h.getString("Name")); - - - %> -
- <% - while(sw.next()) - { - int id=i++; - %> - <%=h.getString("Name")%> <%=sw.getString("Produktname")%> <%=sw.getString("Version") %> <%=sw.getString("Architektur") %> -
- <% - } - } - %> - -
-
-
- Ausgewählte Software -
- -
-
-
-

- - -
-
- - - - - - \ No newline at end of file diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_System.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_System.jsp deleted file mode 100644 index a16ac8af..00000000 --- a/Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_System.jsp +++ /dev/null @@ -1,146 +0,0 @@ -<%@page import="org.apache.catalina.Session"%> -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - <%@ page language="java" import="db.MySQL"%> -<%@ page language="java" import="java.sql.*"%> - - - - - - -Insert title here - - - - - - - - - - <% - String Vorname_V=request.getParameter("Vorname_V"); - session.setAttribute("Vorname_V",Vorname_V ); - - String Nachname_V=request.getParameter("Nachname_V"); - session.setAttribute("Nachname_V",Nachname_V ); - - String Hochschule_V=request.getParameter("Hochschule_V"); - session.setAttribute("Hochschule_V",Hochschule_V ); - - String Email_V=request.getParameter("Email_V"); - session.setAttribute("Email_V",Email_V ); - - String Tel_V=request.getParameter("Tel_V"); - session.setAttribute("Tel_V",Tel_V ); - - String Fakultät_V=request.getParameter("Fakultät_V"); - session.setAttribute("Fakultät_V",Fakultät_V ); - - String Vorname_E=request.getParameter("Vorname_E"); - session.setAttribute("Vorname_E",Vorname_E ); - - String Nachname_E=request.getParameter("Nachname_E"); - session.setAttribute("Nachname_E",Nachname_E ); - - String Hochschule_E=request.getParameter("Hochschule_E"); - session.setAttribute("Hochschule_E",Hochschule_E ); - - String Email_E=request.getParameter("Email_E"); - session.setAttribute("Email_E",Email_E ); - - String Tel_E=request.getParameter("Tel_E"); - session.setAttribute("Tel_E",Tel_E ); - - String Fakultät_E=request.getParameter("Fakultät_E"); - session.setAttribute("Fakultät_E",Fakultät_E ); - %> -
-
- Sie sind hier: - Allgemein - > - System - -
-
-
-
- Systeminformationen - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Laborname (Anzeigename): *
Kurzbeschreibung: *
Langbeschreibung: *
Kommentar:
Betriebssystem: *
Gültigkeitsdatum: *von: bis: - -
-
-
- - - - - - - - - - \ No newline at end of file diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_allgemein.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_allgemein.jsp deleted file mode 100644 index 4ccc6a95..00000000 --- a/Dozentenmodul_V1/bin/WebContent/GUI/de/createVL_allgemein.jsp +++ /dev/null @@ -1,97 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=ISO-8859-1" - pageEncoding="ISO-8859-1"%> - - - - - - -Insert title here - - - - - -
-
- Sie sind hier: - Allgemein - -
-
-
-
- Allgemeine Informationen zum Verantwortlichen - - - - - - - - - - - - - - - - - - - - - - - - - -
Vorname: *
Nachname: *
Hochschule: *
E-Mail: *
Tel.-Nummer:
Fakultät:
-
-

-
- Allgemeine Informationen zum Ersteller - - - - - - - - - - - - - - - - - - - - - - - - - -
Vorname: *
Nachname: *
Hochschule: *
E-Mail: *
Tel.-Nummer:
Fakultät:
-
-
- - -
-
- - - - - - \ No newline at end of file diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/footer.html b/Dozentenmodul_V1/bin/WebContent/GUI/de/footer.html deleted file mode 100644 index 0ebf0a2c..00000000 --- a/Dozentenmodul_V1/bin/WebContent/GUI/de/footer.html +++ /dev/null @@ -1,7 +0,0 @@ - - \ No newline at end of file diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/header.html b/Dozentenmodul_V1/bin/WebContent/GUI/de/header.html deleted file mode 100644 index 5ef0ebcf..00000000 --- a/Dozentenmodul_V1/bin/WebContent/GUI/de/header.html +++ /dev/null @@ -1,7 +0,0 @@ - -
-de de | en us -
- - -
\ No newline at end of file diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/news.jsp b/Dozentenmodul_V1/bin/WebContent/GUI/de/news.jsp deleted file mode 100644 index 426de579..00000000 --- a/Dozentenmodul_V1/bin/WebContent/GUI/de/news.jsp +++ /dev/null @@ -1,15 +0,0 @@ -<%@ page language="java" import="news.News" %> -
-<% - News news=new News(); -String text=""; - - text=news.refreshNews(); - -%> -

News

-

-<%=text.toString() %> -

- -
\ No newline at end of file diff --git a/Dozentenmodul_V1/build/classes/authentifizierung/Ldap.class b/Dozentenmodul_V1/build/classes/authentifizierung/Ldap.class deleted file mode 100644 index 98f75ea2..00000000 Binary files a/Dozentenmodul_V1/build/classes/authentifizierung/Ldap.class and /dev/null differ diff --git a/Dozentenmodul_V1/build/classes/db/DB_Access.class b/Dozentenmodul_V1/build/classes/db/DB_Access.class deleted file mode 100644 index 03075d17..00000000 Binary files a/Dozentenmodul_V1/build/classes/db/DB_Access.class and /dev/null differ diff --git a/Dozentenmodul_V1/build/classes/db/MySQL.class b/Dozentenmodul_V1/build/classes/db/MySQL.class deleted file mode 100644 index 5bb994e5..00000000 Binary files a/Dozentenmodul_V1/build/classes/db/MySQL.class and /dev/null differ diff --git a/Dozentenmodul_V1/build/classes/db/SaveOS.class b/Dozentenmodul_V1/build/classes/db/SaveOS.class deleted file mode 100644 index 7a861604..00000000 Binary files a/Dozentenmodul_V1/build/classes/db/SaveOS.class and /dev/null differ diff --git a/Dozentenmodul_V1/build/classes/news/News.class b/Dozentenmodul_V1/build/classes/news/News.class deleted file mode 100644 index 05651c14..00000000 Binary files a/Dozentenmodul_V1/build/classes/news/News.class and /dev/null differ diff --git a/Dozentenmodul_V1/src/authentifizierung/Ldap.java b/Dozentenmodul_V1/src/authentifizierung/Ldap.java deleted file mode 100644 index 0265d350..00000000 --- a/Dozentenmodul_V1/src/authentifizierung/Ldap.java +++ /dev/null @@ -1,98 +0,0 @@ -package authentifizierung; - -import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.File; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.io.PrintWriter; -import java.net.Socket; -import java.net.URL; -import java.security.Certificate; -import java.security.cert.X509Certificate; -import java.util.Hashtable; -import java.util.logging.Level; -import java.util.logging.Logger; -import javax.naming.AuthenticationException; -import javax.naming.Context; -import javax.naming.NamingException; -import javax.naming.directory.DirContext; -import javax.naming.directory.InitialDirContext; -import javax.naming.ldap.LdapContext; -import javax.net.ssl.HttpsURLConnection; -import javax.servlet.RequestDispatcher; - - - -/** - * Servlet implementation class Ldap - */ -@WebServlet("/Ldap") -public class Ldap extends HttpServlet { - private static final long serialVersionUID = 1L; - - /** - * @see HttpServlet#HttpServlet() - */ - public Ldap() { - super(); - // TODO Auto-generated constructor stub - } - - /** - * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response) - */ - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - doPost(request,response); - } - - /** - * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response) - */ - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - response.setContentType("text/html;charset=UTF-8"); - PrintWriter out = response.getWriter(); - String userName=request.getParameter("User"); - String pass=request.getParameter("Password"); - - - try { - - String base = "ou=hrz,o=fho"; - String dn = "cn="+userName + "," + base; - String ldapURL = "ldaps://fs3.rz.hs-offenburg.de"; - - // Setup environment for authenticating - - Hashtable environment = new Hashtable(); - environment.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory"); - environment.put(Context.PROVIDER_URL, ldapURL); - environment.put(Context.SECURITY_AUTHENTICATION, "simple"); - environment.put(Context.SECURITY_PRINCIPAL, dn); - environment.put(Context.SECURITY_CREDENTIALS, pass); - - try { - DirContext authContext = new InitialDirContext(environment); - // user is authenticated - - RequestDispatcher disp= getServletContext().getRequestDispatcher("/GUI/de/Home.jsp"); - disp.forward(request, response); - } catch (NamingException ex) { - RequestDispatcher disp= getServletContext().getRequestDispatcher("/GUI/de/Login_Error.jsp"); - disp.forward(request, response); - Logger.getLogger(Ldap.class.getName()).log(Level.SEVERE, null, ex); - } - - } finally { - out.close(); - } - } - -} diff --git a/Dozentenmodul_V1/src/db/DB_Access.java b/Dozentenmodul_V1/src/db/DB_Access.java deleted file mode 100644 index 820535f6..00000000 --- a/Dozentenmodul_V1/src/db/DB_Access.java +++ /dev/null @@ -1,57 +0,0 @@ -package db; - -import java.io.IOException; -import java.io.PrintWriter; -import java.util.logging.Level; -import java.util.logging.Logger; - -import javax.naming.NamingException; -import javax.naming.directory.DirContext; -import javax.naming.directory.InitialDirContext; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.sql.*; - -/** - * Servlet implementation class mySQLServlet - */ -@WebServlet("/DB_Access") -public class DB_Access extends HttpServlet { - private static final long serialVersionUID = 1L; - - /** - * @see HttpServlet#HttpServlet() - */ - public DB_Access() { - super(); - // TODO Auto-generated constructor stub - } - - /** - * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response) - */ - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - doPost(request,response); - } - - /** - * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response) - */ - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - response.setContentType("text/html;charset=UTF-8"); - - MySQL sql=new MySQL(); - Connection con=sql.getConnection(); - - - RequestDispatcher disp= getServletContext().getRequestDispatcher("/GUI/de/VLUpload.jsp"); - disp.forward(request, response); - - - } - -} diff --git a/Dozentenmodul_V1/src/db/MySQL.java b/Dozentenmodul_V1/src/db/MySQL.java deleted file mode 100644 index 45e11f36..00000000 --- a/Dozentenmodul_V1/src/db/MySQL.java +++ /dev/null @@ -1,203 +0,0 @@ -package db; - -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; - -public class MySQL { - - public Connection getConnection() - { - try { - Class.forName("com.mysql.jdbc.Driver").newInstance(); - } catch (InstantiationException | IllegalAccessException - | ClassNotFoundException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - try { - Connection con=DriverManager.getConnection("jdbc:mysql://127.0.0.1/bwLehrpool?user=root&password=root"); - return con; - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - return null; - - - } - - - public ResultSet getHersteller(Connection con) - { - try { - Statement stm=con.createStatement(); - return stm.executeQuery("SELECT pk,Name FROM bwLehrpool.SWHersteller order by Name asc;"); - - - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - - return null; - } - public ResultSet getSoftware(Connection con, String Hersteller) - { - - try { - Statement stm=con.createStatement(); - - return stm.executeQuery("SELECT s.pk,s.Produktname, s.Version, s.Architektur FROM bwLehrpool.Software s left join bwLehrpool.SWHersteller h on s.SWHersteller_pk=h.pk where Name like '"+Hersteller+"' order by s.Produktname;"); - - - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - - return null; - - } - - public ResultSet getUserpk(Connection con, String Mail) - { - Statement stm; - try { - stm = con.createStatement(); - return stm.executeQuery("SELECT pk FROM bwLehrpool.Benutzer where EMail like '"+Mail+"';"); - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - return null; - } - - public ResultSet getVMpk(Connection con, String Userpk) - { - Statement stm; - try { - stm = con.createStatement(); - return stm.executeQuery("SELECT VM_pk FROM bwLehrpool.Benutzer_has_VM where Benutzer_pk="+Userpk+";"); - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - return null; - } - - public ResultSet getActiveVLs(Connection con, String VMpk) - { - Statement stm; - try { - stm = con.createStatement(); - return stm.executeQuery("Select Laborname from bwLehrpool.VM where IstAktiv=1 and pk="+VMpk+";"); - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - return null; - - } - - public ResultSet getInactiveVLs(Connection con, String VMpk) - { - Statement stm; - try { - stm = con.createStatement(); - return stm.executeQuery("Select Laborname from bwLehrpool.VM where IstAktiv=0 and pk="+VMpk+";"); - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - return null; - } - - public ResultSet getOSList(Connection con) - { - Statement stm; - try { - stm = con.createStatement(); - return stm.executeQuery("SELECT distinct Produktname, Version, Architektur FROM bwlehrpool.betriebssystem order by Produktname asc;"); - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - return null; - } - - public int AddOS(Connection con, String name, String Version, String Architektur,int Kosten, String Hersteller) - { - Statement stm; - - - try { - stm=con.createStatement(); - - int pk_Hersteller=HerstellerExists(con, Hersteller); - - if(pk_Hersteller==-1) - { - addHersteller(con, Hersteller); - } - - - int ret=stm.executeUpdate("INSERT INTO `bwlehrpool`.`betriebssystem`(`Produktname`,`Version`,`Architektur`,`IstKostenlos`,`SWHersteller_pk`)VALUES('"+name+"','"+Version+"','"+Architektur+"',"+Kosten+","+pk_Hersteller+");"); - return ret; - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - return -1; - - } - - public int HerstellerExists(Connection con, String Hersteller) - { - Statement stm; - int pk_Hersteller=-1; - - - try { - stm=con.createStatement(); - ResultSet rs=getHersteller(con); - - while(rs.next()) - { - if(rs.getString("Name").equals(Hersteller)) - { - pk_Hersteller=Integer.parseInt(rs.getString("pk")); - } - } - } catch (SQLException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - return pk_Hersteller; - - } - - public int addHersteller(Connection con, String Name){ - - Statement stm; - int ret=-1; - try { - stm=con.createStatement(); - ret=stm.executeUpdate("INSERT INTO `bwlehrpool`.`swhersteller`(`Name`)VALUES('"+Name+"');"); - con.commit(); - } catch (SQLException e) { - // TODO Auto-generated catch block - - e.printStackTrace(); - } - return ret; - - } - -} diff --git a/Dozentenmodul_V1/src/db/SaveOS.java b/Dozentenmodul_V1/src/db/SaveOS.java deleted file mode 100644 index 8bdeda1f..00000000 --- a/Dozentenmodul_V1/src/db/SaveOS.java +++ /dev/null @@ -1,66 +0,0 @@ -package db; - -import java.io.IOException; -import java.io.PrintWriter; - -import javax.servlet.ServletException; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import com.mysql.jdbc.Connection; - -import db.MySQL; -/** - * Servlet implementation class SaveOS - */ -@WebServlet("/SaveOS") -public class SaveOS extends HttpServlet { - private static final long serialVersionUID = 1L; - - /** - * @see HttpServlet#HttpServlet() - */ - public SaveOS() { - super(); - // TODO Auto-generated constructor stub - } - - /** - * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response) - */ - protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - doPost(request,response); - } - - /** - * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response) - */ - protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - response.setContentType("text/html"); - PrintWriter out = response.getWriter(); - int Kosten=0; - - if(request.getParameter("Kosten").equals("Kostenpflichtig")) - { - Kosten=1; - } - - MySQL sql=new MySQL(); - java.sql.Connection con=sql.getConnection(); - - int ret=sql.AddOS(con, request.getParameter("Name"), request.getParameter("Version"), request.getParameter("Architektur"), Kosten, request.getParameter("Hersteller")); - - if(ret==1) - { - out.println("Eingabe erfolgreich gespeichert"); - } - else - { - out.println("Bei der Speicherung der Daten ist ein Fehler aufgetreten, bitte wenden Sie sich an den Support"); - } - - } - -} diff --git a/Dozentenmodul_V1/src/news/News.java b/Dozentenmodul_V1/src/news/News.java deleted file mode 100644 index 70146833..00000000 --- a/Dozentenmodul_V1/src/news/News.java +++ /dev/null @@ -1,43 +0,0 @@ -package news; - -import java.io.BufferedReader; -import java.io.FileReader; -import java.io.IOException; -import java.util.StringTokenizer; - -public class News { - - - @SuppressWarnings("resource") - public String refreshNews(){ - - String news=""; - BufferedReader in; - int lineCounter=0; - try { - in = new BufferedReader(new FileReader("C:\\Users\\tspitzer\\Desktop\\news.txt")); - String line; - while((line = in.readLine()) != null) { - - StringTokenizer st = new StringTokenizer(line, ";"); - String Datum = st.nextToken(); - String msg = st.nextToken(); - if(lineCounter!=0) - { - news=news.concat(Datum+" "+msg+"

"); - } - - lineCounter++; - } - - } catch (NumberFormatException | IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - - return news; - - } - -} -- cgit v1.2.3-55-g7522