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

Conflicts:
	dozentenmodulserver/src/main/java/server/ServerHandler.java
	dozentenmodulserver/src/main/java/sql/SQL.java

1 files changed, 39 insertions, 18 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
index cfb83308..0c9099c0 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
@@ -21,6 +21,7 @@ import java.net.URISyntaxException;
 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;
@@ -53,6 +54,7 @@ import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
 
 import models.Image;
+import models.ItemOwner;
 import models.Links;
 import models.person;
 
@@ -442,7 +444,12 @@ public class SearchEditImage_GUI extends JFrame {
 													.convertRowIndexToModel(tablemyImages
 															.getSelectedRow()),
 											7).toString();
+							
+							//write the values into the information pane on the right hand side
 							writeImageData(imageid, version);
+							
+							//fill the itemOwnder model with information from selected item
+							setItemOwnerInformation(imageid);
 						}
 					}
 				});
@@ -673,7 +680,6 @@ public class SearchEditImage_GUI extends JFrame {
 					open.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
 			}
@@ -694,7 +700,6 @@ public class SearchEditImage_GUI extends JFrame {
 					open.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
-					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
 
@@ -729,29 +734,24 @@ public class SearchEditImage_GUI extends JFrame {
 	// Initiale Beffuelung eines Table models
 	public DefaultTableModel initTableModel(DefaultTableModel model) {
 
-		LOGGER.debug("trying to init table first time... in: searcheditimage_gui");
+		//LOGGER.debug("trying to init table first time... in: searcheditimage_gui");
 		
 		List<server.generated.Image> images;
 		try {
 			// Hole eine Liste der passenden Images
 			images = client.getImageListPermissionWrite(person.verantwortlicher
 					.getUserID());
-			//System.out.println("User is: "
-				//	+ person.verantwortlicher.getUserID());
-			// images = client.getImageList(person.verantwortlicher.getUserID(),
-			// requiredPermission);
 
 			Iterator<server.generated.Image> i = images.iterator();
 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
 			int x = 0;
-			//System.out.println("Imagesize is: "+images.size());
 
 			while (i.hasNext()) {
 				// erzeuge Objekte fuer die Tabelle
-				LOGGER.debug("Image last updated on: "
-						+ images.get(x).updateTime);
-				LOGGER.debug("Image name: " + images.get(x).getImageName());
+				//LOGGER.debug("Image last updated on: "
+				//		+ images.get(x).updateTime);
+				//LOGGER.debug("Image name: " + images.get(x).getImageName());
 				
 				Object[] obj = { images.get(x).getImageName(),
 						images.get(x).getLicenseRestriction(),
@@ -767,15 +767,14 @@ public class SearchEditImage_GUI extends JFrame {
 				// Fuege diese Objekte der Tabelle hinzu
 
 				model.addRow(obj);
-				LOGGER.info("Counting model.getRowCount(): "+model.getRowCount());
+				//LOGGER.info("Counting model.getRowCount(): "+model.getRowCount());
 				x++;
 				i.next();
 			}
-			LOGGER.info("Finished counting crap, mo"+model.getRowCount());
+			//LOGGER.info("Finished counting crap, mo"+model.getRowCount());
 
 			return model;
 		} catch (TException | ParseException e1) {
-			// TODO Auto-generated catch block
 			e1.printStackTrace();
 			JOptionPane.showMessageDialog(c,
 					e1.getCause() + "\n" + e1.getStackTrace(), "Debug-Message",
@@ -846,10 +845,32 @@ public class SearchEditImage_GUI extends JFrame {
 			
 			
 		} catch (TException | ParseException e1) {
-			// TODO Auto-generated catch block
 			e1.printStackTrace();
 		}
-	}
+	}//end writeImageData
+	
+	
+	public void setItemOwnerInformation(String imageid){
+		Map<String, String> map = new HashMap<String, String>();
+		
+		try {
+			//get values from server and set them in model
+			map=client.getItemOwner(imageid);
+			
+			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
+	
 	
 	public static String byteToGigabyte(long bytes, boolean si) {
 	    int unit = si ? 1000 : 1024;
@@ -857,5 +878,5 @@ public class SearchEditImage_GUI extends JFrame {
 	    int exp = (int) (Math.log(bytes) / Math.log(unit));
 	    String pre = (si ? "kMGTPE" : "KMGTPE").charAt(exp-1) + (si ? "" : "i");
 	    return String.format("%.1f %sB", bytes / Math.pow(unit, exp), pre);
-	}
-}
+	}//end byteToGigabyte
+}// end class