DMC/scipro
7
0
Fork 0
Code Issues 32 Pull Requests 3 Actions Projects 1 Wiki Activity

Allow supervisors to write a note associated with their projects #8

Merged
ansv7779 merged 10 commits from 3399-supervisor-project-note into develop 2024-07-10 13:43:27 +02:00
Conversation 4 Commits 10 Files Changed 19 +15 -4
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0684919bb2 - Show all commits

1
view/src/main/java/se/su/dsv/scipro/supervisor/panels/ProjectNoteColumn$ViewAndEditNoteCellPanel.html
View File

@ -4,6 +4,7 @@
<wicket:panel> <wicket:panel>
<div wicket:id="edit_note_modal"></div> <div wicket:id="edit_note_modal"></div>
<span wicket:id="shortened_note"></span> <span wicket:id="shortened_note"></span>
<wicket:container wicket:id="full_note"></wicket:container>
<a wicket:id="view_note">[view/edit note]</a> <a wicket:id="view_note">[view/edit note]</a>
</wicket:panel> </wicket:panel>
</body> </body>

18
view/src/main/java/se/su/dsv/scipro/supervisor/panels/ProjectNoteColumn.java
View File

@ -8,6 +8,7 @@ import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulato
import org.apache.wicket.extensions.markup.html.repeater.data.table.export.AbstractExportableColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.export.AbstractExportableColumn;
import org.apache.wicket.feedback.FencedFeedbackPanel; import org.apache.wicket.feedback.FencedFeedbackPanel;
import org.apache.wicket.injection.Injector; import org.apache.wicket.injection.Injector;
import org.apache.wicket.markup.html.basic.MultiLineLabel;
import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextArea; import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.markup.html.panel.GenericPanel; import org.apache.wicket.markup.html.panel.GenericPanel;
@ -69,11 +70,20 @@ public class ProjectNoteColumn extends AbstractExportableColumn<Project, String>
setOutputMarkupId(true); setOutputMarkupId(true);
modal.onClose(target -> target.add(this)); modal.onClose(target -> target.add(this));
IModel<Integer> maxLength = supervisorProjectNoteDisplayModel.map(display -> switch (display) { add(new MaxLengthLabel("shortened_note", getDataModel(model), Model.of(100)) {
case FULL -> Integer.MAX_VALUE; @Override
case COMPACT -> 100; protected void onConfigure() {
super.onConfigure();
setVisibilityAllowed(supervisorProjectNoteDisplayModel.getObject() == SupervisorProjectNoteDisplay.COMPACT);
}
});
add(new MultiLineLabel("full_note", getDataModel(model)) {
@Override
protected void onConfigure() {
super.onConfigure();
setVisibilityAllowed(supervisorProjectNoteDisplayModel.getObject() == SupervisorProjectNoteDisplay.FULL);
}
}); });
add(new MaxLengthLabel("shortened_note", getDataModel(model), maxLength));
AjaxLink<Object> noteLink = new AjaxLink<>("view_note") { AjaxLink<Object> noteLink = new AjaxLink<>("view_note") {
@Override @Override