summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'dozentenmodul/src/main/java')
-rw-r--r--dozentenmodul/src/main/java/config/Config.java17
-rw-r--r--dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java15
-rw-r--r--dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java16
-rw-r--r--dozentenmodul/src/main/java/gui/intro/About_GUI.java4
-rw-r--r--dozentenmodul/src/main/java/gui/intro/Login_GUI.java22
-rw-r--r--dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java27
-rw-r--r--dozentenmodul/src/main/java/util/FormatHelper.java2
7 files changed, 86 insertions, 17 deletions
diff --git a/dozentenmodul/src/main/java/config/Config.java b/dozentenmodul/src/main/java/config/Config.java
index 547e0ad5..e6686a60 100644
--- a/dozentenmodul/src/main/java/config/Config.java
+++ b/dozentenmodul/src/main/java/config/Config.java
@@ -71,7 +71,7 @@ public class Config {
if (!(configPath.isEmpty()||configPath == null)) {
configFile = new File(configPath);
} else {
- throw new IOException("Konnte kein Pfad für die Konfigurationsdatei ermitteln.");
+ throw new IOException("Konnte keinen Pfad für die Konfigurationsdatei ermitteln.");
}
// Check if the directory exists.
@@ -99,6 +99,7 @@ public class Config {
ini.put("main", "Benutzername", "");
ini.put("main", "Letzter Downloadpfad", "");
ini.put("main", "Letzter Uploadpfad", "");
+ ini.put("main", "IdP", "");
ini.store();
} else {
@@ -163,6 +164,13 @@ public class Config {
else
return null;
}
+ /**
+ * Query the IdP of the configuration file
+ * @return stored IdP
+ */
+ public static int getIdP() {
+ return Integer.parseInt(getString("main", "IdP", ""));
+ }
/**
* Sets the value of 'BillOfRights' in the configuration file to 'value'
@@ -206,6 +214,13 @@ public class Config {
public static boolean setLastUploadPath(String value) {
return setString("main", "Letzter Uploadpfad", value);
}
+ /**
+ * Sets the value of "IdP" in the configuration file to 'value'
+ * @return true if it succeeded, false otherwise
+ */
+ public static boolean setIdP(String value) {
+ return setString("main", "IdP", value);
+ }
/**
* Save the changes to the ini file to actual file on the disk.
diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
index 2093d34c..52164f6a 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
@@ -629,6 +629,7 @@ public class SearchEditImage_GUI extends JInternalFrame {
try {
SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
+ String additionalContacts = "";
Map<String, String> res = ThriftManager.getSatClient().getImageData(id, version,
SessionData.authToken);
labelName.setText(res.get("name"));
@@ -661,11 +662,17 @@ public class SearchEditImage_GUI extends JInternalFrame {
List<String> contacts = ThriftManager.getSatClient().getAdditionalImageContacts(id,
SessionData.authToken);
labelWeitereVerantwortliche.setText("");
- for (int i = 0; i < contacts.size(); i++) {
- labelWeitereVerantwortliche.setText(labelWeitereVerantwortliche.getText().trim()
- + (contacts.get(i)));
+
+ for(int i = 0; i < contacts.size(); i++)
+ {
+ additionalContacts += contacts.get(i);
+ if(i != contacts.size() -1)
+ {
+ additionalContacts += " / ";
+ }
}
- labelWeitereVerantwortliche.setToolTipText(labelWeitereVerantwortliche.getText().trim());
+ labelWeitereVerantwortliche.setText(additionalContacts);
+ labelWeitereVerantwortliche.setToolTipText(additionalContacts);
} catch (TException | ParseException e1) {
e1.printStackTrace();
diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
index be3ca527..282e48ec 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
@@ -862,6 +862,7 @@ public class SearchImage_GUI extends JInternalFrame {
try {
SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
+ String additionalContacts = "";
Map<String, String> res = ThriftManager.getSatClient().getImageData(id, version,
SessionData.authToken);
labelName.setText(res.get("name"));
@@ -893,12 +894,19 @@ public class SearchImage_GUI extends JInternalFrame {
List<String> contacts = ThriftManager.getSatClient().getAdditionalImageContacts(id,
SessionData.authToken);
labelWeitereVerantwortliche.setText("");
- for (int i = 0; i < contacts.size(); i++) {
- labelWeitereVerantwortliche.setText(labelWeitereVerantwortliche.getText().trim()
- + (contacts.get(i)));
+
+ for(int i = 0; i < contacts.size(); i++)
+ {
+ additionalContacts += contacts.get(i);
+ if(i != contacts.size() -1)
+ {
+ additionalContacts += " / ";
+ }
}
- labelWeitereVerantwortliche.setToolTipText(labelWeitereVerantwortliche.getText().trim());
+ labelWeitereVerantwortliche.setText(additionalContacts);
+ labelWeitereVerantwortliche.setToolTipText(additionalContacts);
+
if (person.verantwortlicher.getRole().equals("Student") && res.get("license").equals("1")) {
btnDownload.setEnabled(false);
} else {
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
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
index 9e7c40e5..bc5be1d9 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
@@ -345,15 +345,40 @@ public class EditLectureSearch_GUI extends JInternalFrame {
tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()),
6).toString());
+
+
int zweitesLeerzeichen = date.indexOf(" ", date.indexOf(" ") + 1);
+ System.out.println("date: "+date.toString());
+
String startdate = date.substring(0, zweitesLeerzeichen);
String enddate = date.substring(zweitesLeerzeichen);
+
SimpleDateFormat out = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ //SimpleDateFormat out = new SimpleDateFormat("yy-MM-dd HH:mm");
+
SimpleDateFormat in = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
+ //SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ //SimpleDateFormat in = new SimpleDateFormat("yy-MM-dd HH:mm:ss");
+
+ /*
+ 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");
+ SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ */
try {
- enddate = out.format(in.parse(enddate));
+
startdate = out.format(in.parse(startdate));
+ enddate = out.format(in.parse(enddate));
+
+ System.out.println("startdate: "+startdate);
+ System.out.println("enddate: "+enddate);
+
+ //in.parse("2014-12-12 15:50:00");
+ //out.parse("");
+
} catch (ParseException e2) {
e2.printStackTrace();
diff --git a/dozentenmodul/src/main/java/util/FormatHelper.java b/dozentenmodul/src/main/java/util/FormatHelper.java
index 08d8498e..ad1f02f9 100644
--- a/dozentenmodul/src/main/java/util/FormatHelper.java
+++ b/dozentenmodul/src/main/java/util/FormatHelper.java
@@ -6,7 +6,7 @@ import java.text.SimpleDateFormat;
public class FormatHelper {
private static final SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- private static final SimpleDateFormat out = new SimpleDateFormat("dd.MM.yy HH:mm");
+ private static final SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
/**
* Convert mysql date/time format to human readable (German) format.
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2026-02-28 22:42:57 +0100