Skip to content

Codecrew / Moya

Go to a project
Commit fa09aba0 by Tuukka Kivilahti
Options

Merge remote-tracking branch 'origin/deploy-2018-07-27' into feature/folderStructure

2 parents 4f41f41a bf475dd2
Inline Side-by-side
Showing with 3960 additions and 632 deletions
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/AllergyBeanLocal.java
...@@ -2,6 +2,7 @@ package fi.codecrew.moya.beans; ...@@ -2,6 +2,7 @@ package fi.codecrew.moya.beans;
import fi.codecrew.moya.model.Allergy; import fi.codecrew.moya.model.Allergy;
import fi.codecrew.moya.model.EventUser; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.User;
import fi.codecrew.moya.model.UsersAllergy; import fi.codecrew.moya.model.UsersAllergy;
import javax.ejb.Local; import javax.ejb.Local;
...@@ -13,6 +14,7 @@ public interface AllergyBeanLocal { ...@@ -13,6 +14,7 @@ public interface AllergyBeanLocal {
List<Allergy> getAllergies(); List<Allergy> getAllergies();
List<UsersAllergy> getUserAllergies(User currentUser);
List<UsersAllergy> getUserAllergies(EventUser currentUser); List<UsersAllergy> getUserAllergies(EventUser currentUser);
List<UsersAllergy> saveAllergies(ArrayList<UsersAllergy> allergylist); List<UsersAllergy> saveAllergies(ArrayList<UsersAllergy> allergylist);
......
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/ApiApplicationBeanLocal.java
...@@ -37,4 +37,14 @@ public interface ApiApplicationBeanLocal { ...@@ -37,4 +37,14 @@ public interface ApiApplicationBeanLocal {
ApiApplication findApplication(String appKey); ApiApplication findApplication(String appKey);
String findUsernameForApikey(String appkey, String userkey, String domain); String findUsernameForApikey(String appkey, String userkey, String domain);
ApiApplication createApiApplication(ApiApplication apiApp);
ApiApplication findApplication(Integer id);
ApiApplication saveApiApplication(ApiApplication apiApp);
List<ApiApplicationInstance> findInstances(ApiApplication apiApp);
ApiApplicationInstance saveApiInstance(ApiApplicationInstance selectedInstance);
} }
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/PermissionBeanLocal.java
...@@ -24,6 +24,7 @@ import javax.resource.spi.IllegalStateException; ...@@ -24,6 +24,7 @@ import javax.resource.spi.IllegalStateException;
import fi.codecrew.moya.enums.apps.IAppPermission; import fi.codecrew.moya.enums.apps.IAppPermission;
import fi.codecrew.moya.enums.apps.SpecialPermission; import fi.codecrew.moya.enums.apps.SpecialPermission;
import fi.codecrew.moya.model.EventUser; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.Role;
import fi.codecrew.moya.model.User; import fi.codecrew.moya.model.User;
@Local @Local
...@@ -61,6 +62,7 @@ public interface PermissionBeanLocal { ...@@ -61,6 +62,7 @@ public interface PermissionBeanLocal {
String getPrincipalName(); String getPrincipalName();
// boolean hasPermission(String perm); // boolean hasPermission(String perm);
} }
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/UserBeanLocal.java
...@@ -22,6 +22,7 @@ import java.io.IOException; ...@@ -22,6 +22,7 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List; import java.util.List;
import java.util.Map;
import javax.ejb.Local; import javax.ejb.Local;
...@@ -146,6 +147,8 @@ public interface UserBeanLocal { ...@@ -146,6 +147,8 @@ public interface UserBeanLocal {
boolean isUserInRole(EventUser user, Integer roleId); boolean isUserInRole(EventUser user, Integer roleId);
boolean isUserInRole(EventUser user, Role role);
EventUser getOtherEventsEventuser(User user, LanEvent event); EventUser getOtherEventsEventuser(User user, LanEvent event);
/** /**
...@@ -208,4 +211,15 @@ public interface UserBeanLocal { ...@@ -208,4 +211,15 @@ public interface UserBeanLocal {
* @return EventUser with the matching code * @return EventUser with the matching code
*/ */
EventUser findUserByCodeToken(String code); EventUser findUserByCodeToken(String code);
/**
* Return eventusers of all events for user
* This function can only be used by users themselves, and superadmins.
* @param user User to fetch eventusers for
* @return Eventusers for all events this user has been associated to.
*/
List<EventUser> findAllEventusers(User user);
Map<Role,List<String>> findUsersRolesWithReason(EventUser user);
} }
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/UserPropertyBeanLocal.java 0 → 100644
package fi.codecrew.moya.beans;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.EventUserproperty;
import fi.codecrew.moya.model.UsersEventUserproperty;
import javax.ejb.Local;
import java.util.List;
@Local
public interface UserPropertyBeanLocal {
List<EventUserproperty> getPropertiesForUser(EventUser user);
List<UsersEventUserproperty> getUserPropertiesForUser(EventUser user);
UsersEventUserproperty saveUserproperty(UsersEventUserproperty object);
}
code/moya-beans-client/ejbModule/fi/codecrew/moya/beans/VotingBeanLocal.java
...@@ -22,10 +22,7 @@ import java.util.List; ...@@ -22,10 +22,7 @@ import java.util.List;
import javax.ejb.Local; import javax.ejb.Local;
import fi.codecrew.moya.model.Compo; import fi.codecrew.moya.model.*;
import fi.codecrew.moya.model.CompoEntry;
import fi.codecrew.moya.model.CompoEntryFile;
import fi.codecrew.moya.model.Vote;
@Local @Local
public interface VotingBeanLocal { public interface VotingBeanLocal {
...@@ -59,4 +56,9 @@ public interface VotingBeanLocal { ...@@ -59,4 +56,9 @@ public interface VotingBeanLocal {
public List<CompoEntry> getEntriesForCurrentUser(); public List<CompoEntry> getEntriesForCurrentUser();
Compo saveFiletype(CompoFileType filetype);
Compo deleteFiletype(CompoFileType ft);
CompoEntryFileType findEntryFileType(Integer entryId, Integer typeId);
} }
code/moya-beans/ejbModule/fi/codecrew/moya/beans/AllergyBean.java
...@@ -4,6 +4,7 @@ import fi.codecrew.moya.facade.AllergyFacade; ...@@ -4,6 +4,7 @@ import fi.codecrew.moya.facade.AllergyFacade;
import fi.codecrew.moya.facade.UsersAllergyFacade; import fi.codecrew.moya.facade.UsersAllergyFacade;
import fi.codecrew.moya.model.Allergy; import fi.codecrew.moya.model.Allergy;
import fi.codecrew.moya.model.EventUser; import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.User;
import fi.codecrew.moya.model.UsersAllergy; import fi.codecrew.moya.model.UsersAllergy;
import javax.ejb.EJB; import javax.ejb.EJB;
...@@ -27,11 +28,16 @@ public class AllergyBean implements AllergyBeanLocal { ...@@ -27,11 +28,16 @@ public class AllergyBean implements AllergyBeanLocal {
} }
@Override @Override
public List<UsersAllergy> getUserAllergies(EventUser user) { public List<UsersAllergy> getUserAllergies(User user) {
return userAllergyFacade.findForUser(user); return userAllergyFacade.findForUser(user);
} }
@Override @Override
public List<UsersAllergy> getUserAllergies(EventUser user) {
return userAllergyFacade.findForUser(user.getUser());
}
@Override
public List<UsersAllergy> saveAllergies(ArrayList<UsersAllergy> allergylist) { public List<UsersAllergy> saveAllergies(ArrayList<UsersAllergy> allergylist) {
ArrayList<UsersAllergy> ret = new ArrayList<>(); ArrayList<UsersAllergy> ret = new ArrayList<>();
for (UsersAllergy a : allergylist) { for (UsersAllergy a : allergylist) {
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/ApiApplicationBean.java
...@@ -24,10 +24,8 @@ import java.util.List; ...@@ -24,10 +24,8 @@ import java.util.List;
import javax.annotation.security.DeclareRoles; import javax.annotation.security.DeclareRoles;
import javax.annotation.security.RolesAllowed; import javax.annotation.security.RolesAllowed;
import javax.ejb.EJB; import javax.ejb.*;
import javax.ejb.EJBException; import javax.security.jacc.EJBMethodPermission;
import javax.ejb.LocalBean;
import javax.ejb.Singleton;
import fi.codecrew.moya.enums.apps.SpecialPermission; import fi.codecrew.moya.enums.apps.SpecialPermission;
import fi.codecrew.moya.facade.ApiApplicationFacade; import fi.codecrew.moya.facade.ApiApplicationFacade;
...@@ -47,7 +45,7 @@ import org.slf4j.LoggerFactory; ...@@ -47,7 +45,7 @@ import org.slf4j.LoggerFactory;
*/ */
@Singleton @Singleton
@LocalBean @LocalBean
@DeclareRoles(SpecialPermission.S_SUPERADMIN) @DeclareRoles({SpecialPermission.S_SUPERADMIN, SpecialPermission.S_USER})
public class ApiApplicationBean implements ApiApplicationBeanLocal { public class ApiApplicationBean implements ApiApplicationBeanLocal {
@EJB @EJB
...@@ -71,6 +69,7 @@ public class ApiApplicationBean implements ApiApplicationBeanLocal { ...@@ -71,6 +69,7 @@ public class ApiApplicationBean implements ApiApplicationBeanLocal {
UserBean userBean; UserBean userBean;
private static final Logger logger = LoggerFactory.getLogger(ApiApplicationBean.class); private static final Logger logger = LoggerFactory.getLogger(ApiApplicationBean.class);
/** /**
* Default constructor. * Default constructor.
*/ */
...@@ -142,6 +141,69 @@ public class ApiApplicationBean implements ApiApplicationBeanLocal { ...@@ -142,6 +141,69 @@ public class ApiApplicationBean implements ApiApplicationBeanLocal {
@Override @Override
@RolesAllowed(SpecialPermission.S_USER) @RolesAllowed(SpecialPermission.S_USER)
public ApiApplication createApiApplication(ApiApplication apiApp) {
if (apiApp.getDeveloper() == null) {
apiApp.setDeveloper(permissionBean.getCurrentUser().getUser());
}
if (apiApp.getApplicationKey() == null || apiApp.getApplicationKey().isEmpty()) {
apiApp.setApplicationKey(PasswordFunctions.generateRandomString(20, PasswordFunctions.ALL_CHARS));
}
if (apiApp.getApplicationKey().length() < 8) {
throw new EJBException("Application key musst be at least 8 characters long");
}
if (!permissionBean.hasPermission(SpecialPermission.SUPERADMIN) && !permissionBean.isCurrentUser(apiApp.getDeveloper())) {
throw new EJBAccessException("Trying to create application for different user");
}
apiApp.setCreated(new Date());
applicationFacade.create(apiApp);
return apiApp;
}
@Override
@RolesAllowed(SpecialPermission.S_USER)
public ApiApplication findApplication(Integer id) {
ApiApplication ret = applicationFacade.find(id);
if (!permissionBean.isCurrentUser(ret.getDeveloper()) && !permissionBean.hasPermission(SpecialPermission.SUPERADMIN)) {
throw new EJBAccessException("Trying to return apiapp for wrong user");
}
return ret;
}
@Override
@RolesAllowed(SpecialPermission.S_USER)
public ApiApplication saveApiApplication(ApiApplication apiApp) {
if (!permissionBean.isCurrentUser(apiApp.getDeveloper()) && permissionBean.hasPermission(SpecialPermission.SUPERADMIN)) {
throw new EJBAccessException("Trying to save apiapp for another user");
}
return applicationFacade.merge(apiApp);
}
@Override
@RolesAllowed(SpecialPermission.S_USER)
public List<ApiApplicationInstance> findInstances(ApiApplication apiApp) {
return instanceFacade.findForUser(permissionBean.getCurrentUser(), apiApp);
}
@Override
@RolesAllowed(SpecialPermission.S_USER)
public ApiApplicationInstance saveApiInstance(ApiApplicationInstance instance) {
if (instance.getEventuser() == null) {
instance.setEventuser(permissionBean.getCurrentUser());
}
if (!permissionBean.isCurrentUser(instance.getEventuser()) && !permissionBean.hasPermission(SpecialPermission.SUPERADMIN)) {
throw new EJBAccessException("Trying to create apiInstance to foreign user");
}
if (instance.getId() == null) {
instanceFacade.create(instance);
return instance;
}
return instanceFacade.merge(instance);
}
@Override
@RolesAllowed(SpecialPermission.S_USER)
public List<ApiApplication> findMyApplications() { public List<ApiApplication> findMyApplications() {
EventUser curruser = permissionBean.getCurrentUser(); EventUser curruser = permissionBean.getCurrentUser();
return applicationFacade.findForUser(curruser); return applicationFacade.findForUser(curruser);
...@@ -153,4 +215,5 @@ public class ApiApplicationBean implements ApiApplicationBeanLocal { ...@@ -153,4 +215,5 @@ public class ApiApplicationBean implements ApiApplicationBeanLocal {
return applicationFacade.findAll(); return applicationFacade.findAll();
} }
} }
code/moya-beans/ejbModule/fi/codecrew/moya/beans/BootstrapBean.java
...@@ -586,8 +586,49 @@ public class BootstrapBean implements BootstrapBeanLocal { ...@@ -586,8 +586,49 @@ public class BootstrapBean implements BootstrapBeanLocal {
"ALTER TABLE users ALTER confirm_time TYPE TIMESTAMPTZ", "ALTER TABLE users ALTER confirm_time TYPE TIMESTAMPTZ",
"ALTER TABLE users ALTER created TYPE TIMESTAMPTZ" "ALTER TABLE users ALTER created TYPE TIMESTAMPTZ"
}); });
dbUpdates.add(new String[]{
"CREATE TABLE event_userproperties (id SERIAL NOT NULL, description jsonb not null, meta json, name jsonb not null, TYPE TEXT NOT NULL, event_id INTEGER NOT NULL, for_role_id INTEGER, PRIMARY KEY (id))",
"CREATE TABLE users_event_userproperties (id SERIAL NOT NULL, datavalue BYTEA, decimalvalue DECIMAL(38,10), integervalue BIGINT, meta json, textvalue TEXT, property_id INTEGER NOT NULL, user_id INTEGER NOT NULL, PRIMARY KEY (id))",
"ALTER TABLE event_userproperties ADD CONSTRAINT FK_event_userproperties_for_role_id FOREIGN KEY (for_role_id) REFERENCES roles (id)",
"ALTER TABLE event_userproperties ADD CONSTRAINT FK_event_userproperties_event_id FOREIGN KEY (event_id) REFERENCES events (id)",
"ALTER TABLE users_event_userproperties ADD CONSTRAINT FK_users_event_userproperties_property_id FOREIGN KEY (property_id) REFERENCES event_userproperties (id)",
"ALTER TABLE users_event_userproperties ADD CONSTRAINT FK_users_event_userproperties_user_id FOREIGN KEY (user_id) REFERENCES event_users (id)"
});
dbUpdates.add(new String[]{
"ALTER TABLE compo_entry_files ADD COLUMN type_id INTEGER",
"CREATE TABLE compo_file_types (id SERIAL NOT NULL, description TEXT, filetype TEXT, meta jsonb, name TEXT, required BOOLEAN, SORT INTEGER NOT NULL, compo_id INTEGER NOT NULL, PRIMARY KEY (id))",
"ALTER TABLE compo_entry_files ADD CONSTRAINT FK_compo_entry_files_type_id FOREIGN KEY (type_id) REFERENCES compo_file_types (id)",
"ALTER TABLE compo_file_types ADD CONSTRAINT FK_compo_file_types_compo_id FOREIGN KEY (compo_id) REFERENCES compos (id)"
});
dbUpdates.add(new String[]{
"ALTER TABLE compo_entry_files RENAME TO old_compo_entry_file",
"CREATE TABLE compo_entry_files (id SERIAL NOT NULL, description TEXT, file_name TEXT, filepath TEXT NOT NULL, hash TEXT, meta jsonb, mime_type TEXT, uploaded TIMESTAMPTZ NOT NULL, entryfiletype_id INTEGER NOT NULL, PRIMARY KEY (id))",
"CREATE TABLE compo_entry_file_types (id SERIAL NOT NULL, meta jsonb, updated TIMESTAMPTZ NOT NULL, current_file_id INTEGER, entry_id INTEGER NOT NULL, type_id INTEGER NOT NULL, PRIMARY KEY (id))",
"ALTER TABLE compo_entry_file_types ADD CONSTRAINT UNQ_compo_entry_file_types_0 UNIQUE (entry_id, type_id)",
"ALTER TABLE compo_entry_file_types ADD CONSTRAINT FK_compo_entry_file_types_type_id FOREIGN KEY (type_id) REFERENCES compo_file_types (id)",
"ALTER TABLE compo_entry_file_types ADD CONSTRAINT FK_compo_entry_file_types_current_file_id FOREIGN KEY (current_file_id) REFERENCES compo_entry_files (id)",
"ALTER TABLE compo_entry_file_types ADD CONSTRAINT FK_compo_entry_file_types_entry_id FOREIGN KEY (entry_id) REFERENCES compo_entries (id)",
"ALTER TABLE compo_entry_files ADD CONSTRAINT FK_compo_entry_files_entryfiletype_id FOREIGN KEY (entryfiletype_id) REFERENCES compo_entry_file_types (id)",
});
dbUpdates.add(new String[]{
"CREATE TABLE compo_voting_schemes (id SERIAL NOT NULL, allow_recusal BOOLEAN NOT NULL, max_value DECIMAL(24,8), meta jsonb, min_value DECIMAL(24,8), name TEXT NOT NULL, type TEXT NOT NULL, value_increment DECIMAL(24,8), event_id INTEGER NOT NULL, PRIMARY KEY (id))",
"CREATE TABLE compo_voting_roles (id SERIAL NOT NULL, meta jsonb, multiplier DECIMAL(24,8) NOT NULL, override_max DECIMAL(24,8), override_min DECIMAL(24,8), override_others BOOLEAN NOT NULL, PRIORITY INTEGER NOT NULL, role_id INTEGER NOT NULL, scheme_id INTEGER NOT NULL, PRIMARY KEY (id))",
"ALTER TABLE COMPOS ADD COLUMN entrysubmit_role_id INTEGER, ADD COLUMN voting_scheme_id INTEGER",
"ALTER TABLE compo_voting_schemes ADD CONSTRAINT FK_compo_voting_schemes_event_id FOREIGN KEY (event_id) REFERENCES events (id)",
"ALTER TABLE compos ADD CONSTRAINT FK_compos_voting_scheme_id FOREIGN KEY (voting_scheme_id) REFERENCES compo_voting_schemes (id)",
"ALTER TABLE compo_voting_roles ADD CONSTRAINT UNQ_compo_voting_roles_0 UNIQUE (scheme_id, role_id)",
"ALTER TABLE compo_voting_roles ADD CONSTRAINT FK_compo_voting_roles_scheme_id FOREIGN KEY (scheme_id) REFERENCES compo_voting_schemes (id)",
"ALTER TABLE compo_voting_roles ADD CONSTRAINT FK_compo_voting_roles_role_id FOREIGN KEY (role_id) REFERENCES roles (id)",
});
} }
public BootstrapBean() { public BootstrapBean() {
} }
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/PermissionBean.java
...@@ -28,6 +28,7 @@ import javax.resource.spi.IllegalStateException; ...@@ -28,6 +28,7 @@ import javax.resource.spi.IllegalStateException;
import fi.codecrew.moya.enums.apps.*; import fi.codecrew.moya.enums.apps.*;
import fi.codecrew.moya.facade.EventFacade; import fi.codecrew.moya.facade.EventFacade;
import fi.codecrew.moya.model.LanEvent; import fi.codecrew.moya.model.LanEvent;
import fi.codecrew.moya.model.Role;
import fi.codecrew.moya.utilities.UserLoginUtils; import fi.codecrew.moya.utilities.UserLoginUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -127,6 +128,8 @@ public class PermissionBean implements PermissionBeanLocal { ...@@ -127,6 +128,8 @@ public class PermissionBean implements PermissionBeanLocal {
@EJB @EJB
private EventBean eventbean; private EventBean eventbean;
@EJB
private UserBean userbean;
@Override @Override
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/UserBean.java
...@@ -29,12 +29,7 @@ import java.math.BigDecimal; ...@@ -29,12 +29,7 @@ import java.math.BigDecimal;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.ArrayList; import java.util.*;
import java.util.Calendar;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.annotation.security.DeclareRoles; import javax.annotation.security.DeclareRoles;
import javax.annotation.security.PermitAll; import javax.annotation.security.PermitAll;
...@@ -191,7 +186,7 @@ public class UserBean implements UserBeanLocal { ...@@ -191,7 +186,7 @@ public class UserBean implements UserBeanLocal {
@Override @Override
public boolean setUsersLocale(String locale) { public boolean setUsersLocale(String locale) {
if(permbean.getCurrentUser().isAnonymous()) { if (permbean.getCurrentUser().isAnonymous()) {
return false; return false;
} }
...@@ -233,7 +228,16 @@ public class UserBean implements UserBeanLocal { ...@@ -233,7 +228,16 @@ public class UserBean implements UserBeanLocal {
throw new EJBAccessException("Not enough rights to find roles"); throw new EJBAccessException("Not enough rights to find roles");
} }
return new ArrayList<Role>(localFindUsersRoles(u)); ArrayList<Role> ret = new ArrayList<>(localFindUsersRoles(u));
ret.sort((o1, o2) -> o1.getId().compareTo(o2.getId()));
return ret;
}
@Override
@RolesAllowed(UserPermission.S_VIEW_ALL)
public Map<Role, List<String>> findUsersRolesWithReason(EventUser u) {
return localFindUsersRolesWithReason(u);
} }
...@@ -244,6 +248,10 @@ public class UserBean implements UserBeanLocal { ...@@ -244,6 +248,10 @@ public class UserBean implements UserBeanLocal {
// Käytä Viewien puolelta findUsersRoles joka tarkistaa käyttäjän oikeudet // Käytä Viewien puolelta findUsersRoles joka tarkistaa käyttäjän oikeudet
// ensin. // ensin.
public Set<Role> localFindUsersRoles(EventUser u) { public Set<Role> localFindUsersRoles(EventUser u) {
return localFindUsersRolesWithReason(u).keySet();
}
public HashMap<Role, List<String>> localFindUsersRolesWithReason(EventUser u) {
// if (currentEventuser != null && u.equals(currentEventuser)) { // if (currentEventuser != null && u.equals(currentEventuser)) {
// logger.debug("Returnin cached eventuserroles for user {}: {}", // logger.debug("Returnin cached eventuserroles for user {}: {}",
// currentEventuser, currentEventuserRoles); // currentEventuser, currentEventuserRoles);
...@@ -251,26 +259,27 @@ public class UserBean implements UserBeanLocal { ...@@ -251,26 +259,27 @@ public class UserBean implements UserBeanLocal {
// } // }
LanEvent event = u.getEvent(); LanEvent event = u.getEvent();
Set<Role> checkedRoles = new HashSet<Role>(); //Set<Role> checkedRoles = new HashSet<Role>();
HashMap<Role, List<String>> checkedRoles = new HashMap<>();
if (u != null) { if (u != null) {
addRecursive(checkedRoles, rolefacade.findForUser(u)); addRecursive(checkedRoles, rolefacade.findForUser(u), "DIRECT");
addRecursive(checkedRoles, orgRoleFacade.findRolesForUser(u)); addRecursive(checkedRoles, orgRoleFacade.findRolesForUser(u), "ORG_ROLE");
if (permbean.isLoggedIn()) { if (permbean.isLoggedIn()) {
// add roles from events default role. // add roles from events default role.
addRecursive(checkedRoles, event.getDefaultRole()); addRecursive(checkedRoles, event.getDefaultRole(), "EVENT_DEFAULT");
} }
if (!u.isAnonymous()) { if (!u.isAnonymous()) {
// add roles from accountEvents of the user // add roles from accountEvents of the user
addRecursive(checkedRoles, productbean.getRolesFromAccountEvents(u)); addRecursive(checkedRoles, productbean.getRolesFromAccountEvents(u), "ACCOUNTEVENT");
for (GroupMembership member : gmfacade.findMemberships(u)) { for (GroupMembership member : gmfacade.findMemberships(u)) {
if (member != null && member.getPlaceReservation() != null) { if (member != null && member.getPlaceReservation() != null) {
addRecursive(checkedRoles, member.getPlaceReservation().getProvidesRole()); addRecursive(checkedRoles, member.getPlaceReservation().getProvidesRole(), "PLACE");
if (member.getPlaceReservation().getProduct() != null) { if (member.getPlaceReservation().getProduct() != null) {
addRecursive(checkedRoles, member.getPlaceReservation().getProduct().getProvides()); addRecursive(checkedRoles, member.getPlaceReservation().getProduct().getProvides(), "PLACE_PRODUCT");
} }
} }
} }
...@@ -286,20 +295,28 @@ public class UserBean implements UserBeanLocal { ...@@ -286,20 +295,28 @@ public class UserBean implements UserBeanLocal {
return checkedRoles; return checkedRoles;
} }
private void addRecursive(Set<Role> checkedRoles, Collection<Role> roles) { public void addRecursive(Map<Role, List<String>> checkedRoles, Collection<Role> roles, String source) {
for (Role r : roles) { for (Role r : roles) {
addRecursive(checkedRoles, r); addRecursive(checkedRoles, r, source);
} }
} }
private void addRecursive(Set<Role> checkedRoles, Role role) { public void addRecursive(Map<Role, List<String>> checkedRoles, Role role, String source) {
if (role == null || checkedRoles.contains(role)) { if (role == null) {
return; return;
} }
checkedRoles.add(role);
List<String> reasons = checkedRoles.get(role);
if (reasons == null) {
reasons = new ArrayList<>();
checkedRoles.put(role, reasons);
for (Role r : role.getParents()) { for (Role r : role.getParents()) {
addRecursive(checkedRoles, r); addRecursive(checkedRoles, r, source);
} }
}
reasons.add(source);
} }
...@@ -966,11 +983,11 @@ public class UserBean implements UserBeanLocal { ...@@ -966,11 +983,11 @@ public class UserBean implements UserBeanLocal {
@Override @Override
public boolean isUserInRole(EventUser user, Integer roleId) { public boolean isUserInRole(EventUser user, Integer roleId) {
Set<Role> roles = localFindUsersRoles(user); HashMap<Role, List<String>> roles = localFindUsersRolesWithReason(user);
logger.info("CHecking user {} roleid {} from roles {}, roles size{}", new Object[]{user, roleId, roles, roles.size()}); logger.info("CHecking user {} roleid {} from roles {}, roles size{}", new Object[]{user, roleId, roles, roles.size()});
addRecursive(roles, eventBean.getCurrentEvent().getDefaultRole()); addRecursive(roles, eventBean.getCurrentEvent().getDefaultRole(), "DEFAULT");
for (Role r : roles) { for (Role r : roles.keySet()) {
if (roleId.equals(r.getId())) { if (roleId.equals(r.getId())) {
logger.info("User {} found in role {}", user, roleId); logger.info("User {} found in role {}", user, roleId);
return true; return true;
...@@ -981,6 +998,12 @@ public class UserBean implements UserBeanLocal { ...@@ -981,6 +998,12 @@ public class UserBean implements UserBeanLocal {
} }
@Override @Override
public boolean isUserInRole(EventUser user, Role role) {
return role != null && isUserInRole(user, role.getId());
}
@Override
public User getUser(Integer id) { public User getUser(Integer id) {
User ret = userFacade.find(id); User ret = userFacade.find(id);
...@@ -1180,6 +1203,16 @@ public class UserBean implements UserBeanLocal { ...@@ -1180,6 +1203,16 @@ public class UserBean implements UserBeanLocal {
return eventUser; return eventUser;
} }
@Override
@RolesAllowed(SpecialPermission.S_USER)
public List<EventUser> findAllEventusers(User user) {
user = userFacade.reload(user);
if (!permbean.isCurrentUser(user) && !permbean.getCurrentUser().isSuperadmin()) {
throw new EJBAccessException("Only users themselves can fetch all eventusers for all events");
}
return eventUserFacade.findForUser(user);
}
@Override @Override
@RolesAllowed(EventPermission.S_MANAGE_EVENT) @RolesAllowed(EventPermission.S_MANAGE_EVENT)
......
code/moya-beans/ejbModule/fi/codecrew/moya/beans/UserPropertyBean.java 0 → 100644
/*
* Copyright Codecrew Ry
*
* All rights reserved.
*
* This license applies to any software containing a notice placed by the
* copyright holder. Such software is herein referred to as the Software.
* This license covers modification, distribution and use of the Software.
*
* Any distribution and use in source and binary forms, with or without
* modification is not permitted without explicit written permission from the
* copyright owner.
*
* A non-exclusive royalty-free right is granted to the copyright owner of the
* Software to use, modify and distribute all modifications to the Software in
* future versions of the Software.
*
*/
package fi.codecrew.moya.beans;
import fi.codecrew.moya.facade.EventUserpropertyFacade;
import fi.codecrew.moya.facade.UserEventUserpropertyFacade;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.EventUserproperty;
import fi.codecrew.moya.model.UsersEventUserproperty;
import javax.ejb.EJB;
import javax.ejb.LocalBean;
import javax.ejb.Stateless;
import java.util.List;
@Stateless
@LocalBean
public class UserPropertyBean implements UserPropertyBeanLocal {
@EJB
private EventUserpropertyFacade eventPropertyFacade;
@EJB
private UserEventUserpropertyFacade userPropertyFacade;
@EJB
private PermissionBean permbean;
public UserPropertyBean() {
}
@Override
public List<EventUserproperty> getPropertiesForUser(EventUser user) {
return eventPropertyFacade.findForUser(user);
}
@Override
public List<UsersEventUserproperty> getUserPropertiesForUser(EventUser user) {
return userPropertyFacade.findForUser(user);
}
@Override
public UsersEventUserproperty saveUserproperty(UsersEventUserproperty prop) {
if (prop == null) {
return null;
}
if (prop.getId() == null) {
userPropertyFacade.create(prop);
} else {
prop = userPropertyFacade.merge(prop);
}
return prop;
}
}
code/moya-beans/ejbModule/fi/codecrew/moya/beans/VotingBean.java
...@@ -20,6 +20,7 @@ package fi.codecrew.moya.beans; ...@@ -20,6 +20,7 @@ package fi.codecrew.moya.beans;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date;
import java.util.List; import java.util.List;
import javax.annotation.security.DeclareRoles; import javax.annotation.security.DeclareRoles;
...@@ -28,19 +29,13 @@ import javax.ejb.EJB; ...@@ -28,19 +29,13 @@ import javax.ejb.EJB;
import javax.ejb.LocalBean; import javax.ejb.LocalBean;
import javax.ejb.Stateless; import javax.ejb.Stateless;
import fi.codecrew.moya.enums.apps.SpecialPermission;
import fi.codecrew.moya.facade.*;
import fi.codecrew.moya.model.*;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fi.codecrew.moya.enums.apps.CompoPermission; import fi.codecrew.moya.enums.apps.CompoPermission;
import fi.codecrew.moya.facade.CompoEntryFacade;
import fi.codecrew.moya.facade.CompoEntryFileFacade;
import fi.codecrew.moya.facade.CompoFacade;
import fi.codecrew.moya.facade.VoteFacade;
import fi.codecrew.moya.model.Compo;
import fi.codecrew.moya.model.CompoEntry;
import fi.codecrew.moya.model.CompoEntryFile;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.Vote;
/** /**
* Session Bean implementation class VotingBean * Session Bean implementation class VotingBean
...@@ -49,7 +44,9 @@ import fi.codecrew.moya.model.Vote; ...@@ -49,7 +44,9 @@ import fi.codecrew.moya.model.Vote;
@LocalBean @LocalBean
@DeclareRoles({ @DeclareRoles({
CompoPermission.S_SUBMIT_ENTRY, CompoPermission.S_SUBMIT_ENTRY,
CompoPermission.S_MANAGE }) CompoPermission.S_MANAGE,
SpecialPermission.S_USER
})
public class VotingBean implements VotingBeanLocal { public class VotingBean implements VotingBeanLocal {
@EJB @EJB
...@@ -64,7 +61,13 @@ public class VotingBean implements VotingBeanLocal { ...@@ -64,7 +61,13 @@ public class VotingBean implements VotingBeanLocal {
private EventBean eventBean; private EventBean eventBean;
@EJB @EJB
private PermissionBeanLocal permissionBean; private PermissionBeanLocal permissionBean;
@EJB
private CompoFileTypeFacade filetypeFacade;
private static final Logger logger = LoggerFactory.getLogger(VotingBean.class); private static final Logger logger = LoggerFactory.getLogger(VotingBean.class);
@EJB
private CompoEntryFileTypeFacade entryFiletypeFacade;
@EJB
private CompoFileTypeFacade compoFileTypeFadade;
/** /**
* Default constructor. * Default constructor.
...@@ -84,7 +87,8 @@ public class VotingBean implements VotingBeanLocal { ...@@ -84,7 +87,8 @@ public class VotingBean implements VotingBeanLocal {
} }
public void addEntry(CompoEntry compoEntry, CompoEntryFile compoEntryFile) { public void addEntry(CompoEntry compoEntry, CompoEntryFile compoEntryFile) {
compoEntry.setCreated(Calendar.getInstance());
/*compoEntry.setCreated(Calendar.getInstance());
compoEntry.setCreator(permissionBean.getCurrentUser()); compoEntry.setCreator(permissionBean.getCurrentUser());
Compo c = compoFacade.merge(compoEntry.getCompo()); Compo c = compoFacade.merge(compoEntry.getCompo());
...@@ -93,6 +97,7 @@ public class VotingBean implements VotingBeanLocal { ...@@ -93,6 +97,7 @@ public class VotingBean implements VotingBeanLocal {
compoFacade.flush(); compoFacade.flush();
compoEntryFile.setEntriesId(compoEntry); compoEntryFile.setEntriesId(compoEntry);
// compoEntry.getFiles().add(compoEntryFile); // compoEntry.getFiles().add(compoEntryFile);
*/
} }
public Compo getCompoById(Integer compoId) { public Compo getCompoById(Integer compoId) {
...@@ -104,22 +109,20 @@ public class VotingBean implements VotingBeanLocal { ...@@ -104,22 +109,20 @@ public class VotingBean implements VotingBeanLocal {
} }
@Override @Override
@RolesAllowed({ CompoPermission.S_SUBMIT_ENTRY, @RolesAllowed({CompoPermission.S_SUBMIT_ENTRY,
CompoPermission.S_MANAGE, CompoPermission.S_MANAGE,
}) })
public Compo addEntry(CompoEntry entry) { public Compo addEntry(CompoEntry entry) {
Compo co = compoFacade.reload(entry.getCompo()); Compo co = compoFacade.reload(entry.getCompo());
entry.setCreator(permissionBean.getCurrentUser()); entry.setCreator(permissionBean.getCurrentUser());
if (entry.getTitle() == null) if (entry.getTitle() == null) {
{
entry.setTitle(""); entry.setTitle("");
} }
if (co.getCompoEntries() == null) { if (co.getCompoEntries() == null) {
co.setCompoEntries(new ArrayList<CompoEntry>()); co.setCompoEntries(new ArrayList<CompoEntry>());
} }
if (!co.getCompoEntries().contains(entry)) if (!co.getCompoEntries().contains(entry)) {
{
co.getCompoEntries().add(entry); co.getCompoEntries().add(entry);
} }
return co; return co;
...@@ -135,7 +138,8 @@ public class VotingBean implements VotingBeanLocal { ...@@ -135,7 +138,8 @@ public class VotingBean implements VotingBeanLocal {
@Override @Override
public List<CompoEntryFile> getEntryFiles(CompoEntry entry) { public List<CompoEntryFile> getEntryFiles(CompoEntry entry) {
return compoEntryFileFacade.findFor(entry); //return compoEntryFileFacade.findFor(entry);
return null;
} }
@Override @Override
...@@ -170,10 +174,8 @@ public class VotingBean implements VotingBeanLocal { ...@@ -170,10 +174,8 @@ public class VotingBean implements VotingBeanLocal {
entry = compoEntryFacade.find(entry.getId()); entry = compoEntryFacade.find(entry.getId());
EventUser user = permissionBean.getCurrentUser(); EventUser user = permissionBean.getCurrentUser();
Vote voteEntity = voteFacade.find(entry, user); Vote voteEntity = voteFacade.find(entry, user);
if (vote != null) if (vote != null) {
{ if (voteEntity == null) {
if (voteEntity == null)
{
voteEntity = new Vote(); voteEntity = new Vote();
if (user.getVotes() == null) { if (user.getVotes() == null) {
user.setVotes(new ArrayList<Vote>()); user.setVotes(new ArrayList<Vote>());
...@@ -204,13 +206,59 @@ public class VotingBean implements VotingBeanLocal { ...@@ -204,13 +206,59 @@ public class VotingBean implements VotingBeanLocal {
} }
@Override @Override
@RolesAllowed(SpecialPermission.S_USER)
public void create(CompoEntryFile cef) { public void create(CompoEntryFile cef) {
compoEntryFileFacade.create(cef); compoEntryFileFacade.create(cef);
CompoEntryFileType ft = entryFiletypeFacade.reload(cef.getFiletype());
ft.setUpdated(new Date());
ft.setCurrentFile(cef);
ft.getEntryFiles().add(cef);
} }
@Override @Override
@RolesAllowed(SpecialPermission.S_USER)
public List<CompoEntry> getEntriesForCurrentUser() { public List<CompoEntry> getEntriesForCurrentUser() {
EventUser user = permissionBean.getCurrentUser(); EventUser user = permissionBean.getCurrentUser();
return compoEntryFacade.findUsersEntries(user); return compoEntryFacade.findUsersEntries(user);
} }
@Override
@RolesAllowed(CompoPermission.S_MANAGE)
public Compo saveFiletype(CompoFileType filetype) {
if (filetype.getId() != null) {
return filetypeFacade.merge(filetype).getCompo();
}
Compo compo = compoFacade.reload(filetype.getCompo());
filetype.setCompo(compo);
compo.getFiletypes().add(filetype);
filetypeFacade.create(filetype);
return compo;
}
@Override
@RolesAllowed(CompoPermission.S_MANAGE)
public Compo deleteFiletype(CompoFileType ft) {
ft = filetypeFacade.reload(ft);
Compo compo = ft.getCompo();
compo.getFiletypes().remove(ft);
filetypeFacade.remove(ft);
return compo;
}
@Override
public CompoEntryFileType findEntryFileType(Integer entryId, Integer typeId) {
CompoEntryFileType ret = entryFiletypeFacade.findForEntryAndType(entryId, typeId);
if (ret == null) {
ret = new CompoEntryFileType();
ret.setEntry(compoEntryFacade.find(entryId));
ret.setType(compoFileTypeFadade.find(typeId));
ret.setUpdated(new Date());
ret.getEntry().getFiletypes().add(ret);
entryFiletypeFacade.create(ret);
}
return ret;
}
} }
code/moya-beans/ejbModule/fi/codecrew/moya/beans/auth/BasicAuthPBean.java
...@@ -48,7 +48,10 @@ public class BasicAuthPBean extends ApiAuth implements AuthenticationFormat { ...@@ -48,7 +48,10 @@ public class BasicAuthPBean extends ApiAuth implements AuthenticationFormat {
AuthenticationResult ret = null; AuthenticationResult ret = null;
//String username = UserLoginUtils.getUsernameFromJaasString(jaasUsername); //String username = UserLoginUtils.getUsernameFromJaasString(jaasUsername);
if (password.startsWith(HEADER_PREFIX)) { if (!password.startsWith(HEADER_PREFIX)) {
return null;
}
ret = new AuthenticationResult(); ret = new AuthenticationResult();
ret.setUsertype(UserType.REST.name()); ret.setUsertype(UserType.REST.name());
...@@ -58,11 +61,11 @@ public class BasicAuthPBean extends ApiAuth implements AuthenticationFormat { ...@@ -58,11 +61,11 @@ public class BasicAuthPBean extends ApiAuth implements AuthenticationFormat {
String[] pwdsplit = password.split(" "); String[] pwdsplit = password.split(" ");
if (pwdsplit.length != 2) { if (pwdsplit.length != 2) {
logger.warn("Rest auth with Basic failed because pwdsplit != 2: user '{}''", username ); logger.warn("Rest auth with Basic failed because pwdsplit != 2: user '{}''", username);
return null; return null;
} }
// There is a possibility that user has a password that starts with "Basic ". To combat this, // There is a possibility that user has a password that starts with "Basic ". To combat this,
// we chech that the authdata is really a base64 string. If not, we continue trying with other methods // we check that the authdata is really a base64 string. If not, we continue trying with other methods
String authStr = null; String authStr = null;
try { try {
authStr = new String(Base64.getDecoder().decode(pwdsplit[1]), UTF8); authStr = new String(Base64.getDecoder().decode(pwdsplit[1]), UTF8);
...@@ -88,7 +91,7 @@ public class BasicAuthPBean extends ApiAuth implements AuthenticationFormat { ...@@ -88,7 +91,7 @@ public class BasicAuthPBean extends ApiAuth implements AuthenticationFormat {
ret = null; ret = null;
logger.warn("Invalid base64 string on Rest Basic auth: " + password, e); logger.warn("Invalid base64 string on Rest Basic auth: " + password, e);
} }
}
return ret; return ret;
} }
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/AccountEventFacade.java
...@@ -56,12 +56,14 @@ public class AccountEventFacade extends IntegerPkGenericFacade<AccountEvent> { ...@@ -56,12 +56,14 @@ public class AccountEventFacade extends IntegerPkGenericFacade<AccountEvent> {
CriteriaQuery<Role> cq = cb.createQuery(Role.class); CriteriaQuery<Role> cq = cb.createQuery(Role.class);
Root<AccountEvent> root = cq.from(AccountEvent.class); Root<AccountEvent> root = cq.from(AccountEvent.class);
Path<Role> role = root.get(AccountEvent_.product).get(Product_.provides); Path<Product> prodPath = root.get(AccountEvent_.product);
Path<Role> role = prodPath.get(Product_.provides);
cq.select(role); cq.select(role);
cq.where( cq.where(
cb.equal(role.get(Role_.event), event), cb.equal(role.get(Role_.event), event),
cb.equal(root.get(AccountEvent_.user), u) cb.equal(root.get(AccountEvent_.user), u)
,cb.isEmpty(prodPath.get(Product_.places))
); );
// TypedQuery<Role> q = // TypedQuery<Role> q =
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/ApiApplicationFacade.java
...@@ -61,7 +61,7 @@ public class ApiApplicationFacade extends IntegerPkGenericFacade<ApiApplication> ...@@ -61,7 +61,7 @@ public class ApiApplicationFacade extends IntegerPkGenericFacade<ApiApplication>
CriteriaBuilder cb = getEm().getCriteriaBuilder(); CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<ApiApplication> q = cb.createQuery(ApiApplication.class); CriteriaQuery<ApiApplication> q = cb.createQuery(ApiApplication.class);
Root<ApiApplication> root = q.from(ApiApplication.class); Root<ApiApplication> root = q.from(ApiApplication.class);
q.where(cb.equal(root.get(ApiApplication_.developer), curruser)); q.where(cb.equal(root.get(ApiApplication_.developer), curruser.getUser()));
return getEm().createQuery(q).getResultList(); return getEm().createQuery(q).getResultList();
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/ApiApplicationInstanceFacade.java
...@@ -26,6 +26,8 @@ import javax.persistence.criteria.Root; ...@@ -26,6 +26,8 @@ import javax.persistence.criteria.Root;
import fi.codecrew.moya.model.*; import fi.codecrew.moya.model.*;
import java.util.List;
@Stateless @Stateless
@LocalBean @LocalBean
public class ApiApplicationInstanceFacade extends IntegerPkGenericFacade<ApiApplicationInstance> { public class ApiApplicationInstanceFacade extends IntegerPkGenericFacade<ApiApplicationInstance> {
...@@ -57,4 +59,16 @@ public class ApiApplicationInstanceFacade extends IntegerPkGenericFacade<ApiAppl ...@@ -57,4 +59,16 @@ public class ApiApplicationInstanceFacade extends IntegerPkGenericFacade<ApiAppl
return super.getSingleNullableResult(getEm().createQuery(q)); return super.getSingleNullableResult(getEm().createQuery(q));
} }
public List<ApiApplicationInstance> findForUser(EventUser currentUser, ApiApplication apiApp) {
CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<ApiApplicationInstance> q = cb.createQuery(ApiApplicationInstance.class);
Root<ApiApplicationInstance> root = q.from(ApiApplicationInstance.class);
q.where(
cb.equal(root.get(ApiApplicationInstance_.application), apiApp),
cb.equal(root.get(ApiApplicationInstance_.eventuser), currentUser)
);
return getEm().createQuery(q).getResultList();
}
} }
code/moya-beans/ejbModule/fi/codecrew/moya/facade/CompoEntryFileFacade.java
...@@ -38,7 +38,7 @@ public class CompoEntryFileFacade extends IntegerPkGenericFacade<CompoEntryFile> ...@@ -38,7 +38,7 @@ public class CompoEntryFileFacade extends IntegerPkGenericFacade<CompoEntryFile>
super(CompoEntryFile.class); super(CompoEntryFile.class);
} }
/*
public List<CompoEntryFile> findFor(CompoEntry entry) { public List<CompoEntryFile> findFor(CompoEntry entry) {
CriteriaBuilder cb = getEm().getCriteriaBuilder(); CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<CompoEntryFile> cq = cb.createQuery(CompoEntryFile.class); CriteriaQuery<CompoEntryFile> cq = cb.createQuery(CompoEntryFile.class);
...@@ -47,5 +47,6 @@ public class CompoEntryFileFacade extends IntegerPkGenericFacade<CompoEntryFile> ...@@ -47,5 +47,6 @@ public class CompoEntryFileFacade extends IntegerPkGenericFacade<CompoEntryFile>
cq.where(cb.equal(root.get(CompoEntryFile_.entry), entry)); cq.where(cb.equal(root.get(CompoEntryFile_.entry), entry));
return getEm().createQuery(cq).getResultList(); return getEm().createQuery(cq).getResultList();
} }
*/
} }
code/moya-beans/ejbModule/fi/codecrew/moya/facade/CompoEntryFileTypeFacade.java 0 → 100644
package fi.codecrew.moya.facade;
import fi.codecrew.moya.model.*;
import javax.ejb.LocalBean;
import javax.ejb.Stateless;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
@Stateless
@LocalBean
public class CompoEntryFileTypeFacade extends IntegerPkGenericFacade<CompoEntryFileType> {
public CompoEntryFileTypeFacade() {
super(CompoEntryFileType.class);
}
public CompoEntryFileType findForEntryAndType(Integer entryId, Integer typeId) {
CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<CompoEntryFileType> cq = cb.createQuery(CompoEntryFileType.class);
Root<CompoEntryFileType> root = cq.from(CompoEntryFileType.class);
cq.where(
cb.equal(root.get(CompoEntryFileType_.entry).get(CompoEntry_.id), entryId),
cb.equal(root.get(CompoEntryFileType_.type).get(CompoFileType_.id), typeId)
);
return getSingleNullableResult(getEm().createQuery(cq));
}
}
code/moya-beans/ejbModule/fi/codecrew/moya/facade/CompoFacade.java
...@@ -32,6 +32,7 @@ import javax.persistence.criteria.Root; ...@@ -32,6 +32,7 @@ import javax.persistence.criteria.Root;
import fi.codecrew.moya.beans.EventBeanLocal; import fi.codecrew.moya.beans.EventBeanLocal;
import fi.codecrew.moya.model.Compo; import fi.codecrew.moya.model.Compo;
import fi.codecrew.moya.model.Compo_; import fi.codecrew.moya.model.Compo_;
import fi.codecrew.moya.model.LanEvent;
@Stateless @Stateless
@LocalBean @LocalBean
...@@ -58,4 +59,13 @@ public class CompoFacade extends IntegerPkGenericFacade<Compo> { ...@@ -58,4 +59,13 @@ public class CompoFacade extends IntegerPkGenericFacade<Compo> {
List<Compo> ret = getEm().createQuery(cq).getResultList(); List<Compo> ret = getEm().createQuery(cq).getResultList();
return ret; return ret;
} }
@Override
public Compo find(Integer id) {
CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<Compo> cq = cb.createQuery(Compo.class);
Root<Compo> root = cq.from(Compo.class);
cq.where(cb.equal(root.get(Compo_.id), id), cb.equal(root.get(Compo_.event), eventbean.getCurrentEvent()));
return super.getSingleNullableResult(getEm().createQuery(cq));
}
} }
code/moya-beans/ejbModule/fi/codecrew/moya/facade/CompoFileTypeFacade.java 0 → 100644
/*
* Copyright Codecrew Ry
*
* All rights reserved.
*
* This license applies to any software containing a notice placed by the
* copyright holder. Such software is herein referred to as the Software.
* This license covers modification, distribution and use of the Software.
*
* Any distribution and use in source and binary forms, with or without
* modification is not permitted without explicit written permission from the
* copyright owner.
*
* A non-exclusive royalty-free right is granted to the copyright owner of the
* Software to use, modify and distribute all modifications to the Software in
* future versions of the Software.
*
*/
package fi.codecrew.moya.facade;
import fi.codecrew.moya.model.*;
import javax.ejb.LocalBean;
import javax.ejb.Stateless;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
@Stateless
@LocalBean
public class CompoFileTypeFacade extends IntegerPkGenericFacade<CompoFileType> {
public CompoFileTypeFacade() {
super(CompoFileType.class);
}
}
code/moya-beans/ejbModule/fi/codecrew/moya/facade/EventUserFacade.java
...@@ -199,7 +199,7 @@ public class EventUserFacade extends IntegerPkGenericFacade<EventUser> { ...@@ -199,7 +199,7 @@ public class EventUserFacade extends IntegerPkGenericFacade<EventUser> {
listQ.setFirstResult(query.getPage() * query.getPagesize()); listQ.setFirstResult(query.getPage() * query.getPagesize());
listQ.setMaxResults(query.getPagesize()); listQ.setMaxResults(query.getPagesize());
} }
return new SearchResult<EventUser>(listQ.getResultList(), countQ.getSingleResult()); return new SearchResult<>(listQ.getResultList(), countQ.getSingleResult());
} }
...@@ -211,6 +211,14 @@ public class EventUserFacade extends IntegerPkGenericFacade<EventUser> { ...@@ -211,6 +211,14 @@ public class EventUserFacade extends IntegerPkGenericFacade<EventUser> {
return getSingleNullableResult(getEm().createQuery(cq)); return getSingleNullableResult(getEm().createQuery(cq));
} }
public List<EventUser> findForUser(User user) {
CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<EventUser> cq = cb.createQuery(EventUser.class);
Root<EventUser> root = cq.from(EventUser.class);
cq.where(cb.equal(root.get(EventUser_.user), user));
return getEm().createQuery(cq).getResultList();
}
// private Predicate addAcPredicate(CriteriaBuilder cb, UserSearchQuery // private Predicate addAcPredicate(CriteriaBuilder cb, UserSearchQuery
// query, Root<AccountEvent> root) { // query, Root<AccountEvent> root) {
// Expression<BigDecimal> sum = // Expression<BigDecimal> sum =
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/EventUserpropertyFacade.java 0 → 100644
/*
* Copyright Codecrew Ry
*
* All rights reserved.
*
* This license applies to any software containing a notice placed by the
* copyright holder. Such software is herein referred to as the Software.
* This license covers modification, distribution and use of the Software.
*
* Any distribution and use in source and binary forms, with or without
* modification is not permitted without explicit written permission from the
* copyright owner.
*
* A non-exclusive royalty-free right is granted to the copyright owner of the
* Software to use, modify and distribute all modifications to the Software in
* future versions of the Software.
*
*/
package fi.codecrew.moya.facade;
import fi.codecrew.moya.beans.UserBean;
import fi.codecrew.moya.model.*;
import javax.ejb.EJB;
import javax.ejb.LocalBean;
import javax.ejb.Stateless;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Root;
import java.util.Collections;
import java.util.List;
import java.util.Set;
@Stateless
@LocalBean
public class EventUserpropertyFacade extends IntegerPkGenericFacade<EventUserproperty> {
public EventUserpropertyFacade() {
super(EventUserproperty.class);
}
@EJB
private UserBean userbean;
public List<EventUserproperty> findForUser(EventUser user) {
CriteriaBuilder cq = getEm().getCriteriaBuilder();
CriteriaQuery<EventUserproperty> cb = cq.createQuery(EventUserproperty.class);
Root<EventUserproperty> root = cb.from(EventUserproperty.class);
Set<Role> roles = userbean.localFindUsersRoles(user);
if(roles == null || roles.isEmpty()){
return Collections.emptyList();
}
Path<Role> rolePath = root.get(EventUserproperty_.forRole);
cb.where(
cq.equal(root.get(EventUserproperty_.event), user.getEvent()),
cq.or(cq.isNull(rolePath), rolePath.in(roles))
);
return getEm().createQuery(cb).getResultList();
}
}
code/moya-beans/ejbModule/fi/codecrew/moya/facade/UserEventUserpropertyFacade.java 0 → 100644
/*
* Copyright Codecrew Ry
*
* All rights reserved.
*
* This license applies to any software containing a notice placed by the
* copyright holder. Such software is herein referred to as the Software.
* This license covers modification, distribution and use of the Software.
*
* Any distribution and use in source and binary forms, with or without
* modification is not permitted without explicit written permission from the
* copyright owner.
*
* A non-exclusive royalty-free right is granted to the copyright owner of the
* Software to use, modify and distribute all modifications to the Software in
* future versions of the Software.
*
*/
package fi.codecrew.moya.facade;
import fi.codecrew.moya.model.*;
import javax.ejb.LocalBean;
import javax.ejb.Stateless;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Root;
import java.util.List;
@Stateless
@LocalBean
public class UserEventUserpropertyFacade extends IntegerPkGenericFacade<UsersEventUserproperty> {
public UserEventUserpropertyFacade() {
super(UsersEventUserproperty.class);
}
public List<UsersEventUserproperty> findForUser(EventUser user) {
CriteriaBuilder cq = getEm().getCriteriaBuilder();
CriteriaQuery<UsersEventUserproperty> cb = cq.createQuery(UsersEventUserproperty.class);
Root<UsersEventUserproperty> root = cb.from(UsersEventUserproperty.class);
cb.where(
cq.equal(root.get(UsersEventUserproperty_.user), user)
);
return getEm().createQuery(cb).getResultList();
}
}
code/moya-beans/ejbModule/fi/codecrew/moya/facade/UsersAllergyFacade.java
...@@ -18,10 +18,7 @@ ...@@ -18,10 +18,7 @@
*/ */
package fi.codecrew.moya.facade; package fi.codecrew.moya.facade;
import fi.codecrew.moya.model.Allergy; import fi.codecrew.moya.model.*;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.UsersAllergy;
import fi.codecrew.moya.model.UsersAllergy_;
import javax.ejb.LocalBean; import javax.ejb.LocalBean;
import javax.ejb.Stateless; import javax.ejb.Stateless;
...@@ -39,12 +36,12 @@ public class UsersAllergyFacade extends IntegerPkGenericFacade<UsersAllergy> { ...@@ -39,12 +36,12 @@ public class UsersAllergyFacade extends IntegerPkGenericFacade<UsersAllergy> {
} }
public List<UsersAllergy> findForUser(EventUser user) { public List<UsersAllergy> findForUser(User user) {
CriteriaBuilder cb = getEm().getCriteriaBuilder(); CriteriaBuilder cb = getEm().getCriteriaBuilder();
CriteriaQuery<UsersAllergy> cq = cb.createQuery(UsersAllergy.class); CriteriaQuery<UsersAllergy> cq = cb.createQuery(UsersAllergy.class);
Root<UsersAllergy> root = cq.from(UsersAllergy.class); Root<UsersAllergy> root = cq.from(UsersAllergy.class);
cq.where(cb.equal(root.get(UsersAllergy_.user), user.getUser())); cq.where(cb.equal(root.get(UsersAllergy_.user), user));
return getEm().createQuery(cq).getResultList(); return getEm().createQuery(cq).getResultList();
} }
......
code/moya-beans/ejbModule/fi/codecrew/moya/facade/callbacks/EventUserRolefilter.java
...@@ -18,45 +18,32 @@ ...@@ -18,45 +18,32 @@
*/ */
package fi.codecrew.moya.facade.callbacks; package fi.codecrew.moya.facade.callbacks;
import java.util.ArrayList; import java.util.*;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.persistence.criteria.Subquery;
import javax.persistence.criteria.*;
import fi.codecrew.moya.model.*;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import fi.codecrew.moya.model.AccountEvent_;
import fi.codecrew.moya.model.EventUser;
import fi.codecrew.moya.model.EventUser_;
import fi.codecrew.moya.model.GroupMembership_;
import fi.codecrew.moya.model.Place_;
import fi.codecrew.moya.model.Product_;
import fi.codecrew.moya.model.Role;
import fi.codecrew.moya.model.Role_;
import fi.codecrew.moya.utilities.jpa.FacadeCallback; import fi.codecrew.moya.utilities.jpa.FacadeCallback;
public class EventUserRolefilter implements FacadeCallback<EventUser> { public class EventUserRolefilter implements FacadeCallback<EventUser> {
private final List<Role> roles; private final List<Role> roles;
private static final Logger logger = LoggerFactory.getLogger(EventUserRolefilter.class); private static final Logger logger = LoggerFactory.getLogger(EventUserRolefilter.class);
private final LanEvent event;
public EventUserRolefilter(List<Role> filters) { public EventUserRolefilter(List<Role> filters) {
roles = filters; roles = Collections.unmodifiableList(filters);
event = roles.get(0).getEvent();
} }
private static final Set<Integer> getAllChildren(Collection<Role> roles, Set<Integer> checkedRoles) { private static final Set<Integer> getAllChildren(Collection<Role> roles, Set<Integer> checkedRoles) {
if (checkedRoles == null) {
for (Role role : roles) checkedRoles = new HashSet<>();
{ }
for (Role role : roles) {
if (role == null || checkedRoles.contains(role.getId())) { if (role == null || checkedRoles.contains(role.getId())) {
continue; continue;
} }
...@@ -66,40 +53,112 @@ public class EventUserRolefilter implements FacadeCallback<EventUser> { ...@@ -66,40 +53,112 @@ public class EventUserRolefilter implements FacadeCallback<EventUser> {
return checkedRoles; return checkedRoles;
} }
private static final Set<Integer> getAllParents(Collection<Role> roles, Set<Integer> checkedRoles) {
if (checkedRoles == null) {
checkedRoles = new HashSet<>();
}
for (Role role : roles) {
if (role == null || checkedRoles.contains(role.getId())) {
continue;
}
checkedRoles.add(role.getId());
getAllParents(role.getParents(), checkedRoles);
}
return checkedRoles;
}
public void exec(CriteriaBuilder cb, CriteriaQuery<?> cq, Path<EventUser> root, List<Predicate> predicates, boolean isFullQuery) { public void exec(CriteriaBuilder cb, CriteriaQuery<?> cq, Path<EventUser> root, List<Predicate> predicates, boolean isFullQuery) {
if (roles != null && !roles.isEmpty()) if (roles == null || roles.isEmpty()) {
{ return;
HashSet<Integer> roleids = new HashSet<Integer>(); }
getAllChildren(roles, roleids); Set<Integer> roleWChildrenIds = getAllChildren(roles, null);
logger.debug("Requiring roles {}", roleids);
Set<Integer> roleWParentsIds = getAllParents(roles, null);
logger.warn("roles with children: {}, roles with parent {}", roleWChildrenIds, roleWParentsIds);
Path<Integer> rootId = root.get(EventUser_.id); Path<Integer> rootId = root.get(EventUser_.id);
ArrayList<Predicate> orPreds = new ArrayList<Predicate>(); ArrayList<Predicate> orPreds = new ArrayList<Predicate>();
/**
* Find all users that have a role "forced" directly to the user
* If role has parents, user belongs also to them, so also parents are included
*/
{ {
Subquery<Integer> subq = cq.subquery(Integer.class); Subquery<Integer> subq = cq.subquery(Integer.class);
Root<Role> subroot = subq.from(Role.class); Root<Role> subroot = subq.from(Role.class);
subq.select(subroot.join(Role_.users).get(EventUser_.id)); subq.select(subroot.join(Role_.users).get(EventUser_.id));
subq.where(subroot.get(Role_.id).in(roleids));
// Root<Role> rolePath = subq.correlate(roleRoot);
subq.where(subroot.get(Role_.id).in(roleWChildrenIds));
orPreds.add(rootId.in(subq)); orPreds.add(rootId.in(subq));
} }
/**
* Find all products that provide a given role, or a parent of the role via accountevents
* NOTE! Products that have places, do not provide roles to users
*/
{ {
Subquery<Integer> subq = cq.subquery(Integer.class); Subquery<Integer> subq = cq.subquery(Integer.class);
Root<Role> subroot = subq.from(Role.class); Root<Role> subroot = subq.from(Role.class);
subq.select(subroot.join(Role_.productsProvide).join(Product_.accountEvents).get(AccountEvent_.user).get(EventUser_.id)); ListJoin<Role, Product> prodsPath = subroot.join(Role_.productsProvide);
subq.where(subroot.get(Role_.id).in(roleids)); subq.select(prodsPath.join(Product_.accountEvents).get(AccountEvent_.user).get(EventUser_.id));
subq.where(
subroot.get(Role_.id).in(roleWChildrenIds),
cb.isEmpty(prodsPath.get(Product_.places))
);
orPreds.add(rootId.in(subq)); orPreds.add(rootId.in(subq));
} }
/**
* Roles provided by products via places user has been given to.
*/
{ {
Subquery<Integer> subq = cq.subquery(Integer.class); Subquery<Integer> subq = cq.subquery(Integer.class);
Root<Role> subroot = subq.from(Role.class); Root<Role> subroot = subq.from(Role.class);
subq.select(subroot.join(Role_.productsProvide).join(Product_.places).get(Place_.placeReserver).get(GroupMembership_.user).get(EventUser_.id)); subq.select(subroot.join(Role_.productsProvide).join(Product_.places).get(Place_.placeReserver).get(GroupMembership_.user).get(EventUser_.id));
subq.where(subroot.get(Role_.id).in(roleids)); subq.where(subroot.get(Role_.id).in(roleWChildrenIds));
orPreds.add(rootId.in(subq));
}
/** Roles provided by places user has been given to.
*/
{
Subquery<Integer> subq = cq.subquery(Integer.class);
Root<Role> subroot = subq.from(Role.class);
subq.select(subroot.join(Role_.placesProvide).get(Place_.placeReserver).get(GroupMembership_.user).get(EventUser_.id));
subq.where(subroot.get(Role_.id).in(roleWChildrenIds));
orPreds.add(rootId.in(subq)); orPreds.add(rootId.in(subq));
} }
predicates.add(cb.or(orPreds.toArray(new Predicate[orPreds.size()]))); /** Find all roles provided by organisation roles
*
*/
{
Subquery<Integer> subq = cq.subquery(Integer.class);
Root<Role> subroot = subq.from(Role.class);
subroot.get(Role_.orgRoles);
ListJoin<OrgRole, User> orgRoleUser = subroot.join(Role_.orgRoles).join(OrgRole_.users);
ListJoin<User, EventUser> euJoin = orgRoleUser.join(User_.eventusers);
subq.select(euJoin.get(EventUser_.id));
subq.where(
cb.equal(euJoin.get(EventUser_.event), event),
subroot.get(Role_.id).in(roleWChildrenIds));
orPreds.add(rootId.in(subq));
} }
predicates.add(cb.or(orPreds.toArray(new Predicate[orPreds.size()])));
} }
} }
code/moya-database/src/main/java/fi/codecrew/moya/model/ApiApplication.java
...@@ -142,12 +142,12 @@ public class ApiApplication extends GenericEntity { ...@@ -142,12 +142,12 @@ public class ApiApplication extends GenericEntity {
this.readerType = readerType; this.readerType = readerType;
} }
public List<ApiApplicationInstance> getInstances() { private List<ApiApplicationInstance> getInstances() {
return instances; throw new RuntimeException("DO NOT USE. Only for metamodel generation");
} }
public void setInstances(List<ApiApplicationInstance> instances) { public void setInstances(List<ApiApplicationInstance> instances) {
this.instances = instances; throw new RuntimeException("DO NOT USE. Only for metamodel generation");
} }
} }
code/moya-database/src/main/java/fi/codecrew/moya/model/Compo.java
...@@ -109,14 +109,6 @@ public class Compo extends GenericEntity { ...@@ -109,14 +109,6 @@ public class Compo extends GenericEntity {
@Column(name = "hidden", nullable = false) @Column(name = "hidden", nullable = false)
private boolean hidden = false; private boolean hidden = false;
public boolean isHidden() {
return hidden;
}
public void setHidden(boolean hidden) {
this.hidden = hidden;
}
/** /**
* Entries submitted to participate this compo. * Entries submitted to participate this compo.
*/ */
...@@ -124,6 +116,19 @@ public class Compo extends GenericEntity { ...@@ -124,6 +116,19 @@ public class Compo extends GenericEntity {
@OrderBy("sort") @OrderBy("sort")
private List<CompoEntry> compoEntries; private List<CompoEntry> compoEntries;
@OneToMany(mappedBy = "compo")
@OrderBy("sort")
private List<CompoFileType> filetypes;
@ManyToOne()
@JoinColumn(name = "entrysubmit_role_id",referencedColumnName = "id")
private Role entrysubmitRole;
@ManyToOne()
@JoinColumn(name = "voting_scheme_id", referencedColumnName = "id")
private CompoVotingScheme votingScheme;
public Compo(String compoName, boolean holdVoting) { public Compo(String compoName, boolean holdVoting) {
this(); this();
...@@ -131,14 +136,20 @@ public class Compo extends GenericEntity { ...@@ -131,14 +136,20 @@ public class Compo extends GenericEntity {
this.holdVoting = holdVoting; this.holdVoting = holdVoting;
} }
public boolean isSubmit() public boolean isHidden() {
{ return hidden;
}
public void setHidden(boolean hidden) {
this.hidden = hidden;
}
public boolean isSubmit() {
Date now = new Date(); Date now = new Date();
return now.after(getSubmitStart()) && now.before(getSubmitEnd()); return now.after(getSubmitStart()) && now.before(getSubmitEnd());
} }
public boolean isVote() public boolean isVote() {
{
Date now = new Date(); Date now = new Date();
return !getHoldVoting() && return !getHoldVoting() &&
now.after(getVoteStart()) && now.after(getVoteStart()) &&
...@@ -229,8 +240,7 @@ public class Compo extends GenericEntity { ...@@ -229,8 +240,7 @@ public class Compo extends GenericEntity {
} }
/** /**
* @param maxParticipantCount * @param maxParticipantCount the maxParticipantCount to set
* the maxParticipantCount to set
*/ */
public void setMaxParticipantCount(int maxParticipantCount) { public void setMaxParticipantCount(int maxParticipantCount) {
this.maxParticipantCount = maxParticipantCount; this.maxParticipantCount = maxParticipantCount;
...@@ -252,4 +262,31 @@ public class Compo extends GenericEntity { ...@@ -252,4 +262,31 @@ public class Compo extends GenericEntity {
this.endTime = endTime; this.endTime = endTime;
} }
public boolean isHoldVoting() {
return holdVoting;
}
public List<CompoFileType> getFiletypes() {
return filetypes;
}
public void setFiletypes(List<CompoFileType> filetypes) {
this.filetypes = filetypes;
}
public Role getEntrysubmitRole() {
return entrysubmitRole;
}
public void setEntrysubmitRole(Role entrysubmitRole) {
this.entrysubmitRole = entrysubmitRole;
}
public CompoVotingScheme getVotingScheme() {
return votingScheme;
}
public void setVotingScheme(CompoVotingScheme votingScheme) {
this.votingScheme = votingScheme;
}
} }
code/moya-database/src/main/java/fi/codecrew/moya/model/CompoEntry.java
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
package fi.codecrew.moya.model; package fi.codecrew.moya.model;
import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.List; import java.util.List;
...@@ -74,9 +75,8 @@ public class CompoEntry extends GenericEntity { ...@@ -74,9 +75,8 @@ public class CompoEntry extends GenericEntity {
@Column(name = "final_position") @Column(name = "final_position")
private Integer finalPosition; private Integer finalPosition;
@JoinColumn(name = "current_file_id", referencedColumnName = CompoEntryFile.ID_COLUMN) @OneToMany(mappedBy = "entry")
@OneToOne private List<CompoEntryFileType> filetypes = new ArrayList<>();
private CompoEntryFile currentFile;
@OneToMany(mappedBy = "compoEntry") @OneToMany(mappedBy = "compoEntry")
private List<Vote> votes; private List<Vote> votes;
...@@ -93,8 +93,7 @@ public class CompoEntry extends GenericEntity { ...@@ -93,8 +93,7 @@ public class CompoEntry extends GenericEntity {
@ManyToOne @ManyToOne
private EventUser creator; private EventUser creator;
public Integer getVotetotal() public Integer getVotetotal() {
{
int votetotal = 0; int votetotal = 0;
for (Vote v : getVotes()) { for (Vote v : getVotes()) {
votetotal += v.getScore(); votetotal += v.getScore();
...@@ -195,4 +194,11 @@ public class CompoEntry extends GenericEntity { ...@@ -195,4 +194,11 @@ public class CompoEntry extends GenericEntity {
this.author = author; this.author = author;
} }
public List<CompoEntryFileType> getFiletypes() {
return filetypes;
}
public void setFiletypes(List<CompoEntryFileType> filetypes) {
this.filetypes = filetypes;
}
} }
code/moya-database/src/main/java/fi/codecrew/moya/model/CompoEntryFile.java
...@@ -26,6 +26,7 @@ package fi.codecrew.moya.model; ...@@ -26,6 +26,7 @@ package fi.codecrew.moya.model;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date;
import javax.persistence.Basic; import javax.persistence.Basic;
import javax.persistence.Column; import javax.persistence.Column;
...@@ -49,6 +50,9 @@ import org.slf4j.LoggerFactory; ...@@ -49,6 +50,9 @@ import org.slf4j.LoggerFactory;
@Table(name = "compo_entry_files") @Table(name = "compo_entry_files")
public class CompoEntryFile extends GenericEntity { public class CompoEntryFile extends GenericEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final Logger logger = LoggerFactory.getLogger(CompoEntryFile.class);
@Column(name = "mime_type") @Column(name = "mime_type")
private String mimeType; private String mimeType;
...@@ -62,28 +66,21 @@ public class CompoEntryFile extends GenericEntity { ...@@ -62,28 +66,21 @@ public class CompoEntryFile extends GenericEntity {
@Column(name = "hash", updatable = false) @Column(name = "hash", updatable = false)
private String hash; private String hash;
@Lob @Column(name="filepath", updatable = false, nullable = false)
@Column(name = "file_data", updatable = false) private String filepath;
@Basic(fetch = FetchType.LAZY)
private byte[] fileData;
@Column(name = "uploaded", nullable = false) @Column(name = "uploaded", nullable = false)
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Calendar uploaded = Calendar.getInstance(); private Date uploaded = new Date();
@ManyToOne(optional=false)
@JoinColumn(name="entryfiletype_id", referencedColumnName = "id", nullable = false, updatable = false)
private CompoEntryFileType filetype;
@JoinColumn(name = "entry_id", referencedColumnName = "id", nullable = false, updatable = false)
@ManyToOne(optional = false)
private CompoEntry entry;
private static final Logger logger = LoggerFactory.getLogger(CompoEntryFile.class);
public CompoEntryFile() { public CompoEntryFile() {
super(); super();
} }
public CompoEntryFile(CompoEntry entry) {
this.entry = entry;
}
public String getMimeType() { public String getMimeType() {
return mimeType; return mimeType;
} }
...@@ -116,42 +113,28 @@ public class CompoEntryFile extends GenericEntity { ...@@ -116,42 +113,28 @@ public class CompoEntryFile extends GenericEntity {
this.hash = hash; this.hash = hash;
} }
public byte[] getFileData() { public Date getUploaded() {
return fileData;
}
public void setFileData(byte[] fileData) {
this.fileData = fileData;
this.hash = getShaChecksum(fileData);
}
public Calendar getUploaded() {
return uploaded; return uploaded;
} }
public void setUploaded(Calendar uploaded) { public void setUploaded(Date uploaded) {
this.uploaded = uploaded; this.uploaded = uploaded;
} }
public CompoEntry getEntriesId() {
return entry;
}
public void setEntriesId(CompoEntry entriesId) { public CompoEntryFileType getFiletype() {
this.entry = entriesId; return filetype;
} }
public static String getShaChecksum(byte[] data) public void setFiletype(CompoEntryFileType filetype) {
{ this.filetype = filetype;
String ret = "ERROR CALCULATING CHECKSUM!";
try {
MessageDigest algo = MessageDigest.getInstance("SHA");
algo.update(data);
ret = new String(Hex.encodeHex(algo.digest())).toLowerCase();
} catch (NoSuchAlgorithmException e) {
logger.warn("Error calculating checksum", e);
} }
return ret;
public String getFilepath() {
return filepath;
} }
public void setFilepath(String filepath) {
this.filepath = filepath;
}
} }
code/moya-database/src/main/java/fi/codecrew/moya/model/CompoEntryFileType.java 0 → 100644
package fi.codecrew.moya.model;
import javax.persistence.*;
import java.util.Date;
import java.util.List;
import static fi.codecrew.moya.model.CompoEntryFileType.ENTRY_ID_COLUMN;
import static fi.codecrew.moya.model.CompoEntryFileType.TYPE_ID_COLUMN;
@Entity
@Table(name = "compo_entry_file_types", uniqueConstraints = @UniqueConstraint(columnNames = {ENTRY_ID_COLUMN, TYPE_ID_COLUMN}))
public class CompoEntryFileType extends GenericEntity {
public static final String ENTRY_ID_COLUMN = "entry_id";
public static final String TYPE_ID_COLUMN = "type_id";
@ManyToOne(optional = false)
@JoinColumn(name = ENTRY_ID_COLUMN, nullable = false, updatable = false)
private CompoEntry entry;
@ManyToOne(optional = false)
@JoinColumn(name = TYPE_ID_COLUMN, nullable = false, updatable = false)
private CompoFileType type;
@ManyToOne(optional = false)
@JoinColumn(name = "current_file_id")
private CompoEntryFile currentFile;
@OneToMany(mappedBy = "filetype")
// This is here only for metamodel generation.
private List<CompoEntryFile> entryFiles;
@Temporal(TemporalType.TIMESTAMP)
@Column(name="updated", nullable = false)
private Date updated = new Date();
public CompoEntry getEntry() {
return entry;
}
public void setEntry(CompoEntry entry) {
this.entry = entry;
}
public CompoFileType getType() {
return type;
}
public void setType(CompoFileType type) {
this.type = type;
}
public CompoEntryFile getCurrentFile() {
return currentFile;
}
public void setCurrentFile(CompoEntryFile currentFile) {
this.currentFile = currentFile;
}
public Date getUpdated() {
return updated;
}
public void setUpdated(Date updated) {
this.updated = updated;
}
public List<CompoEntryFile> getEntryFiles() {
return entryFiles;
}
public void setEntryFiles(List<CompoEntryFile> entryFiles) {
this.entryFiles = entryFiles;
}
}
code/moya-database/src/main/java/fi/codecrew/moya/model/CompoFileType.java 0 → 100644
package fi.codecrew.moya.model;
import javax.persistence.*;
import java.util.List;
@Table(name = "compo_file_types")
@Entity
public class CompoFileType extends GenericEntity {
public enum FileType {
DATA, THUMBNAIL, MUSIC_PREVIEW
}
@ManyToOne(optional = false)
@JoinColumn(name = "compo_id", nullable = false, updatable = false)
private Compo compo;
/*
@OneToMany(mappedBy = "filetype")
// Only here for metamodel.. Do not create getter and setter!
private List<CompoEntryFile> entryfiles;
*/
@Lob
@Column(name = "name")
private String name;
@Lob
@Column(name = "description")
private String description;
@Column(nullable = false)
private int sort = 100;
@Column(name = "required")
private boolean required = false;
@Enumerated(EnumType.STRING)
@Column(name = "filetype")
private FileType filetype = FileType.DATA;
public Compo getCompo() {
return compo;
}
public void setCompo(Compo compo) {
this.compo = compo;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getDescription() {
return description;
}
public void setDescription(String description) {
this.description = description;
}
public boolean isRequired() {
return required;
}
public void setRequired(boolean required) {
this.required = required;
}
public int getSort() {
return sort;
}
public void setSort(int sort) {
this.sort = sort;
}
public FileType getFiletype() {
return filetype;
}
public void setFiletype(FileType filetype) {
this.filetype = filetype;
}
}
code/moya-database/src/main/java/fi/codecrew/moya/model/CompoVotingRole.java 0 → 100644
package fi.codecrew.moya.model;
import javax.persistence.*;
import java.math.BigDecimal;
import static fi.codecrew.moya.model.CompoVotingRole.SCHEME_ID_COLUMN;
import static fi.codecrew.moya.model.CompoVotingRole.ROLE_ID_COLUMN;
@Table(name = "compo_voting_roles", uniqueConstraints = @UniqueConstraint(columnNames = {SCHEME_ID_COLUMN, ROLE_ID_COLUMN}))
@Entity
public class CompoVotingRole extends GenericEntity {
static final String SCHEME_ID_COLUMN = "scheme_id";
static final String ROLE_ID_COLUMN = "role_id";
@ManyToOne()
@JoinColumn(nullable = false, updatable = false, name = SCHEME_ID_COLUMN)
private CompoVotingScheme scheme;
@Column(nullable = false)
private int priority = 100;
@ManyToOne
@JoinColumn(nullable = false, updatable = false, name = ROLE_ID_COLUMN)
private Role role;
@Column(nullable = false, precision = 24, scale = 8, name = "multiplier")
private BigDecimal multiplier = BigDecimal.ONE;
@Column(name = "override_min", scale = 24, precision = 8)
private BigDecimal overrideMin;
@Column(name = "override_max", scale = 24, precision = 8)
private BigDecimal overrideMax;
@Column(nullable = false, name = "override_others")
private boolean overrideOthers = false;
public CompoVotingScheme getScheme() {
return scheme;
}
public void setScheme(CompoVotingScheme scheme) {
this.scheme = scheme;
}
public int getPriority() {
return priority;
}
public void setPriority(int priority) {
this.priority = priority;
}
public Role getRole() {
return role;
}
public void setRole(Role role) {
this.role = role;
}
public BigDecimal getMultiplier() {
return multiplier;
}
public void setMultiplier(BigDecimal multiplier) {
this.multiplier = multiplier;
}
public BigDecimal getOverrideMin() {
return overrideMin;
}
public void setOverrideMin(BigDecimal overrideMin) {
this.overrideMin = overrideMin;
}
public BigDecimal getOverrideMax() {
return overrideMax;
}
public void setOverrideMax(BigDecimal overrideMax) {
this.overrideMax = overrideMax;
}
public boolean isOverrideOthers() {
return overrideOthers;
}
public void setOverrideOthers(boolean overrideOthers) {
this.overrideOthers = overrideOthers;
}
}
code/moya-database/src/main/java/fi/codecrew/moya/model/CompoVotingScheme.java 0 → 100644
package fi.codecrew.moya.model;
import javax.persistence.*;
import java.math.BigDecimal;
import java.util.List;
@Table(name = "compo_voting_schemes")
@Entity
public class CompoVotingScheme extends GenericEntity {
public enum SchemeType {
INT_TO_ALL_ENTRIES,
SORT_BEST_N,
}
@ManyToOne(optional = false)
@JoinColumn(nullable = false, updatable = false, name = "event_id")
private LanEvent event;
@Enumerated(EnumType.STRING)
@Column(nullable = false, name = "type")
private SchemeType type = SchemeType.INT_TO_ALL_ENTRIES;
@Column(nullable = false, name = "name")
private String name;
@OneToMany(mappedBy = "scheme")
@OrderBy("priority")
private List<CompoVotingRole> votingRoles;
@Column(name = "min_value", scale = 24, precision = 8)
private BigDecimal minValue = BigDecimal.ONE;
@Column(name = "max_value", scale = 24, precision = 8)
private BigDecimal maxValue = BigDecimal.TEN;
@Column(name = "value_increment", scale = 24, precision = 8)
private BigDecimal valueIncrement = BigDecimal.ONE;
@Column(name = "allow_recusal", nullable = false)
private boolean allowRecusal = false;
public LanEvent getEvent() {
return event;
}
public void setEvent(LanEvent event) {
this.event = event;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public List<CompoVotingRole> getVotingRoles() {
return votingRoles;
}
public void setVotingRoles(List<CompoVotingRole> votingRoles) {
this.votingRoles = votingRoles;
}
public BigDecimal getMinValue() {
return minValue;
}
public void setMinValue(BigDecimal minValue) {
this.minValue = minValue;
}
public BigDecimal getMaxValue() {
return maxValue;
}
public void setMaxValue(BigDecimal maxValue) {
this.maxValue = maxValue;
}
public BigDecimal getValueIncrement() {
return valueIncrement;
}
public void setValueIncrement(BigDecimal valueIncrement) {
this.valueIncrement = valueIncrement;
}
public boolean isAllowRecusal() {
return allowRecusal;
}
public void setAllowRecusal(boolean allowRecusal) {
this.allowRecusal = allowRecusal;
}
public SchemeType getType() {
return type;
}
public void setType(SchemeType type) {
this.type = type;
}
}
code/moya-database/src/main/java/fi/codecrew/moya/model/EventUserproperty.java 0 → 100644
/*
* Copyright Codecrew Ry
*
* All rights reserved.
*
* This license applies to any software containing a notice placed by the
* copyright holder. Such software is herein referred to as the Software.
* This license covers modification, distribution and use of the Software.
*
* Any distribution and use in source and binary forms, with or without
* modification is not permitted without explicit written permission from the
* copyright owner.
*
* A non-exclusive royalty-free right is granted to the copyright owner of the
* Software to use, modify and distribute all modifications to the Software in
* future versions of the Software.
*
*/
package fi.codecrew.moya.model;
import javax.persistence.*;
@Entity
@Table(name = "event_userproperties")
public class EventUserproperty extends GenericEntity {
public enum PropertyType {
STRING, INTEGER, DECIMAL, IMAGE, BLOB
}
@ManyToOne(optional = false)
@JoinColumn(nullable = false, updatable = false, name = "event_id", referencedColumnName = "id")
private LanEvent event;
@Convert(converter = LanguageAwareStringConverter.class )
@Column(nullable = false, columnDefinition = "jsonb not null", name="name")
private LanguageAwareString name;
@Convert(converter = LanguageAwareStringConverter.class )
@Column(nullable = false, columnDefinition = "jsonb not null", name="description")
private LanguageAwareString description;
@Column(nullable = false)
@Enumerated(EnumType.STRING)
private PropertyType type = PropertyType.STRING;
@ManyToOne
@JoinColumn(nullable = true, name = "for_role_id", referencedColumnName = "id")
private Role forRole;
public LanEvent getEvent() {
return event;
}
public void setEvent(LanEvent event) {
this.event = event;
}
public PropertyType getType() {
return type;
}
public void setType(PropertyType type) {
this.type = type;
}
public LanguageAwareString getName() {
return name;
}
public void setName(LanguageAwareString name) {
this.name = name;
}
public LanguageAwareString getDescription() {
return description;
}
public void setDescription(LanguageAwareString description) {
this.description = description;
}
public Role getForRole() {
return forRole;
}
public void setForRole(Role forRole) {
this.forRole = forRole;
}
}
code/moya-database/src/main/java/fi/codecrew/moya/model/GenericEntity.java
...@@ -39,10 +39,10 @@ public class GenericEntity extends EntityEquals implements ModelInterface, Entit ...@@ -39,10 +39,10 @@ public class GenericEntity extends EntityEquals implements ModelInterface, Entit
private static final long serialVersionUID = -9041737052951021560L; private static final long serialVersionUID = -9041737052951021560L;
@Id @Id
@Column(name = ID_COLUMN, nullable = false, updatable = false) @Column(name = ID_COLUMN, nullable = false, updatable = false, columnDefinition = "SERIAL NOT NULL")
private Integer id; private Integer id;
@Column(name = "meta", columnDefinition = "json") @Column(name = "meta", columnDefinition = "jsonb")
private JsonObject meta; private JsonObject meta;
@Override @Override
......
code/moya-database/src/main/java/fi/codecrew/moya/model/LanguageAwareString.java
...@@ -25,6 +25,9 @@ public class LanguageAwareString { ...@@ -25,6 +25,9 @@ public class LanguageAwareString {
} }
return ret; return ret;
} }
public String getDefaultValue(){
return getValue(defaultLanguage);
}
public String getDefaultLanguage() { public String getDefaultLanguage() {
return defaultLanguage; return defaultLanguage;
......
code/moya-database/src/main/java/fi/codecrew/moya/model/User.java
...@@ -138,6 +138,18 @@ public class User extends GenericEntity implements IUser { ...@@ -138,6 +138,18 @@ public class User extends GenericEntity implements IUser {
@OrderBy() @OrderBy()
private List<LicenseCode> licenseCodes; private List<LicenseCode> licenseCodes;
@OneToMany(mappedBy="user", fetch = FetchType.LAZY)
private List<EventUser> eventusers;
private List<EventUser> getEventusers(){
throw new RuntimeException("We never want to fetch this. Only here for metamodel");
}
private void setEventusers(List<EventUser> eventusers){
throw new RuntimeException("We never want to fetch this. Only here for metamodel");
}
@Transient @Transient
private static final Logger logger = LoggerFactory.getLogger(User.class); private static final Logger logger = LoggerFactory.getLogger(User.class);
......
code/moya-database/src/main/java/fi/codecrew/moya/model/UsersAllergy.java
...@@ -3,34 +3,35 @@ package fi.codecrew.moya.model; ...@@ -3,34 +3,35 @@ package fi.codecrew.moya.model;
import javax.persistence.*; import javax.persistence.*;
import java.util.Date; import java.util.Date;
@Table(name="user_allergies") @Table(name = "user_allergies")
@Entity @Entity
public class UsersAllergy extends GenericEntity { public class UsersAllergy extends GenericEntity {
@Column(nullable=false, name = "selected") @Column(nullable = false, name = "selected")
private boolean selected = false; private boolean selected = false;
@Enumerated(EnumType.STRING) @Enumerated(EnumType.STRING)
@Column(name="severity") @Column(name = "severity")
private AllergySeverity severity = AllergySeverity.NORMAL; private AllergySeverity severity = AllergySeverity.NORMAL;
@ManyToOne @ManyToOne
@JoinColumn(name="user_id", updatable = false, referencedColumnName = "id", nullable = false) @JoinColumn(name = "user_id", updatable = false, referencedColumnName = "id", nullable = false)
private User user; private User user;
@ManyToOne @ManyToOne
@JoinColumn(name="allergy_id", updatable = false, referencedColumnName = "id", nullable = false) @JoinColumn(name = "allergy_id", updatable = false, referencedColumnName = "id", nullable = false)
private Allergy allergy; private Allergy allergy;
@Column(name="created") @Column(name = "created")
@Temporal(TemporalType.TIMESTAMP) @Temporal(TemporalType.TIMESTAMP)
private Date created; private Date created;
@Lob @Lob
@Column(name="notes") @Column(name = "notes")
private String notes; private String notes;
public UsersAllergy() { public UsersAllergy() {
super(); super();
} }
...@@ -80,4 +81,12 @@ public class UsersAllergy extends GenericEntity { ...@@ -80,4 +81,12 @@ public class UsersAllergy extends GenericEntity {
public void setSelected(boolean selected) { public void setSelected(boolean selected) {
this.selected = selected; this.selected = selected;
} }
public Date getCreated() {
return created;
}
public void setCreated(Date created) {
this.created = created;
}
} }
code/moya-database/src/main/java/fi/codecrew/moya/model/UsersEventUserproperty.java 0 → 100644
/*
* Copyright Codecrew Ry
*
* All rights reserved.
*
* This license applies to any software containing a notice placed by the
* copyright holder. Such software is herein referred to as the Software.
* This license covers modification, distribution and use of the Software.
*
* Any distribution and use in source and binary forms, with or without
* modification is not permitted without explicit written permission from the
* copyright owner.
*
* A non-exclusive royalty-free right is granted to the copyright owner of the
* Software to use, modify and distribute all modifications to the Software in
* future versions of the Software.
*
*/
package fi.codecrew.moya.model;
import javax.persistence.*;
import java.math.BigDecimal;
import java.math.BigInteger;
@Entity
@Table(name = "users_event_userproperties")
public class UsersEventUserproperty extends GenericEntity {
@ManyToOne(optional = false)
@JoinColumn(name = "property_id", updatable = false, nullable = false)
private EventUserproperty property;
@ManyToOne(optional = false)
@JoinColumn(name = "user_id", updatable = false, nullable = false)
private EventUser user;
@Lob
@Column(name = "textvalue")
private String textvalue = "";
@Column(name = "integervalue")
private BigInteger integerValue;
@Column(name = "decimalvalue", scale = 38, precision = 10)
private BigDecimal decimalValue;
@Lob
@Column(name = "datavalue")
private byte[] dataValue;
public UsersEventUserproperty() {
super();
}
public UsersEventUserproperty(EventUserproperty prop, EventUser eventuser) {
super();
this.property = prop;
this.user = eventuser;
}
public EventUserproperty getProperty() {
return property;
}
public void setProperty(EventUserproperty property) {
this.property = property;
}
public EventUser getUser() {
return user;
}
public void setUser(EventUser user) {
this.user = user;
}
public String getTextvalue() {
return textvalue;
}
public void setTextvalue(String textvalue) {
this.textvalue = textvalue;
}
public BigInteger getIntegerValue() {
return integerValue;
}
public void setIntegerValue(BigInteger integerValue) {
this.integerValue = integerValue;
}
public BigDecimal getDecimalValue() {
return decimalValue;
}
public void setDecimalValue(BigDecimal decimalValue) {
this.decimalValue = decimalValue;
}
public byte[] getDataValue() {
return dataValue;
}
public void setDataValue(byte[] dataValue) {
this.dataValue = dataValue;
}
}
code/moya-database/src/main/resources/META-INF/persistence.xml
...@@ -14,7 +14,9 @@ ...@@ -14,7 +14,9 @@
<property name="eclipselink.target-server" value="Glassfish" /> <property name="eclipselink.target-server" value="Glassfish" />
<property name="eclipselink.session.customizer" <property name="eclipselink.session.customizer"
value="fi.codecrew.moya.database.eclipselink.MoyaSessionCustomizer" /> value="fi.codecrew.moya.database.eclipselink.MoyaSessionCustomizer" />
<property name="eclipselink.ddl-generation" value="none"/> <property name="eclipselink.ddl-generation" value="create-tables"/>
<!--property name="eclipselink.ddl-generation" value="create-tables"/-->
<property name="eclipselink.ddl-generation.output-mode" value="sql-script"/> <property name="eclipselink.ddl-generation.output-mode" value="sql-script"/>
</properties> </properties>
......
code/moya-parent/pom.xml
...@@ -170,6 +170,11 @@ ...@@ -170,6 +170,11 @@
<version>${findbugs.version}</version> <version>${findbugs.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>com.graphql-java</groupId>
<artifactId>graphql-java</artifactId>
<version>9.0</version>
</dependency>
</dependencies> </dependencies>
<reporting> <reporting>
<plugins> <plugins>
......
code/moya-utils/src/main/java/fi/codecrew/moya/utilities/SystemProperty.java
...@@ -15,6 +15,7 @@ public enum SystemProperty { ...@@ -15,6 +15,7 @@ public enum SystemProperty {
MOYA_IRC_SERVER, MOYA_IRC_SERVER,
MOYA_IRC_CHANNEL("#moya-debug"), MOYA_IRC_CHANNEL("#moya-debug"),
MOYA_IRC_SERVERPASS(), MOYA_IRC_SERVERPASS(),
MOYA_COMPOFILE_DIR("/tmp/moya"),
; ;
......
code/moya-web/WebContent/api/adminlist.xhtml 0 → 100644
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:p="http://primefaces.org/ui">
<h:body>
<ui:composition template="#{sessionHandler.template}">
<f:metadata>
<f:event type="preRenderView"
listener="#{applicationApiView.initSuperApplicationListView}" />
</f:metadata>
<ui:define name="content">
<button></button>
<div style="display:none;" id="createApp">
</div>
<h1>#{i18n['apiapp.edit.applist']}</h1>
<p:dataTable value="#{applicationApiView.applist}" var="app">
<p:column headerText="#{i18n['apiapp.name']}">
<h:outputText value="#{app.name}" />
</p:column>
<p:column headerText="#{i18n['apiapp.description']}">
<h:outputText value="#{app.description}" />
</p:column>
<p:column>
<h:outputText value="#{app.created}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}"
timeZone="#{sessionHandler.timezone}" />
</h:outputText>
</p:column>
<p:column headerText="#{i18n['apiapp.enabled']}">
<h:outputText value="#{app.enabled}" />
</p:column>
</p:dataTable>
</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/moya-web/WebContent/api/edit.xhtml 0 → 100644
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:p="http://primefaces.org/ui">
<h:body>
<ui:composition template="#{sessionHandler.template}">
<f:metadata>
<f:viewParam name="id" value="#{apiAppEditView.id}"/>
<f:event type="preRenderView"
listener="#{apiAppEditView.initEdit}"/>
</f:metadata>
<ui:define name="content">
<h1>#{i18n['apiapp.edit.applist']}</h1>
<h:form id="appedit">
<p:panelGrid columns="3">
<h:outputText for="appkey" value="#{i18n['apiapp.appkey']}"/>
<p:inplace>
<f:facet name="output">
******** (Click to view and edit)
</f:facet>
<f:facet name="input">
<p:inputText size="30" id="appkey" redisplay="true" value="#{apiAppEditView.apiApp.applicationKey}"/>
</f:facet>
</p:inplace>
<h:message for="appkey"/>
<h:outputText for="appname" value="#{i18n['apiapp.name']}"/>
<p:inputText size="30" id="appname" value="#{apiAppEditView.apiApp.name}"/>
<h:message for="appname"/>
<h:outputText for="appdesc" value="#{i18n['apiapp.description']}"/>
<p:inputText size="30" id="appdesc" value="#{apiAppEditView.apiApp.description}"/>
<h:message for="appdesc"/>
</p:panelGrid>
<p:commandButton ajax="false" action="#{apiAppEditView.save}" value="#{i18n['apiapp.save']}"/>
</h:form>
<h2><h:outputText value="#{i18n['apiInstance.my.header']}"/></h2>
<p:commandButton value="#{i18n['apiInstance.create']}" action="#{apiAppEditView.initCreateInstance}" type="button" onclick="PF('createInstanceDlg').show();"/>
<p:dialog header="Create api instance" widgetVar="createInstanceDlg" closable="true" dynamic="true">
<h:form>
<p:panelGrid columns="3">
<h:outputText for="appinstevent" value="#{i18n['apiapp.event']}"/>
<h:outputText size="30" id="appinstevent" value="#{apiAppEditView.selectedInstance.eventuser.event.name}"/>
<h:message for="appinstevent"/>
<h:outputText for="appinstuser" value="#{i18n['apiapp.event']}"/>
<h:outputText size="30" id="appinstuser" value="(#{apiAppEditView.selectedInstance.eventuser.user.id}) #{apiAppEditView.selectedInstance.eventuser.user.wholeName}"/>
<h:message for="appinstuser"/>
<h:outputText for="appinstcreated" value="#{i18n['apiapp.created']}"/>
<h:outputText size="30" id="appinstcreated" value="#{apiAppEditView.selectedInstance.created}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}"/>
</h:outputText>
<h:message for="appinstcreated"/>
<h:outputText for="appinstenabled" value="#{i18n['apiapp.enabled']}"/>
<p:selectBooleanCheckbox id="appinstenabled" value="#{apiAppEditView.selectedInstance.enabled}"/>
<h:message for="appinstenabled"/>
<h:outputText for="appinstname" value="#{i18n['apiapp.name']}"/>
<p:inputText size="30" id="appinstname" value="#{apiAppEditView.selectedInstance.name}"/>
<h:message for="appinstname"/>
<h:outputText for="appinstnotes" value="#{i18n['apiapp.notes']}"/>
<p:inputText size="30" id="appinstnotes" value="#{apiAppEditView.selectedInstance.notes}"/>
<h:message for="appinstnotes"/>
<h:outputText for="appinstkey" value="#{i18n['apiapp.secretKey']}"/>
<p:inputText size="40" id="appinstkey" value="#{apiAppEditView.selectedInstance.secretKey}"/>
<h:message for="appinstkey"/>
</p:panelGrid>
<p:commandButton value="#{i18n['apiapp.save']}" action="#{apiAppEditView.saveInstance}"/>
</h:form>
</p:dialog>
<p:dataTable value="#{apiAppEditView.apiInstances}" var="instance">
<p:column width="80" headerText="#{i18n['apiInstance.enabled']}"> <h:outputText value="#{instance.enabled}"/> </p:column>
<p:column headerText="#{i18n['apiInstance.created']}"> <h:outputText value="#{instance.created}"/> </p:column>
<p:column headerText="#{i18n['apiIntance.name']}"> <h:outputText value="#{instance.name}"/> </p:column>
<p:column headerText="#{i18n['apiInstance.userWholename']}"> <h:outputText value="#{instance.eventuser.wholeName}"/> </p:column>
<p:column headerText="#{i18n['apiInstance.event']}"><h:outputText value="#{instance.eventuser.event.name}"/></p:column>
<p:column><p:commandButton value="#{i18n['apiInstance.edit']}" action="#{apiAppEditView.selectInstance}" oncomplete="PF('createInstanceDlg').show();"/></p:column>
</p:dataTable>
</ui:define>
</ui:composition>
</h:body>
</html>
\ No newline at end of file
code/moya-web/WebContent/api/index.xhtml
...@@ -12,14 +12,16 @@ ...@@ -12,14 +12,16 @@
<f:metadata> <f:metadata>
<f:event type="preRenderView" <f:event type="preRenderView"
listener="#{applicationApiView.initApplicationListView}" /> listener="#{applicationApiView.initApplicationListView}"/>
</f:metadata> </f:metadata>
<ui:define name="content"> <ui:define name="content">
<button></button> <h:form>
<h:panelGrid columns="2">
<div style="display:none;" id="createApp"> <p:outputLabel for="newappName" value="#{i18n['apiapp.name']}" />
<p:inputText id="newappName" value="#{applicationApiView.newApplication.name}" required="true"/>
</div> </h:panelGrid>
<p:commandButton ajax="false" action="#{applicationApiView.createApp()}" value="#{i18n['apiapp.create']}"/>
</h:form>
<h1>#{i18n['apiapp.edit.applist']}</h1> <h1>#{i18n['apiapp.edit.applist']}</h1>
...@@ -28,19 +30,19 @@ ...@@ -28,19 +30,19 @@
<p:dataTable value="#{applicationApiView.applist}" var="app"> <p:dataTable value="#{applicationApiView.applist}" var="app">
<p:column headerText="#{i18n['apiapp.name']}"> <p:column headerText="#{i18n['apiapp.name']}">
<h:outputText value="#{app.name}" /> <h:link outcome="/api/edit?id=#{app.id}"><h:outputText value="#{app.name}"/></h:link>
</p:column> </p:column>
<p:column headerText="#{i18n['apiapp.description']"> <p:column headerText="#{i18n['apiapp.description']}">
<h:outputText value="#{app.description}" /> <h:outputText value="#{app.description}"/>
</p:column> </p:column>
<p:column> <p:column headerText="#{i18n['apiapp.created']}">
<h:outputText value="#{app.created}"> <h:outputText value="#{app.created}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}"
timeZone="#{sessionHandler.timezone}" /> timeZone="#{sessionHandler.timezone}"/>
</h:outputText> </h:outputText>
</p:column> </p:column>
<p:column headerText="#{i18n['apiapp.enabled']}"> <p:column headerText="#{i18n['apiapp.enabled']}">
<h:outputText value="#{app.enabled}" /> <h:outputText value="#{app.enabled}"/>
</p:column> </p:column>
</p:dataTable> </p:dataTable>
......
code/moya-web/WebContent/resources/cditools/compo/editCompo.xhtml
...@@ -14,51 +14,59 @@ ...@@ -14,51 +14,59 @@
<h:form> <h:form>
<h:panelGrid columns="3"> <h:panelGrid columns="3">
<h:outputLabel value="#{i18n['voting.create.name']}:" for="name" /> <p:outputLabel value="#{i18n['voting.create.name']}:" for="name" />
<h:inputText value="#{compoMgmtView.compo.name}" id="name" /> <p:inputText value="#{compoMgmtView.compo.name}" id="name" />
<h:message for="name" /> <p:message for="name" />
<h:outputLabel value="#{i18n['voting.create.description']}:" for="desc" /> <p:outputLabel value="#{i18n['voting.create.description']}:" for="desc" />
<h:inputText value="#{compoMgmtView.compo.description}" id="desc" /> <p:inputText value="#{compoMgmtView.compo.description}" id="desc" />
<h:message for="desc" /> <p:message for="desc" />
<h:outputLabel value="#{i18n['voting.create.maxParticipants']}:" for="maxPar" /> <p:outputLabel for="entrysubmitrole" value="#{i18n['voting.create.entrysubmitrole']}:" />
<h:inputText value="#{compoMgmtView.compo.maxParticipantCount}" id="maxPar" /> <p:selectOneMenu id="entrysubmitrole" value="#{compoMgmtView.compo.entrysubmitRole}" converter="#{roleConverter}">
<h:message for="maxPar" /> <f:selectItem itemLabel="----" />
<f:selectItems value="#{roleDataView.roleList}" var="r" itemLabel="#{r.name}" />
</p:selectOneMenu>
<p:message for="entrysubmitrole" />
<h:outputLabel value="#{i18n['voting.create.holdVoting']}:" for="holdVoting" />
<h:selectBooleanCheckbox value="#{compoMgmtView.compo.holdVoting}" id="holdVoting" />
<h:message for="holdVoting" />
<h:outputLabel value="#{i18n['voting.create.hidden']}:" for="hidden" /> <p:outputLabel value="#{i18n['voting.create.maxParticipants']}:" for="maxPar" />
<h:selectBooleanCheckbox value="#{compoMgmtView.compo.hidden}" id="hidden" /> <p:inputText value="#{compoMgmtView.compo.maxParticipantCount}" id="maxPar" />
<h:message for="hidden" /> <p:message for="maxPar" />
<h:outputLabel value="#{i18n['voting.create.compoStart']}:" for="cStart" /> <p:outputLabel value="#{i18n['voting.create.holdVoting']}:" for="holdVoting" />
<p:selectBooleanCheckbox value="#{compoMgmtView.compo.holdVoting}" id="holdVoting" />
<p:message for="holdVoting" />
<p:outputLabel value="#{i18n['voting.create.hidden']}:" for="hidden" />
<p:selectBooleanCheckbox value="#{compoMgmtView.compo.hidden}" id="hidden" />
<p:message for="hidden" />
<p:outputLabel value="#{i18n['voting.create.compoStart']}:" for="cStart" />
<p:calendar validator="#{votingDateValidator.saveCStart}" value="#{compoMgmtView.compo.startTime}" pattern="dd/MM/yyyy HH:mm" id="cStart" /> <p:calendar validator="#{votingDateValidator.saveCStart}" value="#{compoMgmtView.compo.startTime}" pattern="dd/MM/yyyy HH:mm" id="cStart" />
<h:message for="cStart" /> <p:message for="cStart" />
<h:outputLabel value="#{i18n['voting.create.compoEnd']}:" for="cEnd" /> <p:outputLabel value="#{i18n['voting.create.compoEnd']}:" for="cEnd" />
<p:calendar validator="#{votingDateValidator.validateCompo}" value="#{compoMgmtView.compo.endTime}" pattern="dd/MM/yyyy HH:mm" id="cEnd" /> <p:calendar validator="#{votingDateValidator.validateCompo}" value="#{compoMgmtView.compo.endTime}" pattern="dd/MM/yyyy HH:mm" id="cEnd" />
<h:message for="cEnd" /> <p:message for="cEnd" />
<h:outputLabel value="#{i18n['voting.create.voteStart']}:" for="vStart" /> <p:outputLabel value="#{i18n['voting.create.voteStart']}:" for="vStart" />
<p:calendar validator="#{votingDateValidator.saveVStart}" value="#{compoMgmtView.compo.voteStart}" pattern="dd/MM/yyyy HH:mm" id="vStart" /> <p:calendar validator="#{votingDateValidator.saveVStart}" value="#{compoMgmtView.compo.voteStart}" pattern="dd/MM/yyyy HH:mm" id="vStart" />
<h:message for="vStart" /> <p:message for="vStart" />
<h:outputLabel value="#{i18n['voting.create.voteEnd']}:" for="vEnd" /> <p:outputLabel value="#{i18n['voting.create.voteEnd']}:" for="vEnd" />
<p:calendar validator="#{votingDateValidator.validateVote}" value="#{compoMgmtView.compo.voteEnd}" pattern="dd/MM/yyyy HH:mm" id="vEnd" /> <p:calendar validator="#{votingDateValidator.validateVote}" value="#{compoMgmtView.compo.voteEnd}" pattern="dd/MM/yyyy HH:mm" id="vEnd" />
<h:message for="vEnd" /> <p:message for="vEnd" />
<h:outputLabel value="#{i18n['voting.create.submitStart']}:" for="sStart" /> <p:outputLabel value="#{i18n['voting.create.submitStart']}:" for="sStart" />
<p:calendar validator="#{votingDateValidator.saveSStart}" value="#{compoMgmtView.compo.submitStart}" pattern="dd/MM/yyyy HH:mm" id="sStart" /> <p:calendar validator="#{votingDateValidator.saveSStart}" value="#{compoMgmtView.compo.submitStart}" pattern="dd/MM/yyyy HH:mm" id="sStart" />
<h:message for="sStart" /> <p:message for="sStart" />
<h:outputLabel value="#{i18n['voting.create.submitEnd']}:" for="sEnd" /> <p:outputLabel value="#{i18n['voting.create.submitEnd']}:" for="sEnd" />
<p:calendar validator="#{votingDateValidator.validateSubmit}" value="#{compoMgmtView.compo.submitEnd}" pattern="dd/MM/yyyy HH:mm" id="sEnd" /> <p:calendar validator="#{votingDateValidator.validateSubmit}" value="#{compoMgmtView.compo.submitEnd}" pattern="dd/MM/yyyy HH:mm" id="sEnd" />
<h:message for="sEnd" /> <p:message for="sEnd" />
<h:commandButton action="#{cc.attrs.commitAction}" id="commitbutton" value="#{cc.attrs.commitValue}" /> <p:commandButton ajax="false" action="#{cc.attrs.commitAction}" id="commitbutton" value="#{cc.attrs.commitValue}" />
</h:panelGrid> </h:panelGrid>
</h:form> </h:form>
......
code/moya-web/WebContent/resources/cditools/user/edit.xhtml
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
</composite:interface> </composite:interface>
<composite:implementation> <composite:implementation>
<h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
<p:panelGrid columns="2" columnClasses="topalign,topalign,topalign" styleClass="noBorders user_profile_page"> <p:panelGrid columns="2" columnClasses="topalign,topalign,topalign" styleClass="noBorders user_profile_page">
<h:form id="userform" enctype="multipart/form-data"> <h:form id="userform" enctype="multipart/form-data">
...@@ -158,14 +157,40 @@ ...@@ -158,14 +157,40 @@
</p:fieldset> </p:fieldset>
</h:form> </h:form>
<p:fieldset legend="#{i18n['user.meta.box.title']}" toggleable="true" collapsed="true" rendered="#{not empty userView.meta}"> <p:fieldset legend="#{i18n['user.meta.box.title']}" toggleable="true" collapsed="true" rendered="#{userView.metaAvailable}">
<div id="usermetaview"><pre><h:outputText value="#{userView.prettyMeta}" /></pre></div> <div id="usermetaview"><pre><h:outputText value="#{userView.prettyMeta}" /></pre></div>
</p:fieldset> </p:fieldset>
</p:panelGrid> </p:panelGrid>
<p:fieldset toggleable="true" collapsed="true" legend="#{i18n['user.eventproperties']}" rendered="${!empty userEventPropertyView.properties}" style="max-width: 800px;">
<h:form id="eventpropertyview">
<p:growl id="msgs" showDetail="true"/>
<p:dataTable id="userpropertytable" widgetVar="userpropertytable" value="#{userEventPropertyView.properties}" var="property" editable="true" rowIndexVar="rowIndex">
<p:ajax event="rowEdit" listener="#{userEventPropertyView.onRowEdit}" update="@form:msgs"/>
<p:ajax event="rowEditCancel" listener="#{userEventPropertyView.onRowCancel}" update="@form:msgs"/>
<p:column><h:outputText value="#{property.property.name.getValue(sessionStore.language)}" title="#{property.property.description.getValue(sessionStore.language)}"/></p:column>
<p:column>
<!--p:ajax event="save" listener="#{userEventPropertyView.saveProperty}" update="userpropertytable">
<f:setPropertyActionListener value="#{property}" target="#{userEventPropertyView.selectedProperty}"/>
</p:ajax-->
<p:cellEditor>
<f:facet name="output"><h:outputText value="#{property.textvalue}"/></f:facet>
<f:facet name="input"><p:inputText onkeydown="PF('userpropertytable').onKeyDown(event)"
onkeyup="PF('userpropertytable').onKeyUp(event, #{rowIndex})"
value="#{property.textvalue}"
style="width:96%"/></f:facet>
</p:cellEditor>
</p:column>
<p:column style="width:32px">
<p:rowEditor />
</p:column>
</p:dataTable>
</h:form>
</p:fieldset>
<p:fieldset toggleable="true" collapsed="true" legend="#{i18n['user.allergies']}"> <p:fieldset toggleable="true" collapsed="true" legend="#{i18n['user.allergies']}">
<h:form id="userAllergies"> <h:form id="userAllergies">
<p:dataTable value="#{userAllergyView.allergies}" var="allergy"> <p:dataTable value="#{userAllergyView.allergies}" var="allergy">
...@@ -182,16 +207,50 @@ ...@@ -182,16 +207,50 @@
<p:fieldset legend="#{i18n['user.userSelectableRoles']}" rendered="#{userView.showUserSelectableRoles and cc.attrs.showRoles}"> <p:fieldset legend="#{i18n['user.userSelectableRoles']}" rendered="#{userView.showUserSelectableRoles and cc.attrs.showRoles}">
<p:panelGrid columns="2" styleClass="noBorders"> <p:panelGrid columns="2" styleClass="noBorders">
<p:selectManyCheckbox converter="#{roleConverter}" layout="pageDirection" value="#{userView.userSelectableRoles}"> <p:selectManyCheckbox converter="#{roleConverter}" layout="pageDirection" value="#{userView.userSelectableRoles}">
<f:selectItems value="#{roleDataView.userSelectableRoles}" var="roleitem" itemLabel="#{roleitem.name}" itemValue="#{roleitem}" /> <f:selectItems value="#{roleDataView.userSelectableRoles}" var="roleitem" itemLabel="#{roleitem.name}" itemValue="#{roleitem}"/>
</p:selectManyCheckbox> </p:selectManyCheckbox>
</p:panelGrid> </p:panelGrid>
<p:commandButton update="userSelectableRoles" actionListener="#{userView.saveUserSelectableRoles}" value="#{i18n['user.saveUserSelectableRoles']}" /> <p:commandButton update="userSelectableRoles" actionListener="#{userView.saveUserSelectableRoles}" value="#{i18n['user.saveUserSelectableRoles']}"/>
<br /><h:outputText rendered="#{userView.saveSuccess}" styleClass="success" value="#{i18n['user.saveSuccessfull']}" /> <br/>
<h:outputText rendered="#{userView.saveSuccess}" styleClass="success" value="#{i18n['user.saveSuccessfull']}"/>
</p:fieldset> </p:fieldset>
</h:form> </h:form>
<script type="text/javascript">
$(function() {
$.extend(PF("userpropertytable"), {
onKeyDown : function(e) {
var key = e.which,
keyCode = $.ui.keyCode;
if((key === keyCode.ENTER||key === keyCode.NUMPAD_ENTER)) {
e.preventDefault();
}
},
onKeyUp : function(e, rowIndex) {
var key = e.which,
keyCode = $.ui.keyCode;
if((key === keyCode.ENTER||key === keyCode.NUMPAD_ENTER)) {
this.tbody
.find('.ui-row-editor .ui-icon-check')
.eq(rowIndex)
.click();
}
if (key === keyCode.ESCAPE) {
this.tbody
.find('.ui-row-editor .ui-icon-close')
.eq(rowIndex)
.click();
}
}
});
});
</script>
</composite:implementation> </composite:implementation>
</html> </html>
code/moya-web/WebContent/useradmin/edit.xhtml
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
<h:body> <h:body>
<ui:composition template="#{sessionHandler.template}"> <ui:composition template="#{sessionHandler.template}">
<f:metadata> <f:metadata>
<f:viewParam name="userid" value="#{userView.userid}" /> <f:viewParam name="userid" value="#{userView.userid}"/>
<f:event type="preRenderView" listener="#{userView.initView}" /> <f:event type="preRenderView" listener="#{userView.initView}"/>
<f:event type="preRenderView" listener="#{userView.setCaptureForwardUrl('')}" /> <f:event type="preRenderView" listener="#{userView.setCaptureForwardUrl('')}"/>
</f:metadata> </f:metadata>
<ui:define name="title"> <ui:define name="title">
...@@ -16,27 +16,43 @@ ...@@ -16,27 +16,43 @@
<!-- <users:usertabs tabId="edit" /> --> <!-- <users:usertabs tabId="edit" /> -->
</ui:define> </ui:define>
<ui:define name="edittab"> <ui:define name="edittab">
<users:usertabs tabId="edit" /> <users:usertabs tabId="edit"/>
</ui:define> </ui:define>
<ui:define name="content"> <ui:define name="content">
<users:edit commitaction="#{userCartView.saveUser()}" commitvalue="#{i18n['user.save']}" /> <users:edit commitaction="#{userCartView.saveUser()}" commitvalue="#{i18n['user.save']}"/>
<div style="display: flex;">
<h:form id="roleform" rendered="#{roleView.canReadRoles}"> <h:form id="roleform" rendered="#{roleView.canReadRoles}">
<h2> <h2>
<h:outputText value="#{i18n['user.roles']}:" /> <h:outputText value="#{i18n['user.roles']}:"/>
</h2> </h2>
<h:selectManyCheckbox converter="#{roleConverter}" disabled="#{!roleView.canWriteRoles}" layout="pageDirection" id="roles" value="#{userView.usersRoles}"> <h:selectManyCheckbox converter="#{roleConverter}" disabled="#{!roleView.canWriteRoles}" layout="pageDirection" id="roles" value="#{userView.usersRoles}">
<f:selectItems var="roleitem" itemLabel="#{roleitem.name}" value="#{roleDataView.roles}" /> <f:selectItems var="roleitem" itemLabel="#{roleitem.name}" value="#{roleDataView.roles}"/>
</h:selectManyCheckbox> </h:selectManyCheckbox>
<div> <div>
<h:message rendered="#{roleView.canReadRoles}" for="roles" /> <p:message rendered="#{roleView.canReadRoles}" for="roles"/>
</div> </div>
<h:commandButton action="#{userView.saveRoles}" value="#{i18n['user.saveRoles']}" /> <p:commandButton ajax="false" action="#{userView.saveRoles}" value="#{i18n['user.saveRoles']}"/>
</h:form> </h:form>
<ui:fragment rendered="#{roleView.canReadRoles}">
<div style="margin-left: 4em;">
<h2><h:outputText value="#{i18n['user.allroles']}"/></h2>
<p:dataTable style="max-width: 600px;" var="r" value="#{userView.allUsersRoles}">
<p:column style="width: 30%;"><f:facet name="header"><h:outputText value="#{i18n['role.name']}"/></f:facet><h:outputText value="#{r.key.name}"/></p:column>
<p:column>
<f:facet name="header">
<h:outputText value="#{i18n['role.source']}"/>
</f:facet>
<ul><ui:repeat var="src" value="#{r.value}">
<li>#{i18n['role.source.'+=src]}</li>
</ui:repeat></ul>
</p:column>
</p:dataTable>
</div>
</ui:fragment>
</div>
</ui:define> </ui:define>
</ui:composition> </ui:composition>
</h:body> </h:body>
......
code/moya-web/WebContent/voting/admincompolist.xhtml
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<h:body> <h:body>
<ui:composition template="#{sessionHandler.template}"> <ui:composition template="#{sessionHandler.template}">
<f:metadata> <f:metadata>
<f:event type="preRenderView" listener="#{compoView.initAdminListView()}" /> <f:event type="preRenderView" listener="#{compoView.initAdminListView()}"/>
</f:metadata> </f:metadata>
<ui:define name="content"> <ui:define name="content">
<h:form id="admincompolist" styleClass="moya_datatable2"> <h:form id="admincompolist" styleClass="moya_datatable2">
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<p:dataTable styleClass="bordertable" rowClasses="roweven,rowodd" id="compolisttable" value="#{compoView.compos}" var="compo"> <p:dataTable styleClass="bordertable" rowClasses="roweven,rowodd" id="compolisttable" value="#{compoView.compos}" var="compo">
<p:column headerText="#{i18n['voting.allcompos.name']}"> <p:column headerText="#{i18n['voting.allcompos.name']}">
<h:outputText value="#{compo.name}" /> <h:outputText value="#{compo.compo.name}"/>
</p:column> </p:column>
<!-- <h:column rendered="#{compoView.curEntries}"> --> <!-- <h:column rendered="#{compoView.curEntries}"> -->
...@@ -30,41 +30,40 @@ ...@@ -30,41 +30,40 @@
<!-- <f:facet name="header"> --> <!-- <f:facet name="header"> -->
<!-- <h:outputText value="#{i18n['voting.allcompos.maxParts']}" /> --> <!-- <h:outputText value="#{i18n['voting.allcompos.maxParts']}" /> -->
<!-- </f:facet> --> <!-- </f:facet> -->
<!-- <h:outputText value="#{compo.maxParticipantCount}" /> --> <!-- <h:outputText value="#{compo.compo.maxParticipantCount}" /> -->
<!-- </h:column> --> <!-- </h:column> -->
<p:column headerText="#{i18n['voting.allcompos.startTime']}"> <p:column headerText="#{i18n['voting.allcompos.startTime']}">
<h:outputText value="#{compo.startTime.time}"> <h:outputText value="#{compo.compo.startTime.time}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" /> <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}"/>
</h:outputText> </h:outputText>
</p:column> </p:column>
<p:column headerText="#{i18n['voting.allcompos.voteEnd']}"> <p:column headerText="#{i18n['voting.allcompos.voteEnd']}">
<h:outputText value="#{compo.voteEnd.time}"> <h:outputText value="#{compo.compo.voteEnd.time}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" /> <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}"/>
</h:outputText> </h:outputText>
</p:column> </p:column>
<p:column headerText="#{i18n['voting.allcompos.submitEnd']}"> <p:column headerText="#{i18n['voting.allcompos.submitEnd']}">
<h:outputText value="#{compo.submitEnd.time}"> <h:outputText value="#{compo.compo.submitEnd.time}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" /> <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}"/>
</h:outputText> </h:outputText>
</p:column> </p:column>
<p:column headerText="#{i18n['voting.allcompos.holdVoting']}"> <p:column headerText="#{i18n['voting.allcompos.holdVoting']}">
<h:outputText value="#{compo.holdVoting}" /> <h:outputText value="#{compo.compo.holdVoting}"/>
</p:column> </p:column>
<p:column headerText="#{i18n['voting.allcompos.hidden']}"> <p:column headerText="#{i18n['voting.allcompos.hidden']}">
<h:outputText value="#{compo.hidden}" /> <h:outputText value="#{compo.compo.hidden}"/>
</p:column> </p:column>
<p:column> <p:column>
<h:commandButton rendered="#{compo.vote or compoView.manage}" action="#{compoView.startVote()}" value="#{i18n['voting.compo.vote']}" /> <p:commandButton ajax="false" action="#{compoView.startVote()}" value="#{i18n['voting.compo.vote']}"/><br/>
</p:column> <p:link rendered="#{compo.canSubmit}" outcome="/voting/submitEntry" value="#{i18n['voting.compo.submit']}">
<p:column> <f:param name="compoId" value="#{compo.compo.id}"/>
<h:commandButton rendered="#{compo.submit or compoView.manage}" action="#{compoView.submitEntry()}" value="#{i18n['voting.compo.submit']}" /> </p:link>
</p:column> </p:column>
<p:column rendered="#{compoView.manage}"> <p:column rendered="#{compoView.manage}">
<h:link outcome="details" value="#{i18n['compo.edit']}"> <h:link outcome="details" value="#{i18n['compo.edit']}">
<f:param name="compoId" value="#{compo.id}" /> <f:param name="compoId" value="#{compo.compo.id}"/>
</h:link> </h:link>
</p:column> </p:column>
</p:dataTable> </p:dataTable>
......
code/moya-web/WebContent/voting/compolist.xhtml
...@@ -10,70 +10,69 @@ ...@@ -10,70 +10,69 @@
<f:event type="preRenderView" listener="#{compoView.initListView()}" /> <f:event type="preRenderView" listener="#{compoView.initListView()}" />
</f:metadata> </f:metadata>
<ui:define name="content"> <ui:define name="content">
<h:outputStylesheet library="style" name="insomnia2/css/actionlog.css" />
<h1>#{i18n['voting.allcompos.header']}</h1>
<p>#{i18n['voting.allcompos.description']}</p>
<h1>#{i18n['voting.allcompos.header']}</h1>
<h:form id="compolist" styleClass="moya_datatable2"> <h:form id="compolist" styleClass="moya_datatable2">
<h:dataTable styleClass="bordertable" rowClasses="roweven,rowodd" id="compolisttable" value="#{compoView.compos}" var="compo"> <p:dataTable styleClass="bordertable" tableStyle="width: auto;" rowClasses="roweven,rowodd" id="compolisttable" value="#{compoView.compos}" var="compo">
<h:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['voting.allcompos.name']}" /> <h:outputText value="#{i18n['voting.allcompos.name']}" />
</f:facet> </f:facet>
<h:outputText value="#{compo.name}" /> <h:outputText value="#{compo.compo.name}" />
</h:column> </p:column>
<!-- <h:column rendered="#{compoView.curEntries}"> --> <!-- <p:column rendered="#{compoView.curEntries}"> -->
<!-- <f:facet name="header"> --> <!-- <f:facet name="header"> -->
<!-- <h:outputText value="#{i18n['voting.allcompos.curEntries']}" /> --> <!-- <h:outputText value="#{i18n['voting.allcompos.curEntries']}" /> -->
<!-- </f:facet> --> <!-- </f:facet> -->
<!-- <h:outputText value="#{compoEntries.size()}" /> --> <!-- <h:outputText value="#{compoEntries.size()}" /> -->
<!-- </h:column> --> <!-- </p:column> -->
<!-- <h:column rendered="#{compoView.maxParts}"> --> <!-- <p:column rendered="#{compoView.maxParts}"> -->
<!-- <f:facet name="header"> --> <!-- <f:facet name="header"> -->
<!-- <h:outputText value="#{i18n['voting.allcompos.maxParts']}" /> --> <!-- <h:outputText value="#{i18n['voting.allcompos.maxParts']}" /> -->
<!-- </f:facet> --> <!-- </f:facet> -->
<!-- <h:outputText value="#{compo.maxParticipantCount}" /> --> <!-- <h:outputText value="#{compo.maxParticipantCount}" /> -->
<!-- </h:column> --> <!-- </p:column> -->
<h:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['voting.allcompos.startTime']}" /> <h:outputText value="#{i18n['voting.allcompos.startTime']}" />
</f:facet> </f:facet>
<h:outputText value="#{compo.startTime.time}"> <h:outputText value="#{compo.compo.startTime.time}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" /> <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText> </h:outputText>
</h:column> </p:column>
<h:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['voting.allcompos.voteEnd']}" /> <h:outputText value="#{i18n['voting.allcompos.voteEnd']}" />
</f:facet> </f:facet>
<h:outputText value="#{compo.voteEnd.time}"> <h:outputText value="#{compo.compo.voteEnd.time}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" /> <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText> </h:outputText>
</h:column> </p:column>
<h:column> <p:column>
<f:facet name="header"> <f:facet name="header">
<h:outputText value="#{i18n['voting.allcompos.submitEnd']}" /> <h:outputText value="#{i18n['voting.allcompos.submitEnd']}" />
</f:facet> </f:facet>
<h:outputText value="#{compo.submitEnd.time}"> <h:outputText value="#{compo.compo.submitEnd.time}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" /> <f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}" />
</h:outputText> </h:outputText>
</h:column> </p:column>
<h:column>
<h:commandButton rendered="#{compo.vote or compoView.manage}" action="#{compoView.startVote()}" value="#{i18n['voting.compo.vote']}" /> <p:column>
</h:column> <p:commandButton rendered="#{compo.canVote}" action="#{compoView.startVote()}" value="#{i18n['voting.compo.vote']}" />
<h:column> <p:link rendered="#{compo.canSubmit}" outcome="/voting/submitEntry" value="#{i18n['voting.compo.submit']}" >
<h:commandButton rendered="#{compo.submit or compoView.manage}" action="#{compoView.submitEntry()}" value="#{i18n['voting.compo.submit']}" /> <f:param name="compoId" value="#{compo.compo.id}" />
</p:link>
</h:column> </p:column>
<h:column rendered="#{compoView.manage}"> <p:column rendered="#{compoView.manage}">
<h:link outcome="details" value="#{i18n['compo.edit']}"> <h:link outcome="details" value="#{i18n['compo.edit']}">
<f:param name="compoId" value="#{compo.id}" /> <f:param name="compoId" value="#{compo.compo.id}" />
</h:link> </h:link>
</h:column> </p:column>
</h:dataTable> </p:dataTable>
</h:form> </h:form>
......
code/moya-web/WebContent/voting/details.xhtml
...@@ -7,56 +7,88 @@ ...@@ -7,56 +7,88 @@
<h:body> <h:body>
<ui:composition template="#{sessionHandler.template}"> <ui:composition template="#{sessionHandler.template}">
<f:metadata> <f:metadata>
<f:viewParam name="compoId" value="#{compoMgmtView.compoId}" /> <f:viewParam name="compoId" value="#{compoMgmtView.compoId}"/>
<!-- <f:viewParam name="compoId" value="#{compoMgmtView.compoId2}" /> --> <!-- <f:viewParam name="compoId" value="#{compoMgmtView.compoId2}" /> -->
<f:event type="preRenderView" listener="#{compoMgmtView.initView}" /> <f:event type="preRenderView" listener="#{compoMgmtView.initView}"/>
</f:metadata> </f:metadata>
<ui:define name="content"> <ui:define name="content">
<!-- <h:outputStylesheet library="style" name="insomnia2/css/actionlog.css" /> --> <!-- <h:outputStylesheet library="style" name="insomnia2/css/actionlog.css" /> -->
<h1>Compo: #{compoMgmtView.compo.name}</h1> <h1>Compo: #{compoMgmtView.compo.name}</h1>
<p>Infoa compon entryistä</p> <p>Infoa compon entryistä</p>
<compo:editCompo commitAction="#{compoMgmtView.saveCompo}" commitValue="#{i18n['voting.create.saveCompo']}" /> <compo:editCompo commitAction="#{compoMgmtView.saveCompo}" commitValue="#{i18n['voting.create.saveCompo']}"/>
<h2>Compo filetypes</h2>
<h:form id="filetypeEditform">
<p:panelGrid columns="2">
<p:outputLabel for="filetypeid" rendered="#{not empty compoMgmtView.filetype.id}" value="#{i18n['compo.filetype.id']}"/>
<h:outputText id="filetypeid" rendered="#{not empty compoMgmtView.filetype.id}" value="#{compoMgmtView.filetype.id}"/>
<p:outputLabel for="filetypename" value="#{i18n['compo.filetype.name']}"/>
<p:inputText id="filetypename" value="#{compoMgmtView.filetype.name}"/>
<p:outputLabel for="filetypesort" value="#{i18n['compo.filetype.sort']}"/>
<p:inputText id="filetypesort" value="#{compoMgmtView.filetype.sort}"/>
<p:outputLabel for="filetypetype" value="#{i18n['compo.filetype.filetype']}"/>
<p:selectOneMenu id="filetypetype" value="#{compoMgmtView.filetype.filetype}">
<f:selectItems value="#{compoMgmtView.filetypeTypes}" val="t"/>
</p:selectOneMenu>
</p:panelGrid>
<p:commandButton update="filetypelist,filetypeEditform" action="#{compoMgmtView.saveFiletype}" value="#{i18n['save']}"/>
</h:form>
<br/>
<p:dataTable id="filetypelist" value="#{compoMgmtView.compo.filetypes}" var="ft">
<p:column> <h:outputText value="#{ft.name}"/> </p:column>
<p:column> <h:outputText value="#{ft.filetype}"/> </p:column>
<p:column>
<p:commandButton value="Edit" update="filetypeEditform" action="#{compoMgmtView.editFiletype(ft.id)}" />
&nbsp;<p:commandButton value="Delete" update="filetypelist" action="#{compoMgmtView.deleteFiletype(ft.id)}" />
</p:column>
</p:dataTable>
<h2>#{i18n['compoMgmtView.compo.entries']}</h2> <h2>#{i18n['compoMgmtView.compo.entries']}</h2>
<h:form> <h:form>
<p:dataTable styleClass="bordertable" rowClasses="roweven,rowodd" id="compolisttable" value="#{compoMgmtView.entries}" var="entry"> <p:dataTable styleClass="bordertable" rowClasses="roweven,rowodd" id="compolisttable" value="#{compoMgmtView.entries}" var="entry">
<p:column headerText="Title"> <p:column headerText="Title">
<h:outputText value="#{entry.title}" /> <h:outputText value="#{entry.title}"/>
</p:column> </p:column>
<p:column headerText="Author"> <p:column headerText="Author">
<h:outputText value="#{entry.author}" /> <h:outputText value="#{entry.author}"/>
</p:column> </p:column>
<p:column headerText="Notes"> <p:column headerText="Notes">
<h:outputText value="#{entry.notes}" /> <h:outputText value="#{entry.notes}"/>
</p:column> </p:column>
<p:column headerText="Screenmessage"> <p:column headerText="Screenmessage">
<h:outputText value="#{entry.screenMessage}" /> <h:outputText value="#{entry.screenMessage}"/>
</p:column> </p:column>
<p:column headerText="creator"> <p:column headerText="creator">
<h:link outcome="/useradmin/edit" value="#{entry.creator.user.nick}"> <h:link outcome="/useradmin/edit" value="#{entry.creator.user.nick}">
<f:param name="userid" value="#{entry.creator.user.id}" /> <f:param name="userid" value="#{entry.creator.user.id}"/>
</h:link> </h:link>
</p:column> </p:column>
<p:column headerText="Sort"> <p:column headerText="Sort">
<h:inputText value="#{entry.sort}" size="4" /> <h:inputText value="#{entry.sort}" size="4"/>
</p:column> </p:column>
<p:column headerText="Vote total"> <p:column headerText="Vote total">
<h:outputText value="#{entry.votetotal}" /> <h:outputText value="#{entry.votetotal}"/>
</p:column> </p:column>
<p:column headerText="Vote count"> <p:column headerText="Vote count">
<h:outputText value="#{entry.votes.size()}" /> <h:outputText value="#{entry.votes.size()}"/>
</p:column> </p:column>
<p:column> <p:column>
<h:link outcome="/voting/submitEntry" value="#{i18n['entry.edit']}"> <h:link outcome="/voting/submitEntry" value="#{i18n['entry.edit']}">
<f:param name="entryId" value="#{entry.id}" /> <f:param name="entryId" value="#{entry.id}"/>
</h:link> </h:link>
</p:column> </p:column>
</p:dataTable> </p:dataTable>
<h:commandButton action="#{compoMgmtView.saveSort}" value="#{i18n['compo.savesort']}" /> <p:commandButton ajax="false" action="#{compoMgmtView.saveSort}" value="#{i18n['compo.savesort']}"/>
</h:form> </h:form>
......
code/moya-web/WebContent/voting/myEntries.xhtml
...@@ -14,39 +14,27 @@ ...@@ -14,39 +14,27 @@
<h:form id="myEntries" styleClass="moya_datatable2"> <h:form id="myEntries" styleClass="moya_datatable2">
<h:dataTable styleClass="bordertable" rowClasses="roweven,rowodd" id="compolisttable" value="#{voteListView.entries}" var="entry"> <p:dataTable tableStyle="width: auto;" styleClass="bordertable" rowClasses="roweven,rowodd" id="compolisttable" value="#{voteListView.entries}" var="entry">
<h:column> <p:column headerText="Title">
<f:facet name="header">
<h:outputText value="Title" />
</f:facet>
<h:outputText value="#{entry.title}" /> <h:outputText value="#{entry.title}" />
</h:column> </p:column>
<h:column> <p:column headerText="Author">
<f:facet name="header">
<h:outputText value="Author" />
</f:facet>
<h:outputText value="#{entry.author}" /> <h:outputText value="#{entry.author}" />
</h:column> </p:column>
<h:column> <p:column headerText="Notes">
<f:facet name="header">
<h:outputText value="Notes" />
</f:facet>
<h:outputText value="#{entry.notes}" /> <h:outputText value="#{entry.notes}" />
</h:column> </p:column>
<h:column> <p:column headerText="Screen message">
<f:facet name="header">
<h:outputText value="Screen message" />
</f:facet>
<h:outputText value="#{entry.screenMessage}" /> <h:outputText value="#{entry.screenMessage}" />
</h:column> </p:column>
<h:column> <p:column>
<h:link outcome="/voting/submitEntry" value="#{i18n['entry.edit']}"> <h:link outcome="/voting/submitEntry" value="#{i18n['entry.edit']}">
<f:param name="entryId" value="#{entry.id}" /> <f:param name="entryId" value="#{entry.id}" />
</h:link> </h:link>
</h:column> </p:column>
</h:dataTable> </p:dataTable>
</h:form> </h:form>
......
code/moya-web/WebContent/voting/submitEntry.xhtml
...@@ -7,75 +7,128 @@ ...@@ -7,75 +7,128 @@
<h:body> <h:body>
<ui:composition template="#{sessionHandler.template}"> <ui:composition template="#{sessionHandler.template}">
<f:metadata> <f:metadata>
<f:viewParam name="compoId" value="#{compoView.compoId}" /> <f:viewParam name="compoId" value="#{entryEditView.compoId}"/>
<f:viewParam name="entryId" value="#{compoView.entryId}" /> <f:viewParam name="entryId" value="#{entryEditView.entryId}"/>
<f:event type="preRenderView" listener="#{compoView.initEntryView}" /> <f:event type="preRenderView" listener="#{entryEditView.initEntryView}"/>
</f:metadata> </f:metadata>
<ui:define name="content"> <ui:define name="content">
<!-- <h:outputStylesheet library="style" name="insomnia2/css/actionlog.css" /> --> <!-- <h:outputStylesheet library="style" name="insomnia2/css/actionlog.css" /> -->
<h1>#{i18n['voting.compoentryadd.title']}</h1> <h1>#{i18n['voting.compoentryadd.title']}</h1>
<p> <p>
#{i18n['voting.compoentryadd.description']} #{i18n['voting.compoentryadd.description']}
<h:outputText value="#{compoView.compo.name}" /> <h:outputText value="#{entryEditView.compo.name}"/>
</p> </p>
<p> <p>
<h:outputText value="#{compoView.compo.description}" /> <h:outputText value="#{entryEditView.compo.description}"/>
</p> </p>
<h:form> <h:form>
<h:outputText value="#{entryEditView.entry.id}"/>
<h:panelGrid columns="3"> <h:panelGrid columns="3">
<h:outputLabel value="Title" for="name" /> <h:outputLabel value="Title" for="name"/>
<h:inputText value="#{compoView.entry.title}" id="name" /> <p:inputText value="#{entryEditView.entry.title}" id="name"/>
<h:message for="name" /> <h:message for="name"/>
<h:outputLabel value="Author" for="author" /> <h:outputLabel value="Author" for="author"/>
<h:inputText value="#{compoView.entry.author}" id="author" /> <p:inputText value="#{entryEditView.entry.author}" id="author"/>
<h:message for="author" /> <h:message for="author"/>
<h:outputLabel value="#{i18n['voting.compoentryadd.notes']}" for="notes" /> <h:outputLabel value="#{i18n['voting.compoentryadd.notes']}" for="notes"/>
<h:inputTextarea value="#{compoView.entry.notes}" id="notes" /> <p:inputTextarea value="#{entryEditView.entry.notes}" id="notes"/>
<h:message for="notes" /> <h:message for="notes"/>
<h:outputLabel value="#{i18n['voting.compoentryadd.screenmessage']}" for="screenmessage" /> <h:outputLabel value="#{i18n['voting.compoentryadd.screenmessage']}" for="screenmessage"/>
<h:inputTextarea value="#{compoView.entry.screenMessage}" id="screenmessage" /> <p:inputTextarea value="#{entryEditView.entry.screenMessage}" id="screenmessage"/>
<h:message for="screenmessage" /> <h:message for="screenmessage"/>
<h:commandButton rendered="#{empty compoView.entry.id}" action="#{compoView.createEntry()}" value="#{i18n['voting.compoentryadd.button']}" />
<h:commandButton rendered="#{!empty compoView.entry.id}" action="#{compoView.saveEntry()}" value="#{i18n['voting.compoentrysave.button']}" />
</h:panelGrid> </h:panelGrid>
<p:commandButton ajax="false" rendered="#{empty entryEditView.entry.id}" action="#{entryEditView.createEntry()}" value="#{i18n['voting.compoentryadd.button']}"/>
<p:commandButton ajax="false" rendered="#{not empty entryEditView.entry.id}" action="#{entryEditView.saveEntry()}" value="#{i18n['voting.compoentrysave.button']}"/>
</h:form>
<ui:fragment rendered="#{!empty entryEditView.entry.id}">
<h2>
<h:outputText value="#{i18n['compofile.download.header']}"/>
</h2>
<p:dataTable style="width: auto;" value="#{entryEditView.entryFiletypes}" var="ft">
<p:column headerText="">
<h:outputText value="#{ft.filetype.name}"/>
</p:column>
<p:column headerText="Current file">
<p:commandButton rendered="#{not empty ft.entryfiletype.currentFile}" update=":fileInfoForm:fileInfoDialog" oncomplete="PF('fileInfoDialog').show()" icon="ui-icon-search"
title="View files">
<f:setPropertyActionListener value="#{ft.entryfiletype}" target="#{entryEditView.selectedFiletype}"/>
</p:commandButton>
</p:column>
<p:column>
<form id="filesubmit-#{ft.filetype.id}" action="#{request.contextPath}/EntryFile" method="post" enctype="multipart/form-data">
<div>
<input type="file" name="file"/>
<input type="hidden" name="entryId" value="#{entryEditView.entry.id}"/>
<input type="hidden" name="typeId" value="#{ft.filetype.id}"/>
<button type="submit">Submit</button>
</div>
</form>
</p:column>
</p:dataTable>
<h:commandButton rendered="#{empty compoView.entry.id}" action="#{compoView.createEntry()}" value="Ilmoittaudu kilpailuun" /> <h:form id="fileInfoForm">
<p:dialog id="fileInfoDialog" widgetVar="fileInfoDialog" modal="true" appendTo="@(body)">
<p:dataTable tableStyle="width: auto;" value="#{entryEditView.selectedFiletype.entryFiles}" var="file">
<p:column headerText="CurrentFile">
<h:outputText value="X" rendered="#{entryEditView.selectedFiletype.currentFile==file}"/>
</p:column>
<p:column headerText="#{i18n['compofile.fileName']}">
<a href="#{request.contextPath}/EntryFile/#{file.id}">
<h:outputText value="#{file.fileName}"/>
</a>
</p:column>
<p:column headerText="#{i18n['compofile.uploadTime']}">
<h:outputText value="#{file.uploaded}">
<f:convertDateTime pattern="#{sessionHandler.datetimeFormat}" timeZone="#{sessionHandler.timezone}"/>
</h:outputText>
</p:column>
<p:column headerText="#{i18n['compofile.shaChecksum']}">
<h:outputText value="#{file.hash}"/>
</p:column>
</p:dataTable>
</p:dialog>
</h:form> </h:form>
<!--
<ui:fragment rendered="#{!empty compoView.entry.id}">
<h:form enctype="multipart/form-data"> <h:form enctype="multipart/form-data">
<p:fileUpload value="#{compoView.uploadedFile}" id="uploadedfile" mode="simple" /> <p:fileUpload value="#{compoView.uploadedFile}" id="uploadedfile" mode="simple"/>
<h:commandButton action="#{compoView.submitEntryfile}" value="#{i18n['compofile.upload']}" /> <p:commandButton ajax="false" action="#{compoView.submitEntryfile}" value="#{i18n['compofile.upload']}"/>
</h:form> </h:form>
<br/>
<h:form rendered="#{!empty compoFileDownloadView.files}"> <h:form rendered="#{!empty compoFileDownloadView.files}">
<h2> <p:dataTable value="#{compoView.compo.filetypes}" var="type">
<h:outputText value="#{i18n['compofile.download.header']}" /> <p:column> <h:outputText value="#{type.name}"/> </p:column>
</h2> <p:column> <h:outputText value="#{type.filetype}"/> </p:column>
</p:dataTable>
<p:dataTable value="#{compoFileDownloadView.files}" var="fi"> <p:dataTable value="#{compoFileDownloadView.files}" var="fi">
<p:column headerText="#{i18n['compofile.fileName']}"> <p:column headerText="#{i18n['compofile.fileName']}">
<h:outputText value="#{fi.fileName}" /> <h:outputText value="#{fi.fileName}"/>
</p:column> </p:column>
<p:column headerText="#{i18n['compofile.uploadTime']}"> <p:column headerText="#{i18n['compofile.uploadTime']}">
<h:outputText value="#{fi.uploaded.time}"> <h:outputText value="#{fi.uploaded.time}"> <f:convertDateTime pattern="#{sessionHandler.shortDatetimeFormat}"/> </h:outputText>
<f:convertDateTime pattern="#{sessionHandler.shortDatetimeFormat}" />
</h:outputText>
</p:column> </p:column>
<p:column headerText="#{i18n['compofile.shaChecksum']}"> <p:column headerText="#{i18n['compofile.shaChecksum']}">
<h:outputText value="#{fi.hash}" /> <h:outputText value="#{fi.hash}"/>
</p:column> </p:column>
<p:column> <p:column>
<p:commandButton ajax="false" value="#{i18n['compofile.download']}" actionListener="#{compoFileDownloadView.selectDownloadedFile}"> <p:commandButton ajax="false" value="#{i18n['compofile.download']}" actionListener="#{compoFileDownloadView.selectDownloadedFile}">
<p:fileDownload value="#{compoFileDownloadView.dlfile}" /> <p:fileDownload value="#{compoFileDownloadView.dlfile}"/>
</p:commandButton> </p:commandButton>
</p:column> </p:column>
</p:dataTable> </p:dataTable>
</h:form> </h:form>
-->
</ui:fragment> </ui:fragment>
</ui:define> </ui:define>
......
code/moya-web/src/main/java/fi/codecrew/moya/HostnameFilter.java
...@@ -20,6 +20,7 @@ package fi.codecrew.moya; ...@@ -20,6 +20,7 @@ package fi.codecrew.moya;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.security.Principal; import java.security.Principal;
import java.util.Base64; import java.util.Base64;
...@@ -179,13 +180,13 @@ public class HostnameFilter implements Filter { ...@@ -179,13 +180,13 @@ public class HostnameFilter implements Filter {
if (httpRequest.getUserPrincipal() == null) { if (httpRequest.getUserPrincipal() == null) {
// Check if we are can login in with rest alternative methods ( appkey, basic auth, etc.. ) // Check if we are can login in with rest alternative methods ( appkey, basic auth, etc.. )
if (RestApplicationEntrypoint.REST_PATH.equals(httpRequest.getServletPath()) if (RestApplicationEntrypoint.REST_PATH.equals(httpRequest.getServletPath())
|| "/dydata".equals(httpRequest.getServletPath())) { || "/dydata".equals(httpRequest.getServletPath()) || "/graphql".equals(httpRequest.getServletPath())) {
authtype = AuthType.REST; authtype = AuthType.REST;
if (!restAuth(httpRequest, response) && RestApplicationEntrypoint.REST_PATH.equals(httpRequest.getServletPath())) { if (!restAuth(httpRequest, response) && RestApplicationEntrypoint.REST_PATH.equals(httpRequest.getServletPath())) {
response.reset(); response.reset();
response.getOutputStream().write("Rest auth failed! ".getBytes( Charsets.UTF_8)); response.getOutputStream().write("Rest auth failed! ".getBytes( StandardCharsets.UTF_8));
if (response instanceof HttpServletResponse) { if (response instanceof HttpServletResponse) {
HttpServletResponse httpResp = (HttpServletResponse) response; HttpServletResponse httpResp = (HttpServletResponse) response;
......
code/moya-web/src/main/java/fi/codecrew/moya/graphql/AlreadyBuiltException.java 0 → 100644
package fi.codecrew.moya.graphql;
public class AlreadyBuiltException extends RuntimeException {
public AlreadyBuiltException(String s) {
super(s);
}
}
code/moya-web/src/main/java/fi/codecrew/moya/graphql/EntityGQLBuilder.java 0 → 100644
package fi.codecrew.moya.graphql;
import graphql.schema.*;
import javax.persistence.metamodel.Attribute;
import javax.persistence.metamodel.PluralAttribute;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import java.util.*;
import static graphql.Scalars.*;
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import static graphql.schema.GraphQLObjectType.newObject;
public class EntityGQLBuilder<T> implements GQLEntityContainer {
private final GraphQLObjectType.Builder builder;
private final GraphQLBuilder parent;
private final String typeName;
private final List<GraphQLFieldDefinition.Builder> fields = new ArrayList<>();
private GraphQLObjectType builtObject;
public EntityGQLBuilder(String name, GraphQLBuilder bld) {
this.typeName = name;
this.parent = bld;
this.builder = newObject().name(name);
}
public GraphQLFieldDefinition.Builder addField(GraphQLOutputType type) {
return addField()
.type(type)
.name(type.getName().toLowerCase());
}
public GraphQLFieldDefinition.Builder addField() {
if (builtObject != null) {
throw new AlreadyBuiltException("This method can not be called after 'build()'-function has been called");
}
GraphQLFieldDefinition.Builder ret = newFieldDefinition();
fields.add(ret);
return ret;
}
public GraphQLFieldDefinition.Builder addField(Class<?> clz) {
return addField()
.type(typeForClass(clz))
.name(clz.getSimpleName().toLowerCase());
}
public GraphQLFieldDefinition.Builder addListField(Class<?> clz) {
return addField()
.type(GraphQLList.list(typeForClass(clz)))
.name((clz.getSimpleName() + "s").toLowerCase());
}
/**
* Add a field to graphql schema from JPA metamodel.
* This function will set a name and DataFetcher to the fieldDefinition builder,
* which then can be overriden from the returned builder, if needed
*
* @param field JPA metamodel field to be added to the graphql schema
* @return Field definition builder, where type, name and data fetcher are set according to the {@param field}
*/
public GraphQLFieldDefinition.Builder addField(Attribute<? super T, ?> field) {
GraphQLOutputType type = typeForClass(field.getJavaType());
if (field instanceof PluralAttribute) {
type = GraphQLList.list(typeForClass(((PluralAttribute) field).getBindableJavaType()));
}
return addField()
.type(type)
.name(field.getName().toLowerCase())
.dataFetcher(new PropertyDataFetcher<>(field.getName()));
}
private GraphQLOutputType typeForClass(Class<?> type) {
if (Map.Entry.class.isAssignableFrom(type)) {
return parent.getMapEntryType();
}
if (Boolean.class.isAssignableFrom(type) || boolean.class.isAssignableFrom(type)) {
return GraphQLBoolean;
}
if (Double.class.isAssignableFrom(type) || double.class.isAssignableFrom(type)) {
return GraphQLFloat;
}
if (Byte.class.isAssignableFrom(type) || byte.class.isAssignableFrom(type)) {
return GraphQLByte;
}
if (Character.class.isAssignableFrom(type) || char.class.isAssignableFrom(type)) {
return GraphQLChar;
}
if (Short.class.isAssignableFrom(type) || short.class.isAssignableFrom(type)) {
return GraphQLShort;
}
if (Integer.class.isAssignableFrom(type) || int.class.isAssignableFrom(type)) {
return GraphQLInt;
}
if (Long.class.isAssignableFrom(type) || long.class.isAssignableFrom(type)) {
return GraphQLLong;
}
if (BigInteger.class.isAssignableFrom(type)) {
return GraphQLBigInteger;
}
if (BigDecimal.class.isAssignableFrom(type)) {
return GraphQLBigDecimal;
}
if (String.class.isAssignableFrom(type)) {
return GraphQLString;
}
if (byte[].class.isAssignableFrom(type) || Byte[].class.isAssignableFrom(type)) {
return GraphQLUtils.GRAPHQL_BYTE_TO_BASE64_TYPE;
}
if (Enum.class.isAssignableFrom(type)) {
return parent.getEnum((Class<Enum>) type);
}
if (Date.class.isAssignableFrom(type)
|| Calendar.class.isAssignableFrom(type)
|| OffsetDateTime.class.isAssignableFrom(type)
|| LocalDateTime.class.isAssignableFrom(type)
|| LocalDate.class.isAssignableFrom(type)) {
return GraphQLUtils.GRAPHQL_DATE_TYPE;
}
return parent.typeFor(type);
}
@Override
public GraphQLObjectType build() {
if (builtObject == null) {
fields.forEach(f -> builder.field(f));
builtObject = builder.build();
}
return builtObject;
}
public GraphQLObjectType.Builder getRawTypeBuilder() {
return builder;
}
public EntityGQLBuilder<T> description(String s) {
builder.description(s);
return this;
}
public GraphQLTypeReference getRef() {
return parent.typeFor(typeName);
}
}
code/moya-web/src/main/java/fi/codecrew/moya/graphql/GQLEntityContainer.java 0 → 100644
package fi.codecrew.moya.graphql;
import graphql.schema.GraphQLObjectType;
public interface GQLEntityContainer {
GraphQLObjectType build();
}
code/moya-web/src/main/java/fi/codecrew/moya/graphql/GRPDException.java 0 → 100644
package fi.codecrew.moya.graphql;
public class GRPDException extends RuntimeException {
public GRPDException(String reason) {
super(reason);
}
}
code/moya-web/src/main/java/fi/codecrew/moya/graphql/GraphQLBuilder.java 0 → 100644
package fi.codecrew.moya.graphql;
import graphql.schema.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.*;
import java.util.stream.Collectors;
import static graphql.Scalars.GraphQLString;
import static graphql.schema.GraphQLEnumType.newEnum;
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import static graphql.schema.GraphQLObjectType.newObject;
public class GraphQLBuilder {
private final Map<String, GQLEntityContainer> entities = new HashMap<>();
private final Map<String, GraphQLEnumType> enums = new HashMap<>();
private final Set<String> uncheckedTypes = new HashSet<>();
private static final Logger logger = LoggerFactory.getLogger(GraphQLBuilder.class);
public <T> EntityGQLBuilder<T> createEntity(Class<T> entityClass) {
return createEntity(entityClass.getSimpleName());
}
public <T> EntityGQLBuilder<T> createEntity(String name) {
EntityGQLBuilder<T> ret = new EntityGQLBuilder<>(name, this);
entities.put(name, ret);
return ret;
}
public GraphQLList getMapEntryType() {
if (!entities.containsKey("MapEntry")) {
entities.put("MapEntry", new GQLEntityContainer() {
@Override
public GraphQLObjectType build() {
return type.build();
}
final GraphQLObjectType.Builder type = newObject()
.name("MapEntry")
.field(newFieldDefinition().name("key").type(GraphQLString))
.field(newFieldDefinition().name("value").type(GraphQLString));
}
);
}
return GraphQLList.list(typeFor("MapEntry"));
}
public Set<GraphQLType> getTypes() {
Set<GraphQLType> ret = new HashSet<>(enums.values());
List<GraphQLObjectType> retEnt = entities.values().stream().map(v -> v.build()).collect(Collectors.toList());
logger.warn("Returning entities", retEnt);
ret.addAll(retEnt);
logger.warn("Enums {}, entities {}", enums, entities);
logger.warn("Builder returning types: {}", ret);
return ret;
}
public GraphQLTypeReference typeFor(String typeName) {
logger.warn("Adding typeFor: {}", typeName);
if (!entities.containsKey(typeName) && !enums.containsKey(typeName)) {
logger.warn("Adding unknown type: this might be an error!" + typeName, new RuntimeException().fillInStackTrace());
uncheckedTypes.add(typeName);
}
return GraphQLTypeReference.typeRef(typeName);
}
public GraphQLTypeReference typeFor(Class<?> clz) {
return typeFor(clz.getSimpleName());
}
public <X extends Enum> GraphQLOutputType getEnum(Class<X> type) {
String name = type.getSimpleName();
if (name == null) {
throw new NullPointerException("Trying to get enum with type " + type);
}
if (!enums.containsKey(name)) {
GraphQLEnumType.Builder ret = newEnum().name(name);
for (Enum c : type.getEnumConstants()) {
ret.value(c.name());
}
enums.put(name, ret.build());
}
return typeFor(type);
}
}
code/moya-web/src/main/java/fi/codecrew/moya/graphql/GraphQLUtils.java 0 → 100644
package fi.codecrew.moya.graphql;
import graphql.schema.*;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.time.*;
import java.time.format.DateTimeFormatter;
import java.util.Base64;
import java.util.Calendar;
import java.util.Date;
import java.util.TimeZone;
public class GraphQLUtils {
public static final GraphQLScalarType GRAPHQL_BYTE_TO_BASE64_TYPE = new GraphQLScalarType("Base64Data", "Binary data in base64 format", new Coercing<byte[], String>() {
@Override
public String serialize(Object dataFetcherResult) throws CoercingSerializeException {
byte[] data = (byte[]) dataFetcherResult;
if (data == null || data.length == 0) {
return "";
}
return Base64.getEncoder().encodeToString(data);
}
@Override
public byte[] parseValue(Object input) throws CoercingParseValueException {
return Base64.getDecoder().decode(input.toString());
}
@Override
public byte[] parseLiteral(Object input) throws CoercingParseLiteralException {
return Base64.getDecoder().decode(input.toString());
}
});
public static final GraphQLScalarType GRAPHQL_DATE_TYPE = new GraphQLScalarType("Date", "Date in ISO-8601 format: yyyymmddThhmmssZ (for example: 2011-12-03T10:15:30Z')", new Coercing<Object, String>() {
@Override
public String serialize(Object dataFetcherResult) throws CoercingSerializeException {
if (dataFetcherResult == null) {
return null;
}
try {
if (dataFetcherResult instanceof Date) {
return Instant
.ofEpochMilli(((Date) dataFetcherResult).getTime())
.atZone(ZoneId.systemDefault())
.toOffsetDateTime()
.format(DateTimeFormatter.ISO_INSTANT);
} else if (dataFetcherResult instanceof Calendar) {
return Instant
.ofEpochMilli(((Calendar) dataFetcherResult).getTime().getTime())
.atZone(ZoneId.systemDefault())
.toOffsetDateTime()
.format(DateTimeFormatter.ISO_INSTANT);
} else if (dataFetcherResult instanceof OffsetDateTime) {
return ((OffsetDateTime) dataFetcherResult).format(DateTimeFormatter.ISO_INSTANT);
} else if (dataFetcherResult instanceof LocalDateTime) {
return ((LocalDateTime) dataFetcherResult).format(DateTimeFormatter.ISO_INSTANT);
} else if (dataFetcherResult instanceof LocalDate) {
return ((LocalDate) dataFetcherResult).format(DateTimeFormatter.ISO_INSTANT);
}
} catch (Exception e) {
throw new CoercingSerializeException("Error converting detected dateformat: " + dataFetcherResult, e);
}
throw new CoercingSerializeException("Unknonw date type " + dataFetcherResult.getClass());
}
@Override
public Object parseValue(Object input) throws CoercingParseValueException {
throw new UnsupportedOperationException("Not yet implemented... TODO... ");
}
@Override
public Object parseLiteral(Object input) throws CoercingParseLiteralException {
throw new UnsupportedOperationException("Not yet implemented... TODO... ");
}
});
}
code/moya-web/src/main/java/fi/codecrew/moya/graphql/MoyaGraphQLServlet.java 0 → 100644
package fi.codecrew.moya.graphql;
import com.google.gson.Gson;
import fi.codecrew.moya.beans.*;
import fi.codecrew.moya.entitysearch.UserSearchQuery;
import fi.codecrew.moya.enums.apps.UserPermission;
import fi.codecrew.moya.graphql.util.JSONPropertyDataFetcher;
import fi.codecrew.moya.graphql.util.PropertyFetchWrapper;
import fi.codecrew.moya.model.*;
import fi.codecrew.moya.utilities.SearchQuery;
import fi.codecrew.moya.utilities.SearchResult;
import graphql.*;
import graphql.schema.*;
import graphql.schema.idl.SchemaPrinter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.ejb.EJB;
import javax.json.Json;
import javax.json.JsonObject;
import javax.json.JsonWriter;
import javax.json.JsonWriterFactory;
import javax.json.stream.JsonGenerator;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.*;
import java.util.stream.Collector;
import java.util.stream.Collectors;
import static graphql.Scalars.*;
import static graphql.schema.GraphQLArgument.newArgument;
import static graphql.schema.GraphQLFieldDefinition.newFieldDefinition;
import static java.util.stream.Collectors.toList;
@WebServlet(name = "MoyaGraphQLServlet", urlPatterns = {"/graphql/*"})
public class MoyaGraphQLServlet extends HttpServlet {
private static final Logger logger = LoggerFactory.getLogger(MoyaGraphQLServlet.class);
private GraphQLSchema schema;
private static final String SIMPLE_EVENT_TYPE_NAME = "SimpleEvent";
@EJB
private UserBeanLocal userbean;
@EJB
private PlaceBeanLocal placebean;
@EJB
private PermissionBeanLocal permbean;
@EJB
private RoleBeanLocal rolebean;
@EJB
private AllergyBeanLocal allergybean;
@EJB
private EventBeanLocal eventbean;
@EJB
private PlaceBeanLocal mapBean;
@EJB
private ProductBeanLocal productbean;
@EJB
private VotingBeanLocal votebean;
@EJB
private UserPropertyBeanLocal eventUserPropertyBean;
private static final Comparator<? super GenericEntity> ENTITY_ID_SORTER = (Comparator<GenericEntity>) (o1, o2) -> o1.getId().compareTo(o2.getId());
@Override
public void init(ServletConfig config) throws ServletException {
super.init(config);
this.schema = createSchema();
logger.warn("Initinqlizing graphql servlet");
}
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
doQuery(request, response);
}
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
doQuery(request, response);
}
private void doQuery(HttpServletRequest request, HttpServletResponse response) throws IOException {
// For now, allow graphql only for VIEW_ALL users...
// After a bit more permission and error checking, allow all users to use this..
if (!permbean.hasPermission(UserPermission.VIEW_ALL)) {
response.setStatus(HttpServletResponse.SC_FORBIDDEN);
PrintWriter writer = response.getWriter();
writer.write("Insufficient permissions");
writer.close();
;
return;
}
logger.warn("Graphql pathinfo: {}, uri: {}, url: {}", request.getPathInfo(), request.getRequestURI(), request.getRequestURL());
if (request.getPathInfo() != null) {
if (request.getPathInfo().equals("/schema")) {
SchemaPrinter.Options opts = SchemaPrinter.Options.defaultOptions().includeScalarTypes(true);
if (request.getParameter("introspection") != null) {
opts = opts.includeIntrospectionTypes(true);
}
if (request.getParameter("schema") != null) {
opts = opts.includeSchemaDefintion(true);
}
if (request.getParameter("ext") != null) {
opts = opts.includeExtendedScalarTypes(true);
}
if (request.getParameter("scalar") != null) {
opts = opts.includeScalarTypes(true);
}
printSchema(response, opts);
return;
}
}
String query = request.getParameter("query");
executeQuery(query, response);
}
private void executeQuery(String query, HttpServletResponse response) throws IOException {
GraphQL graphql = GraphQL.newGraphQL(schema).build();
PrintWriter writer = response.getWriter();
try {
Gson gson = new Gson();
ExecutionResult exec = graphql.execute(query);
logger.warn("Executed stuff errors: {}", exec.getErrors());
if (exec.getErrors() != null && !exec.getErrors().isEmpty()) {
writer.write(gson.toJson(new ErrorContainer(exec.getErrors())));
response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
} else {
Map<String, Object> data = exec.getData();
writer.write(gson.toJson(data));
}
} catch (Exception e) {
logger.warn("Got exception at graphql ", e);
writer.write("Error completing the query because of exception: " + e.getMessage());
}
writer.close();
}
private static class ErrorContainer {
static class Error {
final String message;
final ErrorType type;
final List<Object> path;
final String exceptionMessage;
final boolean isException;
final String exceptionClass;
public Error(GraphQLError error) {
type = error.getErrorType();
message = error.getMessage();
path = error.getPath();
if (error instanceof ExceptionWhileDataFetching) {
Throwable e = ((ExceptionWhileDataFetching) error).getException();
isException = true;
exceptionMessage = e.getMessage();
exceptionClass = e.getClass().getCanonicalName();
} else {
isException = false;
exceptionMessage = null;
exceptionClass = null;
}
}
}
final List<Error> errors = new ArrayList<>();
public ErrorContainer(List<GraphQLError> e) {
e.forEach(graphQLError -> errors.add(new Error(graphQLError)));
}
}
private void printSchema(HttpServletResponse response, SchemaPrinter.Options options) throws IOException {
GraphQLSchema s = schema;
logger.warn("Returning graphql schema, with options {} ", options);
SchemaPrinter printer = new SchemaPrinter(options);
PrintWriter writer = response.getWriter();
writer.print(printer.print(s));
writer.close();
}
private GraphQLBuilder initSchema() {
GraphQLBuilder builder = new GraphQLBuilder();
{
EntityGQLBuilder<JsonObject> b = builder.createEntity(JsonObject.class);
b.addField().type(GraphQLString).name("asJson").dataFetcher(environment -> {
JsonObject obj = environment.getSource();
if (obj == null) {
return null;
}
StringWriter stringWriter = new StringWriter();
Map<String, Boolean> config = new HashMap<String, Boolean>();
config.put(JsonGenerator.PRETTY_PRINTING, true);
JsonWriterFactory writerFactory = Json.createWriterFactory(config);
JsonWriter jsonWriter = writerFactory.createWriter(stringWriter);
jsonWriter.write(obj);
jsonWriter.close();
return stringWriter.toString();
}).description("Returns the object as a string.");
b.addField(Map.Entry.class)
.argument(newArgument().name("keys").defaultValue(Collections.emptyMap()).type(GraphQLList.list(GraphQLString)))
.name("path")
.description("Returngs values from given keys as key, value pairs")
.dataFetcher(environment -> {
Map<String, String> ret = new HashMap<>();
final JsonObject jsonObj = environment.getSource();
((List<String>) environment.getArgument("keys")).forEach(key -> {
if (jsonObj.containsKey(key)) ret.put(key, jsonObj.getString(key));
});
return ret.entrySet();
});
}
{
EntityGQLBuilder<Role> b = builder.createEntity(Role.class);
b.addField(Role_.id);
b.addField(Role_.name);
b.addField(Role_.parents);
b.addField(Role_.children);
b.addField(Place_.meta);
}
{
EntityGQLBuilder<EventMap> b = builder.createEntity(EventMap.class);
b.addField(EventMap_.id);
b.addField(EventMap_.name);
b.addField(EventMap_.width);
b.addField(EventMap_.height);
b.addField(EventMap_.places);
b.addField(EventMap_.active);
b.addField(EventMap_.mimeType);
b.addField(EventMap_.mapData);
b.addField(EventMap_.meta);
}
{
EntityGQLBuilder<Place> b = builder.createEntity(Place.class);
b.addField(Place_.id);
b.addField(Place_.name);
b.addField(Place_.mapX);
b.addField(Place_.mapY);
b.addField(Place_.width);
b.addField(Place_.height);
b.addField(Place_.reserveTime);
b.addField(Place_.details);
b.addField(Place_.buyable);
b.addField(Place_.disabled);
b.addField(Place_.map);
b.addField(Place_.providesRole);
b.addField(Place_.product);
b.addField(Place_.currentUser);
b.addField(Place_.meta);
}
{
EntityGQLBuilder<EventUser> b = builder.createEntity(EventUser.class);
b.addField(EventUser_.id);
b.addField(EventUser_.user);
b.addField(EventUser_.event).type(builder.typeFor(SIMPLE_EVENT_TYPE_NAME));
b.addField(EventUser_.eventuserCreated);
b.addField(EventUser_.id);
b.addListField(Role.class).dataFetcher(environment -> userbean.findUsersRoles(environment.getSource()));
b.addListField(UsersEventUserproperty.class).dataFetcher(environment -> eventUserPropertyBean.getUserPropertiesForUser(environment.getSource()).stream().sorted(ENTITY_ID_SORTER).collect(toList()));
b.addField(EventUser_.currentPlaces);
}
{
EntityGQLBuilder<UsersEventUserproperty> b = builder.createEntity(UsersEventUserproperty.class);
b.addField(UsersEventUserproperty_.id);
b.addField(UsersEventUserproperty_.textvalue);
b.addField(UsersEventUserproperty_.decimalValue);
b.addField(UsersEventUserproperty_.integerValue);
b.addField(UsersEventUserproperty_.dataValue);
b.addField(UsersEventUserproperty_.user);
b.addField().name("name").type(GraphQLString).dataFetcher(environment -> ((UsersEventUserproperty) environment.getSource()).getProperty().getName().getDefaultValue()).description("Shorthand for {property { name { defaultValue }}}");
b.addField(UsersEventUserproperty_.property);
b.addField(UsersEventUserproperty_.meta);
}
{
EntityGQLBuilder<EventUserproperty> b = builder.createEntity(EventUserproperty.class);
b.addField(EventUserproperty_.id);
b.addField(EventUserproperty_.name);
b.addField(EventUserproperty_.forRole);
b.addField(EventUserproperty_.description);
b.addField(EventUserproperty_.type);
b.addField(EventUserproperty_.meta);
}
{
EntityGQLBuilder<User> b = builder.createEntity(User.class);
b.addField(User_.id);
b.addField(User_.firstnames);
b.addField(User_.lastname);
b.addField(User_.birthday);
b.addField(User_.nick);
b.addField(User_.login);
b.addField(User_.email);
b.addField(User_.address);
b.addField(User_.zip);
b.addField(User_.postalTown);
b.addField(User_.town);
b.addField(User_.phone);
b.addField(User_.gender);
b.addField(User_.meta);
b.addField().name("shirtSize").type(GraphQLString).dataFetcher(new JSONPropertyDataFetcher("meta", "shirtSize"));
b.addField().name("allergiesFreetext").type(GraphQLString).dataFetcher(new JSONPropertyDataFetcher("meta", "allergies"));
b.addListField(UsersAllergy.class)
.name("allergies")
.argument(newArgument()
.description("By default, show only allergies, user has selected")
.type(GraphQLBoolean)
.defaultValue(true)
.name("onlySelected"))
.dataFetcher(environment -> {
List<UsersAllergy> allergies = allergybean.getUserAllergies((User) environment.getSource());
logger.warn("Got allergies for user {}", allergies);
if (environment.getArgument("onlySelected")) {
logger.warn("Filtering allergies");
return allergies.stream().sorted(ENTITY_ID_SORTER).filter(a -> a.isSelected()).collect(toList());
}
return allergies;
});
b.addListField(EventUser.class)
.dataFetcher(environment -> userbean.findAllEventusers(environment.getSource()).stream().sorted(ENTITY_ID_SORTER).collect(toList()))
.description("Only users themselves can fetch eventusers for other events. If another user tries to fetch this data, an exception will be thrown");
}
{
EntityGQLBuilder<UsersAllergy> b = builder.createEntity(UsersAllergy.class);
b.description("Note that user 'selected' field notes wether user has this allergy, or not!");
b.addField(UsersAllergy_.allergy);
b.addField(UsersAllergy_.severity);
b.addField(UsersAllergy_.user);
b.addField(UsersAllergy_.created);
b.addField(UsersAllergy_.notes);
b.addField(UsersAllergy_.selected);
b.addField().type(GraphQLString)
.name("allergyname")
.dataFetcher(environment -> ((UsersAllergy) environment.getSource()).getAllergy().getName().getDefaultValue())
.description("Shorthand for { allergy {name {defaultvalue}}}");
}
{
EntityGQLBuilder<Allergy> b = builder.createEntity(Allergy.class);
b.addField(Allergy_.allergyType);
b.addField(Allergy_.description);
b.addField(Allergy_.name);
}
{
EntityGQLBuilder<Object> valB = builder.createEntity("LanguageValue");
valB.addField().name("language").type(GraphQLString).dataFetcher(new PropertyDataFetcher<String>("key"));
valB.addField().name("value").type(GraphQLString);
EntityGQLBuilder<LanguageAwareString> b = builder.createEntity(LanguageAwareString.class);
b.addField().name("defaultvalue").type(GraphQLString);
b.addField().name("defaultlanguage").type(GraphQLString);
b.addField().name("values").type(GraphQLList.list(valB.getRef()));
}
{
EntityGQLBuilder<PlaceSlot> b = builder.createEntity(PlaceSlot.class);
b.addField(PlaceSlot_.id);
b.addField(PlaceSlot_.product);
b.addField(PlaceSlot_.place);
b.addField(PlaceSlot_.description);
b.addField(PlaceSlot_.used);
b.addField(PlaceSlot_.created);
b.addField(PlaceSlot_.meta);
}
{
EntityGQLBuilder<Bill> b = builder.createEntity(Bill.class);
b.addField(Bill_.id);
b.addField(Bill_.paidDate);
b.addField(Bill_.sentDate);
b.addField(Bill_.billNumber);
b.addField().name("paid").type(GraphQLBoolean);
b.addField(Bill_.addr1);
b.addField(Bill_.addr2);
b.addField(Bill_.addr3);
b.addField(Bill_.addr4);
b.addField(Bill_.addr5);
b.addField(Bill_.user);
b.addField(Bill_.meta);
}
{
EntityGQLBuilder<Product> b = builder.createEntity(Product.class);
b.addField(Product_.id);
b.addField(Product_.name);
b.addField(Product_.description);
b.addField(Product_.price);
b.addField(Product_.vat);
b.addField(Product_.provides).description("Role provided to user when this product is bought and paid");
b.addField(Product_.shopRequiredRole).description("Role required to shop this product");
b.addField(Product_.sort);
b.addField(Product_.discounts);
b.addField(Product_.unitName);
b.addField(Product_.productFlags);
b.addField(Product_.meta);
}
{
EntityGQLBuilder<Discount> b = builder.createEntity(Discount.class);
b.addField(Discount_.id);
b.addField(Discount_.active);
b.addField(Discount_.amountMax);
b.addField(Discount_.amountMin);
b.addField(Discount_.code);
b.addField(Discount_.details);
b.addField(Discount_.maxNum);
b.addField(Discount_.percentage);
b.addField(Discount_.perUser);
b.addField(Discount_.role);
b.addField(Discount_.shortdesc);
b.addField(Discount_.validFrom);
b.addField(Discount_.validTo);
b.addField(Discount_.products);
b.addField(Discount_.shortdesc);
b.addField(Discount_.meta);
}
{
EntityGQLBuilder<LanEvent> b = builder.createEntity(SIMPLE_EVENT_TYPE_NAME);
b.addField(LanEvent_.id);
b.addField(LanEvent_.name);
b.addField(LanEvent_.startTime);
b.addField(LanEvent_.endTime);
b.addField(LanEvent_.ticketSalesBegin);
b.addField(LanEvent_.domains).type(GraphQLList.list(GraphQLString)).dataFetcher(environment -> ((LanEvent) environment.getSource()).getDomains().stream().sorted(ENTITY_ID_SORTER).map(d -> d.getDomain()).collect(toList()));
b.addField(LanEvent_.meta);
}
{
EntityGQLBuilder<Compo> b = builder.createEntity(Compo.class);
b.addField(Compo_.id);
b.addField(Compo_.name);
b.addField(Compo_.hidden);
b.addField(Compo_.startTime);
b.addField(Compo_.endTime);
b.addField(Compo_.voteStart);
b.addField(Compo_.voteEnd);
b.addField(Compo_.submitStart);
b.addField(Compo_.submitEnd);
b.addField(Compo_.description);
b.addField(Compo_.maxParticipantCount);
b.addField(Compo_.holdVoting);
b.addField(Compo_.compoEntries);
b.addField(Compo_.meta);
}
{
EntityGQLBuilder<CompoEntry> b = builder.createEntity(CompoEntry.class);
b.addField(CompoEntry_.id);
b.addField(CompoEntry_.created);
b.addField(CompoEntry_.creator);
b.addField(CompoEntry_.title);
b.addField(CompoEntry_.author);
b.addField(CompoEntry_.notes);
b.addField(CompoEntry_.screenMessage);
b.addField(CompoEntry_.sort);
b.addField(CompoEntry_.compo);
b.addField(CompoEntry_.meta);
}
{
EntityGQLBuilder<CompoEntryFile> b = builder.createEntity(CompoEntryFile.class);
b.addField(CompoEntryFile_.id);
b.addField(CompoEntryFile_.mimeType);
b.addField(CompoEntryFile_.fileName);
b.addField(CompoEntryFile_.description);
b.addField(CompoEntryFile_.uploaded);
b.addField(CompoEntryFile_.hash).description("SHA1 hash of the file data");
b.addField(CompoEntryFile_.meta);
}
{
EntityGQLBuilder<LanEventDomain> b = builder.createEntity(LanEventDomain.class);
b.addField(LanEventDomain_.id);
b.addField(LanEventDomain_.domain);
b.addField(LanEventDomain_.event);
b.addField(LanEventDomain_.description);
b.addField(LanEventDomain_.overridePriority);
b.addField(LanEventDomain_.meta);
}
/**
* This event should only be used to return stuff for current event.
* For oher events, use {#getSimpleEventType()}
*
* @return
*/
{
EntityGQLBuilder<LanEvent> b = builder.createEntity(LanEvent.class);
b.addField(LanEvent_.id);
b.addField(LanEvent_.name);
b.addField(LanEvent_.startTime);
b.addField(LanEvent_.endTime);
b.addField(LanEvent_.ticketSalesBegin);
b.addField(LanEvent_.domains);
b.addField(LanEvent_.meta);
b.addListField(EventMap.class).dataFetcher(environment -> placebean.getMaps().stream().sorted(ENTITY_ID_SORTER).collect(toList()));
b.addListField(Role.class).dataFetcher(environment -> rolebean.listRoles().stream().sorted(ENTITY_ID_SORTER).collect(toList()));
b.addListField(Product.class).dataFetcher(environment -> productbean.findProductsForEvent().stream().sorted(ENTITY_ID_SORTER).collect(toList()));
b.addListField(Compo.class).dataFetcher(environment -> votebean.getCompoList(true).stream().sorted(ENTITY_ID_SORTER).collect(toList()));
b.addField(LanEvent_.id);
}
return builder;
}
private GraphQLSchema createSchema() {
GraphQLBuilder builder = initSchema();
GraphQLSchema.Builder schemaBld = GraphQLSchema.newSchema();
schemaBld.additionalTypes(builder.getTypes());
schemaBld.query(GraphQLObjectType.newObject()
.name("moyaQuery")
.field(getUserSearchField(builder))
.field(getEventSearchQuery(builder))
.field(getSingleUserQuery(builder)));
return schemaBld.build();
}
private GraphQLFieldDefinition getSingleUserQuery(GraphQLBuilder builder) {
return newFieldDefinition()
.name("user")
.argument(newArgument().name("id").type(GraphQLInt).description("Id of the global user object. If id is 0, currently logged in user is used"))
.type(builder.typeFor(User.class))
.dataFetcher(environment -> {
Integer id = environment.getArgument("userId");
EventUser user;
if (id == null || id.equals(0)) {
user = permbean.getCurrentUser();
} else {
user = userbean.findByUserId(id, false);
}
if (user == null) {
throw new NullPointerException("User not found with id " + id);
}
return user.getUser();
}).build();
}
private GraphQLFieldDefinition.Builder getEventSearchQuery(GraphQLBuilder builder) {
return newFieldDefinition()
.name("currentevent")
.type(builder.typeFor(LanEvent.class))
.dataFetcher(environment -> eventbean.getCurrentEvent());
}
private GraphQLFieldDefinition.Builder getUserSearchField(GraphQLBuilder builder) {
return newFieldDefinition()
.type(new GraphQLList(builder.typeFor(EventUser.class)))
.name("usersearch")
.description("Search users. Using this method requires admin acccess to the database")
//.argument(newArgument().name("reason").type(GraphQLString).description("Reason for the data request. Reason and requested fields are stored to audit log."))
.argument(newArgument().name("roles").defaultValue(Collections.emptyList()).description("(Optional) Filter users that belong to a role").type(GraphQLList.list(GraphQLInt)))
.argument(newArgument().name("search").type(GraphQLString).defaultValue("").description("(Optional) Filter users that contain the search parameter in their firstname, lastname, nick or email").type(GraphQLString))
.argument(newArgument().name("page").type(GraphQLInt).defaultValue(0).description("Pagination page ( 0 is the first page)"))
.argument(newArgument().name("pagesize").type(GraphQLInt).defaultValue(0).description("Pagination pagesize (0 disables pagination)"))
.dataFetcher((DataFetcher<List<EventUser>>) environment -> {
/*
String reason = environment.getArgument("reason");
if (reason == null || reason.isEmpty()) {
throw new GRPDException("Query did not provide a reason for the request");
}*/
UserSearchQuery query = new UserSearchQuery(environment.getArgument("page"), environment.getArgument("pagesize"), null, null, SearchQuery.QuerySortOrder.UNSORTED);
String searchArg = environment.getArgument("search");
if (searchArg != null && !searchArg.isEmpty()) {
query.setSearch(searchArg);
}
List<Integer> roleArgument = environment.getArgument("roles");
if (roleArgument != null && !roleArgument.isEmpty()) {
query.setFilterRoles(roleArgument.stream().map(id -> rolebean.find(id)).filter(x -> x != null).collect(toList()));
}
SearchResult<EventUser> ret = userbean.getThisEventsUsers(query);
return ret.getResults();
});
}
}
code/moya-web/src/main/java/fi/codecrew/moya/graphql/util/DataFetchingEnvironmentWrapper.java 0 → 100644
package fi.codecrew.moya.graphql.util;
import graphql.execution.ExecutionContext;
import graphql.execution.ExecutionId;
import graphql.execution.ExecutionTypeInfo;
import graphql.language.Field;
import graphql.language.FragmentDefinition;
import graphql.schema.*;
import java.util.List;
import java.util.Map;
public class DataFetchingEnvironmentWrapper<SRCT> implements DataFetchingEnvironment {
private final SRCT source;
private final DataFetchingEnvironment env;
public DataFetchingEnvironmentWrapper(DataFetchingEnvironment environment, SRCT source) {
this.env = environment;
this.source = source;
}
@Override
public SRCT getSource() {
return source;
}
@Override
public Map<String, Object> getArguments() {
return env.getArguments();
}
@Override
public boolean containsArgument(String name) {
return env.containsArgument(name);
}
@Override
public <T> T getArgument(String name) {
return env.getArgument(name);
}
@Override
public <T> T getContext() {
return env.getContext();
}
@Override
public <T> T getRoot() {
return env.getRoot();
}
@Override
public GraphQLFieldDefinition getFieldDefinition() {
return env.getFieldDefinition();
}
@Override
public List<Field> getFields() {
return env.getFields();
}
@Override
public Field getField() {
return env.getField();
}
@Override
public GraphQLOutputType getFieldType() {
return env.getFieldType();
}
@Override
public ExecutionTypeInfo getFieldTypeInfo() {
return env.getFieldTypeInfo();
}
@Override
public GraphQLType getParentType() {
return env.getParentType();
}
@Override
public GraphQLSchema getGraphQLSchema() {
return env.getGraphQLSchema();
}
@Override
public Map<String, FragmentDefinition> getFragmentsByName() {
return env.getFragmentsByName();
}
@Override
public ExecutionId getExecutionId() {
return env.getExecutionId();
}
@Override
public DataFetchingFieldSelectionSet getSelectionSet() {
return env.getSelectionSet();
}
@Override
public ExecutionContext getExecutionContext() {
return env.getExecutionContext();
}
}
code/moya-web/src/main/java/fi/codecrew/moya/graphql/util/JSONPropertyDataFetcher.java 0 → 100644
package fi.codecrew.moya.graphql.util;
import graphql.schema.DataFetcher;
import graphql.schema.DataFetchingEnvironment;
import graphql.schema.PropertyDataFetcher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.json.JsonObject;
public class JSONPropertyDataFetcher implements DataFetcher<String> {
private static final Logger logger = LoggerFactory.getLogger(JSONPropertyDataFetcher.class);
private final PropertyDataFetcher<JsonObject> fetcher;
private final String[] path;
public JSONPropertyDataFetcher(String field, String... path) {
fetcher = new PropertyDataFetcher<>(field);
this.path = path;
}
@Override
public String get(DataFetchingEnvironment environment) {
JsonObject obj = fetcher.get(environment);
for (int i = 0; i < path.length; ++i) {
if (obj == null || !obj.containsKey(path[i])) {
logger.debug("Json Object null, or key null {}, path {}", obj, path[i] );
return null;
}
if(i + 1 == path.length){
return obj.getString(path[i]);
} else {
obj = obj.getJsonObject(path[i]);
}
}
return null;
}
}
code/moya-web/src/main/java/fi/codecrew/moya/graphql/util/PropertyFetchWrapper.java 0 → 100644
package fi.codecrew.moya.graphql.util;
import graphql.schema.DataFetcher;
import graphql.schema.DataFetchingEnvironment;
import graphql.schema.PropertyDataFetcher;
public class PropertyFetchWrapper<T, INNER> implements DataFetcher<T> {
private final DataFetcher<INNER> fetcher;
private final DataFetcher<T> innerFetcher;
public PropertyFetchWrapper(String field, DataFetcher<T> innerFetcher) {
this.fetcher = new PropertyDataFetcher<>(field);
this.innerFetcher = innerFetcher;
}
@Override
public T get(DataFetchingEnvironment environment) {
INNER field = fetcher.get(environment);
return innerFetcher.get(new DataFetchingEnvironmentWrapper(environment, field));
}
}
code/moya-web/src/main/java/fi/codecrew/moya/handler/SessionHandler.java
...@@ -47,7 +47,6 @@ import fi.codecrew.moya.model.LanEventProperty; ...@@ -47,7 +47,6 @@ import fi.codecrew.moya.model.LanEventProperty;
import fi.codecrew.moya.model.LanEventPropertyKey; import fi.codecrew.moya.model.LanEventPropertyKey;
/** /**
*
* @author tuukka * @author tuukka
*/ */
@Named() @Named()
...@@ -85,7 +84,7 @@ public class SessionHandler { ...@@ -85,7 +84,7 @@ public class SessionHandler {
retStr = ret.toLanguageTag(); retStr = ret.toLanguageTag();
} }
if(retStr.trim().equals("")) if (retStr.trim().equals(""))
retStr = "fi_FI"; retStr = "fi_FI";
return retStr; return retStr;
...@@ -93,7 +92,7 @@ public class SessionHandler { ...@@ -93,7 +92,7 @@ public class SessionHandler {
public String getTheme() { public String getTheme() {
if(theme == null) { if (theme == null) {
theme = eventbean.getCurrentEvent().getTheme(); theme = eventbean.getCurrentEvent().getTheme();
} }
if (theme == null || theme.trim().isEmpty()) { if (theme == null || theme.trim().isEmpty()) {
...@@ -104,7 +103,7 @@ public class SessionHandler { ...@@ -104,7 +103,7 @@ public class SessionHandler {
} }
public void setTheme(String theme) { public void setTheme(String theme) {
logger.debug("Setting theme to: "+theme); logger.debug("Setting theme to: " + theme);
} }
public String getFullscreen() { public String getFullscreen() {
...@@ -122,12 +121,11 @@ public class SessionHandler { ...@@ -122,12 +121,11 @@ public class SessionHandler {
return template; return template;
} }
public String getTemplateName() public String getTemplateName() {
{
if (template == null) { if (template == null) {
template = eventbean.getPropertyString(LanEventPropertyKey.EVENT_LAYOUT); template = eventbean.getPropertyString(LanEventPropertyKey.EVENT_LAYOUT);
} }
if(template != null){ if (template != null) {
template = template.trim().toLowerCase(); template = template.trim().toLowerCase();
} }
...@@ -137,8 +135,7 @@ public class SessionHandler { ...@@ -137,8 +135,7 @@ public class SessionHandler {
return template; return template;
} }
public String getTemplatePath() public String getTemplatePath() {
{
return "/resources/templates/" + getTemplateName(); return "/resources/templates/" + getTemplateName();
...@@ -150,8 +147,7 @@ public class SessionHandler { ...@@ -150,8 +147,7 @@ public class SessionHandler {
private EnumMap<LanEventPropertyKey, Boolean> boolPropertyCache = new EnumMap<>(LanEventPropertyKey.class); private EnumMap<LanEventPropertyKey, Boolean> boolPropertyCache = new EnumMap<>(LanEventPropertyKey.class);
public boolean isEventBoolProperty(String property) public boolean isEventBoolProperty(String property) {
{
LanEventPropertyKey prop = LanEventPropertyKey.valueOf(property); LanEventPropertyKey prop = LanEventPropertyKey.valueOf(property);
if (!prop.isBoolean()) { if (!prop.isBoolean()) {
throw new RuntimeException("Trying to fetch boolean value for non-boolean property!"); throw new RuntimeException("Trying to fetch boolean value for non-boolean property!");
...@@ -206,18 +202,15 @@ public class SessionHandler { ...@@ -206,18 +202,15 @@ public class SessionHandler {
// return permbean.hasPermission(perm); // return permbean.hasPermission(perm);
// } // }
public String getDateFormat() public String getDateFormat() {
{
return "dd.MM.yyyy"; return "dd.MM.yyyy";
} }
public String getDatetimeFormat() public String getDatetimeFormat() {
{
return "dd.MM.yyyy HH:mm"; return "dd.MM.yyyy HH:mm";
} }
public String getShortDatetimeFormat() public String getShortDatetimeFormat() {
{
return "dd.MM HH:MM:ss"; return "dd.MM HH:MM:ss";
} }
...@@ -247,7 +240,8 @@ public class SessionHandler { ...@@ -247,7 +240,8 @@ public class SessionHandler {
} }
public String flushCache() { public String flushCache() {
return eventbean.flushCache(); eventbean.flushCache();
return "";
} }
...@@ -257,13 +251,10 @@ public class SessionHandler { ...@@ -257,13 +251,10 @@ public class SessionHandler {
private String preurlString; private String preurlString;
public String getRequestPreUrl() public String getRequestPreUrl() {
{ if (preurlString == null) {
if (preurlString == null)
{
Object ext = FacesContext.getCurrentInstance().getExternalContext().getRequest(); Object ext = FacesContext.getCurrentInstance().getExternalContext().getRequest();
if (ext instanceof HttpServletRequest) if (ext instanceof HttpServletRequest) {
{
StringBuffer url = ((HttpServletRequest) ext).getRequestURL(); StringBuffer url = ((HttpServletRequest) ext).getRequestURL();
preurlString = url.substring(0, url.indexOf("/", 8)); preurlString = url.substring(0, url.indexOf("/", 8));
......
code/moya-web/src/main/java/fi/codecrew/moya/rest/v2/PojoFactoryV2.java
...@@ -22,7 +22,7 @@ public class PojoFactoryV2 implements Serializable { ...@@ -22,7 +22,7 @@ public class PojoFactoryV2 implements Serializable {
*/ */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public UserPojo createUserPojo(EventUser eventUser) { public static UserPojo createUserPojo(EventUser eventUser) {
User user = eventUser.getUser(); User user = eventUser.getUser();
UserPojo pojo = new UserPojo(); UserPojo pojo = new UserPojo();
pojo.eventuserId = eventUser.getId(); pojo.eventuserId = eventUser.getId();
......
code/moya-web/src/main/java/fi/codecrew/moya/servlet/CardTemplateServlet.java
...@@ -33,7 +33,7 @@ import fi.codecrew.moya.model.CardTemplate; ...@@ -33,7 +33,7 @@ import fi.codecrew.moya.model.CardTemplate;
/** /**
* Servlet implementation class UploadServlet * Servlet implementation class UploadServlet
*/ */
@WebServlet("/CardTemplate") @WebServlet(value="/CardTemplate")
public class CardTemplateServlet extends GenericImageServlet { public class CardTemplateServlet extends GenericImageServlet {
/** /**
......
code/moya-web/src/main/java/fi/codecrew/moya/servlet/CompoEntryFileServlet.java 0 → 100644
package fi.codecrew.moya.servlet;
import fi.codecrew.moya.beans.VotingBeanLocal;
import fi.codecrew.moya.model.*;
import fi.codecrew.moya.utilities.SystemProperty;
import org.apache.commons.codec.binary.Hex;
import org.apache.commons.fileupload.FileItemIterator;
import org.apache.commons.fileupload.FileItemStream;
import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.apache.commons.fileupload.util.Streams;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.ejb.EJB;
import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@WebServlet(value = "/EntryFile/*")
public class CompoEntryFileServlet extends HttpServlet {
private static final Logger logger = LoggerFactory.getLogger(CompoEntryFileServlet.class);
/**
* @see HttpServlet#HttpServlet()
*/
public CompoEntryFileServlet() {
super();
logger.warn("Initializing StreamingUploadServlet");
}
@EJB
private VotingBeanLocal votebean;
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
int fileId = Integer.parseUnsignedInt(req.getPathInfo().substring(1));
CompoEntryFile entry = votebean.findEntryFile(fileId);
if (entry == null) {
resp.setStatus(HttpServletResponse.SC_NOT_FOUND);
resp.getWriter().write("Entity not found");
return;
}
File file = new File(new File(SystemProperty.MOYA_COMPOFILE_DIR.getValueOrDefault()), entry.getFilepath());
resp.setContentType(entry.getMimeType());
resp.setHeader("Content-Disposition", "filename=\"" + entry.getFileName() + "\"");
resp.setContentLength((int) file.length());
FileInputStream inStream = new FileInputStream(file);
ServletOutputStream oStream = resp.getOutputStream();
final byte[] buff = new byte[8192];
while (true) {
int len = inStream.read(buff);
if (len < 1) {
break;
}
oStream.write(buff, 0, len);
}
oStream.close();
}
@Override
protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
File dir = new File(SystemProperty.MOYA_COMPOFILE_DIR.getValueOrDefault());
if (!dir.isDirectory()) {
dir.mkdirs();
}
boolean isMultipart = ServletFileUpload.isMultipartContent(req);
if (!isMultipart) {
resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "Expected multipart upload");
return;
}
ServletFileUpload upload = new ServletFileUpload();
try {
FileItemIterator iter = upload.getItemIterator(req);
final byte[] buff = new byte[8192];
File tmpFile = File.createTempFile("moya-file", "tmp", dir);
CompoEntryFile entryfile = new CompoEntryFile();
Integer entryId = 0;
Integer typeId = 0;
while (iter.hasNext()) {
FileItemStream item = iter.next();
String name = item.getFieldName();
InputStream stream = item.openStream();
if (item.isFormField()) {
final String data = Streams.asString(stream);
logger.warn("Streaming upload form field " + name + " with value " + data + " detected.");
switch (name) {
case "entryId": {
entryId = Integer.parseInt(data);
break;
}
case "typeId": {
typeId = Integer.parseInt(data);
break;
}
}
} else {
logger.warn("File field " + name + " with file name " + item.getName() + " detected." + item.getContentType());
MessageDigest algo = MessageDigest.getInstance("SHA");
FileOutputStream ostream = new FileOutputStream(tmpFile);
while (true) {
int len = stream.read(buff);
if (len < 1) {
break;
}
ostream.write(buff, 0, len);
algo.update(buff, 0, len);
}
String shasum = new String(Hex.encodeHex(algo.digest())).toLowerCase();
logger.warn("File shasum " + shasum);
ostream.close();
entryfile.setFileName(item.getName());
entryfile.setMimeType(item.getContentType());
entryfile.setHash(shasum);
}
stream.close();
}
CompoEntryFileType ft = votebean.findEntryFileType(entryId, typeId);
String ftPath = mkEntryFiletypePath(ft);
File filetypepath = new File(dir, ftPath);
if (!filetypepath.isDirectory()) {
filetypepath.mkdirs();
}
String filePath = ftPath + mkPath(entryfile.getUploaded().getTime() + "_" + entryfile.getFileName()) + ".dat";
logger.warn("Target file: {}, ftpath {}", filePath, ftPath);
entryfile.setFilepath(filePath);
if (!tmpFile.renameTo(new File(dir, filePath))) {
throw new RuntimeException("Error moving file to " + filePath);
}
entryfile.setFiletype(ft);
votebean.create(entryfile);
resp.setStatus(HttpServletResponse.SC_SEE_OTHER);
resp.setHeader("Location", "/MoyaWeb/voting/submitEntry.jsf?entryId=" + entryId);
} catch (FileUploadException e) {
logger.warn("Error uploading streaming file", e);
} catch (NoSuchAlgorithmException e) {
logger.warn("Error calculating checksum", e);
}
}
String asString(InputStream stream) throws IOException {
final byte[] buff = new byte[100];
ByteArrayOutputStream baos = new ByteArrayOutputStream();
while (true) {
int len = stream.read(buff);
if (len < 1) {
break;
}
baos.write(buff, 0, len);
}
return baos.toString();
}
public static void main(String[] asd) {
logger.warn("asda {}", mkPath("Foo", "[]{}äöherp", "1239KKKKK"));
}
public static String mkPath(Object... paths) {
StringBuilder ret = new StringBuilder();
for (Object p : paths) {
ret.append("/");
ret.append(p.toString().toLowerCase().replaceAll("[^a-z0-9]", "_"));
}
return ret.toString().replaceAll("_+", "_");
}
public static String mkEntryFiletypePath(CompoEntryFileType type) {
final CompoEntry entry = type.getEntry();
;
final Compo compo = entry.getCompo();
final LanEvent event = compo.getEvent();
return mkPath(
event.getId() + "_ " + event.getName(),
compo.getId() + "_" + compo.getName(),
entry.getId() + "_" + entry.getTitle(),
type.getId() + "_" + type.getType().getName()
);
}
}
code/moya-web/src/main/java/fi/codecrew/moya/servlet/UploadServlet.java
...@@ -83,7 +83,6 @@ public class UploadServlet extends HttpServlet { ...@@ -83,7 +83,6 @@ public class UploadServlet extends HttpServlet {
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
// boolean isMultipart = ServletFileUpload.isMultipartContent(request); // boolean isMultipart = ServletFileUpload.isMultipartContent(request);
FileItemFactory factory = new DiskFileItemFactory(); FileItemFactory factory = new DiskFileItemFactory();
ServletFileUpload upload = new ServletFileUpload(factory);
// Parse the request // Parse the request
CharSequence retmsg = "Tiedosto tallennettu onnistuneesti."; CharSequence retmsg = "Tiedosto tallennettu onnistuneesti.";
...@@ -106,6 +105,9 @@ public class UploadServlet extends HttpServlet { ...@@ -106,6 +105,9 @@ public class UploadServlet extends HttpServlet {
destId = null; destId = null;
} }
} }
ServletFileUpload upload = new ServletFileUpload(factory);
for (Object ti : upload.parseRequest(request)) { for (Object ti : upload.parseRequest(request)) {
if (ti instanceof FileItem) { if (ti instanceof FileItem) {
......
code/moya-web/src/main/java/fi/codecrew/moya/web/api/ApiAppEditView.java 0 → 100644
package fi.codecrew.moya.web.api;
import fi.codecrew.moya.beans.ApiApplicationBeanLocal;
import fi.codecrew.moya.beans.PermissionBeanLocal;
import fi.codecrew.moya.enums.apps.SpecialPermission;
import fi.codecrew.moya.model.ApiApplication;
import fi.codecrew.moya.model.ApiApplicationInstance;
import fi.codecrew.moya.utilities.PasswordFunctions;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.faces.model.ListDataModel;
import javax.inject.Named;
import java.util.List;
@Named
@ConversationScoped
public class ApiAppEditView extends GenericCDIView {
private static final long serialVersionUID = -5137452386861332063L;
@EJB
private ApiApplicationBeanLocal apibean;
@EJB
private PermissionBeanLocal permbean;
private ApiApplication apiApp;
private Integer id;
private ApiApplicationInstance selectedInstance;
private ListDataModel<ApiApplicationInstance> apiInstances;
public void initEdit() {
if (super.requirePermissions(permbean.isLoggedIn()) && apiApp == null) {
super.beginConversation();
apiApp = apibean.findApplication(id);
apiInstances = new ListDataModel<>(apibean.findInstances(apiApp));
}
}
public void initCreateInstance() {
selectedInstance = apibean.createApplicationInstance(apiApp);
}
public void selectInstance(){
selectedInstance = apiInstances.getRowData();
}
public void saveInstance() {
apibean.saveApiInstance(selectedInstance);
}
public String save() {
apiApp = apibean.saveApiApplication(apiApp);
return null;
}
public ApiApplication getApiApp() {
return apiApp;
}
public void setApiApp(ApiApplication apiApp) {
this.apiApp = apiApp;
}
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public ApiApplicationInstance getSelectedInstance() {
return selectedInstance;
}
public void setSelectedInstance(ApiApplicationInstance selectedInstance) {
this.selectedInstance = selectedInstance;
}
public ListDataModel<ApiApplicationInstance> getApiInstances() {
return apiInstances;
}
public void setApiInstances(ListDataModel<ApiApplicationInstance> apiInstances) {
this.apiInstances = apiInstances;
}
}
code/moya-web/src/main/java/fi/codecrew/moya/web/api/ApplicationApiView.java
...@@ -39,15 +39,22 @@ public class ApplicationApiView extends GenericCDIView { ...@@ -39,15 +39,22 @@ public class ApplicationApiView extends GenericCDIView {
private static final Logger logger = LoggerFactory.getLogger(ApplicationApiView.class); private static final Logger logger = LoggerFactory.getLogger(ApplicationApiView.class);
public void initApplicationListView() { public void initApplicationListView() {
if (super.requirePermissions(permbean.isLoggedIn()) && applist == null) { if (super.requirePermissions(permbean.isLoggedIn()) && applist == null) {
EventUser curruser = permbean.getCurrentUser();
if (permbean.hasPermission(SpecialPermission.SUPERADMIN)) {
applist = apibean.findAllApplications();
} else {
applist = apibean.findMyApplications(); applist = apibean.findMyApplications();
} }
} }
public void initSuperApplicationListView() {
if (super.requirePermissions(permbean.hasPermission(SpecialPermission.SUPERADMIN)) && applist == null) {
applist = apibean.findAllApplications();
}
}
public String createApp() {
apibean.createApiApplication(newApplication);
return "/api/edit?faces-redirect=true&id=" + newApplication.getId();
} }
public List<ApiApplication> getApplist() { public List<ApiApplication> getApplist() {
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/UserAllergyView.java
...@@ -98,7 +98,7 @@ public class UserAllergyView extends GenericCDIView { ...@@ -98,7 +98,7 @@ public class UserAllergyView extends GenericCDIView {
this.freetext = freetext; this.freetext = freetext;
} }
public void saveAllergies() { public void saveAllergies() {
if(freetext != null && !freetext.isEmpty()) { if(freetext != null) {
EventUser usr = userview.getSelectedUser(); EventUser usr = userview.getSelectedUser();
usr.getUser().setMetaStringValue(ALLERGIES_METAKEY, freetext); usr.getUser().setMetaStringValue(ALLERGIES_METAKEY, freetext);
userview.saveUser(); userview.saveUser();
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/UserEventPropertyView.java 0 → 100644
/*
* Copyright Codecrew Ry
*
* All rights reserved.
*
* This license applies to any software containing a notice placed by the
* copyright holder. Such software is herein referred to as the Software.
* This license covers modification, distribution and use of the Software.
*
* Any distribution and use in source and binary forms, with or without
* modification is not permitted without explicit written permission from the
* copyright owner.
*
* A non-exclusive royalty-free right is granted to the copyright owner of the
* Software to use, modify and distribute all modifications to the Software in
* future versions of the Software.
*
*/
package fi.codecrew.moya.web.cdiview.user;
import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.beans.UserPropertyBeanLocal;
import fi.codecrew.moya.model.*;
import fi.codecrew.moya.utilities.jsf.MessageHelper;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
import org.primefaces.event.RowEditEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.faces.application.FacesMessage;
import javax.faces.context.FacesContext;
import javax.inject.Inject;
import javax.inject.Named;
import java.util.List;
import java.util.stream.Collectors;
@Named()
@ConversationScoped
public class UserEventPropertyView extends GenericCDIView {
private static final Logger logger = LoggerFactory.getLogger(UserEventPropertyView.class);
@Inject
private UserView userview;
@EJB
private UserBeanLocal userbean;
@EJB
private UserPropertyBeanLocal propBean;
private List<UsersEventUserproperty> properties;
private UsersEventUserproperty selectedProperty;
public void saveProperty() {
logger.warn("Selected property {}, value: {}", selectedProperty, selectedProperty != null ? selectedProperty.getTextvalue() : "NULL");
}
public List<UsersEventUserproperty> getProperties() {
if (properties == null) {
super.beginConversation();
EventUser selectedUser = userview.getSelectedUser();
List<UsersEventUserproperty> userprops = propBean.getUserPropertiesForUser(userview.getSelectedUser());
properties = propBean.getPropertiesForUser(userview.getSelectedUser())
.stream()
.map(prop -> userprops.stream()
.filter(usrProp -> usrProp.getProperty().equals(prop))
.findFirst()
.orElse(new UsersEventUserproperty(prop, selectedUser)))
.collect(Collectors.toList());
}
logger.warn("UserEventProperties: ", properties);
return properties;
}
public void onRowEdit(RowEditEvent event) {
final UsersEventUserproperty oldObj = (UsersEventUserproperty) event.getObject();
int objPoint = properties.indexOf(oldObj);
UsersEventUserproperty newObj = propBean.saveUserproperty(oldObj);
properties.set(objPoint, newObj);
FacesMessage msg = new FacesMessage("Property saved");
FacesContext.getCurrentInstance().addMessage(null, msg);
}
public void onRowCancel(RowEditEvent event) {
FacesMessage msg = new FacesMessage("Edit Cancelled");
FacesContext.getCurrentInstance().addMessage(null, msg);
}
}
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/UserView.java
...@@ -21,9 +21,7 @@ package fi.codecrew.moya.web.cdiview.user; ...@@ -21,9 +21,7 @@ package fi.codecrew.moya.web.cdiview.user;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.StringWriter; import java.io.StringWriter;
import java.util.HashMap; import java.util.*;
import java.util.List;
import java.util.Map;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.enterprise.context.Conversation; import javax.enterprise.context.Conversation;
...@@ -189,7 +187,7 @@ public class UserView extends GenericCDIView { ...@@ -189,7 +187,7 @@ public class UserView extends GenericCDIView {
FacesContext.getCurrentInstance().addMessage(null, msg); FacesContext.getCurrentInstance().addMessage(null, msg);
UploadedFile f = event.getFile(); UploadedFile f = event.getFile();
if (f != null) if (f != null)
logger.info("Received file {}, {}, {}", new Object[] { f.getContentType(), f.getFileName(), f.getSize() }); logger.info("Received file {}, {}, {}", new Object[]{f.getContentType(), f.getFileName(), f.getSize()});
} }
...@@ -231,6 +229,11 @@ public class UserView extends GenericCDIView { ...@@ -231,6 +229,11 @@ public class UserView extends GenericCDIView {
return null; return null;
} }
public ArrayList<Map.Entry<Role, List<String>>> getAllUsersRoles(){
return new ArrayList<>(userbean.findUsersRolesWithReason(user).entrySet());
}
public List<Role> getUserSelectableRoles() { public List<Role> getUserSelectableRoles() {
if (userSelectableRoles == null && user != null) { if (userSelectableRoles == null && user != null) {
userSelectableRoles = rolebean.getRoles(getSelectedUser()); userSelectableRoles = rolebean.getRoles(getSelectedUser());
...@@ -635,6 +638,11 @@ public class UserView extends GenericCDIView { ...@@ -635,6 +638,11 @@ public class UserView extends GenericCDIView {
return shirtEnabled; return shirtEnabled;
} }
public boolean isMetaAvailable(){
JsonObject meta = getSelectedUser().getUser().getMeta();
return meta != null && !meta.isEmpty();
}
/** /**
* Get metadata from the User (not EventUser). The data is shown in ui. * Get metadata from the User (not EventUser). The data is shown in ui.
* *
...@@ -646,19 +654,17 @@ public class UserView extends GenericCDIView { ...@@ -646,19 +654,17 @@ public class UserView extends GenericCDIView {
User user = eventUser.getUser(); User user = eventUser.getUser();
if (user != null) { if (user != null) {
JsonObject meta = user.getMeta(); JsonObject meta = user.getMeta();
if (meta != null) { if (meta != null && !meta.isEmpty()) {
if (meta.keySet().size() > 0) {
return meta.toString(); return meta.toString();
} }
} }
} }
}
return ""; return "";
} }
public String getPrettyMeta(){ public String getPrettyMeta() {
JsonObject meta = getSelectedUser().getUser().getMeta(); JsonObject meta = getSelectedUser().getUser().getMeta();
if(meta == null){ if (meta == null) {
return ""; return "";
} }
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/voting/CompoFileDownloadView.java
...@@ -55,7 +55,7 @@ public class CompoFileDownloadView extends GenericCDIView { ...@@ -55,7 +55,7 @@ public class CompoFileDownloadView extends GenericCDIView {
{ {
if (files == null) if (files == null)
{ {
files = new ListDataModel<CompoEntryFile>(votebean.getEntryFiles(entry)); //files = new ListDataModel<CompoEntryFile>(votebean.getEntryFiles(entry));
} }
return files; return files;
} }
...@@ -64,19 +64,17 @@ public class CompoFileDownloadView extends GenericCDIView { ...@@ -64,19 +64,17 @@ public class CompoFileDownloadView extends GenericCDIView {
return file; return file;
} }
public void selectDownloadedFile()
{
file = files.getRowData();
dlfile = new DefaultStreamedContent(new ByteArrayInputStream(file.getFileData()), file.getMimeType(), file.getFileName());
}
public void setFile(CompoEntryFile file) { public void setFile(CompoEntryFile file) {
this.file = file; this.file = file;
if (file != null) if (file != null)
{ {
/*
dlfile = new DefaultStreamedContent(new ByteArrayInputStream(file.getFileData()), file.getMimeType(), file.getFileName()); dlfile = new DefaultStreamedContent(new ByteArrayInputStream(file.getFileData()), file.getMimeType(), file.getFileName());
logger.info("Uploading file {}, length {}", file.getFileName(), file.getFileData().length); logger.info("Uploading file {}, length {}", file.getFileName(), file.getFileData().length);
*/
} }
} }
......
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/voting/CompoMgmtView.java
...@@ -18,13 +18,16 @@ ...@@ -18,13 +18,16 @@
*/ */
package fi.codecrew.moya.web.cdiview.voting; package fi.codecrew.moya.web.cdiview.voting;
import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.List;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped; import javax.enterprise.context.ConversationScoped;
import javax.faces.model.ListDataModel; import javax.faces.model.ListDataModel;
import javax.inject.Named; import javax.inject.Named;
import fi.codecrew.moya.model.CompoFileType;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -53,6 +56,8 @@ public class CompoMgmtView extends GenericCDIView { ...@@ -53,6 +56,8 @@ public class CompoMgmtView extends GenericCDIView {
private ListDataModel<CompoEntry> entries; private ListDataModel<CompoEntry> entries;
private CompoFileType filetype = new CompoFileType();
@SuppressWarnings("unused") @SuppressWarnings("unused")
private static final Logger logger = LoggerFactory.getLogger(CompoMgmtView.class); private static final Logger logger = LoggerFactory.getLogger(CompoMgmtView.class);
...@@ -60,10 +65,8 @@ public class CompoMgmtView extends GenericCDIView { ...@@ -60,10 +65,8 @@ public class CompoMgmtView extends GenericCDIView {
return compoId; return compoId;
} }
public void initCreate() public void initCreate() {
{ if (super.requirePermissions(fi.codecrew.moya.enums.apps.CompoPermission.MANAGE) && compo == null) {
if (super.requirePermissions(fi.codecrew.moya.enums.apps.CompoPermission.MANAGE) && compo == null)
{
compo = new Compo(); compo = new Compo();
Date now = new Date(); Date now = new Date();
compo.setStartTime(now); compo.setStartTime(now);
...@@ -82,16 +85,13 @@ public class CompoMgmtView extends GenericCDIView { ...@@ -82,16 +85,13 @@ public class CompoMgmtView extends GenericCDIView {
return "details"; return "details";
} }
public String saveCompo() public String saveCompo() {
{
compo = votingBean.saveCompo(compo); compo = votingBean.saveCompo(compo);
return null; return null;
} }
public String saveSort() public String saveSort() {
{ for (CompoEntry e : entries) {
for (CompoEntry e : entries)
{
setCompo(votingBean.saveSort(e).getCompo()); setCompo(votingBean.saveSort(e).getCompo());
} }
entries = new ListDataModel<CompoEntry>(getCompo().getCompoEntries()); entries = new ListDataModel<CompoEntry>(getCompo().getCompoEntries());
...@@ -108,8 +108,7 @@ public class CompoMgmtView extends GenericCDIView { ...@@ -108,8 +108,7 @@ public class CompoMgmtView extends GenericCDIView {
} }
public void initView() { public void initView() {
if (super.requirePermissions(CompoPermission.MANAGE) && entries == null) if (super.requirePermissions(CompoPermission.MANAGE) && entries == null) {
{
setCompo(votingBean.getCompoById(compoId)); setCompo(votingBean.getCompoById(compoId));
entries = new ListDataModel<CompoEntry>(getCompo().getCompoEntries()); entries = new ListDataModel<CompoEntry>(getCompo().getCompoEntries());
super.beginConversation(); super.beginConversation();
...@@ -132,4 +131,40 @@ public class CompoMgmtView extends GenericCDIView { ...@@ -132,4 +131,40 @@ public class CompoMgmtView extends GenericCDIView {
this.compo = compo; this.compo = compo;
} }
public CompoFileType getFiletype() {
return filetype;
}
public void setFiletype(CompoFileType filetype) {
this.filetype = filetype;
}
public List<CompoFileType.FileType> getFiletypeTypes() {
return Arrays.asList(CompoFileType.FileType.values());
}
public void saveFiletype() {
filetype.setCompo(compo);
compo = votingBean.saveFiletype(filetype);
filetype = new CompoFileType();
}
public void editFiletype(Integer id) {
for (CompoFileType ft : compo.getFiletypes()) {
if (ft.getId().equals(id)) {
this.filetype = ft;
return;
}
}
}
public void deleteFiletype(Integer id) {
for (CompoFileType ft : compo.getFiletypes()) {
if (ft.getId().equals(id)) {
compo = votingBean.deleteFiletype(ft);
return;
}
}
}
} }
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/voting/CompoTypeWrapper.java 0 → 100644
package fi.codecrew.moya.web.cdiview.voting;
import fi.codecrew.moya.model.CompoEntryFileType;
import fi.codecrew.moya.model.CompoFileType;
public class CompoTypeWrapper {
private final CompoFileType filetype;
private CompoEntryFileType entryfiletype;
public CompoTypeWrapper(CompoFileType ft) {
this.filetype = ft;
}
public void setEntryType(CompoEntryFileType eft) {
this.entryfiletype = eft;
}
public CompoFileType getFiletype() {
return filetype;
}
public CompoEntryFileType getEntryfiletype() {
return entryfiletype;
}
}
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/voting/CompoView.java
...@@ -19,6 +19,11 @@ ...@@ -19,6 +19,11 @@
package fi.codecrew.moya.web.cdiview.voting; package fi.codecrew.moya.web.cdiview.voting;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped; import javax.enterprise.context.ConversationScoped;
...@@ -26,6 +31,9 @@ import javax.enterprise.inject.Produces; ...@@ -26,6 +31,9 @@ import javax.enterprise.inject.Produces;
import javax.faces.model.ListDataModel; import javax.faces.model.ListDataModel;
import javax.inject.Named; import javax.inject.Named;
import fi.codecrew.moya.beans.RoleBeanLocal;
import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.model.*;
import fi.codecrew.moya.web.helpers.FileUploadUtils; import fi.codecrew.moya.web.helpers.FileUploadUtils;
import org.primefaces.event.RateEvent; import org.primefaces.event.RateEvent;
import org.primefaces.model.UploadedFile; import org.primefaces.model.UploadedFile;
...@@ -35,9 +43,6 @@ import org.slf4j.LoggerFactory; ...@@ -35,9 +43,6 @@ import org.slf4j.LoggerFactory;
import fi.codecrew.moya.beans.PermissionBeanLocal; import fi.codecrew.moya.beans.PermissionBeanLocal;
import fi.codecrew.moya.beans.VotingBeanLocal; import fi.codecrew.moya.beans.VotingBeanLocal;
import fi.codecrew.moya.enums.apps.CompoPermission; import fi.codecrew.moya.enums.apps.CompoPermission;
import fi.codecrew.moya.model.Compo;
import fi.codecrew.moya.model.CompoEntry;
import fi.codecrew.moya.model.CompoEntryFile;
import fi.codecrew.moya.web.cdiview.GenericCDIView; import fi.codecrew.moya.web.cdiview.GenericCDIView;
@Named @Named
...@@ -50,11 +55,14 @@ public class CompoView extends GenericCDIView { ...@@ -50,11 +55,14 @@ public class CompoView extends GenericCDIView {
private VotingBeanLocal votbean; private VotingBeanLocal votbean;
@EJB @EJB
private PermissionBeanLocal permbean; private PermissionBeanLocal permbean;
@EJB
private UserBeanLocal userbean;
private boolean manage; private boolean manage;
private ListDataModel<Compo> compolist; private ListDataModel<CompoWrapper> compolist;
@Produces @Produces
private CompoEntry entry; private CompoEntry entry;
...@@ -70,57 +78,26 @@ public class CompoView extends GenericCDIView { ...@@ -70,57 +78,26 @@ public class CompoView extends GenericCDIView {
private ListDataModel<EntryWrapper> voteEntries; private ListDataModel<EntryWrapper> voteEntries;
public ListDataModel<Compo> getCompos() {
public ListDataModel<CompoWrapper> getCompos() {
return compolist; return compolist;
} }
public void initEntryView()
{
if (super.requirePermissions(CompoPermission.SUBMIT_ENTRY) && entry == null)
{
if (entryId == null)
{
entry = new CompoEntry();
if (compo == null && compoId != null) {
compo = votbean.getCompoById(compoId);
entry.setCompo(compo);
}
super.beginConversation();
} else {
entry = votbean.findEntry(entryId);
if (entry == null ||
!super.requirePermissions(
super.hasPermission(CompoPermission.MANAGE) ||
permbean.isCurrentUser(entry.getCreator()))) {
entry = null;
compo = null;
} else {
compo = entry.getCompo();
super.beginConversation();
}
}
}
logger.info("Initializing entry view {} {}", entry, compo);
}
public String startVote() public String startVote() {
{ compo = compolist.getRowData().getCompo();
compo = compolist.getRowData();
setVoteEntries(EntryWrapper.init(compo.getCompoEntries(), votbean, false)); setVoteEntries(EntryWrapper.init(compo.getCompoEntries(), votbean, false));
logger.info("Initializing voting with entries {}, {}", compo.getCompoEntries().size(), voteEntries.getRowCount()); logger.info("Initializing voting with entries {}, {}", compo.getCompoEntries().size(), voteEntries.getRowCount());
super.beginConversation(); super.beginConversation();
return "/voting/vote"; return "/voting/vote";
} }
public void handleVoteRate(RateEvent rateEvent) public void handleVoteRate(RateEvent rateEvent) {
{
EntryWrapper row = voteEntries.getRowData(); EntryWrapper row = voteEntries.getRowData();
Integer vote = (Integer) rateEvent.getRating() - 3; Integer vote = (Integer) rateEvent.getRating() - 3;
if (vote < -2 || vote > 2) if (vote < -2 || vote > 2) {
{
vote = 0; vote = 0;
} }
votbean.saveVote(row.getEntry(), vote); votbean.saveVote(row.getEntry(), vote);
...@@ -128,76 +105,22 @@ public class CompoView extends GenericCDIView { ...@@ -128,76 +105,22 @@ public class CompoView extends GenericCDIView {
} }
public String saveVotes() { public String saveVotes() {
for (EntryWrapper vw : voteEntries) for (EntryWrapper vw : voteEntries) {
{
votbean.saveVote(vw.getEntry(), vw.getVote()); votbean.saveVote(vw.getEntry(), vw.getVote());
} }
super.addFaceMessage("compo.votesSaved"); super.addFaceMessage("compo.votesSaved");
return null; return null;
} }
public String submitEntry()
{
setCompo(compolist.getRowData());
setEntry(new CompoEntry());
getEntry().setCompo(getCompo());
return "/voting/submitEntry";
}
public String createEntry()
{
compo = votbean.addEntry(getEntry());
return null;
}
public String saveEntry()
{
setEntry(votbean.saveEntry(getEntry()));
return null;
}
public String submitEntryfile()
{
UploadedFile file = getUploadedFile();
if (file == null)
{
super.addFaceMessage("compo.fileuploadFailed");
return null;
}
byte[] contents = FileUploadUtils.getFileContents(file);
if (contents == null || contents.length == 0) {
super.addFaceMessage("compo.fileuploadFailed");
return null;
}
CompoEntryFile cef = new CompoEntryFile(getEntry());
cef.setFileData(contents);
logger.info("Got file name {} length {}", getUploadedFile().getFileName(), cef.getFileData().length);
cef.setFileName(getUploadedFile().getFileName());
cef.setMimeType(getUploadedFile().getContentType());
// getEntry().setCurrentFile(cef);
votbean.create(cef);
return null;
}
public void initAdminListView() { public void initAdminListView() {
if (requirePermissions(CompoPermission.MANAGE) && compolist == null) { if (requirePermissions(CompoPermission.MANAGE) && compolist == null) {
compolist = new ListDataModel<Compo>(votbean.getCompoList(true)); compolist = new ListDataModel<>(votbean.getCompoList(true).stream().map(c -> new CompoWrapper(c)).collect(Collectors.toList()));
setManage(hasPermission(CompoPermission.MANAGE)); setManage(hasPermission(CompoPermission.MANAGE));
logger.info("Permission to view full compo listing."); logger.info("Permission to view full compo listing.");
super.beginConversation(); super.beginConversation();
} } else {
else {
logger.info("Not enough rights to view full compo listing."); logger.info("Not enough rights to view full compo listing.");
} }
...@@ -206,12 +129,11 @@ public class CompoView extends GenericCDIView { ...@@ -206,12 +129,11 @@ public class CompoView extends GenericCDIView {
public void initListView() { public void initListView() {
if (requirePermissions(CompoPermission.VIEW_COMPOS) && compolist == null) { if (requirePermissions(CompoPermission.VIEW_COMPOS) && compolist == null) {
compolist = new ListDataModel<Compo>(votbean.getCompoList(false)); compolist = new ListDataModel<>(votbean.getCompoList(false).stream().map(c -> new CompoWrapper(c)).collect(Collectors.toList()));
setManage(hasPermission(CompoPermission.MANAGE)); setManage(hasPermission(CompoPermission.MANAGE));
logger.info("Permission to view full compo listing."); logger.info("Permission to view full compo listing.");
super.beginConversation(); super.beginConversation();
} } else {
else {
logger.info("Not enough rights to view full compo listing."); logger.info("Not enough rights to view full compo listing.");
} }
...@@ -274,4 +196,25 @@ public class CompoView extends GenericCDIView { ...@@ -274,4 +196,25 @@ public class CompoView extends GenericCDIView {
this.compoId = compoId; this.compoId = compoId;
} }
public class CompoWrapper {
private final Compo compo;
public CompoWrapper(Compo c) {
this.compo = c;
}
public Compo getCompo() {
return compo;
}
public boolean isCanVote() {
return compo.isVote();
}
public boolean isCanSubmit() {
return compo.isSubmit() && (compo.getEntrysubmitRole() == null || userbean.isUserInRole(permbean.getCurrentUser(), compo.getEntrysubmitRole()));
}
}
} }
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/voting/EntryEditView.java 0 → 100644
package fi.codecrew.moya.web.cdiview.voting;
import fi.codecrew.moya.beans.UserBeanLocal;
import fi.codecrew.moya.beans.VotingBeanLocal;
import fi.codecrew.moya.enums.apps.CompoPermission;
import fi.codecrew.moya.model.*;
import fi.codecrew.moya.web.cdiview.GenericCDIView;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.ejb.EJB;
import javax.enterprise.context.ConversationScoped;
import javax.inject.Named;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
@Named
@ConversationScoped
public class EntryEditView extends GenericCDIView {
private static final Logger logger = LoggerFactory.getLogger(EntryEditView.class);
@EJB
private VotingBeanLocal votbean;
@EJB
private UserBeanLocal userbean;
private Integer compoId;
private Integer entryId;
private Compo compo;
private CompoEntry entry;
private CompoEntryFileType selectedFiletype;
public String createEntry() {
compo = votbean.addEntry(entry);
return null;
}
public String saveEntry() {
entry = votbean.saveEntry(entry);
return null;
}
public void initEntryView() {
if (!super.requirePermissions(CompoPermission.SUBMIT_ENTRY) || entry != null) {
return;
}
if (entryId == null) {
if (compo == null && compoId != null) {
compo = votbean.getCompoById(compoId);
}
if (compo == null) {
throw new RuntimeException("Compo not found.");
}
if (compo.getEntrysubmitRole() != null && !userbean.isUserInRole(permbean.getCurrentUser(), compo.getEntrysubmitRole())) {
super.addFaceMessage("You do not have correct permissions to submit an entry to this compo.");
navihandler.forward("/permissionDenied");
return;
}
entry = new CompoEntry();
entry.setCompo(compo);
} else {
entry = votbean.findEntry(entryId);
compo = entry.getCompo();
if (entry == null || !super.requirePermissions(super.hasPermission(CompoPermission.MANAGE) || permbean.isCurrentUser(entry.getCreator()))) {
entry = null;
compo = null;
return;
}
}
super.beginConversation();
logger.info("Initializing entry view {} {}", entry, compo);
}
public List<CompoTypeWrapper> getEntryFiletypes() {
HashMap<CompoFileType, CompoTypeWrapper> ret = new HashMap<>();
for (CompoFileType ft : entry.getCompo().getFiletypes()) {
ret.put(ft, new CompoTypeWrapper(ft));
}
for (CompoEntryFileType eft : entry.getFiletypes()) {
ret.get(eft.getType()).setEntryType(eft);
}
// (x < y) ? -1 : ((x == y) ? 0 : 1);
ArrayList<CompoTypeWrapper> retList = new ArrayList<>(ret.values());
retList.sort(Comparator.comparingInt(o -> o.getFiletype().getSort()));
return retList;
}
public Integer getCompoId() {
return compoId;
}
public void setCompoId(Integer compoId) {
this.compoId = compoId;
}
public Integer getEntryId() {
return entryId;
}
public void setEntryId(Integer entryId) {
this.entryId = entryId;
}
public Compo getCompo() {
return compo;
}
public void setCompo(Compo compo) {
this.compo = compo;
}
public CompoEntry getEntry() {
return entry;
}
public void setEntry(CompoEntry entry) {
this.entry = entry;
}
public CompoEntryFileType getSelectedFiletype() {
return selectedFiletype;
}
public void setSelectedFiletype(CompoEntryFileType selectedFiletype) {
this.selectedFiletype = selectedFiletype;
}
}
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/voting/VotingCompoAddEntryView.java
...@@ -126,8 +126,8 @@ public class VotingCompoAddEntryView extends GenericCDIView { ...@@ -126,8 +126,8 @@ public class VotingCompoAddEntryView extends GenericCDIView {
compoEntry.setNotes(notes); compoEntry.setNotes(notes);
compoEntry.setScreenMessage(screenMessage); compoEntry.setScreenMessage(screenMessage);
compoEntry.setCompo(votingBean.getCompoById(compoId)); compoEntry.setCompo(votingBean.getCompoById(compoId));
CompoEntryFile cef = new CompoEntryFile(compoEntry); CompoEntryFile cef = new CompoEntryFile();
cef.setFileData(contents); //cef.setFileData(contents);
cef.setFileName(uploadedFile.getFileName()); cef.setFileName(uploadedFile.getFileName());
votingBean.addEntry(compoEntry, cef); votingBean.addEntry(compoEntry, cef);
return null; return null;
......
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n.properties
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net) #Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net)
#Sat Mar 30 17:56:44 EET 2013 #Sat Mar 30 17:56:44 EET 2013
acc_line.place =
accountEvent.commit = Tallenna accountEvent.commit = Tallenna
actionlog.create.header = Create new actionmessage actionlog.create.header = Create new actionmessage
...@@ -27,9 +28,11 @@ adduser.update = Update profile picture ...@@ -27,9 +28,11 @@ adduser.update = Update profile picture
adduser.welcome = Welcome adduser.welcome = Welcome
adduser.welcometext = Here you can add new user or update your current user profile image. Please select desired action below. adduser.welcometext = Here you can add new user or update your current user profile image. Please select desired action below.
applicationPermission.description =
barcodeReader.readBarcode = Lue viivakoodi barcodeReader.readBarcode = Lue viivakoodi
bill.billAmount = Tilauksen summa (sis. alv) bill.billAmount = Tilauksen summa (sis. alv)
bill.billMarkedPaidMail.subject =
bill.billNumber = Tilausnumero bill.billNumber = Tilausnumero
bill.cancel = Cancel bill bill.cancel = Cancel bill
bill.expires = Expires bill.expires = Expires
...@@ -84,6 +87,7 @@ bortalApplication.map.BUY_PLACES = Reserve and buy places from ...@@ -84,6 +87,7 @@ bortalApplication.map.BUY_PLACES = Reserve and buy places from
bortalApplication.map.MANAGE_MAPS = Create and modify maps bortalApplication.map.MANAGE_MAPS = Create and modify maps
bortalApplication.map.MANAGE_OTHERS = Manage other users reservations in map bortalApplication.map.MANAGE_OTHERS = Manage other users reservations in map
bortalApplication.map.VIEW = View maps bortalApplication.map.VIEW = View maps
bortalApplication.map.RELEASE_PLACE =
bortalApplication.poll.ANSWER = Can answer and view availabe polls bortalApplication.poll.ANSWER = Can answer and view availabe polls
bortalApplication.poll.CREATE = Create and manage polls bortalApplication.poll.CREATE = Create and manage polls
bortalApplication.poll.VIEW_RESULTS = View anonymized poll results bortalApplication.poll.VIEW_RESULTS = View anonymized poll results
...@@ -384,7 +388,7 @@ incomingflow.giveplace = Mark given ...@@ -384,7 +388,7 @@ incomingflow.giveplace = Mark given
incomingflow.groupmemberships = Computer places and tickets incomingflow.groupmemberships = Computer places and tickets
incomingflow.invalidbarcode.message = Nothing found with the barcode, you can now add it to the user incomingflow.invalidbarcode.message = Nothing found with the barcode, you can now add it to the user
incomingflow.invalidbarcode.title = Invalid code incomingflow.invalidbarcode.title = Invalid code
incomingflow.markEverythingGiven=Give all ungiven tickets incomingflow.markEverythingGiven =Give all ungiven tickets
incomingflow.multisearch = Multisearch incomingflow.multisearch = Multisearch
incomingflow.placesummary = Place summary incomingflow.placesummary = Place summary
incomingflow.printedCard = Card incomingflow.printedCard = Card
...@@ -395,6 +399,7 @@ incomingflow.usereditor = User ...@@ -395,6 +399,7 @@ incomingflow.usereditor = User
incomingflow.usereditor.info = User incomingflow.usereditor.info = User
incomingflow.usereditor.picture = New picture incomingflow.usereditor.picture = New picture
index.title =
infoview.back = Back infoview.back = Back
infoview.computerplace = Computer places infoview.computerplace = Computer places
infoview.multisearch = User search infoview.multisearch = User search
...@@ -684,16 +689,34 @@ page.poll.start.header = Poll ...@@ -684,16 +689,34 @@ page.poll.start.header = Poll
page.product.create.pagegroup = admin page.product.create.pagegroup = admin
page.product.createBill.header = Buy products page.product.createBill.header = Buy products
page.product.createBill.pagegroup = shop page.product.createBill.pagegroup = shop
page.product.validateBillProducts.header =
page.role.list.pagegroup =
page.shop.readerevents.header =
page.svm.error.header = Payment failed page.svm.error.header = Payment failed
page.svm.failure.header = Payment error page.svm.failure.header = Payment error
page.svm.notification.header = Suomen verkkomaksut notification page.svm.notification.header = Suomen verkkomaksut notification
page.svm.pending.header = Payment pending page.svm.pending.header = Payment pending
page.svm.success.header = Payment successfull page.svm.success.header = Payment successfull
page.tests.placemap.pagegroup =
page.user.create.header = New user page.user.create.header = New user
page.user.create.pagegroup =
page.user.edit.header = Edit user page.user.edit.header = Edit user
pagegroup.auth.login = frontpage pagegroup.auth.login = frontpage
page.user.edit.pagegroup =
page.user.editself.header =
page.user.editself.pagegroup =
page.user.list.header =
page.user.list.pagegroup =
page.user.mygroups.header =
page.viewexpired =
pagination.firstpage =
pagination.lastpage =
pagination.nextpage =
pagination.pages =
pagination.previouspage =
pagination.results =
passwordChanged.body = You can now login with the new password. passwordChanged.body = You can now login with the new password.
passwordChanged.header = Password changed successfully. passwordChanged.header = Password changed successfully.
...@@ -717,6 +740,7 @@ place.commit = Save ...@@ -717,6 +740,7 @@ place.commit = Save
place.description = Description place.description = Description
place.details = Details place.details = Details
place.edit = Edit place.edit = Edit
place.groupremove =
place.groupremove.confirm = Are you sure you want to remove this place from the group? place.groupremove.confirm = Are you sure you want to remove this place from the group?
place.height = Height place.height = Height
place.id = ID place.id = ID
...@@ -798,6 +822,7 @@ placeslot.place = Place ...@@ -798,6 +822,7 @@ placeslot.place = Place
placeslot.product = Slot product placeslot.product = Slot product
placeslot.releaseSlot = Release slot lock placeslot.releaseSlot = Release slot lock
placeslot.showBill = Show bill placeslot.showBill = Show bill
placeslot.state =
placeslot.state.expired = Expired placeslot.state.expired = Expired
placeslot.state.notPaid = Not paid placeslot.state.notPaid = Not paid
placeslot.state.paid = Paid placeslot.state.paid = Paid
...@@ -822,6 +847,7 @@ poll.save = Send answers ...@@ -822,6 +847,7 @@ poll.save = Send answers
print = Print print = Print
printedCard.cardState =
printedCard.cardState.PENDING_VALIDATION = Validation pending printedCard.cardState.PENDING_VALIDATION = Validation pending
printedCard.cardState.REJECTED = Rejected printedCard.cardState.REJECTED = Rejected
printedCard.cardState.VALIDATED = Validated printedCard.cardState.VALIDATED = Validated
...@@ -861,6 +887,8 @@ product.vat = VAT-% ...@@ -861,6 +887,8 @@ product.vat = VAT-%
productFlag.CREATE_NEW_PLACE_WHEN_BOUGHT = Create new place when bought productFlag.CREATE_NEW_PLACE_WHEN_BOUGHT = Create new place when bought
productFlag.HIDE_FROM_INFOSHOP = Hide from Info shop productFlag.HIDE_FROM_INFOSHOP = Hide from Info shop
productFlag.PREPAID_CREDIT = Prepaid credit productFlag.PREPAID_CREDIT = Prepaid credit
productFlag.PREPAID_INSTANT_CREATE =
productFlag.RESERVE_PLACE_WHEN_BOUGHT =
productFlag.USERSHOP_AUTOPRODUCT = Product will be added to user's priority productFlag.USERSHOP_AUTOPRODUCT = Product will be added to user's priority
productFlag.USER_SHOPPABLE = Users can buy productFlag.USER_SHOPPABLE = Users can buy
...@@ -944,6 +972,7 @@ registerleaflet.title = Register leaflet ...@@ -944,6 +972,7 @@ registerleaflet.title = Register leaflet
rejectcard.body = Body rejectcard.body = Body
rejectcard.mailBody = Your profile picture for event {0} has been rejected. Please upload new picture as soon as possible. Picture is valid if your face is shown clearly and you can be easily recognized. rejectcard.mailBody = Your profile picture for event {0} has been rejected. Please upload new picture as soon as possible. Picture is valid if your face is shown clearly and you can be easily recognized.
rejectcard.mailSubject =
rejectcard.reject = Reject rejectcard.reject = Reject
rejectcard.sendAndReject = Send and reject rejectcard.sendAndReject = Send and reject
rejectcard.sendRejectionMail = Send mail rejectcard.sendRejectionMail = Send mail
...@@ -953,6 +982,7 @@ rejectcard.toName = Name ...@@ -953,6 +982,7 @@ rejectcard.toName = Name
required = Arvo vaaditaan required = Arvo vaaditaan
reservequeue.nowReservingAlert =
resetMail.body = You can change a forgotten password by inserting your username or email address to the field below. A link where you can change the password will be sent to the email address associated to that. resetMail.body = You can change a forgotten password by inserting your username or email address to the field below. A link where you can change the password will be sent to the email address associated to that.
resetMail.email = Email address resetMail.email = Email address
resetMail.header = Reset lost password resetMail.header = Reset lost password
...@@ -970,6 +1000,7 @@ rfidevent.tag = Tag ...@@ -970,6 +1000,7 @@ rfidevent.tag = Tag
role.cardtemplate = Card template role.cardtemplate = Card template
role.create = Create role role.create = Create role
role.description = Description role.description = Description
role.edit =
role.edit.save = Save role.edit.save = Save
role.execute = (X) role.execute = (X)
role.name = Name role.name = Name
...@@ -1040,6 +1071,7 @@ sidebar.createuser = Register a new account ...@@ -1040,6 +1071,7 @@ sidebar.createuser = Register a new account
sidebar.eventorg.list = My organizations sidebar.eventorg.list = My organizations
sidebar.map.list = Maps sidebar.map.list = Maps
sidebar.map.placemap = Place map sidebar.map.placemap = Place map
sidebar.maps =
sidebar.other = Other sidebar.other = Other
sidebar.product.create = New product sidebar.product.create = New product
sidebar.product.createBill = Buy products sidebar.product.createBill = Buy products
...@@ -1052,6 +1084,7 @@ sidebar.shop.readerEvents = Reader events ...@@ -1052,6 +1084,7 @@ sidebar.shop.readerEvents = Reader events
sidebar.shop.readerlist = Show readers sidebar.shop.readerlist = Show readers
sidebar.user.create = New user sidebar.user.create = New user
sidebar.user.editself = My preferences sidebar.user.editself = My preferences
sidebar.user.list =
sidebar.users = Users sidebar.users = Users
sidebar.utils.flushCache = Flush cache sidebar.utils.flushCache = Flush cache
sidebar.utils.testdata = Test data sidebar.utils.testdata = Test data
...@@ -1142,6 +1175,7 @@ submenu.role.list = Show Roles ...@@ -1142,6 +1175,7 @@ submenu.role.list = Show Roles
submenu.shop.createBill = Purchase tickets submenu.shop.createBill = Purchase tickets
submenu.shop.listReaders = List readers submenu.shop.listReaders = List readers
submenu.shop.shopToUser = Shop to user submenu.shop.shopToUser = Shop to user
submenu.shop.showReaderEvents =
submenu.temp.pms = PMS codes submenu.temp.pms = PMS codes
submenu.tournaments.admin.index = View and manage submenu.tournaments.admin.index = View and manage
submenu.tournaments.index = Tournaments list submenu.tournaments.index = Tournaments list
...@@ -1203,6 +1237,7 @@ svm.notification.errorMessage = Payment failed. ...@@ -1203,6 +1237,7 @@ svm.notification.errorMessage = Payment failed.
svm.notification.successMessage = Payment notification received. svm.notification.successMessage = Payment notification received.
svm.pending.errorMessage = Unknown error! If payment was successfull, an email will be sent after verification. svm.pending.errorMessage = Unknown error! If payment was successfull, an email will be sent after verification.
svm.pending.successMessage = Payment pending. You will receive email after payment verification. svm.pending.successMessage = Payment pending. You will receive email after payment verification.
svm.success.errorMessage =
svm.success.successMessage = Payment was successful. svm.success.successMessage = Payment was successful.
template.keepaliveError = Page has expired. Please refresh the page. template.keepaliveError = Page has expired. Please refresh the page.
...@@ -1248,6 +1283,7 @@ topnavi.userplaces = Computer places ...@@ -1248,6 +1283,7 @@ topnavi.userplaces = Computer places
topnavi.usershop = Shop topnavi.usershop = Shop
tournament.admin.back_to_index = Back to tournament administration tournament.admin.back_to_index = Back to tournament administration
tournament.admin.control =
tournament.admin.create = Create new tournament tournament.admin.create = Create new tournament
tournament.admin.delete = Delete tournament.admin.delete = Delete
tournament.admin.delete_cancel = Cancel deletion tournament.admin.delete_cancel = Cancel deletion
...@@ -1378,6 +1414,7 @@ user.createdmessage = User has been created successfully. ...@@ -1378,6 +1414,7 @@ user.createdmessage = User has been created successfully.
user.cropImage = Crop image user.cropImage = Crop image
user.cropUserImage = Crop image user.cropUserImage = Crop image
user.defaultImage = Default picture user.defaultImage = Default picture
user.edit =
user.edit.gameids = Edit GameIDs user.edit.gameids = Edit GameIDs
user.edit.title = My information user.edit.title = My information
user.email = Email user.email = Email
...@@ -1408,6 +1445,7 @@ user.info = User ...@@ -1408,6 +1445,7 @@ user.info = User
user.insert = Insert user.insert = Insert
user.insertToken = Insert token user.insertToken = Insert token
user.invalidLoginCredentials = Invalid user credentials user.invalidLoginCredentials = Invalid user credentials
user.invite =
user.invite.header = Accept invitation user.invite.header = Accept invitation
user.invite.placeInvite.header = Accept received place user.invite.placeInvite.header = Accept received place
user.invitemail = Email address user.invitemail = Email address
...@@ -1437,8 +1475,10 @@ user.saveFailed = Save failed, missing required permissions! ...@@ -1437,8 +1475,10 @@ user.saveFailed = Save failed, missing required permissions!
user.saveRoles = Save roles user.saveRoles = Save roles
user.saveSuccessfull = Changes saved successfully user.saveSuccessfull = Changes saved successfully
user.saveUserSelectableRoles = Save user.saveUserSelectableRoles = Save
user.search =
user.searchUser = Search user user.searchUser = Search user
user.sendPicture = Send image user.sendPicture = Send image
user.sex =
user.sex.FEMALE = Female user.sex.FEMALE = Female
user.sex.MALE = Male user.sex.MALE = Male
user.sex.UNDEFINED = Prefer not to say user.sex.UNDEFINED = Prefer not to say
...@@ -1564,7 +1604,7 @@ voting.allcompos.holdVoting = Hold voting ...@@ -1564,7 +1604,7 @@ voting.allcompos.holdVoting = Hold voting
voting.allcompos.maxParts = Max participants voting.allcompos.maxParts = Max participants
voting.allcompos.name = Name voting.allcompos.name = Name
voting.allcompos.startTime = Start time voting.allcompos.startTime = Start time
voting.allcompos.submitEnd = End submitting voting.allcompos.submitEnd =
voting.allcompos.submitEntry = Submit entry voting.allcompos.submitEntry = Submit entry
voting.allcompos.submitStart = Start submitting voting.allcompos.submitStart = Start submitting
voting.allcompos.voteEnd = End voting voting.allcompos.voteEnd = End voting
...@@ -1586,6 +1626,7 @@ voting.create.dateValidatorEndDate = End time before start time. ...@@ -1586,6 +1626,7 @@ voting.create.dateValidatorEndDate = End time before start time.
voting.create.description = Description voting.create.description = Description
voting.create.header = Create compo voting.create.header = Create compo
voting.create.hidden = Hidden voting.create.hidden = Hidden
voting.create.holdVoting =
voting.create.maxParticipants = Max participants voting.create.maxParticipants = Max participants
voting.create.name = Name voting.create.name = Name
voting.create.saveCompo = Save compo voting.create.saveCompo = Save compo
...@@ -1595,41 +1636,58 @@ voting.create.voteEnd = Voting close ...@@ -1595,41 +1636,58 @@ voting.create.voteEnd = Voting close
voting.create.voteStart = Voting start voting.create.voteStart = Voting start
yes = Yes yes = Yes
page.product.shopClosed.header=Shop is closed! page.product.shopClosed.header =Shop is closed!
page.product.shopClosed.notOpenYet=Shop is not opened. Try again later. page.product.shopClosed.notOpenYet =Shop is not opened. Try again later.
page.product.shopClosed.alreadyClosed=Shop is closed, welcome back in next event! page.product.shopClosed.alreadyClosed =Shop is closed, welcome back in next event!
queuemgmt.inDatabase=Value in database queuemgmt.inDatabase =Value in database
queuemgmt.biggestFirst=Biggest group first queuemgmt.biggestFirst =Biggest group first
queuemgmt.biggestIsFirst=Bigger group automaticly rises up in queue. queuemgmt.biggestIsFirst =Bigger group automaticly rises up in queue.
reservequeue.reservingTimeIsUpAlert=Timeslot for your place reservation has timeouted. Pleace go back to queue to continue. reservequeue.reservingTimeIsUpAlert =Timeslot for your place reservation has timeouted. Pleace go back to queue to continue.
mapView.reserveTimeLeft=Time to reserve places mapView.reserveTimeLeft =Time to reserve places
queuemgmt.queueEnabled=Queue is ENABLED queuemgmt.queueEnabled =Queue is ENABLED
queuemgmt.queueDisabled=Queue is DISABLED (enable from Edit event -page) queuemgmt.queueDisabled =Queue is DISABLED (enable from Edit event -page)
product.dependency.add=Add product dependency product.dependency.add =Add product dependency
product.dependency.create=Create product.dependency.create =Create
product.dependency.supporter=Depended product product.dependency.supporter =Depended product
product.dependency.type=Dependency type product.dependency.type =Dependency type
product.dependency.priority=Priority product.dependency.priority =Priority
productDependency.delete=Delete productDependency.delete =Delete
product.dependency.multiplier=Multiplier product.dependency.delete =
product.dependency.MAX_SUPPORTED_COUNT=Only up to same number of products can be bought product.dependency.multiplier =Multiplier
product.dependency.MAX_SUPPORTED_COUNT =Only up to same number of products can be bought
submenu.neomap.moveplaces=Change places
mapEdit.removeSelectedPlaces=Delete places placemove.alreadyTaken =
placegroupview.moveUsersPlaces =
submenu.neomap.moveplaces =Change places
mapEdit.removeSelectedPlaces =Delete places
bortalApplication.map.MOVE_PLACES =Selfservice place moving bortalApplication.map.MOVE_PLACES =Selfservice place moving
bill.list.header =Orders bill.list.header =Orders
placemove.noMovablePlaces =No movable places placemove.noMovablePlaces =No movable places
deliver=Toimita deliver =Toimita
placegroupview.noProductsToDeliver=No deliverable products placegroupview.noProductsToDeliver =No deliverable products
placegroupview.productName=Product name placegroupview.productName =Product name
incomingflow.giveAccountEvent=Mark given incomingflow.giveAccountEvent =Mark given
incomingflow.ungiveAccountEvent=Mark not given incomingflow.ungiveAccountEvent =Mark not given
incomingflow.deliverableProducts=Products to deliver incomingflow.deliverableProducts =Products to deliver
placegroupview.accountEventDescription=Description placegroupview.accountEventDescription =Description
incomingflow.ungivenProducts=User has ungiven deliverable products incomingflow.ungivenProducts =User has ungiven deliverable products
placegroupview.count=Count placegroupview.count =Count
user.allergies=Allergies / diets user.allergies =Allergies / diets
allergies.save=Save allergies allergies.save =Save allergies
\ No newline at end of file user.eventproperties =
submenu.permissionDenied =
role.source =
role.source.DIRECT =
role.source.ORG_ROLE =
role.source.PLACE =
role.source.ACCOUNTEVENT =
role.source.PLACE_PRODUCT =
role.source.EVENT_DEFAULT =
user.allroles =
voting.create.entrysubmitrole =
compo.filetype.name =
compo.filetype.sort =
compo.filetype.filetype =
\ No newline at end of file
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_en.properties
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
acc_line.eventuser = Customer acc_line.eventuser = Customer
acc_line.nick = Nick acc_line.nick = Nick
acc_line.place = Place
acc_line.product = Product acc_line.product = Product
acc_line.quantity = Quantity acc_line.quantity = Quantity
acc_line.time = Transaction Date acc_line.time = Transaction Date
...@@ -597,7 +598,7 @@ incomingflow.giveplace = Mark given ...@@ -597,7 +598,7 @@ incomingflow.giveplace = Mark given
incomingflow.groupmemberships = Computer places and tickets incomingflow.groupmemberships = Computer places and tickets
incomingflow.invalidbarcode.message = Nothing found with the barcode, you can now add it to the user incomingflow.invalidbarcode.message = Nothing found with the barcode, you can now add it to the user
incomingflow.invalidbarcode.title = Invalid code incomingflow.invalidbarcode.title = Invalid code
incomingflow.markEverythingGiven=Give all ungiven tickets incomingflow.markEverythingGiven =Give all ungiven tickets
incomingflow.multisearch = Multisearch incomingflow.multisearch = Multisearch
incomingflow.placesummary = Place summary incomingflow.placesummary = Place summary
incomingflow.printedCard = Card incomingflow.printedCard = Card
...@@ -608,6 +609,7 @@ incomingflow.usereditor = User ...@@ -608,6 +609,7 @@ incomingflow.usereditor = User
incomingflow.usereditor.info = User incomingflow.usereditor.info = User
incomingflow.usereditor.picture = New picture incomingflow.usereditor.picture = New picture
index.title = Frontpage
infoview.back = Back infoview.back = Back
infoview.computerplace = Computer places infoview.computerplace = Computer places
infoview.multisearch = User search infoview.multisearch = User search
...@@ -1841,7 +1843,7 @@ voting.allcompos.holdVoting = Hold voting ...@@ -1841,7 +1843,7 @@ voting.allcompos.holdVoting = Hold voting
voting.allcompos.maxParts = Max participants voting.allcompos.maxParts = Max participants
voting.allcompos.name = Name voting.allcompos.name = Name
voting.allcompos.startTime = Start time voting.allcompos.startTime = Start time
voting.allcompos.submitEnd = End submitting voting.allcompos.submitEnd = Compo submit deadline
voting.allcompos.submitEntry = Submit entry voting.allcompos.submitEntry = Submit entry
voting.allcompos.submitStart = Start submitting voting.allcompos.submitStart = Start submitting
voting.allcompos.voteEnd = End voting voting.allcompos.voteEnd = End voting
...@@ -1873,43 +1875,57 @@ voting.create.voteEnd = Voting close ...@@ -1873,43 +1875,57 @@ voting.create.voteEnd = Voting close
voting.create.voteStart = Voting start voting.create.voteStart = Voting start
yes = Yes yes = Yes
page.product.shopClosed.header=Shop is closed! page.product.shopClosed.header =Shop is closed!
page.product.shopClosed.notOpenYet=Shop is not opened. Try again later. page.product.shopClosed.notOpenYet =Shop is not opened. Try again later.
page.product.shopClosed.alreadyClosed=Shop is closed, welcome back in next event! page.product.shopClosed.alreadyClosed =Shop is closed, welcome back in next event!
queuemgmt.inDatabase=Value in database queuemgmt.inDatabase =Value in database
queuemgmt.biggestFirst=Biggest group first queuemgmt.biggestFirst =Biggest group first
queuemgmt.biggestIsFirst=Bigger group automaticly rises up in queue. queuemgmt.biggestIsFirst =Bigger group automaticly rises up in queue.
reservequeue.reservingTimeIsUpAlert=Timeslot for your place reservation has timeouted. Pleace go back to queue to continue. reservequeue.reservingTimeIsUpAlert =Timeslot for your place reservation has timeouted. Pleace go back to queue to continue.
mapView.reserveTimeLeft=Time to reserve places mapView.reserveTimeLeft =Time to reserve places
queuemgmt.queueEnabled=Queue is ENABLED queuemgmt.queueEnabled =Queue is ENABLED
queuemgmt.queueDisabled=Queue is DISABLED (enable from Edit event -page) queuemgmt.queueDisabled =Queue is DISABLED (enable from Edit event -page)
product.dependency.add=Add product dependency product.dependency.add =Add product dependency
product.dependency.create=Create product.dependency.create =Create
product.dependency.supporter=Depended product product.dependency.supporter =Depended product
product.dependency.type=Dependency type product.dependency.type =Dependency type
product.dependency.priority=Priority product.dependency.priority =Priority
product.dependency.delete=Delete product.dependency.delete =Delete
product.dependency.multiplier=Multiplier product.dependency.multiplier =Multiplier
product.dependency.MAX_SUPPORTED_COUNT=Only up to same number of products can be bought product.dependency.MAX_SUPPORTED_COUNT =Only up to same number of products can be bought
placemove.alreadyTaken=Moving the places was cancelled because place {0} was already taken. placemove.alreadyTaken =Moving the places was cancelled because place {0} was already taken.
placegroupview.moveUsersPlaces=Move users places placegroupview.moveUsersPlaces =Move users places
submenu.neomap.moveplaces=Change places submenu.neomap.moveplaces =Change places
mapEdit.removeSelectedPlaces=Delete places mapEdit.removeSelectedPlaces =Delete places
bortalApplication.map.MOVE_PLACES = Selfservice place moving bortalApplication.map.MOVE_PLACES = Selfservice place moving
bill.list.header = Orders bill.list.header = Orders
placemove.noMovablePlaces = No movable places placemove.noMovablePlaces = No movable places
deliver=Deliver deliver =Deliver
placegroupview.noProductsToDeliver=No deliverable products placegroupview.noProductsToDeliver =No deliverable products
placegroupview.productName=Product name placegroupview.productName =Product name
incomingflow.giveAccountEvent=Mark given incomingflow.giveAccountEvent =Mark given
incomingflow.ungiveAccountEvent=Mark not given incomingflow.ungiveAccountEvent =Mark not given
incomingflow.deliverableProducts=Products to deliver incomingflow.deliverableProducts =Products to deliver
placegroupview.accountEventDescription=Description placegroupview.accountEventDescription =Description
incomingflow.ungivenProducts=User has ungiven deliverable products incomingflow.ungivenProducts =User has ungiven deliverable products
placegroupview.count=Count placegroupview.count =Count
user.allergies=Allergies / diets user.allergies =Allergies / diets
allergies.save=Save allergies allergies.save =Save allergies
\ No newline at end of file user.eventproperties = Event specific properties
submenu.permissionDenied = Access denied
role.source = Role source
role.source.DIRECT = Forced for user
role.source.ORG_ROLE = Organisation role
role.source.PLACE = Place
role.source.ACCOUNTEVENT = Accountevent (Bought product)
role.source.PLACE_PRODUCT = Product via place
role.source.EVENT_DEFAULT = Event default role
user.allroles = All users roles
voting.create.entrysubmitrole = Role needed to submit entries
compo.filetype.name = Filetype name
compo.filetype.sort = Sort number
compo.filetype.filetype = Type
\ No newline at end of file
code/moya-web/src/main/resources/fi/codecrew/moya/resources/i18n_fi.properties
...@@ -598,7 +598,7 @@ incomingflow.giveplace = Merkitse annetuksi ...@@ -598,7 +598,7 @@ incomingflow.giveplace = Merkitse annetuksi
incomingflow.groupmemberships = Konepaikat sek\u00E4 liput incomingflow.groupmemberships = Konepaikat sek\u00E4 liput
incomingflow.invalidbarcode.message = Piipatulla koodilla ei l\u00F6ytynyt mit\u00E4\u00E4n, voit lis\u00E4t\u00E4 koodin k\u00E4ytt\u00E4j\u00E4\u00E4n incomingflow.invalidbarcode.message = Piipatulla koodilla ei l\u00F6ytynyt mit\u00E4\u00E4n, voit lis\u00E4t\u00E4 koodin k\u00E4ytt\u00E4j\u00E4\u00E4n
incomingflow.invalidbarcode.title = Virheellinen koodi incomingflow.invalidbarcode.title = Virheellinen koodi
incomingflow.markEverythingGiven=Anna kaikki antamattomat liput incomingflow.markEverythingGiven =Anna kaikki antamattomat liput
incomingflow.multisearch = Monihaku incomingflow.multisearch = Monihaku
incomingflow.placesummary = Paikkayhteenveto incomingflow.placesummary = Paikkayhteenveto
incomingflow.printedCard = Kortti incomingflow.printedCard = Kortti
...@@ -917,6 +917,7 @@ page.game.list.header = Insomnia Game ...@@ -917,6 +917,7 @@ page.game.list.header = Insomnia Game
page.game.start.header = Insomnia Game page.game.start.header = Insomnia Game
page.index.header = Etusivu page.index.header = Etusivu
page.index.pagegroup = etusivu page.index.pagegroup = etusivu
page.permissionDenied.header = P\u00E4\u00E4sy kielletty
page.place.edit.header = Muokkaa paikkaa page.place.edit.header = Muokkaa paikkaa
page.place.insertToken.header = Sy\u00F6t\u00E4 paikkakoodi page.place.insertToken.header = Sy\u00F6t\u00E4 paikkakoodi
page.poll.answer.header = Kysely page.poll.answer.header = Kysely
...@@ -925,7 +926,11 @@ page.poll.start.header = Kysely ...@@ -925,7 +926,11 @@ page.poll.start.header = Kysely
page.product.create.pagegroup = yll\u00E4pito page.product.create.pagegroup = yll\u00E4pito
page.product.createBill.header = Osta tuotteita page.product.createBill.header = Osta tuotteita
page.product.createBill.pagegroup = kauppa page.product.createBill.pagegroup = kauppa
page.product.edit.pagegroup = admin
page.product.list.pagegroup = admin
page.product.validateBillProducts.header = Tilaus luotu page.product.validateBillProducts.header = Tilaus luotu
page.role.create.pagegroup = admin
page.role.edit.pagegroup = admin
page.svm.error.header = Verkkomaksu ep\u00E4onnistui page.svm.error.header = Verkkomaksu ep\u00E4onnistui
page.svm.failure.header = Verkkomaksuvirhe page.svm.failure.header = Verkkomaksuvirhe
page.svm.notification.header = Maksutapahtuman rekister\u00F6inti page.svm.notification.header = Maksutapahtuman rekister\u00F6inti
...@@ -1828,7 +1833,7 @@ voting.allcompos.holdVoting = Hold voting ...@@ -1828,7 +1833,7 @@ voting.allcompos.holdVoting = Hold voting
voting.allcompos.maxParts = Max osallistujam\u00E4\u00E4r\u00E4 voting.allcompos.maxParts = Max osallistujam\u00E4\u00E4r\u00E4
voting.allcompos.name = Nimi voting.allcompos.name = Nimi
voting.allcompos.startTime = Aloitusaika voting.allcompos.startTime = Aloitusaika
voting.allcompos.submitEnd = Lis\u00E4ys kiinni voting.allcompos.submitEnd = Ilmoittautumisen m\u00E4\u00E4r\u00E4aika
voting.allcompos.submitEntry = L\u00E4het\u00E4 entry voting.allcompos.submitEntry = L\u00E4het\u00E4 entry
voting.allcompos.submitStart = Lis\u00E4ys auki voting.allcompos.submitStart = Lis\u00E4ys auki
voting.allcompos.voteEnd = \u00C4\u00E4nestys kiinni voting.allcompos.voteEnd = \u00C4\u00E4nestys kiinni
...@@ -1860,44 +1865,58 @@ voting.create.voteEnd = \u00C4\u00E4nestys kiinni ...@@ -1860,44 +1865,58 @@ voting.create.voteEnd = \u00C4\u00E4nestys kiinni
voting.create.voteStart = \u00C4\u00E4nestys auki voting.create.voteStart = \u00C4\u00E4nestys auki
yes = Kyll\u00E4 yes = Kyll\u00E4
page.product.shopClosed.header=Kauppa on kiinni! page.product.shopClosed.header =Kauppa on kiinni!
page.product.shopClosed.notOpenYet=Tapahtuman lipunmyynti ei ole viel\u00E4 alkanut, Kokeile uudelleen my\u00F6hemmin. page.product.shopClosed.notOpenYet =Tapahtuman lipunmyynti ei ole viel\u00E4 alkanut, Kokeile uudelleen my\u00F6hemmin.
page.product.shopClosed.alreadyClosed=Kauppa on suljettu, tervetuloa uudelleen tuleviin tapahtumiin. page.product.shopClosed.alreadyClosed =Kauppa on suljettu, tervetuloa uudelleen tuleviin tapahtumiin.
queuemgmt.inDatabase=Arvo tietokannassa queuemgmt.inDatabase =Arvo tietokannassa
queuemgmt.biggestFirst=Isoin ryhm\u00E4 ensin queuemgmt.biggestFirst =Isoin ryhm\u00E4 ensin
queuemgmt.biggestIsFirst=Isompi ryhm\u00E4 nousee automaattisesti jonossa edemm\u00E4ksi. queuemgmt.biggestIsFirst =Isompi ryhm\u00E4 nousee automaattisesti jonossa edemm\u00E4ksi.
reservequeue.reservingTimeIsUpAlert=Sinulle varattu varausauka on kulunut loppuun! Palaa takaisin 'varaa paikkasi' -sivulle jatkaaksesi. reservequeue.reservingTimeIsUpAlert =Sinulle varattu varausauka on kulunut loppuun! Palaa takaisin 'varaa paikkasi' -sivulle jatkaaksesi.
mapView.reserveTimeLeft=Aikaa varata paikkasi mapView.reserveTimeLeft =Aikaa varata paikkasi
queuemgmt.queueEnabled=Varausjono ON k\u00E4yt\u00F6ss\u00E4 queuemgmt.queueEnabled =Varausjono ON k\u00E4yt\u00F6ss\u00E4
queuemgmt.queueDisabled=K\u00E4ytt\u00E4j\u00E4jono EI OLE k\u00E4yt\u00F6ss\u00E4 (ota k\u00E4yttoon tapahtuman tiedot -sivulta) queuemgmt.queueDisabled =K\u00E4ytt\u00E4j\u00E4jono EI OLE k\u00E4yt\u00F6ss\u00E4 (ota k\u00E4yttoon tapahtuman tiedot -sivulta)
product.dependency.add=Lis\u00E4\u00E4 tuoteriippuvuus product.dependency.add =Lis\u00E4\u00E4 tuoteriippuvuus
product.dependency.create=Luo uusi product.dependency.create =Luo uusi
product.dependency.supporter=Tuote josta on riippuvuus product.dependency.supporter =Tuote josta on riippuvuus
product.dependency.type=Riippuvuuden tyyppi product.dependency.type =Riippuvuuden tyyppi
product.dependency.priority=Prioriteetti product.dependency.priority =Prioriteetti
product.dependency.delete=Poista product.dependency.delete =Poista
product.dependency.multiplier=Kerroin product.dependency.multiplier =Kerroin
product.dependency.MAX_SUPPORTED_COUNT=Tuotteita voi ostaa enint\u00E4\u00E4n saman m\u00E4\u00E4r\u00E4n product.dependency.MAX_SUPPORTED_COUNT =Tuotteita voi ostaa enint\u00E4\u00E4n saman m\u00E4\u00E4r\u00E4n
placemove.alreadyTaken=Paikkojen siirto peruuntui koska paikka {0} oli jo varattu. placemove.alreadyTaken =Paikkojen siirto peruuntui koska paikka {0} oli jo varattu.
placegroupview.moveUsersPlaces=Siirr\u00E4 k\u00E4ytt\u00E4j\u00E4n paikkoja placegroupview.moveUsersPlaces =Siirr\u00E4 k\u00E4ytt\u00E4j\u00E4n paikkoja
submenu.neomap.moveplaces=Vaihda paikkoja submenu.neomap.moveplaces =Vaihda paikkoja
mapEdit.removeSelectedPlaces=Poista paikat mapEdit.removeSelectedPlaces =Poista paikat
bortalApplication.map.MOVE_PLACES = Paikkojen itsepalvelusiirto bortalApplication.map.MOVE_PLACES = Paikkojen itsepalvelusiirto
bill.list.header = Tilaukset bill.list.header = Tilaukset
placemove.noMovablePlaces = Ei siirrett\u00E4vi\u00E4 paikkoja placemove.noMovablePlaces = Ei siirrett\u00E4vi\u00E4 paikkoja
deliver=Toimita deliver =Toimita
placegroupview.noProductsToDeliver=Ei toimitettavia tuotteita placegroupview.noProductsToDeliver =Ei toimitettavia tuotteita
placegroupview.productName=Tuotteen nimi placegroupview.productName =Tuotteen nimi
incomingflow.giveAccountEvent=Merkitse annetuksi incomingflow.giveAccountEvent =Merkitse annetuksi
incomingflow.ungiveAccountEvent=Ei olekkaan annettu incomingflow.ungiveAccountEvent =Ei olekkaan annettu
incomingflow.deliverableProducts=Toimitettavat tuotteet incomingflow.deliverableProducts =Toimitettavat tuotteet
placegroupview.accountEventDescription=Kuvaus placegroupview.accountEventDescription =Kuvaus
incomingflow.ungivenProducts=K\u00E4ytt\u00E4j\u00E4ll\u00E4 on toimittamattomia tuotteita incomingflow.ungivenProducts =K\u00E4ytt\u00E4j\u00E4ll\u00E4 on toimittamattomia tuotteita
placegroupview.count=Kpl placegroupview.count =Kpl
user.allergies=Allergiat / ruokavaliot user.allergies =Allergiat / ruokavaliot
allergies.save=Tallenna allergiat allergies.save =Tallenna allergiat
\ No newline at end of file user.eventproperties = Tapahtumakohtaiset tiedot
submenu.permissionDenied = P\u00E4\u00E4sy kielletty
role.source = Roolin lhde
role.source.DIRECT = Pakotettu k\u00E4ytt\u00E4j\u00E4lle
role.source.ORG_ROLE = Organisaatiorooli
role.source.PLACE = Paikka
role.source.ACCOUNTEVENT = Tilitapahtuma (Ostettu tuote)
role.source.PLACE_PRODUCT = Tuote paikan kautta
role.source.EVENT_DEFAULT = Tapahtuman oletusrooli
user.allroles = Kaikki k\u00E4ytt\u00E4j\u00E4n roolit
voting.create.entrysubmitrole = Teosten lhettmiseen tarvittava rooli
compo.filetype.name = Tiedostotyypin nimi
compo.filetype.sort = Jrjestysnumero
compo.filetype.filetype = Tyyppi
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!