zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes

Browse source
This commit is contained in:
anhefti 2019-09-10 13:50:42 +02:00
parent 958a97b556
commit eb71c4bcc4
2 changed files with 36 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/main/java/ch/ethz/seb/sebserver/gui/content/activity/ActivitiesPane.java
View file

@ -157,9 +157,10 @@ public class ActivitiesPane implements TemplateComposer {
.create()); .create());
} }
if (this.currentUser.get().hasAnyRole(UserRole.SEB_SERVER_ADMIN, UserRole.INSTITUTIONAL_ADMIN)) { sebadmin.setExpanded(this.currentUser.get().hasAnyRole(
sebadmin.setExpanded(true); UserRole.SEB_SERVER_ADMIN,
} UserRole.INSTITUTIONAL_ADMIN));
// ---- SEB ADMIN ---------------------------------------------------------------------- // ---- SEB ADMIN ----------------------------------------------------------------------
//-------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------
@ -203,9 +204,7 @@ public class ActivitiesPane implements TemplateComposer {
.create()); .create());
} }
if (this.currentUser.get().hasAnyRole(UserRole.EXAM_ADMIN)) { sebConfigs.setExpanded(this.currentUser.get().hasAnyRole(UserRole.EXAM_ADMIN));
sebConfigs.setExpanded(true);
}
} }
// ---- SEB CONFIGURATION -------------------------------------------------------------- // ---- SEB CONFIGURATION --------------------------------------------------------------
@ -260,9 +259,7 @@ public class ActivitiesPane implements TemplateComposer {
.create()); .create());
} }
if (this.currentUser.get().hasAnyRole(UserRole.EXAM_ADMIN)) { examadmin.setExpanded(this.currentUser.get().hasAnyRole(UserRole.EXAM_ADMIN));
examadmin.setExpanded(true);
}
} }
// ---- EXAM ADMINISTRATION ------------------------------------------------------------ // ---- EXAM ADMINISTRATION ------------------------------------------------------------
@ -311,9 +308,7 @@ public class ActivitiesPane implements TemplateComposer {
.create()); .create());
} }
if (this.currentUser.get().hasAnyRole(UserRole.EXAM_SUPPORTER)) { monitoring.setExpanded(this.currentUser.get().hasAnyRole(UserRole.EXAM_SUPPORTER));
monitoring.setExpanded(true);
}
} }
// ---- MONITORING --------------------------------------------------------------------- // ---- MONITORING ---------------------------------------------------------------------
@ -372,7 +367,7 @@ public class ActivitiesPane implements TemplateComposer {
} else if (this.currentUser.get().hasAnyRole(UserRole.EXAM_ADMIN)) { } else if (this.currentUser.get().hasAnyRole(UserRole.EXAM_ADMIN)) {
return findItemByActionDefinition( return findItemByActionDefinition(
navigation.getItems(), navigation.getItems(),
ActivityDefinition.SEB_CONFIGURATION); ActivityDefinition.SEB_EXAM_CONFIG);
} else if (this.currentUser.get().hasAnyRole(UserRole.EXAM_SUPPORTER)) { } else if (this.currentUser.get().hasAnyRole(UserRole.EXAM_SUPPORTER)) {
return findItemByActionDefinition( return findItemByActionDefinition(
navigation.getItems(), navigation.getItems(),

28
src/test/java/ch/ethz/seb/sebserver/gui/integration/UseCasesIntegrationTest.java
View file

@ -77,6 +77,7 @@ import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.seb.clientconfig.
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.seb.clientconfig.GetClientConfigPage; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.seb.clientconfig.GetClientConfigPage;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.seb.clientconfig.NewClientConfig; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.seb.clientconfig.NewClientConfig;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.seb.clientconfig.SaveClientConfig; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.seb.clientconfig.SaveClientConfig;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.seb.examconfig.NewExamConfig;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.useraccount.ActivateUserAccount; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.useraccount.ActivateUserAccount;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.useraccount.ChangePassword; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.useraccount.ChangePassword;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.useraccount.GetUserAccount; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.useraccount.GetUserAccount;
@ -864,6 +865,33 @@ public class UseCasesIntegrationTest extends GuiIntegrationTest {
assertNotNull(readLines); assertNotNull(readLines);
assertFalse(readLines.isEmpty()); assertFalse(readLines.isEmpty());
assertTrue(readLines.get(0).startsWith("pswd")); assertTrue(readLines.get(0).startsWith("pswd"));
// get page
final Result<Page<SebClientConfig>> pageResponse = restService
.getBuilder(GetClientConfigPage.class)
.call();
assertNotNull(pageResponse);
assertFalse(pageResponse.hasError());
final Page<SebClientConfig> page = pageResponse.get();
assertFalse(page.content.isEmpty());
assertTrue(page.content.size() == 2);
}
@Test
@Order(9)
// *************************************
// Use Case 9: Login as examAdmin2 and create a new SEB Exam Configuration
// - save configuration in history
// - change some attribute
// - process an undo
// - table value add, delete, modify
// - export
public void testUsecase9() throws IOException {
final RestServiceImpl restService = createRestServiceForUser(
"examAdmin2",
"examAdmin2",
new NewExamConfig());
} }
} }