• Beim Bearbeiten eines Image oder einer Veranstaltung wurde bisher der aktuell eingeloggte Benutzer immer neu als Verantwortlicher eingetragen --> Der Verantwortliche ändert sich nun nicht mehr und wird korrekt angezeigt

2 files changed, 57 insertions, 112 deletions

diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
index 98e2d513..45d4b0e2 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
@@ -40,6 +40,7 @@ import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
 
 import models.Image;
+import models.ItemOwner;
 import models.Lecture;
 import models.Links;
 import models.person;
@@ -101,7 +102,7 @@ public class EditLectureAllgemein_GUI extends JFrame {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		} catch (ClassNotFoundException | InstantiationException
 				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
+			 
 			e.printStackTrace();
 		}
 		setTitle("bwLehrpool Suite - Veranstaltung bearbeiten");
@@ -153,7 +154,8 @@ public class EditLectureAllgemein_GUI extends JFrame {
 		Vorname = new JTextField();
 		Vorname.setEditable(false);
 		Vorname.setEnabled(false);
-		Vorname.setText(person.verantwortlicher.getVorname());
+		//Vorname.setText(person.verantwortlicher.getVorname());
+		Vorname.setText(ItemOwner.itemOwner.getVorname());
 		Vorname.setBackground(Color.WHITE);
 		Vorname.setColumns(10);
 		Vorname.setBounds(145, 33, 350, 20);
@@ -167,7 +169,8 @@ public class EditLectureAllgemein_GUI extends JFrame {
 		Nachname = new JTextField();
 		Nachname.setEnabled(false);
 		Nachname.setEditable(false);
-		Nachname.setText(person.verantwortlicher.getName());
+		//Nachname.setText(person.verantwortlicher.getName());
+		Nachname.setText(ItemOwner.itemOwner.getNachname());
 		Nachname.setBackground(Color.WHITE);
 		Nachname.setColumns(10);
 		Nachname.setBounds(145, 64, 350, 20);
@@ -181,7 +184,8 @@ public class EditLectureAllgemein_GUI extends JFrame {
 		Hochschule = new JTextField();
 		Hochschule.setEnabled(false);
 		Hochschule.setEditable(false);
-		Hochschule.setText(person.verantwortlicher.getHochschule());
+		//Hochschule.setText(person.verantwortlicher.getHochschule());
+		Hochschule.setText(ItemOwner.itemOwner.getHochschule());
 		Hochschule.setBackground(Color.WHITE);
 		Hochschule.setColumns(10);
 		Hochschule.setBounds(145, 95, 350, 20);
@@ -195,7 +199,8 @@ public class EditLectureAllgemein_GUI extends JFrame {
 		EMail = new JTextField();
 		EMail.setEnabled(false);
 		EMail.setEditable(false);
-		EMail.setText(person.verantwortlicher.getEMail());
+		//EMail.setText(person.verantwortlicher.getEMail());
+		EMail.setText(ItemOwner.itemOwner.getEmail());
 		EMail.setBackground(Color.WHITE);
 		EMail.setColumns(10);
 		EMail.setBounds(145, 126, 350, 20);
@@ -526,7 +531,7 @@ public class EditLectureAllgemein_GUI extends JFrame {
 					windows = new URI(Links.getFAQ());
 					open.openWebpage(windows);
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
+					 
 					e.printStackTrace();
 				}
 			}
@@ -543,7 +548,7 @@ public class EditLectureAllgemein_GUI extends JFrame {
 					windows = new URI(Links.getOTRS());
 					open.openWebpage(windows);
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
+					 
 					e.printStackTrace();
 				}
 			}
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
index ca33dc3c..b6cb5f10 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
@@ -22,6 +22,7 @@ import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -52,6 +53,7 @@ import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
 
+import models.ItemOwner;
 import models.Lecture;
 import models.Links;
 import models.person;
@@ -135,7 +137,7 @@ public class EditLectureSearch_GUI extends JFrame {
 					//initTableModel(modelAll);
 
 				} catch (ParseException e) {
-					// TODO Auto-generated catch block
+					 
 					e.printStackTrace();
 				}
 
@@ -175,7 +177,7 @@ public class EditLectureSearch_GUI extends JFrame {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		} catch (ClassNotFoundException | InstantiationException
 				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
+			 
 			e.printStackTrace();
 		}
 		// Setzt den Fenstertitel
@@ -307,19 +309,25 @@ public class EditLectureSearch_GUI extends JFrame {
 								
 								if(tablemyLectures.getSelectedRow() != -1)
 								{
-								String imageid = modelMyLectures.getValueAt(
+								String lectureid = modelMyLectures.getValueAt(
 										tablemyLectures
 												.convertRowIndexToModel(tablemyLectures
 														.getSelectedRow()), 8)
 										.toString();
 
 								try {
-									writeLectureData(imageid);
+									
+									//write the values into the information pane on the right hand side
+									writeLectureData(lectureid);
+									
+									//fill the itemOwnder model with information from selected item
+									setItemOwnerInformation(lectureid);
+									
 								} catch (TException e1) {
-									// TODO Auto-generated catch block
+									 
 									e1.printStackTrace();
 								} catch (ParseException e1) {
-									// TODO Auto-generated catch block
+									 
 									e1.printStackTrace();
 								}
 							}
@@ -414,7 +422,7 @@ public class EditLectureSearch_GUI extends JFrame {
 								enddate = out.format(in.parse(enddate));
 								startdate = out.format(in.parse(startdate));
 							} catch (ParseException e2) {
-								// TODO Auto-generated catch block
+								 
 								e2.printStackTrace();
 							}
 
@@ -427,7 +435,7 @@ public class EditLectureSearch_GUI extends JFrame {
 								Lecture.lecture.setStartdate(df
 										.parse(startdate));
 							} catch (ParseException e1) {
-								// TODO Auto-generated catch block
+								 
 								e1.printStackTrace();
 							}
 							if (modelMyLectures
@@ -447,98 +455,7 @@ public class EditLectureSearch_GUI extends JFrame {
 							el.setVisible(true);
 							dispose();
 						}
-						/*else if (tableAllLectures.getSelectedRow() != -1
-								&& tableAllLectures
-										.getValueAt(
-												tableAllLectures
-														.getSelectedRow(), 5)
-										.toString().equals(username)) {
-
-							// a row is selected, do operations
-
-							Lecture.lecture.setid(modelAll
-									.getValueAt(
-											tableAllLectures
-													.convertRowIndexToModel(tableAllLectures
-															.getSelectedRow()),
-											8).toString());
-							Lecture.lecture.setName(modelAll
-									.getValueAt(
-											tableAllLectures
-													.convertRowIndexToModel(tableAllLectures
-															.getSelectedRow()),
-											0).toString());
-							Lecture.lecture.setDesc(modelAll
-									.getValueAt(
-											tableAllLectures
-													.convertRowIndexToModel(tableAllLectures
-															.getSelectedRow()),
-											1).toString());
-							String date = modelAll
-									.getValueAt(
-											tableAllLectures
-													.convertRowIndexToModel(tableAllLectures
-															.getSelectedRow()),
-											2).toString();
-
-							Lecture.lecture.setLinkedImagename(modelAll
-									.getValueAt(
-											tableAllLectures
-													.convertRowIndexToModel(tableAllLectures
-															.getSelectedRow()),
-											6).toString());
-
-							int zweitesLeerzeichen = date.indexOf(" ",
-									date.indexOf(" ") + 1);
-
-							String startdate = date.substring(0,
-									zweitesLeerzeichen);
-							String enddate = date.substring(zweitesLeerzeichen);
-							SimpleDateFormat out = new SimpleDateFormat(
-									"yyyy-MM-dd HH:mm:ss");
-							SimpleDateFormat in = new SimpleDateFormat(
-									"dd.MM.yyyy HH:mm:ss");
-							try {
-								enddate = out.format(in.parse(enddate));
-								startdate = out.format(in.parse(startdate));
-							} catch (ParseException e2) {
-								// TODO Auto-generated catch block
-								e2.printStackTrace();
-							}
-							DateFormat df = new SimpleDateFormat(
-									"yyyy-MM-dd HH:mm:ss");
-
-							try {
-								// Format has to be "yyyy-MM-dd HH:mm:ss"
-								Lecture.lecture.setEnddate(df.parse(enddate));
-								Lecture.lecture.setStartdate(df
-										.parse(startdate));
-							} catch (ParseException e1) {
-								// TODO Auto-generated catch block
-								e1.printStackTrace();
-							}
-							if (modelAll
-									.getValueAt(
-											tableAllLectures
-													.convertRowIndexToModel(tableAllLectures
-															.getSelectedRow()),
-											3).toString().equals("1")) {
-								Lecture.lecture.setActive(true);
-							} else {
-								Lecture.lecture.setActive(false);
-							}
-
-							EditLectureAllgemein_GUI el = new EditLectureAllgemein_GUI();
-							el.setVisible(true);
-							dispose();
-						} else {
-							JOptionPane
-									.showMessageDialog(
-											null,
-											"Bitte wählen Sie ein eigenes Image aus.",
-											"Message",
-											JOptionPane.INFORMATION_MESSAGE);
-						} // End Else */
+						
 					} // end action
 
 				});
@@ -667,7 +584,7 @@ public class EditLectureSearch_GUI extends JFrame {
 					open.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
+					 
 					e.printStackTrace();
 				}
 			}
@@ -688,7 +605,7 @@ public class EditLectureSearch_GUI extends JFrame {
 					open.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
+					 
 					e.printStackTrace();
 				}
 
@@ -754,7 +671,7 @@ public class EditLectureSearch_GUI extends JFrame {
 
 			return model;
 		} catch (TException e1) {
-			// TODO Auto-generated catch block
+			 
 			e1.printStackTrace();
 		}
 		return model;
@@ -790,6 +707,29 @@ public class EditLectureSearch_GUI extends JFrame {
 				res.get("imagepath").indexOf("/") + 1));
 		labelimageversion.setText(res.get("imageversion"));
 
-	}
+	}//end writeLectureData
+	
+	public void setItemOwnerInformation(String lectureid){
+		Map<String, String> map = new HashMap<String, String>();
+		
+		try {
+			//get values from server and set them in model
+			map=client.getItemOwner(lectureid);
+			
+			ItemOwner.itemOwner.setUserID(map.get("userID"));
+			ItemOwner.itemOwner.setUsername(map.get("loginName"));
+			ItemOwner.itemOwner.setNachname(map.get("Nachname"));
+			ItemOwner.itemOwner.setVorname(map.get("Vorname"));
+			ItemOwner.itemOwner.setEmail(map.get("mail"));
+			ItemOwner.itemOwner.setHochschule(map.get("institution"));
+			
+						
+			
+		} catch (TException e) {
+			e.printStackTrace();
+		}
+		
+	}//end setItemInformation
+	
 
-}
+}//end class