Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

4 files changed, 171 insertions, 26 deletions

diff --git a/dozentenmodul/src/main/java/models/GUIRights.java b/dozentenmodul/src/main/java/models/GUIRights.java
new file mode 100644
index 00000000..a1937b78
--- /dev/null
+++ b/dozentenmodul/src/main/java/models/GUIRights.java
@@ -0,0 +1,62 @@
+package models;
+
+public class GUIRights {
+
+	private int read;
+	private int write;
+	private int changePermission;
+	private int admin;
+	private int linkAllowed;
+	private String userID;
+
+	public String getUserID() {
+		return userID;
+	}
+
+	public void setUserID(String userID) {
+		this.userID = userID;
+	}
+
+	public static GUIRights rights = new GUIRights();
+
+	public int getRead() {
+		return read;
+	}
+
+	public void setRead(int read) {
+		this.read = read;
+	}
+
+	public int getWrite() {
+		return write;
+	}
+
+	public void setWrite(int write) {
+		this.write = write;
+	}
+
+	public int getChangePermission() {
+		return changePermission;
+	}
+
+	public void setChangePermission(int changePermission) {
+		this.changePermission = changePermission;
+	}
+
+	public int getAdmin() {
+		return admin;
+	}
+
+	public void setAdmin(int admin) {
+		this.admin = admin;
+	}
+
+	public int getLinkAllowed() {
+		return linkAllowed;
+	}
+
+	public void setLinkAllowed(int linkAllowed) {
+		this.linkAllowed = linkAllowed;
+	}
+
+}
diff --git a/dozentenmodul/src/main/java/models/ImageRights.java b/dozentenmodul/src/main/java/models/ImageRights.java
index 1b7e0e55..c5b5efbb 100644
--- a/dozentenmodul/src/main/java/models/ImageRights.java
+++ b/dozentenmodul/src/main/java/models/ImageRights.java
@@ -2,41 +2,48 @@ package models;
 
 public class ImageRights {
 	
-	private int read;
-	private int write;
-	private int changePermission;
-	private int admin;
-	private int linkAllowed;
+	private boolean read;
+	private boolean write;
+	private boolean changePermission;
+	private boolean admin;
+	private boolean linkAllowed;
+	private String userID;
 	
+	public String getUserID() {
+		return userID;
+	}
+	public void setUserID(String userID) {
+		this.userID = userID;
+	}
 	public static ImageRights rights =new ImageRights();
-	public int getRead() {
+	public boolean getRead() {
 		return read;
 	}
-	public void setRead(int read) {
+	public void setRead(boolean read) {
 		this.read = read;
 	}
-	public int getWrite() {
+	public boolean getWrite() {
 		return write;
 	}
-	public void setWrite(int write) {
+	public void setWrite(boolean write) {
 		this.write = write;
 	}
-	public int getChangePermission() {
+	public boolean getChangePermission() {
 		return changePermission;
 	}
-	public void setChangePermission(int changePermission) {
+	public void setChangePermission(boolean changePermission) {
 		this.changePermission = changePermission;
 	}
-	public int getAdmin() {
+	public boolean getAdmin() {
 		return admin;
 	}
-	public void setAdmin(int admin) {
+	public void setAdmin(boolean admin) {
 		this.admin = admin;
 	}
-	public int getLinkAllowed() {
+	public boolean getLinkAllowed() {
 		return linkAllowed;
 	}
-	public void setLinkAllowed(int linkAllowed) {
+	public void setLinkAllowed(boolean linkAllowed) {
 		this.linkAllowed = linkAllowed;
 	}
 	
diff --git a/dozentenmodul/src/main/java/models/RightsManagement.java b/dozentenmodul/src/main/java/models/RightsManagement.java
new file mode 100644
index 00000000..38661870
--- /dev/null
+++ b/dozentenmodul/src/main/java/models/RightsManagement.java
@@ -0,0 +1,31 @@
+package models;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class RightsManagement {
+	
+	
+	public RightsManagement(){
+		//
+	}
+	
+	
+	
+	//list which holds all users and (non-)selected values of the table rightstable in permissionCreateImage 
+	private List<person> pmImageCreateList = new ArrayList<person>(); 
+
+	
+	
+	
+	public static RightsManagement rightsManagement = new RightsManagement();
+
+	public List<person> getPmImageCreateList() {
+		return pmImageCreateList;
+	}
+
+	public void setPmImageCreateList(List<person> list) {
+		this.pmImageCreateList = list;
+	}
+
+}
diff --git a/dozentenmodul/src/main/java/models/person.java b/dozentenmodul/src/main/java/models/person.java
index 479c2ecd..1d8e26e1 100644
--- a/dozentenmodul/src/main/java/models/person.java
+++ b/dozentenmodul/src/main/java/models/person.java
@@ -1,28 +1,73 @@
 package models;
 
-public class person{
+public class person {
 
 	private String username;
-
+	private String userID;
 	private String Name;
-
 	private String Vorname;
-
 	private String Hochschule;
-
 	private String EMail;
-
 	private String Tel;
-
 	private String Fakultaet;
-
 	private boolean ischecked;
-	
 	private String role;
+	private boolean read;
+	private boolean write;
+	private boolean changePermission;
+	private boolean admin;
+	private boolean linkAllowed;
+	
 
-	public static person verantwortlicher=new person();
+	public boolean isRead() {
+		return read;
+	}
 
-	
+	public void setRead(boolean read) {
+		this.read = read;
+	}
+
+	public boolean isWrite() {
+		return write;
+	}
+
+	public void setWrite(boolean write) {
+		this.write = write;
+	}
+
+	public boolean isChangePermission() {
+		return changePermission;
+	}
+
+	public void setChangePermission(boolean changePermission) {
+		this.changePermission = changePermission;
+	}
+
+	public boolean isAdmin() {
+		return admin;
+	}
+
+	public void setAdmin(boolean admin) {
+		this.admin = admin;
+	}
+
+	public boolean isLinkAllowed() {
+		return linkAllowed;
+	}
+
+	public void setLinkAllowed(boolean linkAllowed) {
+		this.linkAllowed = linkAllowed;
+	}
+
+	public String getUserID() {
+		return userID;
+	}
+
+	public void setUserID(String userID) {
+		this.userID = userID;
+	}
+
+	public static person verantwortlicher = new person();
 
 	public String getRole() {
 		return role;