From 5e8c1582149fe6c7102000cc62a2b7b60ecf5048 Mon Sep 17 00:00:00 2001 From: anhefti Date: Wed, 5 Feb 2020 13:18:22 +0100 Subject: [PATCH] creation date for user, list actions, dates and times formatting --- .../ch/ethz/seb/sebserver/gbl/Constants.java | 2 +- .../seb/sebserver/gbl/api/EntityType.java | 2 +- .../ethz/seb/sebserver/gbl/model/Domain.java | 10 +-- .../sebserver/gbl/model/user/UserAccount.java | 4 + .../sebserver/gbl/model/user/UserInfo.java | 17 ++++ .../seb/sebserver/gbl/model/user/UserMod.java | 6 ++ .../content/ExamSebRestrictionSettings.java | 4 +- .../gui/content/InstitutionList.java | 36 +++++++- .../seb/sebserver/gui/content/LoginPage.java | 21 +++-- .../seb/sebserver/gui/content/MainPage.java | 1 + .../UserAccountChangePasswordForm.java | 3 +- .../gui/content/UserAccountForm.java | 9 ++ .../gui/content/UserAccountList.java | 2 +- .../gui/content/action/ActionDefinition.java | 12 +-- .../gui/content/action/ActionPane.java | 89 +++++++++++++++++-- .../gui/service/ResourceService.java | 4 +- .../gui/service/i18n/I18nSupport.java | 21 +++-- .../service/i18n/impl/I18nSupportImpl.java | 64 ++++--------- .../i18n/impl/PolyglotPageServiceImpl.java | 9 +- .../gui/service/page/PageService.java | 17 +++- .../page/event/ActionActivationEvent.java | 39 ++++++++ .../event/ActionActivationEventListener.java | 18 ++++ .../page/event/ActionPublishEvent.java | 4 +- .../page/impl/ComposerServiceImpl.java | 3 +- .../service/page/impl/DefaultPageLayout.java | 3 +- .../service/page/impl/PageContextImpl.java | 16 ++-- .../service/page/impl/PageServiceImpl.java | 4 +- .../seb/sebserver/gui/table/EntityTable.java | 20 ++++- .../seb/sebserver/gui/table/TableBuilder.java | 11 ++- .../sebserver/gui/widget/ColorSelection.java | 9 +- .../seb/sebserver/gui/widget/Message.java | 26 +++++- .../sebserver/gui/widget/WidgetFactory.java | 67 +++++++++++++- .../sebserver/webservice/WebserviceInfo.java | 5 ++ ...ionalAttributeRecordDynamicSqlSupport.java | 14 +-- .../AdditionalAttributeRecordMapper.java | 36 ++++---- ...ientConnectionRecordDynamicSqlSupport.java | 22 ++--- .../mapper/ClientConnectionRecordMapper.java | 36 ++++---- .../ClientEventRecordDynamicSqlSupport.java | 18 ++-- .../batis/mapper/ClientEventRecordMapper.java | 36 ++++---- ...entInstructionRecordDynamicSqlSupport.java | 14 +-- .../mapper/ClientInstructionRecordMapper.java | 36 ++++---- ...ationAttributeRecordDynamicSqlSupport.java | 20 ++--- .../ConfigurationAttributeRecordMapper.java | 36 ++++---- ...figurationNodeRecordDynamicSqlSupport.java | 20 ++--- .../mapper/ConfigurationNodeRecordMapper.java | 36 ++++---- .../ConfigurationRecordDynamicSqlSupport.java | 16 ++-- .../mapper/ConfigurationRecordMapper.java | 36 ++++---- ...igurationValueRecordDynamicSqlSupport.java | 16 ++-- .../ConfigurationValueRecordMapper.java | 36 ++++---- ...nfigurationMapRecordDynamicSqlSupport.java | 16 ++-- .../ExamConfigurationMapRecordMapper.java | 36 ++++---- .../mapper/ExamRecordDynamicSqlSupport.java | 32 +++---- .../batis/mapper/ExamRecordMapper.java | 36 ++++---- .../IndicatorRecordDynamicSqlSupport.java | 14 +-- .../batis/mapper/IndicatorRecordMapper.java | 36 ++++---- .../InstitutionRecordDynamicSqlSupport.java | 16 ++-- .../batis/mapper/InstitutionRecordMapper.java | 36 ++++---- .../LmsSetupRecordDynamicSqlSupport.java | 30 +++---- .../batis/mapper/LmsSetupRecordMapper.java | 36 ++++---- .../OrientationRecordDynamicSqlSupport.java | 24 ++--- .../batis/mapper/OrientationRecordMapper.java | 36 ++++---- .../mapper/RoleRecordDynamicSqlSupport.java | 10 +-- .../batis/mapper/RoleRecordMapper.java | 36 ++++---- ...ebClientConfigRecordDynamicSqlSupport.java | 20 ++--- .../mapper/SebClientConfigRecordMapper.java | 36 ++++---- .../ThresholdRecordDynamicSqlSupport.java | 12 +-- .../batis/mapper/ThresholdRecordMapper.java | 36 ++++---- ...serActivityLogRecordDynamicSqlSupport.java | 18 ++-- .../mapper/UserActivityLogRecordMapper.java | 36 ++++---- .../mapper/UserRecordDynamicSqlSupport.java | 32 ++++--- .../batis/mapper/UserRecordMapper.java | 52 ++++++----- .../mapper/ViewRecordDynamicSqlSupport.java | 14 +-- .../batis/mapper/ViewRecordMapper.java | 36 ++++---- ...viceServerInfoRecordDynamicSqlSupport.java | 10 +-- .../WebserviceServerInfoRecordMapper.java | 36 ++++---- .../model/AdditionalAttributeRecord.java | 28 +++--- .../batis/model/ClientConnectionRecord.java | 44 ++++----- .../batis/model/ClientEventRecord.java | 52 +++++------ .../batis/model/ClientInstructionRecord.java | 28 +++--- .../model/ConfigurationAttributeRecord.java | 40 ++++----- .../batis/model/ConfigurationNodeRecord.java | 40 ++++----- .../batis/model/ConfigurationRecord.java | 32 +++---- .../batis/model/ConfigurationValueRecord.java | 32 +++---- .../model/ExamConfigurationMapRecord.java | 32 +++---- .../datalayer/batis/model/ExamRecord.java | 64 ++++++------- .../batis/model/IndicatorRecord.java | 28 +++--- .../batis/model/InstitutionRecord.java | 32 +++---- .../datalayer/batis/model/LmsSetupRecord.java | 60 ++++++------- .../batis/model/OrientationRecord.java | 48 +++++----- .../datalayer/batis/model/RoleRecord.java | 20 ++--- .../batis/model/SebClientConfigRecord.java | 40 ++++----- .../batis/model/ThresholdRecord.java | 24 ++--- .../batis/model/UserActivityLogRecord.java | 36 ++++---- .../datalayer/batis/model/UserRecord.java | 67 ++++++++------ .../datalayer/batis/model/ViewRecord.java | 28 +++--- .../model/WebserviceServerInfoRecord.java | 20 ++--- .../authorization/impl/UserServiceImpl.java | 3 +- .../servicelayer/dao/impl/UserDAOImpl.java | 7 +- .../config/application-dev-gui.properties | 4 +- .../config/application-dev-ws.properties | 6 +- .../resources/config/application.properties | 31 ++++--- src/main/resources/data-demo.sql | 2 +- src/main/resources/data-prod.sql | 2 +- src/main/resources/messages.properties | 57 ++++++------ src/main/resources/schema-demo.sql | 1 + src/main/resources/schema-dev.sql | 1 + src/main/resources/schema-prod.sql | 3 +- .../gbl/model/user/UserInfoTest.java | 12 ++- .../integration/api/admin/UserAPITest.java | 8 +- .../AuthorizationServiceTest.java | 4 +- src/test/resources/data-test.sql | 14 +-- src/test/resources/schema-test.sql | 1 + 112 files changed, 1527 insertions(+), 1142 deletions(-) create mode 100644 src/main/java/ch/ethz/seb/sebserver/gui/service/page/event/ActionActivationEvent.java create mode 100644 src/main/java/ch/ethz/seb/sebserver/gui/service/page/event/ActionActivationEventListener.java diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/Constants.java b/src/main/java/ch/ethz/seb/sebserver/gbl/Constants.java index d7d5c99d..1aa46112 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/Constants.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/Constants.java @@ -71,7 +71,7 @@ public final class Constants { public static final String DEFAULT_DATE_TIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ss'Z'"; public static final String TIME_ZONE_OFFSET_TAIL_FORMAT = "|ZZ"; - public static final String DEFAULT_DIPLAY_DATE_TIME_FORMAT = "MM-dd-yyyy HH:mm:ss"; + //public static final String DEFAULT_DIPLAY_DATE_TIME_FORMAT = "MM-dd-yyyy HH:mm:ss"; public static final String DEFAULT_DISPLAY_DATE_FORMAT = "MM-dd-yyyy"; public static final String DEFAULT_TIME_FORMAT = "HH:mm:ss"; diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/api/EntityType.java b/src/main/java/ch/ethz/seb/sebserver/gbl/api/EntityType.java index 68829163..23a8ba55 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/api/EntityType.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/api/EntityType.java @@ -2,7 +2,7 @@ package ch.ethz.seb.sebserver.gbl.api; import javax.annotation.Generated; -@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2020-01-29T14:47:50.177+01:00") +@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2020-02-05T10:36:21.905+01:00") public enum EntityType { CONFIGURATION_ATTRIBUTE, CONFIGURATION_VALUE, diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/Domain.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/Domain.java index 6fc486b1..2509658f 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/Domain.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/Domain.java @@ -3,12 +3,9 @@ package ch.ethz.seb.sebserver.gbl.model; import javax.annotation.Generated; /** Defines the global names of the domain model and domain model fields. - * This shall be used as a static overall domain model names reference within SEB Server Web-Service as well as within - * the integrated GUI - * This file is generated by the org.eth.demo.sebserver.gen.DomainModelNameReferencePlugin and must not be edited - * manually. **/ -@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", - comments = "ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin", date = "2020-01-29T14:47:50.132+01:00") +* This shall be used as a static overall domain model names reference within SEB Server Web-Service as well as within the integrated GUI +* This file is generated by the org.eth.demo.sebserver.gen.DomainModelNameReferencePlugin and must not be edited manually.**/ +@Generated(value="org.mybatis.generator.api.MyBatisGenerator",comments="ch.ethz.seb.sebserver.gen.DomainModelNameReferencePlugin",date="2020-02-05T10:36:21.852+01:00") public interface Domain { interface CONFIGURATION_ATTRIBUTE { @@ -217,6 +214,7 @@ public interface Domain { String ATTR_ID = "id"; String ATTR_INSTITUTION_ID = "institutionId"; String ATTR_UUID = "uuid"; + String ATTR_CREATION_DATE = "creationDate"; String ATTR_NAME = "name"; String ATTR_SURNAME = "surname"; String ATTR_USERNAME = "username"; diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserAccount.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserAccount.java index f84c2496..87d41960 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserAccount.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserAccount.java @@ -12,6 +12,7 @@ import java.util.EnumSet; import java.util.Locale; import java.util.Set; +import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import ch.ethz.seb.sebserver.gbl.model.Activatable; @@ -29,6 +30,9 @@ public interface UserAccount extends GrantEntity, Activatable { @Override Long getInstitutionId(); + /** Get the date when the user account was created */ + DateTime getCreationDate(); + /** The first name of the User */ @Override String getName(); diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserInfo.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserInfo.java index 94ddd222..073287de 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserInfo.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserInfo.java @@ -23,6 +23,7 @@ import javax.validation.constraints.Size; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; +import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.springframework.util.CollectionUtils; @@ -63,6 +64,9 @@ public final class UserInfo implements UserAccount, Activatable, Serializable { @JsonProperty(USER.ATTR_INSTITUTION_ID) public final Long institutionId; + @JsonProperty(USER.ATTR_CREATION_DATE) + public final DateTime creationDate; + /** First name of the user */ @NotNull(message = "user:name:notNull") @Size(min = 3, max = 255, message = "user:name:size:{min}:{max}:${validatedValue}") @@ -110,6 +114,7 @@ public final class UserInfo implements UserAccount, Activatable, Serializable { public UserInfo( @JsonProperty(USER.ATTR_UUID) final String uuid, @JsonProperty(USER.ATTR_INSTITUTION_ID) final Long institutionId, + @JsonProperty(USER.ATTR_CREATION_DATE) final DateTime creationDate, @JsonProperty(USER.ATTR_NAME) final String name, @JsonProperty(USER.ATTR_SURNAME) final String surname, @JsonProperty(USER.ATTR_USERNAME) final String username, @@ -121,6 +126,7 @@ public final class UserInfo implements UserAccount, Activatable, Serializable { this.uuid = uuid; this.institutionId = institutionId; + this.creationDate = creationDate; this.name = name; this.surname = surname; this.username = username; @@ -145,6 +151,11 @@ public final class UserInfo implements UserAccount, Activatable, Serializable { return this.uuid; } + @Override + public DateTime getCreationDate() { + return this.creationDate; + } + @Override public Long getInstitutionId() { return this.institutionId; @@ -264,8 +275,12 @@ public final class UserInfo implements UserAccount, Activatable, Serializable { builder.append(this.uuid); builder.append(", institutionId="); builder.append(this.institutionId); + builder.append(", creationDate="); + builder.append(this.creationDate); builder.append(", name="); builder.append(this.name); + builder.append(", surname="); + builder.append(this.surname); builder.append(", username="); builder.append(this.username); builder.append(", email="); @@ -290,6 +305,7 @@ public final class UserInfo implements UserAccount, Activatable, Serializable { return new UserInfo( userInfo.getUuid(), userInfo.getInstitutionId(), + userInfo.creationDate, userInfo.getName(), userInfo.getUsername(), userInfo.getSurname(), @@ -324,6 +340,7 @@ public final class UserInfo implements UserAccount, Activatable, Serializable { return new UserInfo( userInfo.getUuid(), userInfo.getInstitutionId(), + userInfo.creationDate, (name != null) ? name : userInfo.getName(), (surname != null) ? surname : userInfo.getSurname(), (username != null) ? username : userInfo.getUsername(), diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserMod.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserMod.java index 92fbca5e..8d266ccd 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserMod.java +++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserMod.java @@ -22,6 +22,7 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import org.apache.commons.lang3.StringUtils; +import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import com.fasterxml.jackson.annotation.JsonCreator; @@ -151,6 +152,11 @@ public final class UserMod implements UserAccount { return this.institutionId; } + @Override + public DateTime getCreationDate() { + return null; + } + @Override public String getOwnerId() { return this.uuid; diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamSebRestrictionSettings.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamSebRestrictionSettings.java index 2539daa6..47d18675 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamSebRestrictionSettings.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamSebRestrictionSettings.java @@ -202,7 +202,7 @@ public class ExamSebRestrictionSettings { .addFieldIf( () -> lmsType == LmsType.OPEN_EDX, - () -> FormBuilder.multiSelection( + () -> FormBuilder.multiCheckboxSelection( OpenEdxSebRestriction.ATTR_WHITELIST_PATHS, SEB_RESTRICTION_FORM_EDX_WHITE_LIST_PATHS, sebRestriction.getAdditionalProperties() @@ -211,7 +211,7 @@ public class ExamSebRestrictionSettings { .addFieldIf( () -> lmsType == LmsType.OPEN_EDX, - () -> FormBuilder.multiSelection( + () -> FormBuilder.multiCheckboxSelection( OpenEdxSebRestriction.ATTR_PERMISSION_COMPONENTS, SEB_RESTRICTION_FORM_EDX_PERMISSIONS, sebRestriction.getAdditionalProperties() diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/InstitutionList.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/InstitutionList.java index 03333618..025ef8af 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/InstitutionList.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/InstitutionList.java @@ -8,6 +8,9 @@ package ch.ethz.seb.sebserver.gui.content; +import java.util.Set; +import java.util.function.Consumer; + import org.eclipse.swt.widgets.Composite; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; @@ -19,12 +22,14 @@ import ch.ethz.seb.sebserver.gbl.model.Domain; import ch.ethz.seb.sebserver.gbl.model.Entity; import ch.ethz.seb.sebserver.gbl.model.institution.Institution; import ch.ethz.seb.sebserver.gbl.profile.GuiProfile; +import ch.ethz.seb.sebserver.gbl.util.Tuple; import ch.ethz.seb.sebserver.gui.content.action.ActionDefinition; import ch.ethz.seb.sebserver.gui.service.i18n.LocTextKey; import ch.ethz.seb.sebserver.gui.service.page.PageContext; import ch.ethz.seb.sebserver.gui.service.page.PageService; import ch.ethz.seb.sebserver.gui.service.page.PageService.PageActionBuilder; import ch.ethz.seb.sebserver.gui.service.page.TemplateComposer; +import ch.ethz.seb.sebserver.gui.service.page.event.ActionActivationEvent; import ch.ethz.seb.sebserver.gui.service.page.impl.PageAction; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.RestService; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.institution.GetInstitutionPage; @@ -119,6 +124,7 @@ public class InstitutionList implements TemplateComposer { .withDefaultAction(pageActionBuilder .newAction(ActionDefinition.INSTITUTION_VIEW_FROM_LIST) .create()) + .withSelectionListener(getSelectionPublisher(pageContext)) .compose(pageContext.copyOf(content)); // propagate content actions to action-pane @@ -134,19 +140,19 @@ public class InstitutionList implements TemplateComposer { table::getSelection, PageAction::applySingleSelectionAsEntityKey, EMPTY_SELECTION_TEXT_KEY) - .publishIf(() -> table.hasAnyContent()) + .publishIf(() -> table.hasAnyContent(), false) .newAction(ActionDefinition.INSTITUTION_MODIFY_FROM_LIST) .withSelect( table::getSelection, PageAction::applySingleSelectionAsEntityKey, EMPTY_SELECTION_TEXT_KEY) - .publishIf(() -> instGrant.m() && table.hasAnyContent()) + .publishIf(() -> instGrant.m() && table.hasAnyContent(), false) .newAction(ActionDefinition.INSTITUTION_TOGGLE_ACTIVITY) .withExec(this.pageService.activationToggleActionFunction(table, EMPTY_SELECTION_TEXT_KEY)) .withConfirm(this.pageService.confirmDeactivation(table)) - .publishIf(() -> instGrant.m() && table.hasAnyContent()) + .publishIf(() -> instGrant.m() && table.hasAnyContent(), false) // Removed as discussed in SEBSERV-52 // .newAction(ActionDefinition.INSTITUTION_USER_ACCOUNT_NEW) @@ -158,4 +164,28 @@ public class InstitutionList implements TemplateComposer { ; } + private final Consumer> getSelectionPublisher(final PageContext pageContext) { + return rows -> { + this.pageService.firePageEvent(new ActionActivationEvent( + false, + ActionDefinition.INSTITUTION_VIEW_FROM_LIST, + ActionDefinition.INSTITUTION_MODIFY_FROM_LIST, + ActionDefinition.INSTITUTION_TOGGLE_ACTIVITY), + pageContext); + if (!rows.isEmpty()) { + this.pageService.firePageEvent(new ActionActivationEvent( + true, + new Tuple<>( + ActionDefinition.INSTITUTION_TOGGLE_ACTIVITY, + rows.iterator().next().active + ? ActionDefinition.INSTITUTION_DEACTIVATE + : ActionDefinition.INSTITUTION_ACTIVATE), + ActionDefinition.INSTITUTION_VIEW_FROM_LIST, + ActionDefinition.INSTITUTION_MODIFY_FROM_LIST, + ActionDefinition.INSTITUTION_TOGGLE_ACTIVITY), + pageContext); + } + }; + } + } diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/LoginPage.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/LoginPage.java index 305dcc67..b6d0648d 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/LoginPage.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/LoginPage.java @@ -66,6 +66,8 @@ public class LoginPage implements TemplateComposer { @Override public void compose(final PageContext pageContext) { final Composite parent = pageContext.getParent(); + WidgetFactory.setTestId(parent, "login-page"); + WidgetFactory.setARIARole(parent, "composite"); final Composite loginGroup = new Composite(parent, SWT.NONE); final GridLayout rowLayout = new GridLayout(); @@ -158,10 +160,18 @@ public class LoginPage implements TemplateComposer { if (loggedIn) { // Set users locale on page after successful login - this.i18nSupport.setSessionLocale( - authorizationContext - .getLoggedInUser() - .getOrThrow().language); + try { + RWT.getUISession() + .getHttpSession() + .setAttribute(I18nSupport.ATTR_CURRENT_SESSION_LOCALE, authorizationContext + .getLoggedInUser() + .getOrThrow().language); + + } catch (final IllegalStateException e) { + log.error("Set current locale for session failed: ", e); + } + + RWT.setLocale(this.i18nSupport.getUsersFormatLocale()); pageContext.forwardToMainPage(); @@ -183,7 +193,8 @@ public class LoginPage implements TemplateComposer { pageContext.getShell(), this.i18nSupport.getText("sebserver.login.failed.title"), this.i18nSupport.getText(message, message), - SWT.ERROR); + SWT.ERROR, + this.i18nSupport); error.open(null); } diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/MainPage.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/MainPage.java index 95fa56c9..1a806db7 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/MainPage.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/MainPage.java @@ -68,6 +68,7 @@ public class MainPage implements TemplateComposer { final Composite parent = pageContext.getParent(); parent.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + WidgetFactory.setTestId(parent, "main-page"); final SashForm mainSash = new SashForm(parent, SWT.HORIZONTAL); final GridLayout gridLayout = new GridLayout(); diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/UserAccountChangePasswordForm.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/UserAccountChangePasswordForm.java index 9aaf7b19..2b0598ea 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/UserAccountChangePasswordForm.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/UserAccountChangePasswordForm.java @@ -126,7 +126,8 @@ public class UserAccountChangePasswordForm implements TemplateComposer { pageContext.getShell(), this.i18nSupport.getText("sebserver.login.password.change"), this.i18nSupport.getText("sebserver.login.password.change.success"), - SWT.ICON_INFORMATION); + SWT.ICON_INFORMATION, + this.i18nSupport); error.open(null); } return saveAction; diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/UserAccountForm.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/UserAccountForm.java index ec337a79..caa81a82 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/UserAccountForm.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/UserAccountForm.java @@ -78,6 +78,8 @@ public class UserAccountForm implements TemplateComposer { new LocTextKey("sebserver.useraccount.form.surname"); static final LocTextKey FORM_INSTITUTION_TEXT_KEY = new LocTextKey("sebserver.useraccount.form.institution"); + static final LocTextKey FORM_CREATION_DATE_TEXT_KEY = + new LocTextKey("sebserver.useraccount.form.creationdate"); static final LocTextKey FORM_LANG_TEXT_KEY = new LocTextKey("sebserver.useraccount.form.language"); @@ -170,6 +172,13 @@ public class UserAccountForm implements TemplateComposer { String.valueOf(userAccount.getInstitutionId()), () -> this.resourceService.institutionResource()) .readonlyIf(isNotNew)) + .addFieldIf( + () -> readonly, + () -> FormBuilder.text( + Domain.USER.ATTR_CREATION_DATE, + FORM_CREATION_DATE_TEXT_KEY, + this.pageService.getI18nSupport().formatDisplayDate(userAccount.getCreationDate())) + .readonly(true)) .addField(FormBuilder.text( Domain.USER.ATTR_NAME, FORM_NAME_TEXT_KEY, diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/UserAccountList.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/UserAccountList.java index c420fe45..01c2ef63 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/UserAccountList.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/UserAccountList.java @@ -224,7 +224,7 @@ public class UserAccountList implements TemplateComposer { private String getLocaleDisplayText(final UserInfo userInfo) { return (userInfo.language != null) - ? userInfo.language.getDisplayLanguage(this.pageService.getI18nSupport().getCurrentLocale()) + ? userInfo.language.getDisplayLanguage(this.pageService.getI18nSupport().getUsersLanguageLocale()) : Constants.EMPTY_NOTE; } diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java index fc58e7b4..51ddc951 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java @@ -37,11 +37,7 @@ public enum ActionDefinition { ImageIcon.EDIT, PageStateDefinitionImpl.INSTITUTION_EDIT, ActionCategory.INSTITUTION_LIST), - INSTITUTION_TOGGLE_ACTIVITY( - new LocTextKey("sebserver.overall.action.toggle-activity"), - ImageIcon.SWITCH, - PageStateDefinitionImpl.INSTITUTION_LIST, - ActionCategory.INSTITUTION_LIST), + INSTITUTION_MODIFY( new LocTextKey("sebserver.institution.action.modify"), ImageIcon.EDIT, @@ -72,6 +68,12 @@ public enum ActionDefinition { ImageIcon.TOGGLE_ON, PageStateDefinitionImpl.INSTITUTION_VIEW, ActionCategory.FORM), + INSTITUTION_TOGGLE_ACTIVITY( + new LocTextKey("sebserver.overall.action.toggle-activity"), + ImageIcon.TOGGLE_OFF, + PageStateDefinitionImpl.INSTITUTION_LIST, + ActionCategory.INSTITUTION_LIST), + INSTITUTION_USER_ACCOUNT_NEW( new LocTextKey("sebserver.useraccount.action.new"), ImageIcon.USER, diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionPane.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionPane.java index c55f7146..9068c313 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionPane.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionPane.java @@ -18,6 +18,9 @@ import org.eclipse.rap.rwt.template.ImageCell; import org.eclipse.rap.rwt.template.Template; import org.eclipse.rap.rwt.template.TextCell; import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Color; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.graphics.RGBA; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; @@ -33,6 +36,8 @@ import ch.ethz.seb.sebserver.gui.service.i18n.PolyglotPageService; import ch.ethz.seb.sebserver.gui.service.page.PageContext; import ch.ethz.seb.sebserver.gui.service.page.PageService; import ch.ethz.seb.sebserver.gui.service.page.TemplateComposer; +import ch.ethz.seb.sebserver.gui.service.page.event.ActionActivationEvent; +import ch.ethz.seb.sebserver.gui.service.page.event.ActionActivationEventListener; import ch.ethz.seb.sebserver.gui.service.page.event.ActionPublishEvent; import ch.ethz.seb.sebserver.gui.service.page.event.ActionPublishEventListener; import ch.ethz.seb.sebserver.gui.service.page.event.PageEventListener; @@ -79,20 +84,93 @@ public class ActionPane implements TemplateComposer { @Override public void notify(final ActionPublishEvent event) { final Composite parent = pageContext.getParent(); - final Tree treeForGroup = getTreeForGroup(parent, event.action.definition); - final TreeItem actionItem = ActionPane.this.widgetFactory.treeItemLocalized( treeForGroup, event.action.definition.title); - actionItem.setImage(event.action.definition.icon.getImage( - pageContext.getParent().getDisplay())); + final Image image = event.active + ? event.action.definition.icon.getImage(parent.getDisplay()) + : event.action.definition.icon.getGreyedImage(parent.getDisplay()); + if (!event.active) { + actionItem.setForeground(new Color(parent.getDisplay(), new RGBA(150, 150, 150, 50))); + } + + actionItem.setImage(image); actionItem.setData(ACTION_EVENT_CALL_KEY, event.action); parent.layout(); } }); + + final Composite composite = new Composite(pageContext.getParent(), SWT.NONE); + final GridData gridData = new GridData(SWT.FILL, SWT.TOP, true, false); + final GridLayout gridLayout = new GridLayout(); + gridLayout.horizontalSpacing = 0; + gridData.heightHint = 0; + composite.setLayoutData(gridData); + composite.setLayout(gridLayout); + + composite.setData( + PageEventListener.LISTENER_ATTRIBUTE_KEY, + new ActionActivationEventListener() { + @Override + public void notify(final ActionActivationEvent event) { + final Composite parent = pageContext.getParent(); + for (final ActionDefinition ad : event.actions) { + final TreeItem actionItem = findAction(parent, ad); + if (actionItem == null) { + continue; + } + + final Image image = event.activation + ? ad.icon.getImage(parent.getDisplay()) + : ad.icon.getGreyedImage(parent.getDisplay()); + actionItem.setImage(image); + if (event.activation) { + actionItem.setForeground(null); + } else { + actionItem.setForeground(new Color(parent.getDisplay(), new RGBA(150, 150, 150, 50))); + } + } + + if (event.decoration != null) { + final TreeItem actionItemToDecorate = findAction(parent, event.decoration._1); + if (actionItemToDecorate != null && event.decoration._2 != null) { + actionItemToDecorate.setImage(0, + event.decoration._2.icon.getImage(parent.getDisplay())); + ActionPane.this.pageService.getPolyglotPageService().injectI18n( + actionItemToDecorate, + event.decoration._2.title); + } + } + } + }); + } + + private TreeItem findAction(final Composite parent, final ActionDefinition actionDefinition) { + final Tree treeForGroup = getTreeForGroup(parent, actionDefinition); + if (treeForGroup == null) { + return null; + } + + for (int i = 0; i < treeForGroup.getItemCount(); i++) { + final TreeItem item = treeForGroup.getItem(i); + if (item == null) { + continue; + } + + final PageAction action = (PageAction) item.getData(ACTION_EVENT_CALL_KEY); + if (action == null) { + continue; + } + + if (action.definition == actionDefinition) { + return item; + } + } + + return null; } private Tree getTreeForGroup(final Composite parent, final ActionDefinition actionDefinition) { @@ -150,7 +228,8 @@ public class ActionPane implements TemplateComposer { .setWidth(40) .setTop(0) .setBottom(0, 0) - .setHorizontalAlignment(SWT.LEFT); + .setHorizontalAlignment(SWT.LEFT) + .setBackground(null); imageCell.setBindingIndex(0); final TextCell textCell = new TextCell(template); textCell.setLeft(0, 30) diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/ResourceService.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/ResourceService.java index e8ec56be..76353bb0 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/ResourceService.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/ResourceService.java @@ -335,7 +335,7 @@ public class ResourceService { * @return list of language key/name tuples for all supported languages in the language of the current users * locale */ public List> languageResources() { - final Locale currentLocale = this.i18nSupport.getCurrentLocale(); + final Locale currentLocale = this.i18nSupport.getUsersLanguageLocale(); return this.i18nSupport.supportedLanguages() .stream() .map(locale -> new Tuple<>(locale.toLanguageTag(), locale.getDisplayLanguage(currentLocale))) @@ -345,7 +345,7 @@ public class ResourceService { } public List> timeZoneResources() { - final Locale currentLocale = this.i18nSupport.getCurrentLocale(); + final Locale currentLocale = this.i18nSupport.getUsersLanguageLocale(); return DateTimeZone .getAvailableIDs() .stream() diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/I18nSupport.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/I18nSupport.java index ec0d436c..f94d4f33 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/I18nSupport.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/I18nSupport.java @@ -17,18 +17,27 @@ import ch.ethz.seb.sebserver.gbl.util.Utils; public interface I18nSupport { + public static final String SUPPORTED_LANGUAGES_KEY = "sebserver.gui.supported.languages"; + public static final String MULTILINGUAL_KEY = "sebserver.gui.multilingual"; + public static final String FORMAL_LOCALE_KEY = "sebserver.gui.date.displayformat"; + public static final String ATTR_CURRENT_SESSION_LOCALE = "CURRENT_SESSION_LOCALE"; + /** Get all supported languages as a collection of Locale * * @return all supported languages as a collection of Locale */ Collection supportedLanguages(); - /** Get the current Locale either form a user if this is called from a logged in user context or the - * applications default locale. + /** Get the current users language based Locale (from user info language selection) + * Or the default language Locale if the user has not defined any language * - * @return the current Locale to use in context */ - Locale getCurrentLocale(); + * @return the current user language Locale to use in context */ + Locale getUsersLanguageLocale(); - void setSessionLocale(Locale locale); + /** Get the current users format based Locale (from user info format selection) + * Or the default format Locale if the user has not defined any language + * + * @return the current user format Locale to use in context */ + Locale getUsersFormatLocale(); /** Format a DateTime to a text format to display. * This uses the date-format defined by either the attribute 'sebserver.gui.date.displayformat' @@ -49,7 +58,7 @@ public interface I18nSupport { * @param date the DateTime instance * @return date formatted date String to display */ default String formatDisplayDateWithTimeZone(final DateTime date) { - return formatDisplayDate(date) + " " + this.getUsersTimeZoneTitleSuffix(); + return formatDisplayDateTime(date) + " " + this.getUsersTimeZoneTitleSuffix(); } /** Format a time-stamp (milliseconds) to a text format to display. diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/I18nSupportImpl.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/I18nSupportImpl.java index 9409b5c5..3795d156 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/I18nSupportImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/I18nSupportImpl.java @@ -42,19 +42,7 @@ public class I18nSupportImpl implements I18nSupport { private static final Logger log = LoggerFactory.getLogger(I18nSupportImpl.class); - private static final String SUPPORTED_LANGUAGES_KEY = "sebserver.gui.supported.languages"; - private static final String MULTILINGUAL_KEY = "sebserver.gui.multilingual"; - private static final String TIME_DISPLAYFORMAT_KEY = "sebserver.gui.time.displayformat"; - private static final String DATETIME_DISPLAYFORMAT_KEY = "sebserver.gui.datetime.displayformat"; - private static final String DATE_DISPLAYFORMAT_KEY = "sebserver.gui.date.displayformat"; - private static final String DATE_DISPLAYFORMAT_TIMEZONE_KEY = "sebserver.gui.date.displayformat.timezone"; - private static final String ATTR_CURRENT_SESSION_LOCALE = "CURRENT_SESSION_LOCALE"; - - @SuppressWarnings("unused") - private final DateTimeFormatter timeZoneFormatter; - private final DateTimeFormatter displayDateFormatter; - private final DateTimeFormatter displayDateTimeFormatter; - private final DateTimeFormatter displayTimeFormatter; + private final Locale defaultFormatLocale; private final CurrentUser currentUser; private final MessageSource messageSource; private final Locale defaultLocale = Locale.ENGLISH; @@ -68,28 +56,11 @@ public class I18nSupportImpl implements I18nSupport { this.currentUser = currentUser; this.messageSource = messageSource; - this.timeZoneFormatter = DateTimeFormat - .forPattern(environment.getProperty( - DATE_DISPLAYFORMAT_TIMEZONE_KEY, - Constants.TIME_ZONE_OFFSET_TAIL_FORMAT)); + final String defaultForamtLocaleString = environment.getProperty( + FORMAL_LOCALE_KEY, + Constants.DEFAULT_LANG_CODE); - this.displayDateFormatter = DateTimeFormat - .forPattern(environment.getProperty( - DATE_DISPLAYFORMAT_KEY, - Constants.DEFAULT_DISPLAY_DATE_FORMAT)) - .withZoneUTC(); - - this.displayDateTimeFormatter = DateTimeFormat - .forPattern(environment.getProperty( - DATETIME_DISPLAYFORMAT_KEY, - Constants.DEFAULT_DIPLAY_DATE_TIME_FORMAT)) - .withZoneUTC(); - - this.displayTimeFormatter = DateTimeFormat - .forPattern(environment.getProperty( - TIME_DISPLAYFORMAT_KEY, - Constants.DEFAULT_TIME_FORMAT)) - .withZoneUTC(); + this.defaultFormatLocale = Locale.forLanguageTag(defaultForamtLocaleString); final boolean multilingual = BooleanUtils.toBoolean(environment.getProperty( MULTILINGUAL_KEY, @@ -117,19 +88,13 @@ public class I18nSupportImpl implements I18nSupport { } @Override - public void setSessionLocale(final Locale locale) { - try { - RWT.getUISession() - .getHttpSession() - .setAttribute(ATTR_CURRENT_SESSION_LOCALE, locale); - RWT.setLocale(locale); - } catch (final IllegalStateException e) { - log.error("Set current locale for session failed: ", e); - } + public Locale getUsersFormatLocale() { + // TODO here also a user based format locale can be verified on the future + return this.defaultFormatLocale; } @Override - public Locale getCurrentLocale() { + public Locale getUsersLanguageLocale() { // first session-locale if available try { final Locale sessionLocale = (Locale) RWT.getUISession() @@ -153,17 +118,20 @@ public class I18nSupportImpl implements I18nSupport { @Override public String formatDisplayDate(final DateTime date) { - return formatDisplayDate(date, this.displayDateFormatter); + final String pattern = DateTimeFormat.patternForStyle("M-", getUsersFormatLocale()); + return formatDisplayDate(date, DateTimeFormat.forPattern(pattern)); } @Override public String formatDisplayDateTime(final DateTime date) { - return formatDisplayDate(date, this.displayDateTimeFormatter); + final String pattern = DateTimeFormat.patternForStyle("MS", getUsersFormatLocale()); + return formatDisplayDate(date, DateTimeFormat.forPattern(pattern)); } @Override public String formatDisplayTime(final DateTime date) { - return formatDisplayDate(date, this.displayTimeFormatter); + final String pattern = DateTimeFormat.patternForStyle("-S", getUsersFormatLocale()); + return formatDisplayDate(date, DateTimeFormat.forPattern(pattern)); } @Override @@ -178,7 +146,7 @@ public class I18nSupportImpl implements I18nSupport { @Override public String getText(final String key, final String def, final Object... args) { - return this.messageSource.getMessage(key, args, def, this.getCurrentLocale()); + return this.messageSource.getMessage(key, args, def, this.getUsersLanguageLocale()); } @Override diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/PolyglotPageServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/PolyglotPageServiceImpl.java index f064d5eb..3716f59e 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/PolyglotPageServiceImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/i18n/impl/PolyglotPageServiceImpl.java @@ -56,13 +56,16 @@ public final class PolyglotPageServiceImpl implements PolyglotPageService { @Override public void setDefaultPageLocale(final Composite root) { - setPageLocale(root, this.i18nSupport.getCurrentLocale()); + setPageLocale(root, this.i18nSupport.getUsersLanguageLocale()); } @Override @SuppressWarnings("unchecked") public void setPageLocale(final Composite root, final Locale locale) { - this.i18nSupport.setSessionLocale(locale); + RWT.getUISession() + .getHttpSession() + .setAttribute(I18nSupport.ATTR_CURRENT_SESSION_LOCALE, locale); + ComposerService.traversePageTree( root, comp -> comp.getData(POLYGLOT_WIDGET_FUNCTION_KEY) != null, @@ -191,7 +194,7 @@ public final class PolyglotPageServiceImpl implements PolyglotPageService { languageSelection.setData( POLYGLOT_WIDGET_FUNCTION_KEY, (Consumer