DMC/scipro
7
0
Fork 0
Code Issues 23 Pull Requests 2 Actions 1 Projects 1 Releases Wiki Activity

Improve the UX when creating groups as a supervisor #123

Merged
niat8586 merged 9 commits from group-creation-ux into develop 2025-03-05 11:01:37 +01:00
Conversation 5 Commits 9 Files Changed 5 +24
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3fbfc4b310 - Show all commits

3
view/src/main/java/se/su/dsv/scipro/group/EditGroupPanel.html
View File

@ -42,6 +42,9 @@
</div> </div>
</fieldset> </fieldset>
<button type="submit" class="btn btn-success">Save</button> <button type="submit" class="btn btn-success">Save</button>
<button type="submit" wicket:id="save_and_close" class="btn btn-success">Save and close</button>
<button type="submit" wicket:id="save_and_create" class="btn btn-success">Save and create another</button>
<a wicket:id="cancel" class="btn btn-outline-secondary">Cancel</a>
</form> </form>
</div> </div>
</wicket:panel> </wicket:panel>

21
view/src/main/java/se/su/dsv/scipro/group/EditGroupPanel.java
View File

@ -5,6 +5,7 @@ import java.util.*;
import org.apache.wicket.extensions.model.AbstractCheckBoxModel; import org.apache.wicket.extensions.model.AbstractCheckBoxModel;
import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.*; import org.apache.wicket.markup.html.form.*;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.FeedbackPanel; import org.apache.wicket.markup.html.panel.FeedbackPanel;
@ -19,6 +20,8 @@ import se.su.dsv.scipro.project.ProjectService;
import se.su.dsv.scipro.project.ProjectStatus; import se.su.dsv.scipro.project.ProjectStatus;
import se.su.dsv.scipro.project.ProjectTeamMemberRoles; import se.su.dsv.scipro.project.ProjectTeamMemberRoles;
import se.su.dsv.scipro.session.SciProSession; import se.su.dsv.scipro.session.SciProSession;
import se.su.dsv.scipro.supervisor.pages.SupervisorEditGroupPage;
import se.su.dsv.scipro.supervisor.pages.SupervisorMyGroupsPage;
import se.su.dsv.scipro.system.User; import se.su.dsv.scipro.system.User;
public class EditGroupPanel extends Panel { public class EditGroupPanel extends Panel {
@ -82,6 +85,24 @@ public class EditGroupPanel extends Panel {
add( add(
new CheckBox("active", LambdaModel.of(model, Group::isActive, Group::setActive)).setOutputMarkupId(true) new CheckBox("active", LambdaModel.of(model, Group::isActive, Group::setActive)).setOutputMarkupId(true)
); );
add(
new SubmitLink("save_and_close") {
@Override
public void onAfterSubmit() {
setResponsePage(SupervisorMyGroupsPage.class);
}
}
);
add(
new SubmitLink("save_and_create") {
@Override
public void onAfterSubmit() {
setResponsePage(SupervisorEditGroupPage.class);
}
}
);
add(new BookmarkablePageLink<>("cancel", SupervisorMyGroupsPage.class));
} }
@Override @Override