Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1

2 files changed, 16 insertions, 2 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
index 0fac31ac..af49cecf 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
@@ -49,6 +49,7 @@ import org.openslx.dozmod.thrift.Session;
 import org.openslx.dozmod.thrift.ThriftActions;
 import org.openslx.dozmod.thrift.ThriftActions.DeleteCallback;
 import org.openslx.dozmod.thrift.ThriftActions.ImageMetaCallback;
+import org.openslx.dozmod.thrift.cache.LectureCache;
 import org.openslx.dozmod.thrift.cache.MetaDataCache;
 import org.openslx.dozmod.thrift.cache.UserCache;
 import org.openslx.dozmod.util.FormatHelper;
@@ -526,6 +527,14 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 		}
 		txtTags.setText(tagsString);
 
+		// Count the number of linked lectures to the image
+		int lectureCount = 0;
+		for (LectureSummary lecture : LectureCache.get(false)) {
+			if (lecture.imageBaseId.equals(image.imageBaseId))
+				lectureCount++;
+		}
+		linkedLectureCount.setText(Integer.toString(lectureCount));
+
 		// set the versions of the image to the table
 		versionTable.setData(image.getVersions(), true);
 		// make fields editable is allowed
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java
index ba33d964..72670b83 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java
@@ -60,6 +60,7 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
 	protected final JButton btnClose;
 
 	protected final JButton btnShowLinkingLectures;
+	protected final QLabel linkedLectureCount;
 
 	protected final ImageVersionTable versionTable;
 	protected JScrollPane versionTableScrollPane;
@@ -181,8 +182,12 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
 		grid.skip();
 		grid.add(btnPermissions, 2);
 		grid.nextRow();
-		btnShowLinkingLectures = new JButton("Verlinkende Veranstatlungen Zeigen");
-		grid.add(btnShowLinkingLectures, 3);
+
+		grid.add(new QLabel("Verlinkte Veranstaltungen "));
+		linkedLectureCount = new QLabel();
+		grid.add(linkedLectureCount).expand(true, false);
+		btnShowLinkingLectures = new JButton("Anzeigen");
+		grid.add(btnShowLinkingLectures);
 		grid.nextRow();
 		grid.add(Box.createVerticalStrut(10), 3);
 		grid.nextRow();