DMC/scipro
7
0
Fork 0
Code Issues43 Pull Requests9 Actions Projects1 Releases Wiki Activity

3275 orangemarkera två flikar i "finishing up" när man hovrar med musen

Browse Source
This commit is contained in:
Wayne Westmoreland 2024-04-24 16:43:03 +02:00
parent 7e0d0a8558
commit 43516dba16
2 changed files with 10 additions and 14 deletions
view/src/main/java/se/su/dsv/scipro/grading
SupervisorGradingReportPage.htmlSupervisorGradingReportPage.java

13
view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingReportPage.html

@ -35,18 +35,7 @@
<div class="card" wicket:id="tabs"></div> <div class="card" wicket:id="tabs"></div>
</div> </div>
<div class="col-lg-6"> <div class="col-lg-6">
<ul class="nav nav-tabs" role="tablist"> <div class="card" wicket:id="interact"></div>
<li class="nav-item active"><a class="nav-link active" href="#discussion" role="tab" data-bs-toggle="tab">Interact with reviewer</a></li>
<li class="nav-item">
<a class="nav-link" href="#examiner-timeline" role="tab" data-bs-toggle="tab">
Interactions with examiner
</a>
</li>
</ul>
<div class="tab-content">
<div id="discussion" class="tab-pane active bordered" wicket:id="discussion"></div>
<div id="examiner-timeline" class="tab-pane bordered" wicket:id="examiner_timeline"></div>
</div>
</div> </div>
</div> </div>
</wicket:extend> </wicket:extend>

11
view/src/main/java/se/su/dsv/scipro/grading/SupervisorGradingReportPage.java

@ -136,6 +136,15 @@ public class SupervisorGradingReportPage extends AbstractSupervisorProjectDetail
TabbedPanel<ITab> tabbedPanel = new BootstrapCardTabbedPanel<>("tabs", tabs); TabbedPanel<ITab> tabbedPanel = new BootstrapCardTabbedPanel<>("tabs", tabs);
add(tabbedPanel); add(tabbedPanel);
List<ITab> interactTabs = new ArrayList<>();
interactTabs.add(createTab(Model.of("Interact with reviewer"),
panelId -> new TimelinePanel(panelId, projectModel)));
interactTabs.add(createTab(Model.of("Interactions with examiner"),
panelId -> new ExaminerTimelinePanel(panelId, projectModel)));
TabbedPanel<ITab> tabbedPanelInteract = new BootstrapCardTabbedPanel<>("interact", interactTabs);
add(tabbedPanelInteract);
final String externalGradingURL = generalSystemSettingsService.getGeneralSystemSettingsInstance().getExternalGradingURL(); final String externalGradingURL = generalSystemSettingsService.getGeneralSystemSettingsInstance().getExternalGradingURL();
add(new ExternalLink("moreInformation", externalGradingURL) { add(new ExternalLink("moreInformation", externalGradingURL) {
@Override @Override
@ -145,8 +154,6 @@ public class SupervisorGradingReportPage extends AbstractSupervisorProjectDetail
} }
}); });
add(new TimelinePanel("discussion", projectModel));
add(new ExaminerTimelinePanel("examiner_timeline", projectModel));
} }
private Component newGreenHighlight(String id, IModel<Boolean> completed, IModel<String> text) { private Component newGreenHighlight(String id, IModel<Boolean> completed, IModel<String> text) {