DMC/scipro
7
0
Fork 0
Code Issues42 Pull Requests4 Actions Projects1 Releases Wiki Activity

Make the full view of project notes respect formatting (line breaks)

Browse Source
This commit is contained in:
Andreas Svanberg 2024-07-10 13:09:44 +02:00
parent eeedd0cd56
commit 0684919bb2
2 changed files with 15 additions and 4 deletions
view/src/main/java/se/su/dsv/scipro/supervisor/panels
ProjectNoteColumn$ViewAndEditNoteCellPanel.htmlProjectNoteColumn.java

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

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

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

@ -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.feedback.FencedFeedbackPanel;
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.TextArea;
import org.apache.wicket.markup.html.panel.GenericPanel;
@ -69,11 +70,20 @@ public class ProjectNoteColumn extends AbstractExportableColumn<Project, String>
setOutputMarkupId(true);
modal.onClose(target -> target.add(this));
IModel<Integer> maxLength = supervisorProjectNoteDisplayModel.map(display -> switch (display) {
case FULL -> Integer.MAX_VALUE;
case COMPACT -> 100;
add(new MaxLengthLabel("shortened_note", getDataModel(model), Model.of(100)) {
@Override
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") {
@Override