Lists now have the functionality to show complete lists, when role=="Admin"

8 files changed, 65 insertions, 19 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
index 2ed4e9e9..75703924 100644
--- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
@@ -784,8 +784,15 @@ public class DeleteImage_GUI extends JFrame {
 		
 		List<server.generated.Image> images;
 		try {
+			
 			// Hole eine Liste der Images
-			images = client.getImageListPermissionAdmin(person.verantwortlicher.getUserID());
+			if(person.verantwortlicher.getRole()=="Admin"){
+				//get complete list
+				images = client.getImageList(person.verantwortlicher.getUserID());
+			} else {
+				//get permitted list
+				images = client.getImageListPermissionAdmin(person.verantwortlicher.getUserID());
+			}
 
 			Iterator<server.generated.Image> i = images.iterator();
 
diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
index 115d6083..983b62b1 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
@@ -754,9 +754,15 @@ public class SearchEditImage_GUI extends JFrame {
 		
 		List<server.generated.Image> images;
 		try {
-			// Hole eine Liste der passenden Images
-			images = client.getImageListPermissionWrite(person.verantwortlicher
-					.getUserID());
+			
+			// Hole eine Liste der passenden Images,
+			if(person.verantwortlicher.getRole()=="Admin"){
+				//get complete list
+				images = client.getImageList(person.verantwortlicher.getUserID()); 
+			} else {
+				//only get permitted list
+				images = client.getImageListPermissionWrite(person.verantwortlicher.getUserID());
+			}
 
 			Iterator<server.generated.Image> i = images.iterator();
 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
index 19900dba..f144489d 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
@@ -1017,8 +1017,14 @@ public class SearchImage_GUI extends JFrame {
 	public DefaultTableModel initTableModel(DefaultTableModel model) {

 		List<server.generated.Image> images;

 		try {

+			

 			// Hole eine Liste der Images

-			images = client.getImageListPermissionRead(person.verantwortlicher.getUserID());

+			if(person.verantwortlicher.getRole()=="Admin"){

+				//get complete list

+				images = client.getImageList(person.verantwortlicher.getUserID());

+			} else {

+				images = client.getImageListPermissionRead(person.verantwortlicher.getUserID());

+			}

 

 			Iterator<server.generated.Image> i = images.iterator();

 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
index 328dcb86..6fad3b69 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
@@ -760,9 +760,12 @@ public class CreateLectureLink_GUI extends JFrame {
 		List<server.generated.Image> images;
 
 		// Hole eine Liste der Images
-		// images =
-		// client.getImageListPermissionLink(person.verantwortlicher.getUserID());
-		images = client.getImageListPermissionLink(person.verantwortlicher.getUserID());
+		if(person.verantwortlicher.getRole()=="Admin"){
+			//get complete list
+			images = client.getImageList(person.verantwortlicher.getUserID());
+		} else {		
+			images = client.getImageListPermissionLink(person.verantwortlicher.getUserID());
+		}
 
 		Iterator<server.generated.Image> i = images.iterator();
 		SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
diff --git a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
index 28c5d00a..47414981 100644
--- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
@@ -613,11 +613,17 @@ public class DeleteLecture_GUI extends JFrame {
 			throws ParseException {
 		List<server.generated.Lecture> lectures;
 		try {
+			
+		
 			// Hole eine Liste der erlaubten Images für die diese Person
-			// lectures = client.getLectureList();
-			lectures = client
-					.getLectureListPermissionAdmin(person.verantwortlicher
-							.getUserID());
+			if(person.verantwortlicher.getRole()=="Admin"){
+				//get complete list
+				lectures = client.getLectureList();
+			} else {
+				//get permitted list
+				lectures = client.getLectureListPermissionAdmin(person.verantwortlicher.getUserID());
+			}
+			
 			Iterator<server.generated.Lecture> i = lectures.iterator();
 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
index 112e535c..ed2dccd6 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
@@ -1202,8 +1202,14 @@ public class EditLectureLink_GUI extends JFrame {
 		List<server.generated.Image> images;
 
 		// Hole eine Liste der Images
-		images = client.getImageListPermissionLink(person.verantwortlicher
+		if(person.verantwortlicher.getRole()=="Admin"){
+			//get complete list
+			images = client.getImageList(person.verantwortlicher.getUserID());
+		} else {
+			//get permitted list
+			images = client.getImageListPermissionLink(person.verantwortlicher
 				.getUserID());
+		}
 
 		Iterator<server.generated.Image> i = images.iterator();
 		SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
index 4aadd013..5c40d936 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
@@ -659,11 +659,16 @@ public class EditLectureSearch_GUI extends JFrame {
 			throws ParseException {
 		List<server.generated.Lecture> lectures;
 		try {
+			
 			// Hole eine Liste der erlaubten Images für die diese Person
-			// lectures = client.getLectureList();
-			lectures = client
-					.getLectureListPermissionWrite(person.verantwortlicher
-							.getUserID());
+			if(person.verantwortlicher.getRole()=="Admin"){
+				//get complete list
+				lectures = client.getLectureList();
+			} else {
+				//get permitted list
+				lectures = client.getLectureListPermissionWrite(person.verantwortlicher.getUserID());
+			}
+			
 			Iterator<server.generated.Lecture> i = lectures.iterator();
 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
diff --git a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
index 8fa8a8e5..39978f3f 100644
--- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
@@ -627,9 +627,16 @@ public class SearchLecture_GUI extends JFrame {
 	public DefaultTableModel initTableModel(DefaultTableModel model) throws ParseException {

 		List<server.generated.Lecture> lectures;

 		try {

+			

 			// Hole eine Liste der erlaubten Images für die diese Person

-			//lectures = client.getLectureList();

-			lectures = client.getLectureListPermissionRead(person.verantwortlicher.getUserID());

+			if(person.verantwortlicher.getRole()=="Admin"){

+				//get complete list

+				lectures = client.getLectureList();

+			} else {

+				//get permitted list			

+				lectures = client.getLectureListPermissionRead(person.verantwortlicher.getUserID());

+			}

+			

 			Iterator<server.generated.Lecture> i = lectures.iterator();

 			SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

 			SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");