Anlegen eines Benutzers in die Datenbank erfolgt nun bereits beim einloggen. Vorher war es fälschlicherweise erst beim hochladen des ersten Images

4 files changed, 41 insertions, 9 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
index 3a9e9c87..43df4d12 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -404,11 +404,13 @@ public class FTPCreateUploader_GUI extends JFrame implements
 							Config.setLastUploadPath(f.getParentFile()
 									.toString());
 						}
+						
 						// save configuration
 						Config.store();
 						dispose();
 						MainMenue_GUI m = new MainMenue_GUI(c);
 						m.setVisible(true);
+						
 						if (taskrun == true) {
 							try {
 								client.DeleteFtpUser(user.userName);
@@ -654,6 +656,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 
 		try {
 
+			
 			client.writeVLdata(Image.image.getImagename(),
 					Image.image.getDesc(),
 					person.verantwortlicher.getUsername(),
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
index 95654247..09cf5dd8 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
@@ -38,7 +38,6 @@ import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JSeparator;
 import javax.swing.JTable;
-import javax.swing.JTextField;
 import javax.swing.JTextPane;
 import javax.swing.ScrollPaneConstants;
 import javax.swing.UIManager;
diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
index 11b1c515..261c6464 100644
--- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
@@ -1,6 +1,5 @@
 package gui.intro;
 
-import java.awt.Choice;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Image;
@@ -9,7 +8,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
@@ -40,6 +38,7 @@ import org.apache.thrift.TException;
 import org.openslx.imagemaster.thrift.iface.ImageServer.Client;
 import org.openslx.imagemaster.thrift.iface.UserInfo;
 
+//import server.generated.Server.Client;
 import thrift.MasterThriftConnection;
 import thrift.ThriftConnection;
 import util.GuiOrganizer;
@@ -111,7 +110,7 @@ public class Login_GUI extends JFrame {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		} catch (ClassNotFoundException | InstantiationException
 				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
+			
 			e.printStackTrace();
 		}
 		// Titel des Fensters setzen
@@ -417,10 +416,10 @@ public class Login_GUI extends JFrame {
 							setStatus(Color.red, "Fehler: bwIDM-Login fehlgeschlagen!", null);
 						}
 					} catch (InterruptedException e) {
-						// TODO Auto-generated catch block
+						
 						e.printStackTrace();
 					} catch (ExecutionException e) {
-						// TODO Auto-generated catch block
+						
 						e.printStackTrace();
 					}
 				}
@@ -460,6 +459,27 @@ public class Login_GUI extends JFrame {
 	}// end performLogin
 
 	private void showMainMenu() {
+		
+		
+		
+		/*
+		 * TODO check if user has already been regisistered. if not, do so
+		 * 
+		 * 
+		 */
+		//import server.generated.Server.Client;
+		server.generated.Server.Client client_2 = models.Client.clientcon.getClient();
+		try {
+			String pk_institution = client_2.setInstitution(person.verantwortlicher.getHochschule());
+			LOGGER.info("Institution of user is: "+pk_institution);
+			client_2.setPerson(person.verantwortlicher.getUserID(), person.verantwortlicher.getName(), person.verantwortlicher.getVorname(), person.verantwortlicher.getEMail(), pk_institution);
+			LOGGER.info("user data, ID="+person.verantwortlicher.getUserID()+" , Name="+person.verantwortlicher.getName()+" , Vorname="+ person.verantwortlicher.getVorname()+" , E-Mail="+ person.verantwortlicher.getEMail()+" , Institution="+ pk_institution);
+		} catch (TException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		
+		
 		// Pruefe ob Bills Of Rights schon akzeptiert wurden,
 		// wenn nicht zeige diese an
 		if (!Config.getBillOfRights()) {
diff --git a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
index 072ef196..510590e6 100644
--- a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
@@ -51,7 +51,9 @@ import models.RightsManagement;
 import models.SessionData;
 import models.person;
 
+
 import org.apache.log4j.Logger;
+import org.apache.thrift.TException;
 
 import util.GuiOrganizer;
 import util.News;
@@ -79,6 +81,7 @@ public class MainMenue_GUI extends JFrame {
 	private final ButtonGroup buttonGroup = new ButtonGroup();
 	private JMenuItem mntmAbout;
 	Component c = null;
+
 	
 	
 	private static final String HELP_MESSAGE = "<html><div align=\"center\">" +
@@ -87,10 +90,10 @@ public class MainMenue_GUI extends JFrame {
 
 	// for testing
 	ImageRights imageRights = new ImageRights();
+	
+	
 
-	/**
-	 * Create the dialog.
-	 */
+	
 	public MainMenue_GUI(Component formerGUI) {
 
 		addWindowListener(new WindowAdapter() {
@@ -499,6 +502,13 @@ public class MainMenue_GUI extends JFrame {
 		});
 		mnNewMenu_1.add(mntmAbout);
 		
+		
+		
+		
+		
+		
+		
+		
 		c = this;
 	}// end main