diff options
Diffstat (limited to 'dozentenmodul/src/main/java')
5 files changed, 36 insertions, 18 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java index 8a6af0da..cd3cca87 100644 --- a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java @@ -154,7 +154,7 @@ public class CreateImageTechnisch_GUI extends JFrame { panel_1.add(lblNewLabel_2); chckbxIsLicensed = new JCheckBox(""); - chckbxIsLicensed.setSelected(Image.image.isLicensed()); + chckbxIsLicensed.setSelected(true); chckbxIsLicensed.setBounds(266, 52, 97, 23); panel_1.add(chckbxIsLicensed); diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java index 985a9bf7..a4300f97 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java @@ -41,6 +41,7 @@ import javax.swing.filechooser.FileNameExtensionFilter; import models.Image; import models.Links; +import models.RightsManagement; import models.SessionData; import models.person; @@ -659,11 +660,15 @@ public class FTPCreateUploader_GUI extends JFrame implements person.verantwortlicher.getEMail(), person.verantwortlicher.getTel(), person.verantwortlicher.getFakultaet(), - Image.image.isLicensed(), Image.image.isInternet(), - Image.image.getRam(), Image.image.getCpu(), "temp/" - + Image.image.getNewName(), - Image.image.isVorlage(), Image.image.getFilesize(), - Image.image.getShareMode(), Image.image.getOS()); + Image.image.isLicensed(), + Image.image.isInternet(), + Image.image.getRam(), + Image.image.getCpu(), + "temp/"+ Image.image.getNewName(), + Image.image.isVorlage(), + Image.image.getFilesize(), + Image.image.getShareMode(), + Image.image.getOS()); client.startFileCopy(Image.image.getNewName()); @@ -673,7 +678,23 @@ public class FTPCreateUploader_GUI extends JFrame implements person.verantwortlicher.getVorname(), person.verantwortlicher.getEMail(), person.verantwortlicher.getHochschule(), - person.verantwortlicher.getRole()); + person.verantwortlicher.getRole() + ); + + for(int i=0; i< RightsManagement.rightsManagement.getPmImageCreateList().size(); i++){ + System.out.println("Writing additional rights for user "+RightsManagement.rightsManagement.getPmImageCreateList().get(i).getUserID()+", User "+i+"/"+RightsManagement.rightsManagement.getPmImageCreateList().size()); + client.writeAdditionalImageRights( + Image.image.getImagename(), + RightsManagement.rightsManagement.getPmImageCreateList().get(i).getUserID(), + RightsManagement.rightsManagement.getPmImageCreateList().get(i).isRead(), + RightsManagement.rightsManagement.getPmImageCreateList().get(i).isWrite(), + RightsManagement.rightsManagement.getPmImageCreateList().get(i).isLinkAllowed(), + RightsManagement.rightsManagement.getPmImageCreateList().get(i).isAdmin() + ); + + }//end for + + } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java index 37d5eddf..63323969 100644 --- a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java @@ -196,8 +196,12 @@ public class PermissionCreateImage_GUI extends JFrame { System.out.println("getting data from db"); System.out.println(RightsManagement.rightsManagement .getPmImageCreateList().size()); + + person.verantwortlicher.getUserID(); + System.out.println("Current userID: " +person.verantwortlicher.getUserID()); + try { - map = client.getAllOGUsers(); + map = client.getAllOtherSatelliteUsers(person.verantwortlicher.getUserID()); Iterator<server.generated.Person> i = map.iterator(); int x = 0; diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java index 8c076dc7..42fa9409 100644 --- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java +++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java @@ -244,6 +244,7 @@ public class Login_GUI extends JFrame { //person.verantwortlicher.setUsername(lblusername.getText().substring(0,lblusername.getText().indexOf("@"))); person.verantwortlicher.setUsername(lblusername.getText().trim()); + person.verantwortlicher.setUserID(lblusername.getText().trim()); person.verantwortlicher.setName(user.lastName); person.verantwortlicher.setVorname(user.firstName); person.verantwortlicher.setEMail(user.eMail); diff --git a/dozentenmodul/src/main/java/models/person.java b/dozentenmodul/src/main/java/models/person.java index b1a44288..1d8e26e1 100644 --- a/dozentenmodul/src/main/java/models/person.java +++ b/dozentenmodul/src/main/java/models/person.java @@ -3,29 +3,21 @@ package models; 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; - private String userID; + public boolean isRead() { return read; |