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

Conflicts:
	Dozentenmodul/src/GUI/SearchImage_GUI.java
	Dozentenmodul/src/Models/person.java
	Dozentenmodul/src/Models/vm.java

1 files changed, 0 insertions, 328 deletions

diff --git a/Dozentenmodul/src/GUI/EingabeVeranstatlungTechnisch_GUI.java b/Dozentenmodul/src/GUI/EingabeVeranstatlungTechnisch_GUI.java
deleted file mode 100644
index 6f645ac5..00000000
--- a/Dozentenmodul/src/GUI/EingabeVeranstatlungTechnisch_GUI.java
+++ /dev/null
@@ -1,328 +0,0 @@
-package gui;
-
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.ScrollPane;
-import java.awt.SystemColor;
-import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-
-import javax.swing.ButtonGroup;
-import javax.swing.JButton;
-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.JSeparator;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.JTextPane;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-import javax.swing.border.EmptyBorder;
-
-import models.Image;
-import models.Lecture;
-
-
-import com.toedter.calendar.JDateChooser;
-
-@SuppressWarnings("serial")
-public class EingabeVeranstatlungTechnisch_GUI extends JFrame {
-
-	private final JPanel contentPanel = new JPanel();
-	String[] result;
-	private JTextField textFieldLaborname;
-	JRadioButton rdbtnJa;
-	JDateChooser dateChooserend;
-	JDateChooser dateChooserstart;
-	JTextArea textAreashort;
-	JTextArea textArealong;
-	private final ButtonGroup buttonGroup = new ButtonGroup();
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			EingabeVeranstatlungTechnisch_GUI dialog = new EingabeVeranstatlungTechnisch_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Create the dialog.
-	 */
-	public EingabeVeranstatlungTechnisch_GUI() {
-		addWindowListener(new WindowAdapter() {
-			@Override
-			public void windowClosing(WindowEvent arg0) {
-				System.exit(0);
-			}
-		});
-		setResizable(false);
-		
-		try {
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (ClassNotFoundException | InstantiationException
-				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		setTitle("bwLehrpool Suite *Prototyp*");
-		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-		int top=(screenSize.height - 722) / 2;
-		int left=(screenSize.width - 603) / 2;
-		setBounds(left, top, 603, 722);
-		//setBounds(100, 100, 603, 722);
-		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("Dateneingabe f\u00FCr Veranstaltung");
-				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("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an");
-			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);
-		
-		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
-		lblHauptmen.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				
-				EingabeVeranstatlungTechnisch_GUI.this.setVisible(false);
-				MainMenue_GUI main=new MainMenue_GUI();
-				main.setVisible(true);
-			}
-		});
-		lblHauptmen.setForeground(Color.BLUE);
-		lblHauptmen.setBounds(10, 11, 61, 14);
-		contentPanel.add(lblHauptmen);
-		
-		JLabel label_1 = new JLabel(">");
-		label_1.setBounds(69, 11, 13, 14);
-		contentPanel.add(label_1);
-		
-		JLabel lblVlimage = new JLabel("Veranstaltung ");
-		lblVlimage.setForeground(Color.BLUE);
-		lblVlimage.setBounds(81, 11, 74, 14);
-		contentPanel.add(lblVlimage);
-		
-		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(152, 11, 13, 14);
-		contentPanel.add(label_2);
-		
-		JLabel lblNewLabel_1 = new JLabel("Neu");
-		lblNewLabel_1.setBounds(165, 11, 46, 14);
-		contentPanel.add(lblNewLabel_1);
-		
-		JLabel lblLabornameanzeigename = new JLabel("Laborname (Anzeigename): *");
-		lblLabornameanzeigename.setBounds(10, 57, 250, 14);
-		contentPanel.add(lblLabornameanzeigename);
-		
-		textFieldLaborname = new JTextField();
-		textFieldLaborname.setBounds(270, 54, 307, 20);
-		contentPanel.add(textFieldLaborname);
-		textFieldLaborname.setColumns(10);
-		
-		JLabel lblKurzbeschreibung = new JLabel("Kurzbeschreibung: *");
-		lblKurzbeschreibung.setBounds(10, 175, 250, 14);
-		contentPanel.add(lblKurzbeschreibung);
-		
-		ScrollPane scrollPane = new ScrollPane();
-		scrollPane.setBounds(270, 175, 307, 137);
-		contentPanel.add(scrollPane);
-		
-		textAreashort = new JTextArea();
-		textAreashort.setLineWrap(true);
-		scrollPane.add(textAreashort);
-		textAreashort.setBounds(0, 0, 4, 22);
-		
-		ScrollPane scrollPane_1 = new ScrollPane();
-		scrollPane_1.setBounds(270, 315, 307, 137);
-		contentPanel.add(scrollPane_1);
-		
-		textArealong = new JTextArea();
-		textArealong.setLineWrap(true);
-		textArealong.setBounds(0, 0, 4, 22);
-		scrollPane_1.add(textArealong);
-		
-		JLabel label = new JLabel("Kurzbeschreibung: *");
-		label.setBounds(0, 318, 250, 14);
-		contentPanel.add(label);
-		
-		JLabel lblGltigkeitsdatum = new JLabel("G\u00FCltigkeitsdatum: *");
-		lblGltigkeitsdatum.setBounds(0, 464, 250, 14);
-		contentPanel.add(lblGltigkeitsdatum);
-		
-		JLabel lblVon = new JLabel("von:");
-		lblVon.setBounds(270, 461, 30, 20);
-		contentPanel.add(lblVon);
-		
-		dateChooserstart = new JDateChooser();
-		dateChooserstart.setDateFormatString("yyyy-MM-dd hh:mm:ss");
-		dateChooserstart.setBounds(332, 458, 101, 20);
-		contentPanel.add(dateChooserstart);
-		
-		JLabel lblBis = new JLabel("bis");
-		lblBis.setBounds(443, 461, 24, 20);
-		contentPanel.add(lblBis);
-		
-		dateChooserend = new JDateChooser();
-		dateChooserend.setDateFormatString("dd.MM.yyyy hh:mm:ss");
-		dateChooserend.setBounds(477, 459, 100, 20);
-		contentPanel.add(dateChooserend);
-		
-		JLabel lblAktiv = new JLabel("Aktiv:");
-		lblAktiv.setBounds(0, 492, 250, 14);
-		contentPanel.add(lblAktiv);
-		
-		JLabel lblimVmchooserSichtbar = new JLabel("(Im VMChooser sichtbar)");
-		lblimVmchooserSichtbar.setBounds(0, 517, 250, 14);
-		contentPanel.add(lblimVmchooserSichtbar);
-		
-		rdbtnJa = new JRadioButton("Ja");
-		rdbtnJa.setSelected(true);
-		buttonGroup.add(rdbtnJa);
-		rdbtnJa.setBounds(270, 488, 109, 23);
-		contentPanel.add(rdbtnJa);
-		
-		JRadioButton rdbtnNein = new JRadioButton("Nein");
-		buttonGroup.add(rdbtnNein);
-		rdbtnNein.setBounds(381, 488, 109, 23);
-		contentPanel.add(rdbtnNein);
-		
-		JTextArea txtrGebenSieBitte = new JTextArea();
-		txtrGebenSieBitte.setWrapStyleWord(true);
-		txtrGebenSieBitte.setText("Geben Sie bitte einen sprechenden Namen f\u00FCr das Image an. Dieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Programmieren 1\"");
-		txtrGebenSieBitte.setLineWrap(true);
-		txtrGebenSieBitte.setFont(new Font("Tahoma", Font.PLAIN, 12));
-		txtrGebenSieBitte.setBackground(SystemColor.menu);
-		txtrGebenSieBitte.setBounds(10, 82, 567, 59);
-		contentPanel.add(txtrGebenSieBitte);
-		//contentPanel.add(textArea);
-		{
-			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) {
-						
-						if(rdbtnJa.isSelected()==true)
-						{
-							Lecture.lecture.setActive(true);
-						}
-						else
-						{
-							Lecture.lecture.setActive(false);
-						}
-						
-						Lecture.lecture.setName(textFieldLaborname.getText());
-						Lecture.lecture.setDesc(textArealong.getText());
-						Lecture.lecture.setEnddate(dateChooserend.getDate());
-						Lecture.lecture.setShortDesc(textAreashort.getText());
-						Lecture.lecture.setStartdate(dateChooserstart.getDate());
-						Image.image.setImagename(textFieldLaborname.getText());
-						
-						EingabeVeranstaltungAllgemein_GUI sr=new EingabeVeranstaltungAllgemein_GUI();
-						sr.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) {
-						if(rdbtnJa.isSelected()==true)
-						{
-							Lecture.lecture.setActive(true);
-						}
-						else
-						{
-							Lecture.lecture.setActive(false);
-						}
-						
-						Lecture.lecture.setName(textFieldLaborname.getText());
-						Lecture.lecture.setDesc(textArealong.getText());
-						Lecture.lecture.setEnddate(dateChooserend.getDate());
-						Lecture.lecture.setShortDesc(textAreashort.getText());
-						Lecture.lecture.setStartdate(dateChooserstart.getDate());
-						Image.image.setImagename(textFieldLaborname.getText());
-						LinkImage_GUI ea=new LinkImage_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 = new JMenu("Suchen");
-		menuBar.add(mnNewMenu);
-		
-		JMenuItem mntmVlSuche = new JMenuItem("VL Suche");
-		mnNewMenu.add(mntmVlSuche);
-		
-		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);
-		
-	}
-}