• fixed Bug whereas Lectures weren't editable anymore due to date-parsing error

• IdP is stored in config file, default 0. should IdP-Authentication be default now?

• Fixed bug: version number was replaced by "unknown".. it is unknown, why that happened :)

• Optimized view for additional contacts in images

2 files changed, 20 insertions, 6 deletions

diff --git a/dozentenmodul/src/main/java/gui/intro/About_GUI.java b/dozentenmodul/src/main/java/gui/intro/About_GUI.java
index 63681286..61140156 100644
--- a/dozentenmodul/src/main/java/gui/intro/About_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/About_GUI.java
@@ -16,6 +16,8 @@ import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 
+import models.Version;
+
 import util.ResourceLoader;
 
 @SuppressWarnings("serial")
@@ -84,7 +86,7 @@ public class About_GUI extends JFrame {
 
 		txtpnVersionVBuilddate = new JTextPane();
 		txtpnVersionVBuilddate
-				.setText("Version: unknown\r\n\r\nContact: bwlehrpool@hs-offenburg.de\r\nWebsite: http://bwlehrpool.hs-offenburg.de/");
+				.setText("Version: "+Version.getVersion()+"\r\n\r\nContact: bwlehrpool@hs-offenburg.de\r\nWebsite: http://bwlehrpool.hs-offenburg.de/");
 		txtpnVersionVBuilddate.setEditable(false);
 		txtpnVersionVBuilddate.setBackground(SystemColor.menu);
 		txtpnVersionVBuilddate.setBounds(62, 95, 224, 90);
diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
index 2a5909d1..57876479 100644
--- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
@@ -157,7 +157,7 @@ public class Login_GUI extends JInternalFrame {
 		LabelUser = new JLabel("Benutzername:");
 		LabelUser.setBounds(25, 60, 82, 20);
 		panel.add(LabelUser);
-
+		
 		// Erzeugen und Hinzufuegen des Textfeldes
 		lblusername = new JTextField();
 		lblusername.setBounds(135, 60, 237, 20);
@@ -420,12 +420,16 @@ public class Login_GUI extends JInternalFrame {
 		}
 
 		// always save to user's config file.
-		if (chckbxBenutzernameSpeichern.isSelected()) {
+		if (chckbxBenutzernameSpeichern.isSelected()) 
+		{
 			Config.setUsername(lblusername.getText());
 			Config.setSaveUsername(true);
-		} else {
+			Config.setIdP(String.valueOf(idpChoice.getSelectedIndex()));
+		} else 
+		{
 			Config.setUsername("");
 			Config.setSaveUsername(false);
+			Config.setIdP(String.valueOf(0));
 		}
 		// save it to local disk
 		Config.store();
@@ -558,7 +562,7 @@ public class Login_GUI extends JInternalFrame {
 			lblpass.setText("");
 			lblpass.setToolTipText("Bitte geben Sie Ihr bwIDM-Passwort ein.");
 			panel.add(lblpass);
-			lblusername.setToolTipText("Bitte geben Sie Ihr bwIDM-Benutzername ein.");
+			lblusername.setToolTipText("Bitte geben Sie Ihren bwIDM-Benutzernamen ein.");
 			panel.revalidate();
 			panel.repaint();
 			panel.setVisible(true);
@@ -647,6 +651,7 @@ public class Login_GUI extends JInternalFrame {
 					return false;
 				}
 				publish("Info: Liste von IdPs empfangen.");
+				
 				return true;
 			}
 
@@ -659,7 +664,8 @@ public class Login_GUI extends JInternalFrame {
 						idpChoice.setModel(new DefaultComboBoxModel<OrganizationData>(orgs));
 						// now override the renderer, to show the display names
 						// of the organizations.
-						idpChoice.setRenderer(new DefaultListCellRenderer() {
+						idpChoice.setRenderer(new DefaultListCellRenderer() 
+						{
 							@Override
 							public Component getListCellRendererComponent(JList<?> list, Object value,
 									int index, boolean isSelected, boolean cellHasFocus) {
@@ -672,6 +678,7 @@ public class Login_GUI extends JInternalFrame {
 								return this;
 							}
 						});
+						
 						setStatus(Color.black, "Info: Bereit für Login", null);
 					} else {
 						setStatus(Color.red, "Fehler: Vorbereitung für bwIDM-Login fehlgeschlagen!", null);
@@ -681,6 +688,11 @@ public class Login_GUI extends JInternalFrame {
 				} catch (ExecutionException e) {
 					LOGGER.error("Execution of SwingWorker for 'getOrganizationsList' failed, see trace: ", e);
 				}
+				
+				if(Config.getIdP() != -1)
+				{
+					idpChoice.setSelectedIndex(Config.getIdP()); //set IdP preselction to saved value, if stored. 0 is default
+				}
 			}
 
 			@Override