values) {
if (!isReportingDatabaseEnabled()) return -1;
Session sessionReporting = sessionFactoryReporting.getCurrentSession();
@@ -1354,7 +1380,30 @@ public int getCount(Survey survey, String quid, String auid, boolean noPrefixSea
sql += " LIKE '%" + auid + "%'";
}
+ if (where != null)
+ {
+ sql += " AND QANSWERSETID IN (SELECT QANSWERSETID FROM " + GetOLAPTableName(survey) + " " + where + ")";
+ }
+
SQLQuery query = sessionReporting.createSQLQuery(sql);
+
+ if (where != null)
+ {
+ for (String attrib : values.keySet()) {
+ Object value = values.get(attrib);
+ if (value instanceof String)
+ {
+ query.setString(attrib, (String)values.get(attrib));
+ } else if (value instanceof Integer)
+ {
+ query.setInteger(attrib, (Integer)values.get(attrib));
+ } else if (value instanceof Date)
+ {
+ query.setTimestamp(attrib, (Date)values.get(attrib));
+ }
+ }
+ }
+
return ConversionTools.getValue(query.uniqueResult());
}
diff --git a/src/main/java/com/ec/survey/service/SchedulerService.java b/src/main/java/com/ec/survey/service/SchedulerService.java
index 69868819b..0ac4d5070 100644
--- a/src/main/java/com/ec/survey/service/SchedulerService.java
+++ b/src/main/java/com/ec/survey/service/SchedulerService.java
@@ -32,6 +32,7 @@
import com.ec.survey.tools.EcasUserUpdater;
import com.ec.survey.tools.ExportUpdater;
import com.ec.survey.tools.FileUpdater;
+import com.ec.survey.tools.SendReportedSurveysWorker;
import com.ec.survey.tools.SurveyUpdater;
import com.ec.survey.tools.ValidCodesRemover;
@@ -72,6 +73,9 @@ public class SchedulerService extends BasicService {
@Resource(name = "deleteInvalidStatisticsWorker")
private DeleteInvalidStatisticsWorker deleteInvalidStatisticsWorker;
+ @Resource(name = "sendReportedSurveysWorker")
+ private SendReportedSurveysWorker sendReportedSurveysWorker;
+
@Resource(name = "surveyWorker")
private SurveyUpdater surveyWorker;
@@ -472,7 +476,7 @@ public void migrateReportingSchedule() {
}
}
- @Scheduled(fixedDelay=1200000) //every 20 minutes
+ @Scheduled(fixedDelay=10000) //wait for 10 seconds between calls
public void doToDosSchedule() throws Exception {
if (!isReportingDatabaseEnabled()) return;
@@ -525,6 +529,7 @@ public void doNightlySchedule() {
deleteDraftsWorker.run();
deleteTemporaryFoldersWorker.run();
deleteInvalidStatisticsWorker.run();
+ sendReportedSurveysWorker.run();
logger.debug("End nightly schedule");
}
diff --git a/src/main/java/com/ec/survey/service/SchemaService.java b/src/main/java/com/ec/survey/service/SchemaService.java
index 1fd273829..4e306b43c 100644
--- a/src/main/java/com/ec/survey/service/SchemaService.java
+++ b/src/main/java/com/ec/survey/service/SchemaService.java
@@ -58,6 +58,118 @@ public boolean isOss()
@Resource(name = "domainWorker")
private DomainUpdater domaintWorker;
+ @Transactional
+ public void step93() {
+ Session session = sessionFactory.getCurrentSession();
+ Status status = getStatus();
+
+ settingsService.add(Setting.TrustValueCreatorInternal, "500", "int");
+ settingsService.add(Setting.TrustValuePastSurveys, "500", "int");
+ settingsService.add(Setting.TrustValuePrivilegedUser, "100", "int");
+ settingsService.add(Setting.TrustValueNbContributions, "50", "int");
+ settingsService.add(Setting.TrustValueMinimumPassMark, "100", "int");
+
+ status.setDbversion(93);
+ session.saveOrUpdate(status);
+ }
+
+ @Transactional
+ public void step92() {
+ Session session = sessionFactory.getCurrentSession();
+ Status status = getStatus();
+
+ String text = "Please be informed that the following user [LOGIN] having the email address: [EMAIL] has been banned from EUSurvey.
For more information please contact the EUSurvey team.
";
+ settingsService.add(Setting.FreezeUserTextAdminBan, text, "text");
+
+ text = "Please be informed that the following user [LOGIN] having the email address: [EMAIL] has been unbanned from EUSurvey.
For more information please contact the EUSurvey team.
";
+ settingsService.add(Setting.FreezeUserTextAdminUnban, text, "text");
+
+ text = "Dear Sir or Madam,
You have been banned from EUSurvey application due to infrigiment to our policy.
Reason: to specify
Please refer to our Terms of Service for more information.
Kind regards,
The EUSurvey Team
";
+ settingsService.add(Setting.FreezeUserTextBan, text, "text");
+
+ text = "Dear Sir or Madam,
You have just been unbanned and got back your access to the EUSurvey application. You can now connect to EUSurvey
Kind regards,
The EUSurvey Team
";
+ settingsService.add(Setting.FreezeUserTextUnban, text, "text");
+
+ Setting s = new Setting();
+ s.setKey(Setting.BannedUserRecipients);
+ s.setValue("");
+ s.setFormat("email addresses separated by ;");
+ session.saveOrUpdate(s);
+
+ status.setDbversion(92);
+ session.saveOrUpdate(status);
+ }
+
+ @Transactional
+ public void step91() {
+ Session session = sessionFactory.getCurrentSession();
+ Status status = getStatus();
+
+ SQLQuery query = session.createSQLQuery("ALTER TABLE SETTINGS MODIFY SETTINGS.SETTINGS_VALUE TEXT");
+ query.executeUpdate();
+
+ String newReportText = "The following survey:
" +
+ "
" +
+ "| Published survey link: | [LINK] |
" +
+ "| Alias: | [ALIAS] |
" +
+ "| Title: | [TITLE] |
" +
+ "
" +
+ "has been reported as infringing our policy by [EMAIL] at [DATE]." +
+ "The reason provided is the following: [TYPE].
" +
+ "So far, it has been reported [COUNT] time(s).
";
+
+ settingsService.update(Setting.ReportText, newReportText);
+
+ status.setDbversion(91);
+ session.saveOrUpdate(status);
+ }
+
+ @Transactional
+ public void step90() {
+ Session session = sessionFactory.getCurrentSession();
+ Status status = getStatus();
+ String existing = settingsService.get(Setting.MaxReports);
+ if (existing == null)
+ {
+ Setting s = new Setting();
+ s.setKey(Setting.MaxReports);
+ s.setValue("5");
+ s.setFormat("int");
+ session.saveOrUpdate(s);
+
+ s = new Setting();
+ s.setKey(Setting.ReportText);
+ s.setValue("Survey [ALIAS]
[TITLE] has been reported as infringing our policy by [EMAIL] at [DATE]. The reason provided is the following: [TYPE].
So far, it has been reported [COUNT] time(s).");
+ s.setFormat("text");
+ session.saveOrUpdate(s);
+
+ s = new Setting();
+ s.setKey(Setting.ReportRecipients);
+ s.setValue("");
+ s.setFormat("email addresses separated by ;");
+ session.saveOrUpdate(s);
+ }
+ status.setDbversion(90);
+ session.saveOrUpdate(status);
+ }
+
+ @Transactional
+ public void step89() {
+ Session session = sessionFactory.getCurrentSession();
+ Status status = getStatus();
+ String existing = settingsService.get(Setting.WeakAuthenticationDisabled);
+ if (existing == null)
+ {
+ Setting s = new Setting();
+ s.setKey(Setting.WeakAuthenticationDisabled);
+ s.setValue("true");
+ s.setFormat("true / false");
+ session.saveOrUpdate(s);
+ }
+ status.setDbversion(89);
+ session.saveOrUpdate(status);
+ }
+
@Transactional
public void step88() {
Session session = sessionFactory.getCurrentSession();
diff --git a/src/main/java/com/ec/survey/service/SessionService.java b/src/main/java/com/ec/survey/service/SessionService.java
index 8e70588f5..943e61194 100644
--- a/src/main/java/com/ec/survey/service/SessionService.java
+++ b/src/main/java/com/ec/survey/service/SessionService.java
@@ -15,6 +15,8 @@
import com.ec.survey.model.survey.Text;
import com.ec.survey.tools.ConversionTools;
import com.ec.survey.tools.NotAgreedToTosException;
+import com.ec.survey.tools.WeakAuthenticationException;
+
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Hibernate;
import org.hibernate.Query;
@@ -57,22 +59,30 @@ public class SessionService extends BasicService {
private @Value("${pdfserver.prefix}") String pdfServerPrefix;
private @Value("${proxy.nonProxyHosts}") String proxyNonProxyHosts;
- public User getCurrentUser(HttpServletRequest request) throws NotAgreedToTosException {
- return getCurrentUser(request, true);
+ public User getCurrentUser(HttpServletRequest request) throws NotAgreedToTosException, WeakAuthenticationException {
+ return getCurrentUser(request, true, true);
}
- public User getCurrentUser(HttpServletRequest request, boolean checkTOS) throws NotAgreedToTosException {
+ public User getCurrentUser(HttpServletRequest request, boolean checkTOS, boolean checkWeakAuthentication) throws NotAgreedToTosException, WeakAuthenticationException {
if (request == null) return null;
User user = (User) request.getSession().getAttribute("USER");
+ Boolean weakAuthentication = (Boolean) request.getSession().getAttribute("WEAKAUTHENTICATION");
if (user != null)
{
Session session = sessionFactory.getCurrentSession();
user = (User) session.merge(user);
+ String weakAuthenticationDisabled = settingsService.get(Setting.WeakAuthenticationDisabled);
+
+ if (weakAuthenticationDisabled.equalsIgnoreCase("true") && checkWeakAuthentication && user.getType().equalsIgnoreCase(User.ECAS) && user.isExternal() && weakAuthentication)
+ {
+ throw new WeakAuthenticationException();
+ }
+
String disabled = settingsService.get(Setting.CreateSurveysForExternalsDisabled);
- if (disabled.equalsIgnoreCase("true") && user.getGlobalPrivileges().get(GlobalPrivilege.ECAccess) == 0)
+ if (disabled.equalsIgnoreCase("true") && user.isExternal())
{
user.setCanCreateSurveys(false);
}
@@ -294,7 +304,7 @@ public void updateSessionInfo(Survey survey, User user, HttpServletRequest reque
request.getSession().setAttribute("sessioninfo", new SessionInfo(survey.getId(), user.getId(), survey.getOwner().getId(), survey.getLanguage().getCode(),survey.getShortname()));
}
- public SurveyFilter getSurveyFilter(HttpServletRequest request, boolean forms) throws NotAgreedToTosException {
+ public SurveyFilter getSurveyFilter(HttpServletRequest request, boolean forms) throws NotAgreedToTosException, WeakAuthenticationException {
SurveyFilter filter = new SurveyFilter();
filter.setUser(getCurrentUser(request));
@@ -513,6 +523,9 @@ public UserFilter getUserFilter(HttpServletRequest request) {
filter.setLanguages(request.getParameterValues("languages"));
+ filter.setBanned(request.getParameter("banned") != null && request.getParameter("banned").equalsIgnoreCase("true"));
+ filter.setUnbanned(request.getParameter("unbanned") != null && request.getParameter("unbanned").equalsIgnoreCase("true"));
+
String roles[] = request.getParameterValues("roles");
if (roles != null && roles.length > 0)
{
diff --git a/src/main/java/com/ec/survey/service/SurveyService.java b/src/main/java/com/ec/survey/service/SurveyService.java
index 8f75885d9..45731997c 100644
--- a/src/main/java/com/ec/survey/service/SurveyService.java
+++ b/src/main/java/com/ec/survey/service/SurveyService.java
@@ -38,60 +38,61 @@
@Service("surveyService")
public class SurveyService extends BasicService {
-
+
private @Value("${publicsurveynotification}") String publicsurveynotification;
private @Value("${smtpserver}") String smtpServer;
private @Value("${smtp.port}") String smtpPort;
private @Value("${sender}") String sender;
private @Value("${server.prefix}") String host;
public @Value("${opc.notify}") String opcnotify;
-
+ private @Value("${monitoring.recipient}") String monitoringEmail;
+
@Autowired
protected SqlQueryService sqlQueryService;
-
+
+ @Autowired
+ protected LdapService ldapDBService;
+
@Transactional(readOnly = true)
- public int getNumberPublishedAnswersFromMaterializedView(String uid)
- {
+ public int getNumberPublishedAnswersFromMaterializedView(String uid) {
Session session = sessionFactory.getCurrentSession();
String sql = "SELECT npa.PUBLISHEDANSWERS FROM MV_SURVEYS_NUMBERPUBLISHEDANSWERS npa WHERE npa.SURVEYUID = :uid";
SQLQuery query = session.createSQLQuery(sql);
query.setString("uid", uid);
List res = (List) query.list();
- if (res.size() > 0) return ConversionTools.getValue(res.get(0));
+ if (res.size() > 0)
+ return ConversionTools.getValue(res.get(0));
return 0;
}
-
+
private Map getLanguageMap() {
- return getLanguages()
- .stream()
- .collect(Collectors.toMap(Language::getId, l -> l));
+ return getLanguages().stream().collect(Collectors.toMap(Language::getId, l -> l));
}
-
+
@SuppressWarnings("unchecked")
private List loadSurveysfromDatabase(String sql, HashMap parameters, SqlPagination sqlPagination) throws Exception {
Session session = sessionFactory.getCurrentSession();
- SQLQuery query = session.createSQLQuery(sql);
+ SQLQuery query = session.createSQLQuery(sql);
sqlQueryService.setParameters(query, parameters);
-
+
return query.setFirstResult(sqlPagination.getFirstResult()).setMaxResults(sqlPagination.getMaxResult()).list();
}
-
+
@Transactional(readOnly = true)
public List getSurveys(SurveyFilter filter, SqlPagination sqlPagination) throws Exception {
String sql = "SELECT s.SURVEY_ID, s.SURVEY_UID, s.SURVEYNAME, s.TITLE, s.SURVEY_CREATED, s.SURVEY_END_DATE, s.SURVEY_START_DATE, s.ISPUBLISHED, s.LANGUAGE"
- + " , npa.PUBLISHEDANSWERS as replies, s.ACTIVE, s.OWNER, s.CONTACT"
- + " , (SELECT USER_LOGIN FROM USERS u WHERE u.USER_ID = s.OWNER) as ownerlogin, (SELECT USER_DISPLAYNAME FROM USERS u WHERE u.USER_ID = s.OWNER) as ownername, s.AUTOMATICPUBLISHING, s.CONTACTLABEL, s.SURVEYSECURITY, s.QUIZ, s.OPC, s.HASPENDINGCHANGES"
- + " from SURVEYS s LEFT JOIN MV_SURVEYS_NUMBERPUBLISHEDANSWERS npa on s.SURVEY_UID = npa.SURVEYUID where s.ISDRAFT = 1 and (s.ARCHIVED = 0 or s.ARCHIVED is null) and (s.DELETED = 0 or s.DELETED is null)";
-
+ + " , npa.PUBLISHEDANSWERS as replies, s.ACTIVE, s.OWNER, s.CONTACT"
+ + " , (SELECT USER_LOGIN FROM USERS u WHERE u.USER_ID = s.OWNER) as ownerlogin, (SELECT USER_DISPLAYNAME FROM USERS u WHERE u.USER_ID = s.OWNER) as ownername, s.AUTOMATICPUBLISHING, s.CONTACTLABEL, s.SURVEYSECURITY, s.QUIZ, s.OPC, s.HASPENDINGCHANGES"
+ + " from SURVEYS s LEFT JOIN MV_SURVEYS_NUMBERPUBLISHEDANSWERS npa on s.SURVEY_UID = npa.SURVEYUID where s.ISDRAFT = 1 and (s.ARCHIVED = 0 or s.ARCHIVED is null) and (s.DELETED = 0 or s.DELETED is null)";
+
HashMap parameters = new HashMap<>();
sql += getSql(filter, parameters, false);
-
- List surveys = new ArrayList<>();
- Map languageMap = getLanguageMap();
- for (Object[] row: loadSurveysfromDatabase(sql, parameters, sqlPagination))
- {
+
+ List surveys = new ArrayList<>();
+ Map languageMap = getLanguageMap();
+ for (Object[] row : loadSurveysfromDatabase(sql, parameters, sqlPagination)) {
Survey survey = new Survey();
-
+
survey.setId(ConversionTools.getValue(row[0]));
survey.setUniqueId((String) row[1]);
survey.setShortname((String) row[2]);
@@ -118,96 +119,98 @@ public List getSurveys(SurveyFilter filter, SqlPagination sqlPagination)
survey.setSecurity((String) row[17]);
survey.setIsQuiz((Boolean) row[18]);
survey.setIsOPC((Boolean) row[19]);
-
+
survey.setHasPendingChanges((Boolean) row[20]);
-
+
surveys.add(survey);
}
return surveys;
}
-
- public List getSurveysIncludingTranslationLanguages(SurveyFilter filter, SqlPagination sqlPagination, boolean addInvitedAndDrafts) throws Exception {
+
+ public List getSurveysIncludingTranslationLanguages(SurveyFilter filter, SqlPagination sqlPagination, boolean addInvitedAndDrafts, boolean addNumberOfReports) throws Exception {
List surveys = getSurveys(filter, sqlPagination);
for (Survey survey : surveys) {
- survey.setTranslations(translationService.getTranslationLanguagesForSurvey(survey.getId(), false));
- survey.setCompleteTranslations(getCompletedTranslations(survey));
-
- if (addInvitedAndDrafts)
- {
- survey.setNumberOfInvitations(participationService.getNumberOfInvitations(survey.getUniqueId()));
- survey.setNumberOfDrafts(answerService.getNumberOfDrafts(survey.getId()));
- } else {
- survey.setNumberOfInvitations(-1);
- survey.setNumberOfDrafts(-1);
- }
+ survey.setTranslations(translationService.getTranslationLanguagesForSurvey(survey.getId(), false));
+ survey.setCompleteTranslations(getCompletedTranslations(survey));
+
+ if (addInvitedAndDrafts) {
+ survey.setNumberOfInvitations(participationService.getNumberOfInvitations(survey.getUniqueId()));
+ survey.setNumberOfDrafts(answerService.getNumberOfDrafts(survey.getId()));
+ } else {
+ survey.setNumberOfInvitations(-1);
+ survey.setNumberOfDrafts(-1);
+ }
+
+ if (addNumberOfReports)
+ {
+ survey.setNumberOfReports(surveyService.getAbuseReportsForSurvey(survey.getUniqueId()));
+ }
}
return surveys;
}
-
+
private List getCompletedTranslations(Survey survey) {
- return translationService.getTranslationsForSurvey(survey.getId(), false)
- .stream()
- .filter(Translations::getActive)
- .map(t -> t.getLanguage().getCode())
- .collect(toList());
+ return translationService.getTranslationsForSurvey(survey.getId(), false).stream().filter(Translations::getActive).map(t -> t.getLanguage().getCode()).collect(toList());
}
-
+
public List getSurveysIncludingPublicationDates(SurveyFilter filter, SqlPagination sqlPagination) throws Exception {
- String sql = "SELECT s.SURVEY_ID, s.SURVEY_UID, s.SURVEYNAME, s.TITLE, s.OWNER, (SELECT USER_LOGIN FROM USERS u WHERE u.USER_ID = s.OWNER) as ownerlogin,(SELECT USER_DISPLAYNAME FROM USERS u WHERE u.USER_ID = s.OWNER) as ownername, npa.PUBLISHEDANSWERS as replies, SUBSTRING(GROUP_CONCAT(s.survey_created),21, 19), SUBSTRING(GROUP_CONCAT(s.survey_created),-19), s.SURVEYSECURITY, s.ACTIVE from SURVEYS s LEFT JOIN MV_SURVEYS_NUMBERPUBLISHEDANSWERS npa on s.SURVEY_UID = npa.SURVEYUID where ";
-
- if (filter.getSurveys() != null && filter.getSurveys().equalsIgnoreCase("ARCHIVED"))
- {
+ String sql = "SELECT s.SURVEY_ID, s.SURVEY_UID, s.SURVEYNAME, s.TITLE, s.OWNER, (SELECT USER_LOGIN FROM USERS u WHERE u.USER_ID = s.OWNER) as ownerlogin,(SELECT USER_DISPLAYNAME FROM USERS u WHERE u.USER_ID = s.OWNER) as ownername, npa.PUBLISHEDANSWERS as replies, SUBSTRING(GROUP_CONCAT(s.survey_created),21, 19), SUBSTRING(GROUP_CONCAT(s.survey_created),-19), s.SURVEYSECURITY, s.ACTIVE, s.FROZEN from SURVEYS s LEFT JOIN MV_SURVEYS_NUMBERPUBLISHEDANSWERS npa on s.SURVEY_UID = npa.SURVEYUID where ";
+
+ if (filter.getSurveys() != null && filter.getSurveys().equalsIgnoreCase("ARCHIVED")) {
sql += "(s.ARCHIVED = 1)";
} else if (filter.getSurveys() != null && filter.getSurveys().equalsIgnoreCase("DELETED")) {
sql += "(s.DELETED = 1)";
+ } else if (filter.getSurveys() != null && filter.getSurveys().equalsIgnoreCase("REPORTED")) {
+ sql += "(s.SURVEY_ID > 0)";
+ // handled inside getSql
} else {
sql += "(s.ARCHIVED = 0 or s.ARCHIVED is null) and (s.DELETED = 0 or s.DELETED is null)";
}
-
+
HashMap parameters = new HashMap<>();
sql += getSql(filter, parameters, true);
-
+
List surveys = new ArrayList<>();
- for (Object[] row: loadSurveysfromDatabase(sql, parameters, sqlPagination))
- {
+ for (Object[] row : loadSurveysfromDatabase(sql, parameters, sqlPagination)) {
Survey survey = new Survey();
survey.setId(ConversionTools.getValue(row[0]));
survey.setUniqueId((String) row[1]);
survey.setShortname((String) row[2]);
survey.setTitle((String) row[3]);
-
- User user = new User();
+
+ User user = new User();
user.setId(ConversionTools.getValue(row[4]));
user.setLogin((String) row[5]);
user.setDisplayName((String) row[6]);
survey.setOwner(user);
-
- survey.setNumberOfAnswerSetsPublished(ConversionTools.getValue(row[7]));
+
+ survey.setNumberOfAnswerSetsPublished(ConversionTools.getValue(row[7]));
survey.setFirstPublished(ConversionTools.getDate((String) row[9]));
survey.setPublished(ConversionTools.getDate((String) row[9]));
survey.setSecurity((String) row[10]);
survey.setIsActive((Boolean) row[11]);
+ survey.setIsFrozen((Boolean) row[12]);
surveys.add(survey);
}
-
+
return surveys;
- }
+ }
public List getPopularSurveys(SurveyFilter filter) throws Exception {
- filter.setSortKey("replies");
- SqlPagination sqlPagination = new SqlPagination(1, 5);
- return getSurveys(filter, sqlPagination);
+ filter.setSortKey("replies");
+ SqlPagination sqlPagination = new SqlPagination(1, 5);
+ return getSurveys(filter, sqlPagination);
}
-
+
private String getSql(SurveyFilter filter, HashMap oQueryParameters, boolean loadpublicationdates) {
-
+
StringBuilder sql = new StringBuilder();
-
+
if (filter == null) {
return sql.toString();
}
-
+
if (filter.getUid() != null && filter.getUid().length() > 0) {
sql.append(" AND s.SURVEY_UID like :uid");
oQueryParameters.put("uid", "%" + filter.getUid().trim() + "%");
@@ -222,155 +225,148 @@ private String getSql(SurveyFilter filter, HashMap oQueryParamet
sql.append(" AND s.TITLE COLLATE UTF8_GENERAL_CI like :title");
oQueryParameters.put("title", "%" + filter.getTitle().trim() + "%");
}
-
+
if (filter.getAccess() != null && filter.getAccess().length() > 0) {
sql.append(" AND s.SURVEYSECURITY like :access");
oQueryParameters.put("access", filter.getAccess());
}
-
- if (filter.getStatus() != null)
- {
+
+ if (filter.getStatus() != null) {
boolean unpublished = filter.getStatus().contains("Unpublished");
boolean published = filter.getStatus().contains("Published");
-
- if (published && unpublished)
- {
- //return everything
- }
- else if (published)
- {
+
+ if (published && unpublished) {
+ // return everything
+ } else if (published) {
sql.append(" AND s.ISPUBLISHED = 1 AND s.ACTIVE = 1");
- } else if (unpublished)
- {
+ } else if (unpublished) {
sql.append(" AND NOT(s.ISPUBLISHED = 1 AND s.ACTIVE = 1)");
}
}
-
+
if (filter.getGeneratedFrom() != null) {
sql.append(" AND s.SURVEY_CREATED >= :generatedFrom");
oQueryParameters.put("generatedFrom", filter.getGeneratedFrom());
}
-
+
if (filter.getGeneratedTo() != null) {
sql.append(" AND s.SURVEY_CREATED <= :generatedTo");
oQueryParameters.put("generatedTo", Tools.getFollowingDay(filter.getGeneratedTo()));
}
-
+
if (filter.getStartFrom() != null) {
sql.append(" AND s.SURVEY_START_DATE >= :startFrom");
oQueryParameters.put("startFrom", filter.getStartFrom());
}
-
+
if (filter.getStartTo() != null) {
sql.append(" AND s.SURVEY_START_DATE <= :startTo");
oQueryParameters.put("startTo", Tools.getFollowingDay(filter.getStartTo()));
}
-
+
if (filter.getEndFrom() != null) {
sql.append(" AND s.SURVEY_END_DATE >= :endFrom");
oQueryParameters.put("endFrom", filter.getEndFrom());
}
-
+
if (filter.getEndTo() != null) {
sql.append(" AND s.SURVEY_END_DATE <= :endTo");
oQueryParameters.put("endTo", Tools.getFollowingDay(filter.getEndTo()));
}
-
- if (filter.getOwner() != null && filter.getOwner().length() > 0 && filter.getUser() != null && (filter.getUser().getLogin().equals(filter.getOwner()) || filter.getUser().getGlobalPrivileges().get(GlobalPrivilege.FormManagement) == 2))
- {
+
+ if (filter.getOwner() != null && filter.getOwner().length() > 0 && filter.getUser() != null
+ && (filter.getUser().getLogin().equals(filter.getOwner()) || filter.getUser().getGlobalPrivileges().get(GlobalPrivilege.FormManagement) == 2)) {
sql.append(" AND (s.OWNER in (SELECT USER_ID FROM USERS WHERE USER_LOGIN = :ownername OR USER_DISPLAYNAME = :ownername))");
oQueryParameters.put("ownername", filter.getOwner());
- } else if (filter.getUser() == null)
- {
- sql.append(" AND s.LISTFORM = 1 AND s.LISTFORMVALIDATED = 1 AND s.ISPUBLISHED = true AND s.ACTIVE = true AND (s.SURVEYSECURITY = 'open' or s.SURVEYSECURITY = 'openanonymous') AND (s.SURVEY_END_DATE IS NULL OR s.SURVEY_END_DATE > :now)");
+ } else if (filter.getUser() == null) {
+ sql.append(
+ " AND s.LISTFORM = 1 AND s.LISTFORMVALIDATED = 1 AND s.ISPUBLISHED = true AND s.ACTIVE = true AND (s.SURVEYSECURITY = 'open' or s.SURVEYSECURITY = 'openanonymous') AND (s.SURVEY_END_DATE IS NULL OR s.SURVEY_END_DATE > :now)");
oQueryParameters.put("now", new Date());
- } else if (filter.getUser() != null)
- {
- if (filter.getSelector() != null && filter.getSelector().equalsIgnoreCase("my"))
- {
+ } else if (filter.getUser() != null) {
+ if (filter.getSelector() != null && filter.getSelector().equalsIgnoreCase("my")) {
sql.append(" AND (s.OWNER = :ownerId)");
oQueryParameters.put("ownerId", filter.getUser().getId());
- } else if (filter.getSelector() != null && filter.getSelector().equalsIgnoreCase("shared"))
- {
- if (filter.getUser().getType().equalsIgnoreCase("ECAS"))
- {
- sql.append(" AND (s.SURVEY_ID in (Select a.SURVEY FROM SURACCESS a WHERE (a.ACCESS_USER = :ownerId OR a.ACCESS_DEPARTMENT IN (SELECT GRPS FROM ECASGROUPS WHERE eg_ID = (SELECT USER_ID FROM ECASUSERS WHERE USER_LOGIN = :login))) AND (a.ACCESS_PRIVILEGES like '%2%' or a.ACCESS_PRIVILEGES like '%1%')))");
+ } else if (filter.getSelector() != null && filter.getSelector().equalsIgnoreCase("shared")) {
+ if (filter.getUser().getType().equalsIgnoreCase("ECAS")) {
+ sql.append(
+ " AND (s.SURVEY_ID in (Select a.SURVEY FROM SURACCESS a WHERE (a.ACCESS_USER = :ownerId OR a.ACCESS_DEPARTMENT IN (SELECT GRPS FROM ECASGROUPS WHERE eg_ID = (SELECT USER_ID FROM ECASUSERS WHERE USER_LOGIN = :login))) AND (a.ACCESS_PRIVILEGES like '%2%' or a.ACCESS_PRIVILEGES like '%1%')))");
oQueryParameters.put("ownerId", filter.getUser().getId());
oQueryParameters.put("login", filter.getUser().getLogin());
} else {
sql.append(" AND (s.SURVEY_ID in (Select a.SURVEY FROM SURACCESS a WHERE a.ACCESS_USER = :ownerId AND (a.ACCESS_PRIVILEGES like '%2%' or a.ACCESS_PRIVILEGES like '%1%')))");
oQueryParameters.put("ownerId", filter.getUser().getId());
}
- } else if (filter.getUser().getGlobalPrivileges().get(GlobalPrivilege.FormManagement) < 2)
- {
- if (filter.getUser().getType().equalsIgnoreCase("ECAS"))
- {
- sql.append(" AND (s.OWNER = :ownerId OR s.SURVEY_ID in (Select a.SURVEY FROM SURACCESS a WHERE (a.ACCESS_USER = :ownerId OR a.ACCESS_DEPARTMENT IN (SELECT GRPS FROM ECASGROUPS WHERE eg_ID = (SELECT USER_ID FROM ECASUSERS WHERE USER_LOGIN = :login))) AND (a.ACCESS_PRIVILEGES like '%2%' or a.ACCESS_PRIVILEGES like '%1%')))");
+ } else if (filter.getUser().getGlobalPrivileges().get(GlobalPrivilege.FormManagement) < 2) {
+ if (filter.getUser().getType().equalsIgnoreCase("ECAS")) {
+ sql.append(
+ " AND (s.OWNER = :ownerId OR s.SURVEY_ID in (Select a.SURVEY FROM SURACCESS a WHERE (a.ACCESS_USER = :ownerId OR a.ACCESS_DEPARTMENT IN (SELECT GRPS FROM ECASGROUPS WHERE eg_ID = (SELECT USER_ID FROM ECASUSERS WHERE USER_LOGIN = :login))) AND (a.ACCESS_PRIVILEGES like '%2%' or a.ACCESS_PRIVILEGES like '%1%')))");
oQueryParameters.put("ownerId", filter.getUser().getId());
oQueryParameters.put("login", filter.getUser().getLogin());
} else {
- sql.append(" AND (s.OWNER = :ownerId OR s.SURVEY_ID in (Select a.SURVEY FROM SURACCESS a WHERE a.ACCESS_USER = :ownerId AND (a.ACCESS_PRIVILEGES like '%2%' or a.ACCESS_PRIVILEGES like '%1%')))");
+ sql.append(
+ " AND (s.OWNER = :ownerId OR s.SURVEY_ID in (Select a.SURVEY FROM SURACCESS a WHERE a.ACCESS_USER = :ownerId AND (a.ACCESS_PRIVILEGES like '%2%' or a.ACCESS_PRIVILEGES like '%1%')))");
oQueryParameters.put("ownerId", filter.getUser().getId());
}
- }
- }
+ }
+ }
if (filter.getKeywords() != null && filter.getKeywords().trim().length() > 0) {
int i = 0;
sql.append(" AND (");
for (String word : filter.getKeywords().split(" ")) {
- if (word.trim().length() > 0)
- {
+ if (word.trim().length() > 0) {
String w = "word" + i++;
-
- if (i > 1)
- {
+
+ if (i > 1) {
sql.append(" OR");
}
-
+
sql.append(" ( s.SURVEYNAME COLLATE UTF8_GENERAL_CI like :").append(w).append(" OR s.TITLE COLLATE UTF8_GENERAL_CI like :").append(w).append(")");
oQueryParameters.put(w, "%" + word.trim() + "%");
}
}
sql.append(" )");
}
-
- if (filter.getLanguages() != null)
- {
+
+ if (filter.getLanguages() != null) {
int i = 0;
sql.append(" AND (");
- for (String lang : filter.getLanguages())
- {
- if (lang.trim().length() > 0)
- {
+ for (String lang : filter.getLanguages()) {
+ if (lang.trim().length() > 0) {
String l = "lang" + i++;
-
- if (i > 1)
- {
+
+ if (i > 1) {
sql.append(" OR");
}
-
- sql.append(" ( s.LANGUAGE = :").append(l).append(" or s.SURVEY_ID in (Select distinct t.SURVEY_ID FROM TRANSLATIONS t WHERE t.SURVEY_ACTIVE = 1 AND t.LANGUAGE = :").append(l).append("))");
+
+ sql.append(" ( s.LANGUAGE = :").append(l).append(" or s.SURVEY_ID in (Select distinct t.SURVEY_ID FROM TRANSLATIONS t WHERE t.SURVEY_ACTIVE = 1 AND t.LANGUAGE = :").append(l)
+ .append("))");
oQueryParameters.put(l, lang.trim());
}
}
sql.append(" )");
}
+
+ if (filter.getSurveys() != null && filter.getSurveys().equalsIgnoreCase("REPORTED")) {
+ sql.append(" AND (s.SURVEY_UID IN (SELECT DISTINCT SURABUSE_SURVEY FROM SURABUSE))");
+ }
- if (loadpublicationdates)
- {
+ if (filter.getSurveys() != null && filter.getSurveys().equalsIgnoreCase("FROZEN")) {
+ sql.append(" AND (s.FROZEN = 1)");
+ }
+
+ if (loadpublicationdates) {
sql.append(" GROUP BY s.SURVEY_UID");
-
+
boolean having = false;
if (filter.getPublishedFrom() != null) {
sql.append(" HAVING STR_TO_DATE(SUBSTRING(GROUP_CONCAT(s.survey_created),-19), '%Y-%m-%d') >= :publishedFrom");
having = true;
oQueryParameters.put("publishedFrom", filter.getPublishedFrom());
}
-
+
if (filter.getPublishedTo() != null) {
- if (having)
- {
+ if (having) {
sql.append(" AND ");
} else {
sql.append(" HAVING ");
@@ -378,11 +374,10 @@ else if (published)
}
sql.append("STR_TO_DATE(SUBSTRING(GROUP_CONCAT(s.survey_created),-19), '%Y-%m-%d') <= :publishedTo");
oQueryParameters.put("publishedTo", filter.getPublishedTo());
- }
-
+ }
+
if (filter.getFirstPublishedFrom() != null) {
- if (having)
- {
+ if (having) {
sql.append(" AND ");
} else {
sql.append(" HAVING ");
@@ -391,10 +386,9 @@ else if (published)
sql.append("STR_TO_DATE(SUBSTRING(GROUP_CONCAT(s.survey_created),21, 19), '%Y-%m-%d') >= :firstPublishedFrom");
oQueryParameters.put("firstPublishedFrom", filter.getFirstPublishedFrom());
}
-
+
if (filter.getFirstPublishedTo() != null) {
- if (having)
- {
+ if (having) {
sql.append(" AND ");
} else {
sql.append(" HAVING ");
@@ -402,292 +396,253 @@ else if (published)
}
sql.append("STR_TO_DATE(SUBSTRING(GROUP_CONCAT(s.survey_created),21, 19), '%Y-%m-%d') <= :firstPublishedTo");
oQueryParameters.put("firstPublishedTo", filter.getFirstPublishedTo());
- }
+ }
}
-
- if (filter.getSortKey() != null && filter.getSortKey().length() > 0)
- {
- if (filter.getSortKey().equalsIgnoreCase("replies"))
- {
+
+ if (filter.getSortKey() != null && filter.getSortKey().length() > 0) {
+ if (filter.getSortKey().equalsIgnoreCase("replies")) {
sql.append(" ORDER BY npa.PUBLISHEDANSWERS");
-
- if (filter.getSortOrder() != null && filter.getSortOrder().length() > 0)
- {
+
+ if (filter.getSortOrder() != null && filter.getSortOrder().length() > 0) {
sql.append(" ").append(filter.getSortOrder().toUpperCase());
}
- } else if (filter.getSortKey().equalsIgnoreCase("created"))
- {
+ } else if (filter.getSortKey().equalsIgnoreCase("created")) {
sql.append(" ORDER BY s.SURVEY_CREATED");
-
- if (filter.getSortOrder() != null && filter.getSortOrder().length() > 0)
- {
+
+ if (filter.getSortOrder() != null && filter.getSortOrder().length() > 0) {
sql.append(" ").append(filter.getSortOrder().toUpperCase());
}
- } else {
+ } else {
sql.append(" ORDER BY s.").append(filter.getSortKey());
-
- if (filter.getSortOrder() != null && filter.getSortOrder().length() > 0)
- {
+
+ if (filter.getSortOrder() != null && filter.getSortOrder().length() > 0) {
sql.append(" ").append(filter.getSortOrder().toUpperCase());
} else {
sql.append(" DESC");
- }
- }
+ }
+ }
}
-
+
return sql.toString();
}
-
- private void synchronizeSurvey(Survey survey, String languageCode, boolean setSurvey)
- {
+
+ private void synchronizeSurvey(Survey survey, String languageCode, boolean setSurvey) {
SurveyHelper.synchronizeSurvey(survey, languageCode, translationService, getLanguage(languageCode), setSurvey);
}
-
+
@Transactional
- public Survey getSurvey(int id)
- {
+ public Survey getSurvey(int id) {
Session session = sessionFactory.getCurrentSession();
return (Survey) session.get(Survey.class, id);
}
-
+
@Transactional
- public Survey getSurvey(int id, boolean readonly)
- {
- Session session = sessionFactory.getCurrentSession();
+ public Survey getSurvey(int id, boolean readonly) {
+ Session session = sessionFactory.getCurrentSession();
Survey survey = (Survey) session.get(Survey.class, id);
-
+
if (survey != null) {
session.setReadOnly(survey, readonly);
for (Element e : survey.getElementsRecursive(true)) {
- e = (Element)session.merge(e);
+ e = (Element) session.merge(e);
session.setReadOnly(e, readonly);
}
}
-
+
return survey;
}
-
+
@Transactional(readOnly = true)
public Survey getSurveyReadOnly(int id, boolean loadTranslations, boolean setSurvey) {
return getSurvey(id, loadTranslations, true, true, setSurvey);
}
-
+
@Transactional
public Survey getSurvey(int id, boolean loadTranslations, boolean readonly) {
return getSurvey(id, loadTranslations, readonly, true, true);
}
-
+
@Transactional
public Survey getSurvey(int id, boolean loadTranslations, boolean readonly, boolean synchronizeSurvey, boolean setSurvey) {
- Session session = sessionFactory.getCurrentSession();
+ Session session = sessionFactory.getCurrentSession();
Survey survey = (Survey) session.get(Survey.class, id);
-
- if (survey != null && survey.getIsDraft())
- {
+
+ if (survey != null && survey.getIsDraft()) {
List translations = translationService.getTranslationLanguagesForSurvey(survey.getId());
survey.setTranslations(translations);
- } else if (survey != null && loadTranslations)
- {
+ } else if (survey != null && loadTranslations) {
List translations = translationService.getTranslationLanguagesForSurvey(survey.getId());
survey.setTranslations(translations);
}
if (survey != null && synchronizeSurvey) {
synchronizeSurvey(survey, survey.getLanguage().getCode(), setSurvey);
-
+
session.setReadOnly(survey, readonly);
for (Element e : survey.getElementsRecursive(true)) {
- e = (Element)session.merge(e);
+ e = (Element) session.merge(e);
session.setReadOnly(e, readonly);
}
}
-
+
return survey;
}
-
+
@Transactional
- public Survey getSurveyByUniqueIdToWrite(String uid)
- {
+ public Survey getSurveyByUniqueIdToWrite(String uid) {
Session session = sessionFactory.getCurrentSession();
Query query = session.createQuery("SELECT id FROM Survey s WHERE s.uniqueId = :uid AND s.isDraft = :draft ORDER BY s.id DESC").setString("uid", uid);
query.setBoolean("draft", true);
-
+
@SuppressWarnings("unchecked")
List list = query.setReadOnly(true).setMaxResults(1).list();
- if (list.size() > 0)
- {
+ if (list.size() > 0) {
Survey survey = getSurvey(ConversionTools.getValue(list.get(0)));
return survey;
}
return null;
}
-
+
@Transactional(readOnly = true)
- public Survey getSurveyByUniqueId(String uid, boolean loadTranslations, boolean draft)
- {
+ public Survey getSurveyByUniqueId(String uid, boolean loadTranslations, boolean draft) {
Session session = sessionFactory.getCurrentSession();
Query query = session.createQuery("SELECT id FROM Survey s WHERE s.uniqueId = :uid AND s.isDraft = :draft ORDER BY s.id DESC").setString("uid", uid);
query.setBoolean("draft", draft);
-
+
@SuppressWarnings("unchecked")
List list = query.setReadOnly(true).setMaxResults(1).list();
- if (list.size() > 0)
- {
+ if (list.size() > 0) {
Survey survey = getSurvey(ConversionTools.getValue(list.get(0)));
-
- if (survey != null && loadTranslations)
- {
+
+ if (survey != null && loadTranslations) {
List translations = translationService.getTranslationLanguagesForSurvey(survey.getId());
survey.setTranslations(translations);
}
- if (survey != null){
+ if (survey != null) {
synchronizeSurvey(survey, survey.getLanguage().getCode(), true);
}
-
+
session.setReadOnly(survey, true);
for (Element e : survey.getElementsRecursive(true)) {
session.setReadOnly(e, true);
}
-
+
return survey;
}
return null;
}
@Transactional
- public Survey initializeAndMergeSurvey(Survey survey)
- {
+ public Survey initializeAndMergeSurvey(Survey survey) {
Session session = sessionFactory.getCurrentSession();
Survey s = (Survey) session.merge(survey);
initializeSurvey(s);
return s;
}
-
- public void initializeSkin(Survey survey)
- {
- if (survey.getSkin() != null)
- {
+
+ public void initializeSkin(Survey survey) {
+ if (survey.getSkin() != null) {
Hibernate.initialize(survey.getSkin().getElements());
- }
+ }
}
-
- public void initializeSurvey(Survey survey)
- {
+
+ public void initializeSurvey(Survey survey) {
Hibernate.initialize(survey.getBackgroundDocuments());
Hibernate.initialize(survey.getUsefulLinks());
Hibernate.initialize(survey.getPublication().getFilter().getVisibleQuestions());
Hibernate.initialize(survey.getPublication().getFilter().getExportedQuestions());
Hibernate.initialize(survey.getPublication().getFilter().getFilterValues());
Hibernate.initialize(survey.getPublication().getFilter().getLanguages());
-
- if (survey.getSkin() != null)
- {
+
+ if (survey.getSkin() != null) {
Hibernate.initialize(survey.getSkin().getElements());
- }
-
+ }
+
for (Element element : survey.getElementsRecursive(true)) {
-
- if (element instanceof Question)
- {
+
+ if (element instanceof Question) {
Question q = (Question) element;
Hibernate.initialize(q.getScoringItems());
}
-
- if (element instanceof ChoiceQuestion)
- {
+
+ if (element instanceof ChoiceQuestion) {
ChoiceQuestion question = (ChoiceQuestion) element;
- for (PossibleAnswer answer: question.getPossibleAnswers())
- {
+ for (PossibleAnswer answer : question.getPossibleAnswers()) {
Hibernate.initialize(answer.getDependentElements());
- if (answer.getDependentElements() != null)
- {
+ if (answer.getDependentElements() != null) {
Hibernate.initialize(answer.getDependentElements().getDependentElements());
} else {
logger.warn("answer.getDependentElements() null for answer " + answer.getId());
}
}
- } else if (element instanceof Matrix)
- {
+ } else if (element instanceof Matrix) {
Matrix matrix = (Matrix) element;
Hibernate.initialize(matrix.getDependentElements());
Hibernate.initialize(matrix.getChildElements());
- for (DependencyItem dep: matrix.getDependentElements())
- {
+ for (DependencyItem dep : matrix.getDependentElements()) {
Hibernate.initialize(dep.getDependentElements());
}
- } else if (element instanceof RatingQuestion)
- {
+ } else if (element instanceof RatingQuestion) {
RatingQuestion rating = (RatingQuestion) element;
Hibernate.initialize(rating.getChildElements());
- } else if (element instanceof Table)
- {
+ } else if (element instanceof Table) {
Table table = (Table) element;
- Hibernate.initialize(table.getChildElements());
- } else if (element instanceof Download)
- {
+ Hibernate.initialize(table.getChildElements());
+ } else if (element instanceof Download) {
Download download = (Download) element;
Hibernate.initialize(download.getFiles());
- } else if (element instanceof Confirmation)
- {
+ } else if (element instanceof Confirmation) {
Confirmation confirmation = (Confirmation) element;
Hibernate.initialize(confirmation.getFiles());
- } else if (element instanceof GalleryQuestion)
- {
+ } else if (element instanceof GalleryQuestion) {
GalleryQuestion gallery = (GalleryQuestion) element;
Hibernate.initialize(gallery.getFiles());
}
}
}
-
+
@Transactional(readOnly = true)
public Survey getSurvey(int id, String language) {
Survey survey = getSurvey(id, false, true, false, true);
synchronizeSurvey(survey, language, true);
return survey;
}
-
+
@Transactional(readOnly = true)
- public Survey getSurveyByShortname(String shortname, boolean isDraft, User u, HttpServletRequest request, boolean initElements, boolean checkNotArchived, boolean checkNotDeleted, boolean synchronize) throws InvalidURLException {
-
- if (shortname.equals("noform"))
- {
+ public Survey getSurveyByShortname(String shortname, boolean isDraft, User u, HttpServletRequest request, boolean initElements, boolean checkNotArchived, boolean checkNotDeleted,
+ boolean synchronize) throws InvalidURLException {
+
+ if (shortname.equals("noform")) {
SessionInfo info = (SessionInfo) request.getSession().getAttribute("sessioninfo");
-
- if (info != null)
- {
+
+ if (info != null) {
Survey survey = getSurvey(info.getSurvey(), info.getLanguage());
- if (survey != null) return survey;
+ if (survey != null)
+ return survey;
}
-
+
throw new InvalidURLException();
}
-
+
Survey survey = surveyService.getSurvey(shortname, isDraft, false, false, false, null, true, checkNotDeleted, true, synchronize);
-
+
if (survey != null) {
- List translations = translationService.getTranslationLanguagesForSurvey(survey.getId());
+ List translations = translationService.getTranslationLanguagesForSurvey(survey.getId());
survey.setTranslations(translations);
-
- if (u != null)
- {
+
+ if (u != null) {
boolean allowed = false;
- if (!survey.getOwner().getId().equals(u.getId()))
- {
- if (u.getGlobalPrivileges().get(GlobalPrivilege.FormManagement) < 2)
- {
- if (u.getLocalPrivileges().get(LocalPrivilege.FormManagement) < 1)
- {
- if (u.getLocalPrivileges().get(LocalPrivilege.AccessDraft) > 0)
- {
+ if (!survey.getOwner().getId().equals(u.getId())) {
+ if (u.getGlobalPrivileges().get(GlobalPrivilege.FormManagement) < 2) {
+ if (u.getLocalPrivileges().get(LocalPrivilege.FormManagement) < 1) {
+ if (u.getLocalPrivileges().get(LocalPrivilege.AccessDraft) > 0) {
allowed = true;
- }
- if (u.getLocalPrivileges().get(LocalPrivilege.AccessResults) > 0)
- {
+ }
+ if (u.getLocalPrivileges().get(LocalPrivilege.AccessResults) > 0) {
allowed = true;
- }
- if (u.getLocalPrivileges().get(LocalPrivilege.ManageInvitations) > 0)
- {
+ }
+ if (u.getLocalPrivileges().get(LocalPrivilege.ManageInvitations) > 0) {
allowed = true;
- }
+ }
}
} else {
allowed = true;
@@ -695,119 +650,113 @@ public Survey getSurveyByShortname(String shortname, boolean isDraft, User u, Ht
} else {
allowed = true;
}
-
- if (allowed) sessionService.updateSessionInfo(survey, u, request);
+
+ if (allowed)
+ sessionService.updateSessionInfo(survey, u, request);
}
-
+
if (initElements)
- for (Element element: survey.getElementsRecursive())
- {
- element.setSurvey(survey);
- }
-
- if (checkNotArchived && (survey.getArchived() || survey.getIsDeleted()))
- {
+ for (Element element : survey.getElementsRecursive()) {
+ element.setSurvey(survey);
+ }
+
+ if (checkNotArchived && (survey.getArchived() || survey.getIsDeleted())) {
throw new InvalidURLException();
}
-
+
return survey;
}
throw new InvalidURLException();
}
-
+
@Transactional
- public Survey getSurveyWithMissingElements(String uidorshortname, boolean isDraft, boolean checkActive, boolean readReplies, boolean useEagerLoading, String language, boolean readonly, boolean synchronize) {
+ public Survey getSurveyWithMissingElements(String uidorshortname, boolean isDraft, boolean checkActive, boolean readReplies, boolean useEagerLoading, String language, boolean readonly,
+ boolean synchronize) {
Survey survey = getSurvey(uidorshortname, isDraft, checkActive, readReplies, useEagerLoading, language, readonly, false, false, synchronize);
- if (survey != null) CheckAndRecreateMissingElements(survey, null);
+ if (survey != null)
+ CheckAndRecreateMissingElements(survey, null);
return survey;
}
-
+
@Transactional
public Survey getSurvey(String uidorshortname, boolean isDraft, boolean checkActive, boolean readReplies, boolean useEagerLoading, String language, boolean readonly, boolean synchronize) {
return getSurvey(uidorshortname, isDraft, checkActive, readReplies, useEagerLoading, language, readonly, false, false, synchronize);
}
-
+
@Transactional
- public Survey getSurvey(String uidorshortname, boolean isDraft, boolean checkActive, boolean readReplies, boolean useEagerLoading, String language, boolean readonly, boolean checkNotDeleted, boolean shortnamefirst, boolean synchronize) {
+ public Survey getSurvey(String uidorshortname, boolean isDraft, boolean checkActive, boolean readReplies, boolean useEagerLoading, String language, boolean readonly, boolean checkNotDeleted,
+ boolean shortnamefirst, boolean synchronize) {
Session session = sessionFactory.getCurrentSession();
String sql;
-
- if (shortnamefirst)
- {
+
+ if (shortnamefirst) {
sql = "SELECT max(s.id) FROM Survey s WHERE (s.shortname = :uid OR s.uniqueId = :uid) AND s.isDraft = :draft";
} else {
sql = "SELECT max(s.id) FROM Survey s WHERE (s.uniqueId = :uid OR s.shortname = :uid) AND s.isDraft = :draft";
}
-
- if (checkNotDeleted)
- {
+
+ if (checkNotDeleted) {
sql += " AND (s.isDeleted is null OR s.isDeleted = false)";
}
-
+
Query query = session.createQuery(sql).setString("uid", uidorshortname).setBoolean("draft", isDraft).setReadOnly(true);
-
+
int id = ConversionTools.getValue(query.uniqueResult());
-
+
if (id > 0) {
-
+
Survey survey = (Survey) session.get(Survey.class, id);
- //logger.info("Refreshing survey " + id);
- //session.refresh(survey);
-
- if (useEagerLoading)
- {
+ // logger.info("Refreshing survey " + id);
+ // session.refresh(survey);
+
+ if (useEagerLoading) {
initializeSurvey(survey);
}
-
- //used e.g. in form runner to check whether disclaimer has to be displayed
+
+ // used e.g. in form runner to check whether disclaimer has to be displayed
Hibernate.initialize(survey.getOwner().getRoles());
-
- if (readReplies)
- {
- survey.setNumberOfAnswerSetsPublished(answerService.getNumberOfAnswerSetsPublished(uidorshortname, survey.getUniqueId()));
+
+ if (readReplies) {
+ survey.setNumberOfAnswerSetsPublished(answerService.getNumberOfAnswerSetsPublished(uidorshortname, survey.getUniqueId()));
}
-
- if (survey.getIsActive() && survey.getAutomaticPublishing() && survey.getEnd() != null && survey.getEnd().before(new Date()))
- {
+
+ if (survey.getIsActive() && survey.getAutomaticPublishing() && survey.getEnd() != null && survey.getEnd().before(new Date())) {
survey.setIsActive(false);
session.update(survey);
- } else if (!survey.getIsActive() && survey.getAutomaticPublishing() && survey.getStart() != null && survey.getStart().before(new Date()))
- {
- if (survey.getEnd() == null || survey.getEnd().after(new Date()))
- {
+ } else if (!survey.getIsActive() && survey.getAutomaticPublishing() && survey.getStart() != null && survey.getStart().before(new Date())) {
+ if (survey.getEnd() == null || survey.getEnd().after(new Date())) {
survey.setIsActive(true);
survey.setIsPublished(true);
session.update(survey);
}
}
-
- if (checkActive && !isDraft)
- {
+
+ if (checkActive && !isDraft) {
query = session.createQuery(sql).setString("uid", uidorshortname).setBoolean("draft", true);
id = ConversionTools.getValue(query.uniqueResult());
-
- if (id == 0) return null;
-
+
+ if (id == 0)
+ return null;
+
Survey draft = (Survey) session.get(Survey.class, id);
- if (!draft.getIsActive()) return null;
+ if (!draft.getIsActive())
+ return null;
}
-
+
session.setReadOnly(survey, readonly);
for (Element e : survey.getElementsRecursive(true)) {
- e = (Element)session.merge(e);
+ e = (Element) session.merge(e);
session.setReadOnly(e, readonly);
}
-
- if (synchronize)
- {
- if (language == null)
- {
+
+ if (synchronize) {
+ if (language == null) {
synchronizeSurvey(survey, survey.getLanguage().getCode(), true);
} else {
synchronizeSurvey(survey, language, true);
}
}
- List translations = translationService.getTranslationLanguagesForSurvey(survey.getId());
+ List translations = translationService.getTranslationLanguagesForSurvey(survey.getId());
survey.setTranslations(translations);
return survey;
}
@@ -817,7 +766,7 @@ public Survey getSurvey(String uidorshortname, boolean isDraft, boolean checkAct
@Transactional
public Survey add(Survey survey, int userId) {
return add(survey, true, userId);
- }
+ }
@Transactional
public Survey add(Survey survey, boolean synchronize, int userId) {
@@ -827,32 +776,28 @@ public Survey add(Survey survey, boolean synchronize, int userId) {
survey.setCreated(new Date());
survey.setUpdated(survey.getCreated());
}
- if (survey.getUniqueId() == null || survey.getUniqueId().length() == 0)
- {
+ if (survey.getUniqueId() == null || survey.getUniqueId().length() == 0) {
survey.setUniqueId(UUID.randomUUID().toString());
}
Session session = sessionFactory.getCurrentSession();
int id = (Integer) session.save(survey);
Survey result = (Survey) session.get(Survey.class, id);
-
+
UpdatePossibleAnswers(result);
session.update(result);
-
- if (synchronize) synchronizeTranslation(survey, userId);
-
+
+ if (synchronize)
+ synchronizeTranslation(survey, userId);
+
reportingService.addToDo(ToDo.CHANGEDDRAFTSURVEY, survey.getUniqueId(), null);
-
+
return result;
- }
-
- private void UpdatePossibleAnswers(Survey survey)
- {
- for (Element element: survey.getElements())
- {
- if (element instanceof ChoiceQuestion)
- {
- for (PossibleAnswer pa: ((ChoiceQuestion)element).getPossibleAnswers())
- {
+ }
+
+ private void UpdatePossibleAnswers(Survey survey) {
+ for (Element element : survey.getElements()) {
+ if (element instanceof ChoiceQuestion) {
+ for (PossibleAnswer pa : ((ChoiceQuestion) element).getPossibleAnswers()) {
pa.setQuestionId(element.getId());
}
}
@@ -860,47 +805,122 @@ private void UpdatePossibleAnswers(Survey survey)
}
@Transactional
- public Survey publish(Survey survey, int pnumberOfAnswerSets, int pnumberOfAnswerSetsPublished, boolean deactivateAutoPublishing, int userId, boolean resetSourceIds, boolean resetSurvey) throws Exception
+ private void computeTrustScore(Survey survey) throws Exception
{
- //this means to create a copy of the survey and save it as non-draft survey
- Session session = sessionFactory.getCurrentSession();
- boolean alreadyPublished = survey.getIsPublished();
+ Session session = sessionFactory.getCurrentSession();
+ int score = 0;
+
+ int trustValueCreatorInternal = Integer.parseInt(settingsService.get(Setting.TrustValueCreatorInternal));
+ int trustValuePastSurveys = Integer.parseInt(settingsService.get(Setting.TrustValuePastSurveys));
+ int trustValuePrivilegedUser = Integer.parseInt(settingsService.get(Setting.TrustValuePrivilegedUser));
+ int trustValueNbContributions = Integer.parseInt(settingsService.get(Setting.TrustValueNbContributions));
+
+ //Rule 0: if the Form Manager is internal
+ if (!survey.getOwner().isExternal())
+ {
+ score += trustValueCreatorInternal;
+ }
+
+ //Rule 1: if the Form Manager has published in the past 3 or more surveys:
+ //- having all reached 10 contributions or more ; and
+ //- including at least one survey having been published for one month or more
+
+ SurveyFilter filter = new SurveyFilter();
+ filter.setUser(survey.getOwner());
+ filter.setOwner(survey.getOwner().getLogin());
+ SqlPagination pagination = new SqlPagination(1, 1000);
+ List surveys = getSurveysIncludingPublicationDates(filter, pagination);
+
+ int countSurveysWith10Contributions = 0;
+ boolean found = false;
+ Calendar c = Calendar.getInstance();
+ c.setTime(new Date());
+ c.add(Calendar.MONTH, -1);
+ Date lastmonth = c.getTime();
+ for (Survey candidate: surveys) {
+ int candidateanswers = answerService.getNumberOfAnswerSetsPublished(candidate.getShortname(), candidate.getUniqueId());
+ if (candidateanswers >= 10)
+ {
+ countSurveysWith10Contributions++;
+ }
+
+ if (candidate.getFirstPublished() != null && candidate.getFirstPublished().before(lastmonth))
+ {
+ found = true;
+ }
+
+ if (found && countSurveysWith10Contributions >= 3) {
+ break;
+ }
+ }
+ if (found && countSurveysWith10Contributions >= 3) {
+ score += trustValuePastSurveys;
+ }
+
+ //Rule 2: if a privileged user is internal
+ List accesses = this.getAccesses(survey.getId());
+ for (Access access : accesses) {
+ if (access.getUser() != null && !access.getUser().isExternal())
+ {
+ score += trustValuePrivilegedUser;
+ break;
+ }
+ }
+
+ int answers = answerService.getNumberOfAnswerSetsPublished(survey.getShortname(), survey.getUniqueId());
+
+ //Rule 3: when the survey is reaching 10 contributions
+ if (answers >= 10)
+ {
+ score += trustValueNbContributions;
+ }
- if (resetSurvey)
+ //Rule 4: when the survey is reaching 100 contributions
+ if (answers >= 100)
{
+ score += trustValueNbContributions;
+ }
+
+ survey.setTrustScore(score);
+ session.saveOrUpdate(survey);
+ }
+
+ @Transactional
+ public Survey publish(Survey survey, int pnumberOfAnswerSets, int pnumberOfAnswerSetsPublished, boolean deactivateAutoPublishing, int userId, boolean resetSourceIds, boolean resetSurvey)
+ throws Exception {
+ // this means to create a copy of the survey and save it as non-draft survey
+ Session session = sessionFactory.getCurrentSession();
+ boolean alreadyPublished = survey.getIsPublished();
+
+ if (resetSurvey) {
session.evict(survey);
survey = (Survey) session.merge(survey);
}
-
+
Survey published = survey.copy(this, survey.getOwner(), fileDir, true, pnumberOfAnswerSets, pnumberOfAnswerSetsPublished, true, resetSourceIds, true, null, null);
- published.setIsDraft(false); //this means it is not a draft
- if (deactivateAutoPublishing)
- {
+ published.setIsDraft(false); // this means it is not a draft
+ if (deactivateAutoPublishing) {
published.setAutomaticPublishing(false);
}
- published = update(published, false, true, false, userId);
-
- //copy translations
+ published = update(published, false, true, false, userId);
+
+ computeTrustScore(survey);
+
+ // copy translations
Map keys = new HashMap<>();
- for (Element element: published.getElementsRecursive())
- {
+ for (Element element : published.getElementsRecursive()) {
keys.put(element.getUniqueId(), element.getUniqueId());
keys.put(element.getSourceId().toString(), element.getId().toString());
- if (element instanceof ChoiceQuestion)
- {
- for (PossibleAnswer answer: ((ChoiceQuestion)element).getPossibleAnswers())
- {
+ if (element instanceof ChoiceQuestion) {
+ for (PossibleAnswer answer : ((ChoiceQuestion) element).getPossibleAnswers()) {
keys.put(answer.getUniqueId(), answer.getUniqueId());
keys.put(answer.getSourceId().toString(), answer.getId().toString());
}
}
- if (element instanceof Question)
- {
+ if (element instanceof Question) {
Question question = (Question) element;
- if (question.getScoringItems() != null)
- {
- for (ScoringItem scoringItem: question.getScoringItems())
- {
+ if (question.getScoringItems() != null) {
+ for (ScoringItem scoringItem : question.getScoringItems()) {
keys.put(scoringItem.getUniqueId(), scoringItem.getUniqueId());
keys.put(scoringItem.getSourceId().toString(), scoringItem.getId().toString());
}
@@ -908,10 +928,8 @@ public Survey publish(Survey survey, int pnumberOfAnswerSets, int pnumberOfAnswe
}
}
List translations = translationService.getTranslationsForSurvey(survey.getId(), true);
- for (Translations translation: translations)
- {
- if (!translation.getLanguage().getCode().equalsIgnoreCase(survey.getLanguage().getCode()))
- {
+ for (Translations translation : translations) {
+ if (!translation.getLanguage().getCode().equalsIgnoreCase(survey.getLanguage().getCode())) {
Translations tcopy = new Translations();
tcopy.setActive(translation.getActive());
tcopy.setLanguage(translation.getLanguage());
@@ -919,95 +937,79 @@ public Survey publish(Survey survey, int pnumberOfAnswerSets, int pnumberOfAnswe
tcopy.setSurveyUid(published.getUniqueId());
tcopy.setTitle(translation.getTitle());
tcopy.setComplete(translation.getComplete());
-
- for (Translation t: translation.getTranslations())
- {
+
+ for (Translation t : translation.getTranslations()) {
Translation tc = new Translation();
tc.setLabel(t.getLabel());
tc.setLanguage(t.getLanguage());
tc.setSurveyId(published.getId());
tc.setTranslations(tcopy);
- if (t.getKey().equalsIgnoreCase(Survey.TITLE) || t.getKey().equalsIgnoreCase(Survey.INTRODUCTION) || t.getKey().equalsIgnoreCase(Survey.ESCAPEPAGE) || t.getKey().equalsIgnoreCase(Survey.ESCAPELINK) || t.getKey().equalsIgnoreCase(Survey.CONFIRMATIONPAGE) || t.getKey().equalsIgnoreCase(Survey.CONFIRMATIONLINK) || t.getKey().equalsIgnoreCase(Survey.HELP) || t.getKey().equalsIgnoreCase(Survey.QUIZWELCOMEMESSAGE) || t.getKey().equalsIgnoreCase(Survey.QUIZRESULTSMESSAGE))
- {
+ if (t.getKey().equalsIgnoreCase(Survey.TITLE) || t.getKey().equalsIgnoreCase(Survey.INTRODUCTION) || t.getKey().equalsIgnoreCase(Survey.ESCAPEPAGE)
+ || t.getKey().equalsIgnoreCase(Survey.ESCAPELINK) || t.getKey().equalsIgnoreCase(Survey.CONFIRMATIONPAGE) || t.getKey().equalsIgnoreCase(Survey.CONFIRMATIONLINK)
+ || t.getKey().equalsIgnoreCase(Survey.HELP) || t.getKey().equalsIgnoreCase(Survey.QUIZWELCOMEMESSAGE) || t.getKey().equalsIgnoreCase(Survey.QUIZRESULTSMESSAGE)) {
tc.setKey(t.getKey());
tcopy.getTranslations().add(tc);
} else {
- if (t.getKey().endsWith("help"))
- {
+ if (t.getKey().endsWith("help")) {
String k = t.getKey().replace("help", "");
- if (keys.containsKey(k))
- {
+ if (keys.containsKey(k)) {
tc.setKey(keys.get(k) + "help");
tcopy.getTranslations().add(tc);
} else {
logger.info("key " + t.getKey() + " not found in key map for translation");
}
- } else if (t.getKey().endsWith("FEEDBACK"))
- {
+ } else if (t.getKey().endsWith("FEEDBACK")) {
String k = t.getKey().replace("FEEDBACK", "");
- if (keys.containsKey(k))
- {
+ if (keys.containsKey(k)) {
tc.setKey(keys.get(k) + "FEEDBACK");
tcopy.getTranslations().add(tc);
} else {
logger.info("key " + t.getKey() + " not found in key map for translation");
}
- } else if (t.getKey().endsWith("UNIT"))
- {
+ } else if (t.getKey().endsWith("UNIT")) {
String k = t.getKey().replace("UNIT", "");
- if (keys.containsKey(k))
- {
+ if (keys.containsKey(k)) {
tc.setKey(keys.get(k) + "UNIT");
tcopy.getTranslations().add(tc);
} else {
logger.info("key " + t.getKey() + " not found in key map for translation");
}
- } else if (t.getKey().endsWith("CONFIRMATIONTEXT"))
- {
+ } else if (t.getKey().endsWith("CONFIRMATIONTEXT")) {
String k = t.getKey().replace("CONFIRMATIONTEXT", "");
- if (keys.containsKey(k))
- {
+ if (keys.containsKey(k)) {
tc.setKey(keys.get(k) + "CONFIRMATIONTEXT");
tcopy.getTranslations().add(tc);
} else {
logger.info("key " + t.getKey() + " not found in key map for translation");
}
- } else if (t.getKey().endsWith("CONFIRMATIONLABEL"))
- {
+ } else if (t.getKey().endsWith("CONFIRMATIONLABEL")) {
String k = t.getKey().replace("CONFIRMATIONLABEL", "");
- if (keys.containsKey(k))
- {
+ if (keys.containsKey(k)) {
tc.setKey(keys.get(k) + "CONFIRMATIONLABEL");
tcopy.getTranslations().add(tc);
} else {
logger.info("key " + t.getKey() + " not found in key map for translation");
}
- } else if (t.getKey().endsWith("TABTITLE"))
- {
+ } else if (t.getKey().endsWith("TABTITLE")) {
String k = t.getKey().replace("TABTITLE", "");
- if (keys.containsKey(k))
- {
+ if (keys.containsKey(k)) {
tc.setKey(keys.get(k) + "TABTITLE");
tcopy.getTranslations().add(tc);
} else {
logger.info("key " + t.getKey() + " not found in key map for translation");
}
- } else if (t.getKey().endsWith("shortname"))
- {
- String k = t.getKey().replace("shortname", "");
- if (keys.containsKey(k))
- {
- tc.setKey(keys.get(k) + "shortname");
- tcopy.getTranslations().add(tc);
- } else {
- logger.info("key " + t.getKey() + " not found in key map for translation");
- }
- } else if (t.getKey().endsWith("#backgrounddocument") || t.getKey().endsWith("#usefullink"))
- {
+ } else if (t.getKey().endsWith("shortname")) {
+ String k = t.getKey().replace("shortname", "");
+ if (keys.containsKey(k)) {
+ tc.setKey(keys.get(k) + "shortname");
+ tcopy.getTranslations().add(tc);
+ } else {
+ logger.info("key " + t.getKey() + " not found in key map for translation");
+ }
+ } else if (t.getKey().endsWith("#backgrounddocument") || t.getKey().endsWith("#usefullink")) {
tc.setKey(t.getKey());
tcopy.getTranslations().add(tc);
- } else if (keys.containsKey(t.getKey()))
- {
+ } else if (keys.containsKey(t.getKey())) {
tc.setKey(keys.get(t.getKey()));
tcopy.getTranslations().add(tc);
} else {
@@ -1018,49 +1020,46 @@ public Survey publish(Survey survey, int pnumberOfAnswerSets, int pnumberOfAnswe
translationService.save(tcopy);
}
}
-
+
Survey ob = null;
ob = (Survey) session.get(Survey.class, survey.getId());
-
+
ob.setIsPublished(true);
ob.setHasPendingChanges(false);
-
- if (deactivateAutoPublishing)
- {
+
+ if (deactivateAutoPublishing) {
ob.setAutomaticPublishing(false);
survey.setAutomaticPublishing(false);
}
-
+
survey.setHasPendingChanges(false);
-
+
session.update(ob);
survey.setIsPublished(true);
-
- if (!alreadyPublished) reportingService.addToDo(ToDo.NEWSURVEY, survey.getUniqueId(), null);
-
+
+ if (!alreadyPublished)
+ reportingService.addToDo(ToDo.NEWSURVEY, survey.getUniqueId(), null);
+
return published;
}
-
+
@Transactional
- public Survey activate(Survey survey, boolean deactivateAutoPublishing, int userId) throws Exception
- {
- //this means to create a copy of the survey and save it as non-draft survey
- Session session = sessionFactory.getCurrentSession();
-
+ public Survey activate(Survey survey, boolean deactivateAutoPublishing, int userId) throws Exception {
+ // this means to create a copy of the survey and save it as non-draft survey
+ Session session = sessionFactory.getCurrentSession();
+
Survey published = getSurvey(survey.getShortname(), false, false, false, false, null, false, false);
-
- if (published != null)
- {
+
+ if (published != null) {
published.setIsActive(true);
- if (deactivateAutoPublishing)
- {
+ if (deactivateAutoPublishing) {
published.setAutomaticPublishing(false);
}
- update(published, false, false, false, userId);
+ update(published, false, false, false, userId);
} else {
throw new Exception("Survey does not exist");
}
-
+
// hibernate: transactional change of local variable
Survey ob = null;
ob = (Survey) session.get(Survey.class, survey.getId());
@@ -1068,29 +1067,30 @@ public Survey activate(Survey survey, boolean deactivateAutoPublishing, int user
ob.setIsActive(true);
ob.setIsPublished(true);
ob.setNotified(false);
- if (deactivateAutoPublishing)
- {
+ if (deactivateAutoPublishing) {
ob.setAutomaticPublishing(false);
survey.setAutomaticPublishing(false);
}
session.update(ob);
-
+
survey.setIsPublished(true);
- survey.setIsActive(true);
+ survey.setIsActive(true);
+ computeTrustScore(survey);
+
return published;
}
-
+
@Transactional
public Survey clearChanges(String shortname, int userId) throws Exception {
Session session = sessionFactory.getCurrentSession();
-
+
Survey survey = this.getSurvey(shortname, true, false, false, false, null, false, false);
-
+
boolean active = survey.getIsActive();
-
+
Survey publishedSurvey = this.getSurvey(shortname, false, false, false, false, null, true, false);
-
+
// hibernate: transactional change of local variable
Survey newDraft = publish(publishedSurvey, survey.getNumberOfAnswerSets(), survey.getNumberOfAnswerSetsPublished(), false, userId, true, false);
newDraft.setCreated(survey.getCreated());
@@ -1098,140 +1098,125 @@ public Survey clearChanges(String shortname, int userId) throws Exception {
newDraft.setIsPublished(true);
newDraft.setIsActive(active);
session.update(newDraft);
-
+
AdaptIDs(survey, newDraft, true, survey.getUniqueIDsByID());
- //delete original
- deleteSurveyData(survey.getId(), false, false, survey.getUniqueId(), false);
- session.delete(survey);
-
+ // delete original
+ deleteSurveyData(survey.getId(), false, false, survey.getUniqueId(), false);
+ session.delete(survey);
+
return newDraft;
}
@Transactional
- public void unpublish(Survey survey, boolean deactivateAutoPublishing, int userId)
- {
+ public void unpublish(Survey survey, boolean deactivateAutoPublishing, int userId) {
Session session = sessionFactory.getCurrentSession();
-
+
Survey publishedSurvey = this.getSurvey(survey.getShortname(), false, false, false, false, null, false, false);
-
- if (publishedSurvey == null)
- {
+
+ if (publishedSurvey == null) {
publishedSurvey = this.getSurvey(survey.getUniqueId(), false, false, false, false, null, false, false);
}
-
- if (publishedSurvey != null)
- {
+
+ if (publishedSurvey != null) {
publishedSurvey.setIsActive(false);
- if (deactivateAutoPublishing)
- {
+ if (deactivateAutoPublishing) {
publishedSurvey.setAutomaticPublishing(false);
publishedSurvey.setNotificationValue(null);
publishedSurvey.setNotificationUnit(null);
}
update(publishedSurvey, false, false, false, userId);
}
-
- Survey ob = null;
- ob = (Survey) session.get(Survey.class, survey.getId());
- session.setReadOnly(ob, false);
-
- ob.setIsActive(false);
-
- if (deactivateAutoPublishing)
- {
- ob.setAutomaticPublishing(false);
- ob.setNotificationValue(null);
- ob.setNotificationUnit(null);
- survey.setAutomaticPublishing(false);
- survey.setNotificationValue(null);
- survey.setNotificationUnit(null);
- }
-
- survey.setIsActive(false);
-
- session.update(ob);
+
+ Survey ob = null;
+ ob = (Survey) session.get(Survey.class, survey.getId());
+ session.setReadOnly(ob, false);
+
+ ob.setIsActive(false);
+
+ if (deactivateAutoPublishing) {
+ ob.setAutomaticPublishing(false);
+ ob.setNotificationValue(null);
+ ob.setNotificationUnit(null);
+ survey.setAutomaticPublishing(false);
+ survey.setNotificationValue(null);
+ survey.setNotificationUnit(null);
}
-
- public static HashMap getUniqueIdsById(Survey publishedSurvey)
- {
+
+ survey.setIsActive(false);
+
+ session.update(ob);
+ }
+
+ public static HashMap getUniqueIdsById(Survey publishedSurvey) {
HashMap oldUniqueIdsById = new HashMap<>();
for (Element element : publishedSurvey.getElementsRecursive(true)) {
oldUniqueIdsById.put(element.getId(), element.getUniqueId());
- }
+ }
return oldUniqueIdsById;
}
-
- private HashMap getSourceIdsById(Survey publishedSurvey)
- {
+
+ private HashMap getSourceIdsById(Survey publishedSurvey) {
HashMap oldSourceIdsById = new HashMap<>();
for (Element element : publishedSurvey.getElementsRecursive()) {
oldSourceIdsById.put(element.getId(), element.getSourceId());
- }
+ }
return oldSourceIdsById;
}
-
-
- private void AdaptIDs(Survey oldSurvey, Survey newSurvey, boolean isDraft, Map draftUniqueIDsByID) throws Exception
- {
+
+ private void AdaptIDs(Survey oldSurvey, Survey newSurvey, boolean isDraft, Map draftUniqueIDsByID) throws Exception {
Session session = sessionFactory.getCurrentSession();
-
- if (isDraft)
- {
- //get existing answers and change survey reference
- List answers = answerService.getAnswersAndDrafts(oldSurvey.getId());
+
+ if (isDraft) {
+ // get existing answers and change survey reference
+ List answers = answerService.getAnswersAndDrafts(oldSurvey.getId());
for (AnswerSet answerSet : answers) {
answerSet.setSurvey(newSurvey);
answerSet.setSurveyId(newSurvey.getId());
-
+
session.update(answerSet);
}
-
- //also update draft-specific data
-
- //update privileges
+
+ // also update draft-specific data
+
+ // update privileges
List accesses = getAccesses(oldSurvey.getId());
- for (Access access: accesses)
- {
+ for (Access access : accesses) {
access.setSurvey(newSurvey);
session.update(access);
}
}
}
-
+
public void updateAnswerUids(int id, String uid, boolean pa) throws Exception {
boolean saved = false;
-
+
int counter = 1;
-
- while(!saved)
- {
+
+ while (!saved) {
try {
internalUpdateAnswerUids(id, uid, pa);
saved = true;
- } catch (org.hibernate.exception.LockAcquisitionException ex)
- {
+ } catch (org.hibernate.exception.LockAcquisitionException ex) {
logger.info("lock on answerSet table catched; retry counter: " + counter);
counter++;
-
- if (counter > 60)
- {
+
+ if (counter > 60) {
logger.error(ex.getLocalizedMessage(), ex);
throw ex;
}
-
+
Thread.sleep(1000);
}
- }
+ }
}
-
+
@Transactional
private void internalUpdateAnswerUids(int id, String uid, boolean pa) {
Session session = sessionFactory.getCurrentSession();
Query query;
-
- if (pa)
- {
+
+ if (pa) {
query = session.createSQLQuery("UPDATE ANSWERS SET PA_UID = :uid WHERE PA_UID IS NULL AND PA_ID = :id");
} else {
query = session.createSQLQuery("UPDATE ANSWERS SET QUESTION_UID = :uid WHERE QUESTION_UID IS NULL AND QUESTION_ID = :id");
@@ -1241,24 +1226,22 @@ private void internalUpdateAnswerUids(int id, String uid, boolean pa) {
}
@Transactional
- public int applyChanges(Survey survey, boolean deactivateAutoPublishing, int userId, boolean resetSurey) throws Exception
- {
- if (resetSurey)
- {
+ public int applyChanges(Survey survey, boolean deactivateAutoPublishing, int userId, boolean resetSurey) throws Exception {
+ if (resetSurey) {
Session session = sessionFactory.getCurrentSession();
session.evict(survey);
survey = (Survey) session.merge(survey);
initializeSurvey(survey);
}
-
+
boolean sendListFormMail = survey.isListFormValidated();
-
+
Map uniqueIDSByID = survey.getUniqueIDsByID();
-
+
Survey publishedSurvey = getSurvey(survey.getShortname(), false, false, false, true, null, true, false);
-
+
Survey newPublishedSurvey = publish(survey, -1, -1, deactivateAutoPublishing, userId, false, false);
- newPublishedSurvey.setVersion(publishedSurvey.getVersion()+1);
+ newPublishedSurvey.setVersion(publishedSurvey.getVersion() + 1);
newPublishedSurvey.setIsActive(publishedSurvey.getIsActive());
newPublishedSurvey.setNotified(publishedSurvey.getNotified());
newPublishedSurvey.setListFormValidated(false);
@@ -1273,377 +1256,329 @@ public int applyChanges(Survey survey, boolean deactivateAutoPublishing, int use
survey.setHasPendingChanges(false);
survey.setListFormValidated(false);
survey.setPublicationRequestedDate(new Date());
+
+ computeTrustScore(survey);
- //copy result filters
+ // copy result filters
List filters = sessionService.getAllResultFilter(publishedSurvey.getId());
- if (filters != null)
- {
- for (ResultFilter filter: filters)
- {
- //do not copy filters of exports
+ if (filters != null) {
+ for (ResultFilter filter : filters) {
+ // do not copy filters of exports
Export export = exportService.getExportByResultFilterID(filter.getId());
- if (export == null)
- {
+ if (export == null) {
ResultFilter newFilter = filter.copy();
-
- if (filter.getDefaultQuestions() == null || !filter.getDefaultQuestions())
- {
+
+ if (filter.getDefaultQuestions() == null || !filter.getDefaultQuestions()) {
Map uidsById = publishedSurvey.getUniqueIDsByID();
Map idsByUid = newPublishedSurvey.getIDsByUniqueID();
Set newids = new HashSet();
- for (String sid : filter.getVisibleQuestions())
- {
+ for (String sid : filter.getVisibleQuestions()) {
String uid = uidsById.get(sid);
- if (uid != null)
- {
+ if (uid != null) {
String id = idsByUid.get(uid);
- if (id != null)
- {
+ if (id != null) {
newids.add(id);
}
}
}
newFilter.setVisibleQuestions(newids);
-
+
newids = new HashSet();
- for (String sid : filter.getExportedQuestions())
- {
+ for (String sid : filter.getExportedQuestions()) {
String uid = uidsById.get(sid);
- if (uid != null)
- {
+ if (uid != null) {
String id = idsByUid.get(uid);
- if (id != null)
- {
+ if (id != null) {
newids.add(id);
}
}
}
newFilter.setExportedQuestions(newids);
}
-
+
newFilter.setSurveyId(newPublishedSurvey.getId());
- if (filter.getUserId() != null)
- {
+ if (filter.getUserId() != null) {
sessionService.internalSetLastResultFilter(newFilter, filter.getUserId(), newFilter.getSurveyId());
}
}
}
}
-
+
update(survey, true);
-
- if (sendListFormMail)
- {
+
+ if (sendListFormMail) {
sendListFormMail(survey);
}
-
- if (survey.getIsOPC())
- {
+
+ if (survey.getIsOPC()) {
sendOPCApplyChangesMail(survey, userId);
}
-
+
fileService.deleteOldSurveyPDFs(publishedSurvey.getUniqueId(), publishedSurvey.getId());
answerService.deleteStatisticsForSurvey(publishedSurvey.getId());
-
+
reportingService.addToDo(ToDo.CHANGEDSURVEY, survey.getUniqueId(), null);
-
+
return newPublishedSurvey.getId();
}
-
+
@Transactional
- public void makeDirty(int id)
- {
+ public void makeDirty(int id) {
Session session = sessionFactory.getCurrentSession();
Survey survey = (Survey) session.get(Survey.class, id);
session.setReadOnly(survey, false);
survey.setHasPendingChanges(true);
session.update(survey);
}
-
+
@Transactional(readOnly = false)
- public void makeClean(int id)
- {
+ public void makeClean(int id) {
Session session = sessionFactory.getCurrentSession();
-
+
Query query = session.createQuery("UPDATE Survey s SET s.hasPendingChanges = false WHERE s.id = :id");
query.setInteger("id", id);
query.executeUpdate();
}
-
+
@Transactional(readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
- public Survey editSave(Survey oldsurvey, HttpServletRequest request) throws Exception
- {
+ public Survey editSave(Survey oldsurvey, HttpServletRequest request) throws Exception {
Session session = sessionFactory.getCurrentSession();
-
+
Map referencedFiles = oldsurvey.getReferencedFileUIDs(contextpath);
- Map fileIDsByUID = new HashMap<>();
-
- //File and dependent elements are recreated during parsing
- for (Element element : oldsurvey.getElements())
- {
- if (element instanceof Download)
- {
- Download download = (Download)element;
-
- for (File file : download.getFiles())
- {
+ Map fileIDsByUID = new HashMap<>();
+
+ // File and dependent elements are recreated during parsing
+ for (Element element : oldsurvey.getElements()) {
+ if (element instanceof Download) {
+ Download download = (Download) element;
+
+ for (File file : download.getFiles()) {
fileIDsByUID.put(file.getUid(), file.getId());
}
-
+
download.getFiles().clear();
- } else if (element instanceof Confirmation)
- {
- Confirmation confirmation = (Confirmation)element;
-
- for (File file : confirmation.getFiles())
- {
+ } else if (element instanceof Confirmation) {
+ Confirmation confirmation = (Confirmation) element;
+
+ for (File file : confirmation.getFiles()) {
fileIDsByUID.put(file.getUid(), file.getId());
}
-
+
confirmation.getFiles().clear();
- } else if (element instanceof GalleryQuestion)
- {
- GalleryQuestion gallery = (GalleryQuestion)element;
-
- for (File file : gallery.getFiles())
- {
+ } else if (element instanceof GalleryQuestion) {
+ GalleryQuestion gallery = (GalleryQuestion) element;
+
+ for (File file : gallery.getFiles()) {
fileIDsByUID.put(file.getUid(), file.getId());
}
-
+
gallery.getFiles().clear();
}
- }
-
- oldsurvey = (Survey)session.merge(oldsurvey);
+ }
+
+ oldsurvey = (Survey) session.merge(oldsurvey);
session.update(oldsurvey);
-
+
Survey survey = SurveyHelper.parseSurvey(request, this, true, fileService, servletContext, activityService.isEnabled(217), activityService.isEnabled(220), fileIDsByUID);
-
+
Map pendingChanges = surveyService.getPendingChanges(survey);
-
+
update(survey, pendingChanges.size() > 0, true, false, sessionService.getCurrentUser(request).getId());
-
+
Map referencedFilesNew = survey.getReferencedFileUIDs(contextpath);
-
- for (String fileuid : referencedFiles.keySet())
- {
- if (!referencedFilesNew.containsKey(fileuid))
- {
+
+ for (String fileuid : referencedFiles.keySet()) {
+ if (!referencedFilesNew.containsKey(fileuid)) {
fileService.delete(referencedFiles.get(fileuid));
fileService.deleteIfNotReferenced(fileuid, survey.getUniqueId());
}
}
-
+
activityService.log(survey.getActivitiesToLog(), sessionService.getCurrentUser(request).getId(), survey.getUniqueId());
-
+
survey = getSurvey(survey.getId(), false, false);
-
+
return survey;
}
-
+
@Transactional(readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
public Survey update(Survey survey, boolean hasPendingChanges, boolean synchronizeTranslations, boolean mergeFirst, int userId) {
Session session = sessionFactory.getCurrentSession();
survey.setHasPendingChanges(hasPendingChanges);
survey.setUpdated(new Date());
-
- if (survey.getRegistrationForm())
- {
+
+ if (survey.getRegistrationForm()) {
boolean[] result = checkRegistrationFormElements(survey);
- if (!result[0] || !result[1])
- {
+ if (!result[0] || !result[1]) {
survey.setRegistrationForm(false);
}
- }
-
- if (mergeFirst)
- {
+ }
+
+ if (mergeFirst) {
Survey existing = (Survey) session.get(Survey.class, survey.getId());
session.evict(existing);
survey = (Survey) session.merge(survey);
session.setReadOnly(survey, false);
}
session.update(survey);
-
+
session.flush();
-
+
UpdatePossibleAnswers(survey);
session.update(survey);
-
+
session.flush();
-
- if (synchronizeTranslations) synchronizeTranslation(survey, userId);
-
+
+ if (synchronizeTranslations)
+ synchronizeTranslation(survey, userId);
+
if (survey.getTranslations() != null)
- for (String lang : survey.getTranslations()) {
- try
- {
- java.io.File target = fileService.getSurveyPDFFile(survey.getUniqueId(), survey.getId(), lang);
- if (target.exists()) target.delete();
- } catch (Exception e)
- {
- logger.error(e.getLocalizedMessage(), e);
- }
- }
-
+ for (String lang : survey.getTranslations()) {
+ try {
+ java.io.File target = fileService.getSurveyPDFFile(survey.getUniqueId(), survey.getId(), lang);
+ if (target.exists())
+ target.delete();
+ } catch (Exception e) {
+ logger.error(e.getLocalizedMessage(), e);
+ }
+ }
+
return survey;
}
-
- public boolean[] checkRegistrationFormElements(Survey survey)
- {
+
+ public boolean[] checkRegistrationFormElements(Survey survey) {
boolean[] result = new boolean[2];
result[0] = false;
result[1] = false;
-
- //check if name and email questions exist
- for (Element element: survey.getElements())
- {
- if (element instanceof Question)
- {
- Question question = (Question)element;
-
- if (question.getIsAttribute() && !question.getOptional())
- {
- if (question.getAttributeName().equalsIgnoreCase("name")) result[0] = true;
- if (question.getAttributeName().equalsIgnoreCase("email")) result[1] = true;
- if (result[0] && result[1]) break;
- }
+
+ // check if name and email questions exist
+ for (Element element : survey.getElements()) {
+ if (element instanceof Question) {
+ Question question = (Question) element;
+
+ if (question.getIsAttribute() && !question.getOptional()) {
+ if (question.getAttributeName().equalsIgnoreCase("name"))
+ result[0] = true;
+ if (question.getAttributeName().equalsIgnoreCase("email"))
+ result[1] = true;
+ if (result[0] && result[1])
+ break;
+ }
}
}
-
+
return result;
}
-
+
@Transactional
public Survey update(Survey survey, boolean evict) {
Session session = sessionFactory.getCurrentSession();
- if (evict)
- {
+ if (evict) {
session.evict(survey);
- survey = (Survey)session.merge(survey);
+ survey = (Survey) session.merge(survey);
}
session.update(survey);
return survey;
}
-
+
private void synchronizeTranslation(Survey survey, int userId) {
- Map oldInfo = null;
+ Map oldInfo = null;
Translations translations = TranslationsHelper.getTranslations(survey, false);
- if (translations != null)
- {
+ if (translations != null) {
Translations originalTranslations = translationService.getTranslations(survey.getId(), survey.getLanguage().getCode());
- if (originalTranslations != null)
- {
+ if (originalTranslations != null) {
oldInfo = originalTranslations.getInfo();
- Map originalTranslationsMap = originalTranslations.getTranslationsByKey();
- Map newTranslationsMap = translations.getTranslationsByKey();
+ Map originalTranslationsMap = originalTranslations.getTranslationsByKey();
+ Map newTranslationsMap = translations.getTranslationsByKey();
boolean structureChanges = false;
- for (Translation translation: translations.getTranslations())
- {
- if (!originalTranslationsMap.containsKey(translation.getKey()))
- {
- if (!translation.getKey().endsWith("help") && !translation.getKey().endsWith("UNIT") && !translation.getKey().endsWith("TABTITLE"))
- {
+ for (Translation translation : translations.getTranslations()) {
+ if (!originalTranslationsMap.containsKey(translation.getKey())) {
+ if (!translation.getKey().endsWith("help") && !translation.getKey().endsWith("UNIT") && !translation.getKey().endsWith("TABTITLE")) {
structureChanges = true;
break;
}
}
}
-
+
List deletedElements = new ArrayList<>();
- for (Translation translation: originalTranslations.getTranslations())
- {
- if (!newTranslationsMap.containsKey(translation.getKey()))
- {
- if (!translation.getKey().endsWith("help") && !translation.getKey().endsWith("UNIT") && !translation.getKey().endsWith("TABTITLE"))
- {
- if (!deletedElements.contains(translation.getKey()))
- {
+ for (Translation translation : originalTranslations.getTranslations()) {
+ if (!newTranslationsMap.containsKey(translation.getKey())) {
+ if (!translation.getKey().endsWith("help") && !translation.getKey().endsWith("UNIT") && !translation.getKey().endsWith("TABTITLE")) {
+ if (!deletedElements.contains(translation.getKey())) {
deletedElements.add(translation.getKey());
}
}
}
}
-
+
List allTranslations = translationService.getTranslationsForSurvey(survey.getId(), false);
-
- if (structureChanges)
- {
- //invalidate all other translations
- for (Translations invalidTranslations: allTranslations)
- {
- if (invalidTranslations.getActive() && !invalidTranslations.getLanguage().getCode().equalsIgnoreCase(survey.getLanguage().getCode()))
- {
+
+ if (structureChanges) {
+ // invalidate all other translations
+ for (Translations invalidTranslations : allTranslations) {
+ if (invalidTranslations.getActive() && !invalidTranslations.getLanguage().getCode().equalsIgnoreCase(survey.getLanguage().getCode())) {
invalidTranslations.setActive(false);
translationService.save(invalidTranslations);
}
}
}
-
- for (Translations existingTranslations: allTranslations)
- {
+
+ for (Translations existingTranslations : allTranslations) {
boolean changed = false;
- for (String key: deletedElements)
- {
- if (!existingTranslations.getLanguage().getCode().equalsIgnoreCase(survey.getLanguage().getCode()))
- {
+ for (String key : deletedElements) {
+ if (!existingTranslations.getLanguage().getCode().equalsIgnoreCase(survey.getLanguage().getCode())) {
changed = changed || existingTranslations.removeTranslationByKey(key);
}
}
- if (changed)
- {
+ if (changed) {
translationService.save(existingTranslations);
}
}
}
-
+
translationService.deleteTranslations(survey.getId(), survey.getLanguage().getCode());
translations.setComplete(TranslationsHelper.isComplete(translations, survey));
translationService.save(translations);
-
+
activityService.logTranslations(227, translations.getLanguage().getCode(), oldInfo, translations.getInfo(), userId, survey.getUniqueId());
}
}
- private void deleteSurveyData(int id, boolean deleteAnswers, boolean deleteAccesses, String uid, boolean deleteLogs)
- {
+ private void deleteSurveyData(int id, boolean deleteAnswers, boolean deleteAccesses, String uid, boolean deleteLogs) {
Session session = sessionFactory.getCurrentSession();
-
- if (deleteAnswers)
- {
- Query query0 = session.createSQLQuery("SELECT fi.FILE_UID from FILES fi JOIN ANSWERS_FILES f ON fi.FILE_ID = f.files_FILE_ID JOIN ANSWERS a ON f.ANSWERS_ANSWER_ID = a.ANSWER_ID JOIN ANSWERS_SET an ON a.AS_ID = an.ANSWER_SET_ID WHERE an.SURVEY_ID = :id");
+
+ if (deleteAnswers) {
+ Query query0 = session.createSQLQuery(
+ "SELECT fi.FILE_UID from FILES fi JOIN ANSWERS_FILES f ON fi.FILE_ID = f.files_FILE_ID JOIN ANSWERS a ON f.ANSWERS_ANSWER_ID = a.ANSWER_ID JOIN ANSWERS_SET an ON a.AS_ID = an.ANSWER_SET_ID WHERE an.SURVEY_ID = :id");
@SuppressWarnings("unchecked")
- List fileuids = query0.setInteger("id", id).list();
-
+ List fileuids = query0.setInteger("id", id).list();
+
Query query = session.createSQLQuery("DELETE d.* from DRAFTS d INNER JOIN ANSWERS_SET an ON d.answerSet_ANSWER_SET_ID = an.ANSWER_SET_ID where an.SURVEY_ID = :id");
query.setInteger("id", id).executeUpdate();
-
- Query query1 = session.createSQLQuery("DELETE f.* from ANSWERS_FILES f JOIN ANSWERS a ON f.ANSWERS_ANSWER_ID = a.ANSWER_ID JOIN ANSWERS_SET an ON a.AS_ID = an.ANSWER_SET_ID WHERE an.SURVEY_ID = :id");
+
+ Query query1 = session
+ .createSQLQuery("DELETE f.* from ANSWERS_FILES f JOIN ANSWERS a ON f.ANSWERS_ANSWER_ID = a.ANSWER_ID JOIN ANSWERS_SET an ON a.AS_ID = an.ANSWER_SET_ID WHERE an.SURVEY_ID = :id");
query1.setInteger("id", id).executeUpdate();
-
+
Query query2 = session.createSQLQuery("DELETE a.* from ANSWERS a JOIN ANSWERS_SET an ON a.AS_ID = an.ANSWER_SET_ID WHERE an.SURVEY_ID = :id");
query2.setInteger("id", id).executeUpdate();
-
+
Query query3 = session.createQuery("DELETE from AnswerSet a where a.surveyId = :id");
- query3.setInteger("id", id).executeUpdate();
-
- for (String fileuid : fileuids)
- {
- java.io.File file = fileService.getSurveyFile(uid, fileuid);
- if (file.exists())
- {
+ query3.setInteger("id", id).executeUpdate();
+
+ for (String fileuid : fileuids) {
+ java.io.File file = fileService.getSurveyFile(uid, fileuid);
+ if (file.exists()) {
file.delete();
}
}
-
+
Query query4 = session.createSQLQuery("SELECT v.VALIDCODE_CODE FROM VALIDCODE v WHERE v.VALIDCODE_SURVEYUID = :uid");
@SuppressWarnings("unchecked")
- List codes = query4.setString("uid", uid).list();
- for (String code: codes)
- {
+ List codes = query4.setString("uid", uid).list();
+ for (String code : codes) {
java.io.File folder = fileService.getSurveyFile(uid, code);
- if (folder.exists() && folder.isDirectory())
- {
+ if (folder.exists() && folder.isDirectory()) {
try {
FileUtils.deleteDirectory(folder);
} catch (IOException e) {
@@ -1651,93 +1586,85 @@ private void deleteSurveyData(int id, boolean deleteAnswers, boolean deleteAcces
}
}
}
-
+
Query query5 = session.createSQLQuery("DELETE FROM VALIDCODE WHERE VALIDCODE_SURVEYUID = :uid");
query5.setString("uid", uid).executeUpdate();
}
-
+
List translations = translationService.getTranslationsForSurvey(id, false);
- for (Translations translation: translations)
- {
+ for (Translations translation : translations) {
if (translation.getId() > 0)
- session.delete(translation);
- }
-
- if (deleteAccesses)
- {
+ session.delete(translation);
+ }
+
+ if (deleteAccesses) {
List accesses = getAccesses(id);
- for (Access access: accesses)
- {
+ for (Access access : accesses) {
if (access.getId() > 0)
- session.delete(access);
+ session.delete(access);
}
}
-
+
exportService.deleteSurveyExports(id);
-
- if (deleteLogs)
- {
+
+ if (deleteLogs) {
activityService.deleteLogsForSurvey(uid);
}
-
+
List groups = participationService.getAll(id);
- for (ParticipationGroup group : groups)
- {
+ for (ParticipationGroup group : groups) {
Query query6 = session.createSQLQuery("DELETE FROM INVITATIONS WHERE PARTICIPATIONGROUP_ID = :id");
query6.setInteger("id", group.getId()).executeUpdate();
-
+
session.delete(group);
}
-
- //remove dependencies (this is only needed for older surveys that have zombie dependencies
+
+ // remove dependencies (this is only needed for older surveys that have zombie
+ // dependencies
SQLQuery query = session.createSQLQuery("DELETE FROM POSSIBLEANSWER_ELEMENT where dependentElements_ID in (SELECT elements_ID from SURVEYS_ELEMENTS WHERE SURVEYS_SURVEY_ID = :id)");
query.setInteger("id", id);
query.executeUpdate();
}
-
+
@Transactional
public void delete(int id, boolean deleteLogs, boolean deleteFileMappings) throws Exception {
deleteNoTransaction(id, deleteLogs, deleteFileMappings);
}
-
+
public void deleteNoTransaction(int id, boolean deleteLogs, boolean deleteFileMappings) throws Exception {
Session session = sessionFactory.getCurrentSession();
- Survey s = this.getSurvey(id, false, false);
-
+ Survey s = this.getSurvey(id, false, false);
+
List surveyIDs = surveyService.getAllSurveyVersions(s.getShortname(), s.getUniqueId());
fileService.deleteFilesForSurveys(surveyIDs);
-
- if (contextpath == null || contextpath.trim().length() == 0)
- {
+
+ if (contextpath == null || contextpath.trim().length() == 0) {
throw new Exception("contextpath empty");
}
-
+
if (deleteFileMappings)
{
deleteFileMappings(surveyIDs);
}
- //delete draft
- Map referencedFiles = s.getReferencedFileUIDs(contextpath);
+ // delete draft
+ Map referencedFiles = s.getReferencedFileUIDs(contextpath);
deleteSurveyData(id, true, true, s.getUniqueId(), deleteLogs);
session.flush();
session.delete(s);
session.flush();
-
- for (String uid : referencedFiles.keySet())
- {
- if (referencedFiles.get(uid) == null)
- {
- //delete files belonging to images and background documents
+
+ for (String uid : referencedFiles.keySet()) {
+ if (referencedFiles.get(uid) == null) {
+ // delete files belonging to images and background documents
fileService.deleteIfNotReferenced(uid, s.getUniqueId());
- }
- }
-
- //delete published versions
+ }
+ }
+
+ // delete published versions
Survey published = getSurveyByUniqueId(s.getUniqueId(), false, false);
- if (published != null)
- {
+ if (published != null) {
surveyIDs = this.getAllSurveyVersions(published.getId());
for (Integer sid : surveyIDs) {
s = this.getSurvey(sid, false, false);
@@ -1746,27 +1673,25 @@ public void deleteNoTransaction(int id, boolean deleteLogs, boolean deleteFileMa
session.flush();
session.delete(s);
session.flush();
- for (String uid : referencedFiles.keySet())
- {
- if (referencedFiles.get(uid) == null)
- {
- //delete files belonging to images and background documents
+ for (String uid : referencedFiles.keySet()) {
+ if (referencedFiles.get(uid) == null) {
+ // delete files belonging to images and background documents
fileService.deleteIfNotReferenced(uid, s.getUniqueId());
}
}
}
}
-
+
java.io.File folder = fileService.getSurveyFolder(s.getUniqueId());
try {
FileUtils.deleteDirectory(folder);
} catch (Exception e) {
logger.error(e.getLocalizedMessage(), e);
- }
-
+ }
+
reportingService.addToDo(ToDo.DELETEDSURVEY, s.getUniqueId(), null);
}
-
+
private void deleteFileMappings(List surveyIDs) {
Session session = sessionFactory.getCurrentSession();
String sql = "delete from ELEMENTS_FILES" +
@@ -1787,49 +1712,43 @@ private void deleteFileMappings(List surveyIDs) {
}
@Transactional(readOnly = true)
- public List getLanguages()
- {
+ public List getLanguages() {
Session session = sessionFactory.getCurrentSession();
- Query query = session.createQuery("FROM Language l order by l.englishName asc");
+ Query query = session.createQuery("FROM Language l order by l.englishName asc");
@SuppressWarnings("unchecked")
List languages = query.list();
return languages;
}
-
+
@Transactional(readOnly = true)
- public Language getLanguage(String code)
- {
+ public Language getLanguage(String code) {
return getLanguage(code, sessionFactory.getCurrentSession());
}
-
- public Language getLanguage(String code, Session session)
- {
+
+ public Language getLanguage(String code, Session session) {
Query query = session.createQuery("FROM Language l WHERE l.code = :code").setString("code", code);
-
+
@SuppressWarnings("rawtypes")
List result = query.list();
-
- if (result.size() == 0)
- {
+
+ if (result.size() == 0) {
logger.error("ivalid language code: " + code);
}
-
+
return (Language) result.get(0);
}
@Transactional
public void saveLanguages(List langs) {
Session session = sessionFactory.getCurrentSession();
- for (Language l : langs)
- {
+ for (Language l : langs) {
try {
- session.save(l);
- } catch (Exception e)
- {
+ session.save(l);
+ } catch (Exception e) {
logger.error("language " + l.getEnglishName() + " could not be imported");
}
}
-
+
}
public boolean getIsSurveyPublished(String shortname) {
@@ -1840,54 +1759,45 @@ public boolean getIsSurveyPublished(String shortname) {
@Transactional(readOnly = true)
public List getLanguageCodes() {
Session session = sessionFactory.getCurrentSession();
- Query query = session.createQuery("Select l.code FROM Language l");
+ Query query = session.createQuery("Select l.code FROM Language l");
@SuppressWarnings("unchecked")
List codes = query.list();
return codes;
}
-
+
@Transactional
- private Map importDraftSurvey(Survey copy, ImportResult result, User user)
- {
- if (copy.getSkin() != null)
- {
+ private Map importDraftSurvey(Survey copy, ImportResult result, User user) {
+ if (copy.getSkin() != null) {
Skin skin = skinService.get(copy.getSkin().getId());
- if (skin == null)
- {
+ if (skin == null) {
copy.setSkin(null);
}
}
-
+
Map oldToNewUniqueIds = new HashMap<>();
- oldToNewUniqueIds.put("", ""); //leave blank for old surveys that have no uniqueIds
-
- //recreate unique ids
- for (Element elem: copy.getElementsRecursive(true))
- {
+ oldToNewUniqueIds.put("", ""); // leave blank for old surveys that have no uniqueIds
+
+ // recreate unique ids
+ for (Element elem : copy.getElementsRecursive(true)) {
String newUniqueId = UUID.randomUUID().toString();
- if (!oldToNewUniqueIds.containsKey(elem.getUniqueId()))
- {
+ if (!oldToNewUniqueIds.containsKey(elem.getUniqueId())) {
oldToNewUniqueIds.put(elem.getUniqueId(), newUniqueId);
}
elem.setUniqueId(newUniqueId);
}
-
+
Map elementsBySourceId = copy.getElementsBySourceId();
- if (result.isFromIPM())
- {
- //recreate dependencies
- for (int elem: result.getOriginalDependencies().keySet())
- {
+ if (result.isFromIPM()) {
+ // recreate dependencies
+ for (int elem : result.getOriginalDependencies().keySet()) {
PossibleAnswer answer = (PossibleAnswer) elementsBySourceId.get(elem);
-
- for (String originalId: result.getOriginalDependencies().get(elem))
- {
+
+ for (String originalId : result.getOriginalDependencies().get(elem)) {
Element dependent = elementsBySourceId.get(result.getOriginalIdsToNewIds().get(originalId));
answer.getDependentElements().getDependentElements().add(dependent);
-
- if (result.getAdditionalElements().containsKey(dependent.getSourceId()))
- {
+
+ if (result.getAdditionalElements().containsKey(dependent.getSourceId())) {
List ids = result.getAdditionalElements().get(dependent.getSourceId());
for (Integer id : ids) {
Element upload = elementsBySourceId.get(id);
@@ -1896,86 +1806,76 @@ private Map importDraftSurvey(Survey copy, ImportResult result,
}
}
}
-
- for (String elems: result.getOriginalMatrixDependencies().keySet())
- {
+
+ for (String elems : result.getOriginalMatrixDependencies().keySet()) {
String[] data = elems.split("#");
int answerpos = Integer.parseInt(data[1]);
String questionoriginal = data[0];
int question = elementsBySourceId.get(result.getOriginalIdsToNewIds().get(questionoriginal)).getId();
String matrix = data[2];
-
+
Matrix m = (Matrix) elementsBySourceId.get(result.getOriginalIdsToNewIds().get(matrix));
-
- for (String originalId: result.getOriginalMatrixDependencies().get(elems))
- {
+
+ for (String originalId : result.getOriginalMatrixDependencies().get(elems)) {
Element dependent = elementsBySourceId.get(result.getOriginalIdsToNewIds().get(originalId));
-
+
DependencyItem dep = new DependencyItem();
-
+
int k = 0;
- for (Element q : m.getQuestions())
- {
- if (q.getId() == question)
- {
+ for (Element q : m.getQuestions()) {
+ if (q.getId() == question) {
k += answerpos;
break;
}
-
- k+= m.getAnswers().size();
+
+ k += m.getAnswers().size();
}
-
+
dep.setPosition(k);
dep.getDependentElements().add(dependent);
-
- if (result.getAdditionalElements().containsKey(dependent.getSourceId()))
- {
+
+ if (result.getAdditionalElements().containsKey(dependent.getSourceId())) {
List ids = result.getAdditionalElements().get(dependent.getSourceId());
for (Integer id : ids) {
Element upload = elementsBySourceId.get(id);
dep.getDependentElements().add(upload);
}
}
-
+
m.getDependentElements().add(dep);
}
}
}
-
- if (result.getActiveSurvey() != null)
- {
+
+ if (result.getActiveSurvey() != null) {
copy.setIsActive(false);
copy.setIsPublished(true);
}
-
+
this.update(copy, false, true, false, user.getId());
-
+
return oldToNewUniqueIds;
}
-
+
@Transactional
- private Survey importOldPublishedSurvey(Survey survey, User user, Map oldToNewUniqueIds) throws Exception
- {
- HashMap oldSourceIdsById2 = getSourceIdsById(survey);
-
+ private Survey importOldPublishedSurvey(Survey survey, User user, Map oldToNewUniqueIds) throws Exception {
+ HashMap oldSourceIdsById2 = getSourceIdsById(survey);
+
Survey copyOld = survey.copy(this, user, fileDir, false, -1, -1, false, false, true, null, null);
copyOld.setIsDraft(false);
-
- if (copyOld.getSkin() != null)
- {
+
+ if (copyOld.getSkin() != null) {
Skin skin = skinService.get(copyOld.getSkin().getId());
- if (skin == null)
- {
+ if (skin == null) {
copyOld.setSkin(null);
}
}
-
- //update source_ids
+
+ // update source_ids
for (Element element : copyOld.getElementsRecursive(true)) {
element.setSourceId(oldSourceIdsById2.get(element.getSourceId()));
-
- if (oldToNewUniqueIds.containsKey(element.getUniqueId()))
- {
+
+ if (oldToNewUniqueIds.containsKey(element.getUniqueId())) {
element.setUniqueId(oldToNewUniqueIds.get(element.getUniqueId()));
} else {
String newUniqueId = UUID.randomUUID().toString();
@@ -1983,31 +1883,27 @@ private Survey importOldPublishedSurvey(Survey survey, User user, Map oldToNewUniqueIds, HashMap oldSourceIdsById)
- {
+ private void importPublishedSurvey(Survey copyActive, ImportResult result, User user, Map oldToNewUniqueIds, HashMap oldSourceIdsById) {
copyActive.setIsDraft(false);
-
- if (copyActive.getSkin() != null)
- {
+
+ if (copyActive.getSkin() != null) {
Skin skin = skinService.get(copyActive.getSkin().getId());
- if (skin == null)
- {
+ if (skin == null) {
copyActive.setSkin(null);
}
}
-
- //update source_ids
+
+ // update source_ids
for (Element element : copyActive.getElementsRecursive(true)) {
element.setSourceId(oldSourceIdsById.get(element.getSourceId()));
-
- if (oldToNewUniqueIds.containsKey(element.getUniqueId()))
- {
+
+ if (oldToNewUniqueIds.containsKey(element.getUniqueId())) {
element.setUniqueId(oldToNewUniqueIds.get(element.getUniqueId()));
} else {
String newUniqueId = UUID.randomUUID().toString();
@@ -2015,16 +1911,15 @@ private void importPublishedSurvey(Survey copyActive, ImportResult result, User
element.setUniqueId(newUniqueId);
}
}
-
- if (result.getActiveAnswerSets() != null && result.getActiveAnswerSets().size() > 0)
- {
+
+ if (result.getActiveAnswerSets() != null && result.getActiveAnswerSets().size() > 0) {
copyActive.setIsActive(true);
copyActive.setIsPublished(true);
}
-
- this.update(copyActive, false, true, false, user.getId());
+
+ this.update(copyActive, false, true, false, user.getId());
}
-
+
@Transactional
public int importSurvey(ImportResult result, User user, boolean isRestore) throws Exception {
Survey copy = result.getSurvey().copy(this, user, fileDir, false, -1, -1, false, false, true, null, null);
@@ -2032,12 +1927,11 @@ public int importSurvey(ImportResult result, User user, boolean isRestore) throw
try {
Map missingfiles = new HashMap<>();
Map convertedUIDs = surveyService.copyFiles(copy, new HashMap<>(), true, missingfiles, result.getSurvey().getUniqueId());
-
+
Map oldToNewUniqueIds = importDraftSurvey(copy, result, user);
importSurveyData(result, user, true, copy, oldToNewUniqueIds, result.getSurvey().getId());
-
- if (result.getActiveSurvey() != null && result.getActiveAnswerSets() != null && result.getActiveAnswerSets().size() > 0)
- {
+
+ if (result.getActiveSurvey() != null && result.getActiveAnswerSets() != null && result.getActiveAnswerSets().size() > 0) {
HashMap oldSourceIdsById = getSourceIdsById(result.getActiveSurvey());
for (int id : result.getOldSurveys().keySet()) {
Survey copyOld = importOldPublishedSurvey(result.getOldSurveys().get(id), user, oldToNewUniqueIds);
@@ -2045,38 +1939,35 @@ public int importSurvey(ImportResult result, User user, boolean isRestore) throw
}
copyActive = result.getActiveSurvey().copy(this, user, fileDir, false, -1, -1, false, false, true, null, null);
surveyService.copyFiles(copyActive, convertedUIDs, true, missingfiles, result.getSurvey().getUniqueId());
-
- importPublishedSurvey(copyActive, result, user, oldToNewUniqueIds, oldSourceIdsById);
+
+ importPublishedSurvey(copyActive, result, user, oldToNewUniqueIds, oldSourceIdsById);
importSurveyData(result, user, false, copyActive, oldToNewUniqueIds, result.getActiveSurvey().getId());
}
-
- for (String fileuid : convertedUIDs.keySet())
- {
+
+ for (String fileuid : convertedUIDs.keySet()) {
fileService.deleteIfNotReferenced(fileuid, copy.getUniqueId());
}
-
- if (missingfiles.size() > 0)
- {
+
+ if (missingfiles.size() > 0) {
Locale locale = new Locale(user.getLanguage().toLowerCase());
-
+
StringBuilder text = new StringBuilder();
String link = "" + copy.getShortname() + "";
- text.append(resources.getMessage("error.ProblemDuringRestore", new Object[] {link}, "Error during operation", locale));
-
+ text.append(resources.getMessage("error.ProblemDuringRestore", new Object[] { link }, "Error during operation", locale));
+
text.append("| File Name | Type |
|---|
");
-
- for (String name : missingfiles.keySet())
- {
+
+ for (String name : missingfiles.keySet()) {
text.append("| ");
text.append(name);
text.append(" | ");
text.append(missingfiles.get(name));
text.append(" |
");
}
-
+
text.append("
");
text.append(resources.getMessage("error.ProblemDuringRestore2", null, "Error during operation", locale));
-
+
Message m = new Message();
m.setType(4);
m.setCriticality(3);
@@ -2084,37 +1975,32 @@ public int importSurvey(ImportResult result, User user, boolean isRestore) throw
m.setUserId(user.getId());
systemService.save(m);
}
-
- } catch (Exception e)
- {
- if (isRestore && copy.getId() > 0)
- {
- //mark survey as archived so it is not visible
+
+ } catch (Exception e) {
+ if (isRestore && copy.getId() > 0) {
+ // mark survey as archived so it is not visible
copy.setArchived(true);
surveyService.update(copy, true);
}
-
- if (e instanceof ConstraintViolationException && copy != null && copy.getId() > 0)
- {
+
+ if (e instanceof ConstraintViolationException && copy != null && copy.getId() > 0) {
logger.error(e.getLocalizedMessage(), e);
throw new SurveyException(copy.getId());
} else {
- throw e;
+ throw e;
}
}
-
- return copy.getId();
+
+ return copy.getId();
}
-
- private void importSurveyData(ImportResult result, User user, boolean draft, Survey survey, Map oldToNewUniqueIds, Integer surveyid) throws Exception
- {
+
+ private void importSurveyData(ImportResult result, User user, boolean draft, Survey survey, Map oldToNewUniqueIds, Integer surveyid) throws Exception {
List translations = null;
List answerSets = new ArrayList<>();
- Map> files = null;
-
- if (draft)
- {
- translations = result.getTranslations();
+ Map> files = null;
+
+ if (draft) {
+ translations = result.getTranslations();
answerSets = result.getAnswerSets();
files = result.getFiles();
} else {
@@ -2123,138 +2009,117 @@ private void importSurveyData(ImportResult result, User user, boolean draft, Sur
} else {
translations = result.getOldTranslations().get(surveyid);
}
-
+
if (result.getActiveAnswerSets() != null)
- for (List list : result.getActiveAnswerSets()) {
- for (AnswerSet as : list) {
- if (as.getSurveyId() == surveyid) {
- answerSets.add(as);
+ for (List list : result.getActiveAnswerSets()) {
+ for (AnswerSet as : list) {
+ if (as.getSurveyId() == surveyid) {
+ answerSets.add(as);
+ }
}
}
- }
files = result.getActiveFiles();
}
-
- if (translations != null)
- {
- copyTranslations(translations, survey, oldToNewUniqueIds, result, false);
+
+ if (translations != null) {
+ copyTranslations(translations, survey, oldToNewUniqueIds, result, false);
}
-
- if (answerSets != null && answerSets.size() > 0)
- {
+
+ if (answerSets != null && answerSets.size() > 0) {
logger.info("starting import of answers");
-
+
Map keys = new HashMap<>();
- for (Element element: survey.getElementsRecursive())
- {
+ for (Element element : survey.getElementsRecursive()) {
keys.put(element.getSourceId().toString(), element.getId());
- if (element instanceof ChoiceQuestion)
- {
- for (PossibleAnswer answer: ((ChoiceQuestion)element).getPossibleAnswers())
- {
- if (answer.getSourceId() != null)
- {
+ if (element instanceof ChoiceQuestion) {
+ for (PossibleAnswer answer : ((ChoiceQuestion) element).getPossibleAnswers()) {
+ if (answer.getSourceId() != null) {
keys.put(answer.getSourceId().toString(), answer.getId());
}
}
}
}
-
+
Set answerSets2 = new HashSet<>();
-
- while (answerSets.size() > 0)
- {
- AnswerSet a = answerSets.remove(0);
+
+ while (answerSets.size() > 0) {
+ AnswerSet a = answerSets.remove(0);
AnswerSet b = a.copy(survey, files);
-
- for (Answer an: b.getAnswers())
- {
- if (keys.containsKey(an.getQuestionId().toString()))
- {
+
+ for (Answer an : b.getAnswers()) {
+ if (keys.containsKey(an.getQuestionId().toString())) {
an.setQuestionId(keys.get(an.getQuestionId().toString()));
}
-
+
an.setQuestionUniqueId(oldToNewUniqueIds.get(an.getQuestionUniqueId()));
-
- if (an.getPossibleAnswerId() > 0)
- {
- if (keys.containsKey(an.getPossibleAnswerId().toString()))
- {
+
+ if (an.getPossibleAnswerId() > 0) {
+ if (keys.containsKey(an.getPossibleAnswerId().toString())) {
an.setValue(keys.get(an.getPossibleAnswerId().toString()).toString());
an.setPossibleAnswerId(keys.get(an.getPossibleAnswerId().toString()));
}
-
+
an.setPossibleAnswerUniqueId(oldToNewUniqueIds.get(an.getPossibleAnswerUniqueId()));
}
}
-
- answerSets2.add(b);
-
- if (answerSets2.size() > 1000)
- {
+
+ answerSets2.add(b);
+
+ if (answerSets2.size() > 1000) {
logger.info("1000 answers imported");
SaveAnswerSets(answerSets2, tempFileDir, null);
answerSets2 = new HashSet<>();
- }
+ }
}
-
+
SaveAnswerSets(answerSets2, tempFileDir, null);
logger.info("finished import of answers");
- }
+ }
}
-
+
@Transactional
- public void SaveAnswerSets(Set answerSets, String fileDir, String draftid) throws Exception
- {
+ public void SaveAnswerSets(Set answerSets, String fileDir, String draftid) throws Exception {
Session session = sessionFactory.getCurrentSession();
- for (AnswerSet answerSet: answerSets)
- {
+ for (AnswerSet answerSet : answerSets) {
saveAnswerSet(answerSet, fileDir, draftid);
session.evict(answerSet);
}
}
-
+
public void saveAnswerSet(AnswerSet answerSet, String fileDir, String draftid) throws Exception {
boolean saved = false;
-
+
int counter = 1;
-
- while(!saved)
- {
+
+ while (!saved) {
try {
answerService.internalSaveAnswerSet(answerSet, fileDir, draftid, false, false);
saved = true;
- } catch (org.hibernate.exception.LockAcquisitionException ex)
- {
+ } catch (org.hibernate.exception.LockAcquisitionException ex) {
logger.info("lock on answerSet table catched; retry counter: " + counter);
counter++;
-
- if (counter > 60)
- {
+
+ if (counter > 60) {
logger.error(ex.getLocalizedMessage(), ex);
throw ex;
}
-
+
Thread.sleep(1000);
}
- }
+ }
}
-
- public void copyTranslations(List translations, Survey survey, Map oldToNewUniqueIds, ImportResult result, boolean newTitle)
- {
- Map elementsBySourceId = survey.getElementsBySourceId();
-
- for (Translations tOriginal: translations)
- {
+
+ public void copyTranslations(List translations, Survey survey, Map oldToNewUniqueIds, ImportResult result, boolean newTitle) {
+ Map elementsBySourceId = survey.getElementsBySourceId();
+
+ for (Translations tOriginal : translations) {
Translations t = new Translations();
t.setActive(tOriginal.getActive());
t.setLanguage(tOriginal.getLanguage());
- if (newTitle)
- {
- if (survey.getLanguage().getCode().equals(tOriginal.getLanguage().getCode()))
- {
+ if (newTitle) {
+ if (survey.getLanguage().getCode().equals(tOriginal.getLanguage().getCode())) {
t.setTitle(survey.getTitle());
} else {
t.setTitle("");
@@ -2264,23 +2129,17 @@ public void copyTranslations(List translations, Survey survey, Map
}
t.setSurveyId(survey.getId());
t.setSurveyUid(survey.getUniqueId());
- for (Translation trOriginal: tOriginal.getTranslations())
- {
- if (trOriginal.getLabel() != null)
- {
+ for (Translation trOriginal : tOriginal.getTranslations()) {
+ if (trOriginal.getLabel() != null) {
Translation tr = new Translation();
tr.setSurveyId(survey.getId());
-
- if (result == null || !result.isFromIPM())
- {
+
+ if (result == null || !result.isFromIPM()) {
tr.setKey(translateKey(trOriginal.getKey(), elementsBySourceId, oldToNewUniqueIds));
} else {
- if (trOriginal.getKey().equalsIgnoreCase(Survey.IPMINTRODUCTION))
- {
- for (com.ec.survey.model.survey.Element element: survey.getElements())
- {
- if (element instanceof Section && element.getPosition() == 0 && element.getShortname().equalsIgnoreCase("Introduction"))
- {
+ if (trOriginal.getKey().equalsIgnoreCase(Survey.IPMINTRODUCTION)) {
+ for (com.ec.survey.model.survey.Element element : survey.getElements()) {
+ if (element instanceof Section && element.getPosition() == 0 && element.getShortname().equalsIgnoreCase("Introduction")) {
Translation tr2 = new Translation();
tr2.setSurveyId(survey.getId());
tr2.setKey(element.getId().toString());
@@ -2288,22 +2147,19 @@ public void copyTranslations(List translations, Survey survey, Map
tr2.setLanguage(trOriginal.getLanguage());
tr2.setTranslations(t);
t.getTranslations().add(tr2);
- } else if (element instanceof Text && element.getShortname() != null && element.getShortname().equalsIgnoreCase("introduction") && element.getPosition() < 2)
- {
+ } else if (element instanceof Text && element.getShortname() != null && element.getShortname().equalsIgnoreCase("introduction") && element.getPosition() < 2) {
tr.setKey(element.getUniqueId());
break;
}
}
} else {
-
+
tr.setKey(translateIPMKey(trOriginal.getKey(), elementsBySourceId, oldToNewUniqueIds, result));
-
+
if (trOriginal.getKey().endsWith("desc") && trOriginal.getKey().length() > 4) {
-
- for (com.ec.survey.model.survey.Element element: survey.getElements())
- {
- if (element instanceof Text && element.getShortname() != null && element.getShortname().equals(trOriginal.getKey()))
- {
+
+ for (com.ec.survey.model.survey.Element element : survey.getElements()) {
+ if (element instanceof Text && element.getShortname() != null && element.getShortname().equals(trOriginal.getKey())) {
tr.setKey(element.getUniqueId());
break;
}
@@ -2311,181 +2167,175 @@ public void copyTranslations(List translations, Survey survey, Map
}
}
}
-
- if (newTitle && trOriginal.getKey().equalsIgnoreCase("TITLE"))
- {
- if (trOriginal.getLanguage().equalsIgnoreCase(survey.getLanguage().getCode()))
- {
+
+ if (newTitle && trOriginal.getKey().equalsIgnoreCase("TITLE")) {
+ if (trOriginal.getLanguage().equalsIgnoreCase(survey.getLanguage().getCode())) {
tr.setLabel(survey.getTitle());
}
- } else {
+ } else {
tr.setLabel(trOriginal.getLabel());
}
-
+
tr.setLanguage(trOriginal.getLanguage());
tr.setTranslations(t);
t.getTranslations().add(tr);
}
}
-
- if (result != null && result.isFromIPM())
- {
-
- for (List ids : result.getAdditionalElements().values())
- for (Integer id : ids) {
- Element upload = elementsBySourceId.get(id);
-
- if (upload instanceof Upload)
- {
- Translation tr = new Translation();
- tr.setSurveyId(survey.getId());
- tr.setKey(elementsBySourceId.get(id).getId().toString());
- tr.setLabel("");
- tr.setLanguage(tOriginal.getLanguage().getCode());
- t.getTranslations().add(tr);
+
+ if (result != null && result.isFromIPM()) {
+
+ for (List ids : result.getAdditionalElements().values())
+ for (Integer id : ids) {
+ Element upload = elementsBySourceId.get(id);
+
+ if (upload instanceof Upload) {
+ Translation tr = new Translation();
+ tr.setSurveyId(survey.getId());
+ tr.setKey(elementsBySourceId.get(id).getId().toString());
+ tr.setLabel("");
+ tr.setLanguage(tOriginal.getLanguage().getCode());
+ t.getTranslations().add(tr);
+ }
}
- }
}
-
+
translationService.deleteTranslations(survey.getId(), t.getLanguage().getCode());
translationService.add(t, true);
}
}
private String translateKey(String key, Map elementsBySourceId, Map oldToNewUniqueIds) {
-
- if (key == null) return key;
-
- if (key.equalsIgnoreCase(Survey.TITLE)) return key;
- if (key.equalsIgnoreCase(Survey.INTRODUCTION)) return key;
- if (key.equalsIgnoreCase(Survey.ESCAPEPAGE)) return key;
- if (key.equalsIgnoreCase(Survey.ESCAPELINK)) return key;
- if (key.equalsIgnoreCase(Survey.CONFIRMATIONPAGE)) return key;
- if (key.equalsIgnoreCase(Survey.CONFIRMATIONLINK)) return key;
-
+
+ if (key == null)
+ return key;
+
+ if (key.equalsIgnoreCase(Survey.TITLE))
+ return key;
+ if (key.equalsIgnoreCase(Survey.INTRODUCTION))
+ return key;
+ if (key.equalsIgnoreCase(Survey.ESCAPEPAGE))
+ return key;
+ if (key.equalsIgnoreCase(Survey.ESCAPELINK))
+ return key;
+ if (key.equalsIgnoreCase(Survey.CONFIRMATIONPAGE))
+ return key;
+ if (key.equalsIgnoreCase(Survey.CONFIRMATIONLINK))
+ return key;
+
Integer retVal;
String uid;
- try {
- if (key.endsWith("help"))
- {
+ try {
+ if (key.endsWith("help")) {
uid = key.substring(0, key.indexOf("help"));
-
- if (oldToNewUniqueIds.containsKey(uid))
- {
+
+ if (oldToNewUniqueIds.containsKey(uid)) {
return oldToNewUniqueIds.get(uid) + "help";
- }
- retVal = Integer.parseInt(uid);
- if (elementsBySourceId.containsKey(retVal)) return elementsBySourceId.get(retVal).getUniqueId() + "help";
- } else if (key.endsWith(NumberQuestion.UNIT))
- {
+ }
+ retVal = Integer.parseInt(uid);
+ if (elementsBySourceId.containsKey(retVal))
+ return elementsBySourceId.get(retVal).getUniqueId() + "help";
+ } else if (key.endsWith(NumberQuestion.UNIT)) {
uid = key.substring(0, key.indexOf(NumberQuestion.UNIT));
- if (oldToNewUniqueIds.containsKey(uid))
- {
+ if (oldToNewUniqueIds.containsKey(uid)) {
return oldToNewUniqueIds.get(uid) + NumberQuestion.UNIT;
}
-
- retVal = Integer.parseInt(uid);
- if (elementsBySourceId.containsKey(retVal)) return elementsBySourceId.get(retVal).getUniqueId() + NumberQuestion.UNIT;
- } else if (key.endsWith(Confirmation.LABEL))
- {
+
+ retVal = Integer.parseInt(uid);
+ if (elementsBySourceId.containsKey(retVal))
+ return elementsBySourceId.get(retVal).getUniqueId() + NumberQuestion.UNIT;
+ } else if (key.endsWith(Confirmation.LABEL)) {
uid = key.substring(0, key.indexOf(Confirmation.LABEL));
- if (oldToNewUniqueIds.containsKey(uid))
- {
+ if (oldToNewUniqueIds.containsKey(uid)) {
return oldToNewUniqueIds.get(uid) + Confirmation.LABEL;
}
-
- retVal = Integer.parseInt(uid);
- if (elementsBySourceId.containsKey(retVal)) return elementsBySourceId.get(retVal).getUniqueId() + Confirmation.LABEL;
- } else if (key.endsWith(Confirmation.TEXT))
- {
+
+ retVal = Integer.parseInt(uid);
+ if (elementsBySourceId.containsKey(retVal))
+ return elementsBySourceId.get(retVal).getUniqueId() + Confirmation.LABEL;
+ } else if (key.endsWith(Confirmation.TEXT)) {
uid = key.substring(0, key.indexOf(Confirmation.TEXT));
- if (oldToNewUniqueIds.containsKey(uid))
- {
+ if (oldToNewUniqueIds.containsKey(uid)) {
return oldToNewUniqueIds.get(uid) + Confirmation.TEXT;
}
-
- retVal = Integer.parseInt(uid);
- if (elementsBySourceId.containsKey(retVal)) return elementsBySourceId.get(retVal).getUniqueId() + Confirmation.TEXT;
- } else if (key.endsWith(Section.TABTITLE))
- {
+
+ retVal = Integer.parseInt(uid);
+ if (elementsBySourceId.containsKey(retVal))
+ return elementsBySourceId.get(retVal).getUniqueId() + Confirmation.TEXT;
+ } else if (key.endsWith(Section.TABTITLE)) {
uid = key.substring(0, key.indexOf(Section.TABTITLE));
- if (oldToNewUniqueIds.containsKey(uid))
- {
+ if (oldToNewUniqueIds.containsKey(uid)) {
return oldToNewUniqueIds.get(uid) + Section.TABTITLE;
}
-
- retVal = Integer.parseInt(uid);
- if (elementsBySourceId.containsKey(retVal)) return elementsBySourceId.get(retVal).getUniqueId() + Section.TABTITLE;
- } else if (key.endsWith("shortname"))
- {
+
+ retVal = Integer.parseInt(uid);
+ if (elementsBySourceId.containsKey(retVal))
+ return elementsBySourceId.get(retVal).getUniqueId() + Section.TABTITLE;
+ } else if (key.endsWith("shortname")) {
uid = key.substring(0, key.indexOf("shortname"));
- if (oldToNewUniqueIds.containsKey(uid))
- {
+ if (oldToNewUniqueIds.containsKey(uid)) {
return oldToNewUniqueIds.get(uid) + "shortname";
}
-
- retVal = Integer.parseInt(uid);
-
- if (elementsBySourceId.containsKey(retVal)) return elementsBySourceId.get(retVal).getUniqueId() + "shortname";
- } else if (oldToNewUniqueIds.containsKey(key))
- {
+
+ retVal = Integer.parseInt(uid);
+
+ if (elementsBySourceId.containsKey(retVal))
+ return elementsBySourceId.get(retVal).getUniqueId() + "shortname";
+ } else if (oldToNewUniqueIds.containsKey(key)) {
return oldToNewUniqueIds.get(key);
- } else {
- retVal = Integer.parseInt(key);
- if (elementsBySourceId.containsKey(retVal)) return elementsBySourceId.get(retVal).getUniqueId();
+ } else {
+ retVal = Integer.parseInt(key);
+ if (elementsBySourceId.containsKey(retVal))
+ return elementsBySourceId.get(retVal).getUniqueId();
}
} catch (NumberFormatException nfe) {
logger.info("unknown key " + key + "found in translation");
}
-
+
return key;
}
-
+
private String translateIPMKey(String key, Map elementsBySourceId, Map oldToNewUniqueIds, ImportResult result) {
- if (key.equalsIgnoreCase(Survey.TITLE)) return key;
- if (key.equalsIgnoreCase(Survey.INTRODUCTION)) return key;
- if (key.equalsIgnoreCase(Survey.ESCAPEPAGE)) return key;
- if (key.equalsIgnoreCase(Survey.CONFIRMATIONPAGE)) return key;
-
+ if (key.equalsIgnoreCase(Survey.TITLE))
+ return key;
+ if (key.equalsIgnoreCase(Survey.INTRODUCTION))
+ return key;
+ if (key.equalsIgnoreCase(Survey.ESCAPEPAGE))
+ return key;
+ if (key.equalsIgnoreCase(Survey.CONFIRMATIONPAGE))
+ return key;
+
String key2 = key;
-
+
try {
- if (key.endsWith("help"))
- {
+ if (key.endsWith("help")) {
String id = key.substring(0, key.indexOf("help"));
- if (result.getOriginalIdsToNewIds().containsKey(id))
- {
+ if (result.getOriginalIdsToNewIds().containsKey(id)) {
key2 = result.getOriginalIdsToNewIds().get(id).toString() + "help";
}
- } else if (key.endsWith(NumberQuestion.UNIT))
- {
+ } else if (key.endsWith(NumberQuestion.UNIT)) {
String id = key.substring(0, key.indexOf(NumberQuestion.UNIT));
- if (result.getOriginalIdsToNewIds().containsKey(id))
- {
+ if (result.getOriginalIdsToNewIds().containsKey(id)) {
key2 = result.getOriginalIdsToNewIds().get(id).toString() + NumberQuestion.UNIT;
}
- } else if (key.endsWith(Section.TABTITLE))
- {
+ } else if (key.endsWith(Section.TABTITLE)) {
String id = key.substring(0, key.indexOf(Section.TABTITLE));
- if (result.getOriginalIdsToNewIds().containsKey(id))
- {
+ if (result.getOriginalIdsToNewIds().containsKey(id)) {
key2 = result.getOriginalIdsToNewIds().get(id).toString() + Section.TABTITLE;
}
- } else {
- if (result.getOriginalIdsToNewIds().containsKey(key))
- {
+ } else {
+ if (result.getOriginalIdsToNewIds().containsKey(key)) {
key2 = result.getOriginalIdsToNewIds().get(key).toString();
}
}
} catch (Exception e) {
- logger.info("unknown key " + key + "found in translation");
+ logger.info("unknown key " + key + "found in translation");
}
-
+
return translateKey(key2, elementsBySourceId, oldToNewUniqueIds);
}
@@ -2514,45 +2364,47 @@ public void deleteAccess(Access access) {
Session session = sessionFactory.getCurrentSession();
session.delete(access);
}
-
+
@Transactional(readOnly = true)
public Access getAccess(Integer id, Integer userId) {
Session session = sessionFactory.getCurrentSession();
Query query = session.createQuery("FROM Access a WHERE a.survey.id = :id AND a.user.id = :userId").setInteger("id", id).setInteger("userId", userId);
@SuppressWarnings("unchecked")
List result = query.list();
- if (result.size() > 0) return result.get(0);
+ if (result.size() > 0)
+ return result.get(0);
return null;
}
-
+
@Transactional(readOnly = true)
public Access getGroupAccess(Integer id, String groupName) {
Session session = sessionFactory.getCurrentSession();
Query query = session.createQuery("FROM Access a WHERE a.survey.id = :id AND a.department = :groupName").setInteger("id", id).setString("groupName", groupName);
@SuppressWarnings("unchecked")
List result = query.list();
- if (result.size() > 0) return result.get(0);
+ if (result.size() > 0)
+ return result.get(0);
return null;
}
-
+
@Transactional
public void save(Template template) {
Session session = sessionFactory.getCurrentSession();
session.saveOrUpdate(template);
}
-
+
@Transactional(readOnly = true)
public Template getTemplate(int id) {
Session session = sessionFactory.getCurrentSession();
return (Template) session.get(Template.class, id);
}
-
+
@Transactional
public void deleteTemplate(Template template) {
Session session = sessionFactory.getCurrentSession();
session.delete(template);
}
-
+
@SuppressWarnings("unchecked")
@Transactional(readOnly = true)
public List getTemplates(Integer ownerId) {
@@ -2571,218 +2423,212 @@ public void save(Language objLang) {
@SuppressWarnings("unchecked")
public List getSurveysToStart() {
Session session = sessionFactory.getCurrentSession();
- Query query = session.createQuery("FROM Survey s WHERE s.isDraft = true AND s.start <= :start AND s.end > :start AND s.automaticPublishing = true AND s.isActive = false").setTimestamp("start", new Date());
+ Query query = session.createQuery("FROM Survey s WHERE s.isDraft = true AND s.start <= :start AND s.end > :start AND s.automaticPublishing = true AND s.isActive = false").setTimestamp("start",
+ new Date());
return query.list();
}
-
+
@Transactional(readOnly = true)
@SuppressWarnings("unchecked")
public List getSurveysToStop() {
Session session = sessionFactory.getCurrentSession();
- Query query = session.createQuery("FROM Survey s WHERE s.isDraft = true AND s.end <= :end AND s.automaticPublishing = true AND s.isPublished = true AND s.isActive = true").setTimestamp("end", new Date());
+ Query query = session.createQuery("FROM Survey s WHERE s.isDraft = true AND s.end <= :end AND s.automaticPublishing = true AND s.isPublished = true AND s.isActive = true").setTimestamp("end",
+ new Date());
return query.list();
}
-
+
@Transactional(readOnly = true)
public List getSurveysToNotify() {
Session session = sessionFactory.getCurrentSession();
- Query query = session.createQuery("FROM Survey s WHERE s.isDraft = true AND s.notified = false AND s.automaticPublishing = true AND s.end != null AND s.notificationValue != null AND s.notificationUnit != null AND s.isActive = true");
+ Query query = session.createQuery(
+ "FROM Survey s WHERE s.isDraft = true AND s.notified = false AND s.automaticPublishing = true AND s.end != null AND s.notificationValue != null AND s.notificationUnit != null AND s.isActive = true");
@SuppressWarnings("unchecked")
List surveys = query.list();
List result = new ArrayList<>();
-
+
Calendar today = Calendar.getInstance();
today.setTime(new Date());
-
+
for (Survey survey : surveys) {
Calendar cal = Calendar.getInstance();
cal.setTime(survey.getEnd());
-
+
int val = 0;
-
- try {
+
+ try {
val = -1 * Integer.parseInt(survey.getNotificationValue());
-
- if (survey.getNotificationUnit().equalsIgnoreCase("0"))
- {
- cal.add(Calendar.HOUR_OF_DAY, val);
- } else if (survey.getNotificationUnit().equalsIgnoreCase("1"))
- {
- cal.add(Calendar.DAY_OF_MONTH, val);
- } else if (survey.getNotificationUnit().equalsIgnoreCase("2"))
- {
- cal.add(Calendar.WEEK_OF_YEAR, val);
- } else if (survey.getNotificationUnit().equalsIgnoreCase("3"))
- {
- cal.add(Calendar.MONTH, val);
- }
-
- } catch (NumberFormatException e)
- {
+
+ if (survey.getNotificationUnit().equalsIgnoreCase("0")) {
+ cal.add(Calendar.HOUR_OF_DAY, val);
+ } else if (survey.getNotificationUnit().equalsIgnoreCase("1")) {
+ cal.add(Calendar.DAY_OF_MONTH, val);
+ } else if (survey.getNotificationUnit().equalsIgnoreCase("2")) {
+ cal.add(Calendar.WEEK_OF_YEAR, val);
+ } else if (survey.getNotificationUnit().equalsIgnoreCase("3")) {
+ cal.add(Calendar.MONTH, val);
+ }
+
+ } catch (NumberFormatException e) {
logger.error("invalid notification value found for survey " + survey.getId());
}
-
- //check if it is time to notify
- if (today.after(cal))
- {
- result.add(survey);
- }
+
+ // check if it is time to notify
+ if (today.after(cal)) {
+ result.add(survey);
}
-
+ }
+
return result;
}
@Transactional(readOnly = true)
public Map getPendingChanges(Survey draft) {
Map result = new HashMap<>();
-
+
Survey published = getSurvey(draft.getShortname(), false, false, false, false, draft.getLanguage().getCode(), true, true);
-
- if (draft != null && published != null)
- {
+
+ if (draft != null && published != null) {
Map publishedElements = published.getElementsByUniqueId();
- for (Element element: draft.getElements())
- {
- if (!publishedElements.containsKey(element.getUniqueId()))
- {
- //these are new elements
+ for (Element element : draft.getElements()) {
+ if (!publishedElements.containsKey(element.getUniqueId())) {
+ // these are new elements
result.put(element, 0);
} else {
Element publishedElement = publishedElements.get(element.getUniqueId());
- if (publishedElement.differsFrom(element))
- {
+ if (publishedElement.differsFrom(element)) {
result.put(element, 1);
}
}
}
-
- //deleted elements
+
+ // deleted elements
Map draftElements = draft.getElementsByUniqueId();
- for (Element element: published.getElements())
- {
- if (!draftElements.containsKey(element.getUniqueId()))
- {
- //these are deleted elements
+ for (Element element : published.getElements()) {
+ if (!draftElements.containsKey(element.getUniqueId())) {
+ // these are deleted elements
result.put(element, 2);
}
}
}
-
+
boolean hasPendingChanges = false;
-
- if (draft != null && published != null)
- {
- if (draft.getContact() != null && !draft.getContact().equals(published.getContact())) hasPendingChanges = true;
- if (draft.getMultiPaging() != published.getMultiPaging()) hasPendingChanges = true;
- if (draft.getValidatedPerPage() != published.getValidatedPerPage()) hasPendingChanges = true;
- if (!Objects.equals(draft.getWcagCompliance(), published.getWcagCompliance())) hasPendingChanges = true;
- if (!Tools.isFileEqual(draft.getLogo(),published.getLogo())) hasPendingChanges = true;
- if (!draft.getLogoInInfo().equals(published.getLogoInInfo())) hasPendingChanges = true;
- if (!Tools.isEqual(draft.getSkin(),published.getSkin())) hasPendingChanges = true;
- if (draft.getSectionNumbering() != published.getSectionNumbering()) hasPendingChanges = true;
- if (draft.getQuestionNumbering() != published.getQuestionNumbering()) hasPendingChanges = true;
- if (!Tools.isEqual(draft.getConfirmationPage(),published.getConfirmationPage())) hasPendingChanges = true;
- if (!Tools.isEqual(draft.getConfirmationPageLink(),published.getConfirmationPageLink())) hasPendingChanges = true;
- if (!Tools.isEqual(draft.getConfirmationLink(),published.getConfirmationLink())) hasPendingChanges = true;
-
- if (!Tools.isEqual(draft.getIsQuiz(),published.getIsQuiz())) hasPendingChanges = true;
- if (!Tools.isEqualIgnoreEmptyString(draft.getQuizWelcomeMessage(),published.getQuizWelcomeMessage())) hasPendingChanges = true;
- if (!Tools.isEqualIgnoreEmptyString(draft.getQuizResultsMessage(),published.getQuizResultsMessage())) hasPendingChanges = true;
-
- if (!Tools.isEqual(draft.getShowTotalScore(),published.getShowTotalScore())) hasPendingChanges = true;
- if (!Tools.isEqual(draft.getScoresByQuestion(),published.getScoresByQuestion())) hasPendingChanges = true;
-
- if (!Tools.isEqual(draft.getShowQuizIcons(),published.getShowQuizIcons())) hasPendingChanges = true;
-
+
+ if (draft != null && published != null) {
+ if (draft.getContact() != null && !draft.getContact().equals(published.getContact()))
+ hasPendingChanges = true;
+ if (draft.getMultiPaging() != published.getMultiPaging())
+ hasPendingChanges = true;
+ if (draft.getValidatedPerPage() != published.getValidatedPerPage())
+ hasPendingChanges = true;
+ if (!Objects.equals(draft.getWcagCompliance(), published.getWcagCompliance()))
+ hasPendingChanges = true;
+ if (!Tools.isFileEqual(draft.getLogo(), published.getLogo()))
+ hasPendingChanges = true;
+ if (!draft.getLogoInInfo().equals(published.getLogoInInfo()))
+ hasPendingChanges = true;
+ if (!Tools.isEqual(draft.getSkin(), published.getSkin()))
+ hasPendingChanges = true;
+ if (draft.getSectionNumbering() != published.getSectionNumbering())
+ hasPendingChanges = true;
+ if (draft.getQuestionNumbering() != published.getQuestionNumbering())
+ hasPendingChanges = true;
+ if (!Tools.isEqual(draft.getConfirmationPage(), published.getConfirmationPage()))
+ hasPendingChanges = true;
+ if (!Tools.isEqual(draft.getConfirmationPageLink(), published.getConfirmationPageLink()))
+ hasPendingChanges = true;
+ if (!Tools.isEqual(draft.getConfirmationLink(), published.getConfirmationLink()))
+ hasPendingChanges = true;
+
+ if (!Tools.isEqual(draft.getIsQuiz(), published.getIsQuiz()))
+ hasPendingChanges = true;
+ if (!Tools.isEqualIgnoreEmptyString(draft.getQuizWelcomeMessage(), published.getQuizWelcomeMessage()))
+ hasPendingChanges = true;
+ if (!Tools.isEqualIgnoreEmptyString(draft.getQuizResultsMessage(), published.getQuizResultsMessage()))
+ hasPendingChanges = true;
+
+ if (!Tools.isEqual(draft.getShowTotalScore(), published.getShowTotalScore()))
+ hasPendingChanges = true;
+ if (!Tools.isEqual(draft.getScoresByQuestion(), published.getScoresByQuestion()))
+ hasPendingChanges = true;
+
+ if (!Tools.isEqual(draft.getShowQuizIcons(), published.getShowQuizIcons()))
+ hasPendingChanges = true;
+
if (!hasPendingChanges)
- for (String key : draft.getUsefulLinks().keySet())
- {
- if (!published.getUsefulLinks().containsKey(key) || !published.getUsefulLinks().get(key).equals(draft.getUsefulLinks().get(key)))
- {
- hasPendingChanges = true;
- break;
+ for (String key : draft.getUsefulLinks().keySet()) {
+ if (!published.getUsefulLinks().containsKey(key) || !published.getUsefulLinks().get(key).equals(draft.getUsefulLinks().get(key))) {
+ hasPendingChanges = true;
+ break;
+ }
}
- }
-
+
if (!hasPendingChanges)
- for (String key : published.getUsefulLinks().keySet())
- {
- if (!draft.getUsefulLinks().containsKey(key) || !draft.getUsefulLinks().get(key).equals(published.getUsefulLinks().get(key)))
- {
- hasPendingChanges = true;
- break;
+ for (String key : published.getUsefulLinks().keySet()) {
+ if (!draft.getUsefulLinks().containsKey(key) || !draft.getUsefulLinks().get(key).equals(published.getUsefulLinks().get(key))) {
+ hasPendingChanges = true;
+ break;
+ }
}
- }
-
+
if (!hasPendingChanges)
- for (String key : draft.getBackgroundDocuments().keySet())
- {
- if (!published.getBackgroundDocuments().containsKey(key) || !published.getBackgroundDocuments().get(key).equals(draft.getBackgroundDocuments().get(key)))
- {
- hasPendingChanges = true;
- break;
+ for (String key : draft.getBackgroundDocuments().keySet()) {
+ if (!published.getBackgroundDocuments().containsKey(key) || !published.getBackgroundDocuments().get(key).equals(draft.getBackgroundDocuments().get(key))) {
+ hasPendingChanges = true;
+ break;
+ }
}
- }
-
+
if (!hasPendingChanges)
- for (String key : published.getBackgroundDocuments().keySet())
- {
- if (!draft.getBackgroundDocuments().containsKey(key) || !draft.getBackgroundDocuments().get(key).equals(published.getBackgroundDocuments().get(key)))
- {
- hasPendingChanges = true;
- break;
+ for (String key : published.getBackgroundDocuments().keySet()) {
+ if (!draft.getBackgroundDocuments().containsKey(key) || !draft.getBackgroundDocuments().get(key).equals(published.getBackgroundDocuments().get(key))) {
+ hasPendingChanges = true;
+ break;
+ }
}
- }
-
- if (hasPendingChanges) result.put(new PropertiesElement(), 1);
-
- //check if the order of elements has changed
- if (!hasPendingChanges && !draft.getElementsRecursiveUids().equals(published.getElementsRecursiveUids()))
- {
+
+ if (hasPendingChanges)
+ result.put(new PropertiesElement(), 1);
+
+ // check if the order of elements has changed
+ if (!hasPendingChanges && !draft.getElementsRecursiveUids().equals(published.getElementsRecursiveUids())) {
hasPendingChanges = true;
- if (hasPendingChanges) result.put(new PropertiesElement(true), 1);
+ if (hasPendingChanges)
+ result.put(new PropertiesElement(true), 1);
}
-
+
boolean hasPendingTranslationChanges = false;
List draftTranslations = translationService.getActiveTranslationsForSurvey(draft.getId());
List publishedTranslations = translationService.getActiveTranslationsForSurvey(published.getId());
-
+
Translations currentTranslations = TranslationsHelper.getTranslations(draft, false);
Map currentKeys = currentTranslations.getTranslationsByKey();
-
+
// if (draftTranslations.size() != publishedTranslations.size()) {
// hasPendingTranslationChanges = true;
// } else {
Map publishedTranslationsByLanguageCode = new HashMap<>();
- for (Translations trans : publishedTranslations)
- {
+ for (Translations trans : publishedTranslations) {
publishedTranslationsByLanguageCode.put(trans.getLanguage().getCode(), trans);
}
-
- for (Translations trans : draftTranslations)
- {
- if (!publishedTranslationsByLanguageCode.containsKey(trans.getLanguage().getCode()))
- {
+
+ for (Translations trans : draftTranslations) {
+ if (!publishedTranslationsByLanguageCode.containsKey(trans.getLanguage().getCode())) {
hasPendingTranslationChanges = true;
break;
}
Translations pub = publishedTranslationsByLanguageCode.get(trans.getLanguage().getCode());
-
+
Map publishedTranslationsMap = pub.getTranslationsMap();
- for (Translation t : trans.getFilteredTranslations())
- {
- if (!publishedTranslationsMap.containsKey(t.getKey()) || !publishedTranslationsMap.get(t.getKey()).equals(t.getLabel()))
- {
- if (t.getLabel() != null && t.getLabel().trim().length() > 0)
- {
- if (currentKeys.containsKey(t.getKey()) && !t.getKey().startsWith("ESCAPE"))
- {
+ for (Translation t : trans.getFilteredTranslations()) {
+ if (!publishedTranslationsMap.containsKey(t.getKey()) || !publishedTranslationsMap.get(t.getKey()).equals(t.getLabel())) {
+ if (t.getLabel() != null && t.getLabel().trim().length() > 0) {
+ if (currentKeys.containsKey(t.getKey()) && !t.getKey().startsWith("ESCAPE")) {
hasPendingTranslationChanges = true;
break;
}
}
}
- }
+ }
Map draftTranslationsMap = trans.getTranslationsMap();
for (String key : publishedTranslationsMap.keySet())
@@ -2791,17 +2637,17 @@ public Map getPendingChanges(Survey draft) {
{
hasPendingTranslationChanges = true;
break;
- }
- }
-
+ }
+ }
+
}
// }
if (hasPendingTranslationChanges)
result.put(new TranslationsElement(), 1);
-
+
}
-
+
return result;
}
@@ -2809,29 +2655,25 @@ public Map getPendingChanges(Survey draft) {
public Map getLanguageNamesByCode() {
List languages = getLanguages();
Map result = new HashMap<>();
- for (Language language: languages)
- {
- if (!result.containsKey(language.getCode()))
- {
+ for (Language language : languages) {
+ if (!result.containsKey(language.getCode())) {
result.put(language.getCode(), language.getEnglishName());
}
}
return result;
}
-
+
@Transactional(readOnly = true)
- public int getDBVersion()
- {
+ public int getDBVersion() {
Session session = sessionFactory.getCurrentSession();
Query statusQuery = session.createQuery("FROM Status");
@SuppressWarnings("unchecked")
List states = statusQuery.setReadOnly(true).list();
-
- if (states.size() == 0)
- {
+
+ if (states.size() == 0) {
return 0;
}
-
+
Status status = states.get(0);
return status.getDbversion();
}
@@ -2843,23 +2685,22 @@ public String getFileDir() {
@Transactional
public void createStatus(int version) {
Session session = sessionFactory.getCurrentSession();
-
+
Query statusQuery = session.createQuery("FROM Status");
@SuppressWarnings("unchecked")
List states = statusQuery.setReadOnly(true).list();
-
- if (states.size() == 0)
- {
+
+ if (states.size() == 0) {
Status status = new Status();
status.setDbversion(version);
status.setUpdateDate(new Date());
- session.saveOrUpdate(status);
+ session.saveOrUpdate(status);
}
}
public void removeDependencies(Element element) {
Session session = sessionFactory.getCurrentSession();
-
+
Query query = session.createSQLQuery("DELETE FROM POSSIBLEANSWER_ELEMENT WHERE dependentElements_ID = :id").setInteger("id", element.getId());
query.executeUpdate();
}
@@ -2876,18 +2717,17 @@ public void update(Element element) {
session.saveOrUpdate(element);
}
-
@Transactional(readOnly = true)
- public boolean answerSetExists(String uniqueCode,boolean isDraft) {
+ public boolean answerSetExists(String uniqueCode, boolean isDraft) {
Session session = sessionFactory.getCurrentSession();
- String sql = "select ANSWER_SET_ID FROM ANSWERS_SET WHERE UNIQUECODE = :uid and ISDRAFT = :draft";
+ String sql = "select ANSWER_SET_ID FROM ANSWERS_SET WHERE UNIQUECODE = :uid and ISDRAFT = :draft";
SQLQuery query = session.createSQLQuery(sql);
query.setString("uid", uniqueCode);
query.setBoolean("draft", isDraft);
@SuppressWarnings("rawtypes")
List list = query.list();
- return list.size() > 0;
+ return list.size() > 0;
}
@Transactional(readOnly = true)
@@ -2895,15 +2735,15 @@ public Element getParentForChildQuestion(Integer id) {
Session session = sessionFactory.getCurrentSession();
Query query = session.createSQLQuery("SELECT childElements_ID FROM ELEMENTS WHERE ID = :id").setInteger("id", id);
int parentid = ConversionTools.getValue(query.uniqueResult());
-
- //questions could have been deleted from the parent -> get newest version of the parent
- if (parentid > 0)
- {
+
+ // questions could have been deleted from the parent -> get newest version of
+ // the parent
+ if (parentid > 0) {
query = session.createSQLQuery("SELECT MAX(ID) FROM ELEMENTS WHERE ELEM_UID IN (SELECT ELEM_UID FROM ELEMENTS WHERE ID = :id)").setInteger("id", parentid);
parentid = ConversionTools.getValue(query.uniqueResult());
}
-
- return parentid > 0 ? getElement(parentid) : null;
+
+ return parentid > 0 ? getElement(parentid) : null;
}
@Transactional(readOnly = true)
@@ -2911,269 +2751,229 @@ public Element getNewestElementByUid(String uid) {
Session session = sessionFactory.getCurrentSession();
Query query = session.createSQLQuery("SELECT MAX(ID) FROM ELEMENTS WHERE ELEM_UID = :uid").setString("uid", uid);
int elementid = ConversionTools.getValue(query.uniqueResult());
-
- if (elementid > 0)
- {
+
+ if (elementid > 0) {
return getElement(elementid);
}
-
- return null;
+
+ return null;
}
-
+
@SuppressWarnings("unchecked")
@Transactional(readOnly = true)
- private List