diff options
| author | Nino Breuer | 2015-05-20 17:08:08 +0200 |
|---|---|---|
| committer | Nino Breuer | 2015-05-20 17:08:08 +0200 |
| commit | 1d8ef80202ebaeba26ce7996fb97c226baaa6be8 (patch) | |
| tree | 661f7a3dfd372cc8f5ba1c36816708b2d4f74787 /dozentenmodul/src/main/java/gui/image | |
| parent | [client] GuiManager class cleanup + bundled priv/pub functions... (diff) | |
| download | tutor-module-1d8ef80202ebaeba26ce7996fb97c226baaa6be8.tar.gz tutor-module-1d8ef80202ebaeba26ce7996fb97c226baaa6be8.tar.xz tutor-module-1d8ef80202ebaeba26ce7996fb97c226baaa6be8.zip | |
• 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
Diffstat (limited to 'dozentenmodul/src/main/java/gui/image')
| -rw-r--r-- | dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java | 15 | ||||
| -rw-r--r-- | dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java | 16 |
2 files changed, 23 insertions, 8 deletions
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 {
|