Skip to content

Fix Wicket Import error #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ottenhoff merged 1 commit into from
Oct 22, 2025
Merged

Fix Wicket Import error #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions tool/src/java/org/sakaiproject/attendance/tool/pages/ImportConfirmation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,37 +24,37 @@ <h2><wicket:message key="attendance.export.confirmation.pageHeader" /></h2>
<h2> </h2>
<form wicket:id="form">
<div class="iclPage">
<button type="submit" wicket:id="submitLink2" class="cancel"><wicket:message key="attendance.export.confirmation.button.cancel"/></button>
<button type="submit" wicket:id="submitLink" class="confirm" ><wicket:message key="attendance.export.confirmation.button.confirm"/></button>
<button type="submit" wicket:id="submitLink2" class="btn btn-outline-secondary me-2"><wicket:message key="attendance.export.confirmation.button.cancel"/></button>
<button type="submit" wicket:id="submitLink" class="btn btn-primary"><wicket:message key="attendance.export.confirmation.button.confirm"/></button>
<label wicket:id="lowerErrorAlert" class="text-danger" />
</div>
</form>
<br />
<h3 class="iclPage"><wicket:message key="attendance.export.confirmation.tableHeader" /></h3>
<table wicket:id="student-overview-stats-table" id="overviewTable" class="importChangeTable">
<table wicket:id="student-overview-stats-table" id="overviewTable" class="table table-striped table-hover align-middle ms-3">
<thead>
<tr>
<th class="importEventandStudentHeader"><span> <wicket:message key="attendance.export.confirmation.header.event" /></span></th>
<th class="importEventandStudentHeader"><span> <wicket:message key="attendance.export.confirmation.header.student" /></span></th>
<th class="importOldCommentandStatusHeader"><span> <wicket:message key="attendance.export.confirmation.header.oldStatus" /></span></th>
<th wicket:id="old-comment-header" class="importOldCommentandStatusHeader"><span> <wicket:message key="attendance.export.confirmation.header.oldComment" /> </span> </th>
<th class="importNewCommentandStatusHeader"><span> <wicket:message key="attendance.export.confirmation.header.newStatus" /></span></th>
<th wicket:id="new-comment-header" class="importNewCommentandStatusHeader"><span> <wicket:message key="attendance.export.confirmation.header.newComment" /> </span></th>
<th scope="col" class="text-start"><span><wicket:message key="attendance.export.confirmation.header.event" /></span></th>
<th scope="col" class="text-start"><span><wicket:message key="attendance.export.confirmation.header.student" /></span></th>
<th scope="col" class="text-center"><span><wicket:message key="attendance.export.confirmation.header.oldStatus" /></span></th>
<th wicket:id="old-comment-header" scope="col" class="text-start"><span wicket:id="old-comment" /></th>
<th scope="col" class="text-center"><span><wicket:message key="attendance.export.confirmation.header.newStatus" /></span></th>
<th wicket:id="new-comment-header" scope="col" class="text-start"><span wicket:id="new-comment" /></th>
</tr>
</thead>
<tbody>
<tr wicket:id="students">
<td class="importColumn"><span wicket:id="event-name-label" /></td>
<td class="importColumn"><span wicket:id="student-name-label" /></td>
<td class="importColumn"><span wicket:id="old-status-label" /></td>
<td class="importColumn" wicket:id="old-comment-wmc"><span wicket:id="old-comment-label" /></td>
<td class="importColumn"><span wicket:id="new-status-label" /></td>
<td class="importColumn" wicket:id="new-comment-wmc"><span wicket:id="new-comment-label" /></td>
<td class="text-start"><span wicket:id="event-name-label" /></td>
<td class="text-start"><span wicket:id="student-name-label" /></td>
<td class="text-center"><span wicket:id="old-status-label" /></td>
<td class="text-start" wicket:id="old-comment-wmc"><span wicket:id="old-comment-label" /></td>
<td class="text-center"><span wicket:id="new-status-label" /></td>
<td class="text-start" wicket:id="new-comment-wmc"><span wicket:id="new-comment-label" /></td>
<!--<td wicket:id="active-status-stats" class="overviewStatusCol"><span wicket:id="student-stats" /></td>-->
</tr>
<wicket:enclosure child="no-changes">
<tr>
<td colspan="100" class="importColumn">
<td colspan="100" class="text-start">
<span wicket:id="no-changes" />
</td>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions tool/src/java/org/sakaiproject/attendance/tool/pages/ImportConfirmation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ public boolean isVisible() {
};
attendanceItemTableContainer.add(oldCommentContainer);
attendanceItemTableContainer.add(newCommentContainer);
oldCommentContainer.add(new Label("old-comment", "Old Comment"));
newCommentContainer.add(new Label("new-comment", "New Comment"));
oldCommentContainer.add(new Label("old-comment", getString("attendance.export.confirmation.header.oldComment")));
newCommentContainer.add(new Label("new-comment", getString("attendance.export.confirmation.header.newComment")));
}

private void createStatsTableData(WebMarkupContainer attendanceItemTableContainer, List<ImportConfirmList> attendanceItemDataList, boolean commentsChanged) {
Expand Down
163 changes: 1 addition & 162 deletions tool/src/webapp/css/attendance.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,73 +186,10 @@ table.itemListTable, table.eventViewTable, table.takeAttendanceTable, div.eventF
background-color: var(--sakai-background-color-4);
}

th.overviewDateCol, td.overviewDateCol, td.takeAttendanceDateHeader, th.takeAttendanceDateHeader, td.studentNameCol, th.studentOverviewNameHeader, th.importEventandStudentHeader, th.importNewCommentandStatusHeader,th.importOldCommentandStatusHeader {
th.overviewDateCol, td.overviewDateCol, td.takeAttendanceDateHeader, th.takeAttendanceDateHeader, td.studentNameCol, th.studentOverviewNameHeader {
border-right-width: 3px;
}

.importChangeTable th{
text-align: center;
border-bottom-width: 2px;
font-size: 1.2em;
vertical-align: bottom;
}

.importChangeTable td{
border: 1px solid #ccc;
padding: .5em;
text-align: right;
}

.importChangeTable th{
border: 1px solid #ccc;
padding: .5em;
text-align: center;
}

.importChangeTable thead tr{
background-color: #eee;
}

.importChangeTable tbody tr:hover{
background-color: #deeeff;
}

table.importChangeTable{
border: 2px solid #ccc;
border-collapse: collapse;
padding: .5em;
margin-left: 35px;
}

table.importChangeTable thead tr .header{
background: url(../images/bg.gif) no-repeat bottom .5em right;
cursor: pointer;
padding-right: 24px;
}

table.importChangeTable thead tr .headerSortUp{
background-image: url(../images/asc.gif);
}
table.importChangeTable thead tr .headerSortDown{
background-image: url(../images/desc.gif);
}

table.importChangeTable thead tr th.importEventandStudentHeader{
background-color: lightgray;
}

table.importChangeTable thead tr th.importNewCommentandStatusHeader{
background-color: lightgreen;
}

table.importChangeTable thead tr th.importOldCommentandStatusHeader{
background-color: lightcoral;
}

td.importColumn{
text-align: right;
}

.eventViewTable td {
text-align: right;
font-size: 1.2em;
Expand Down Expand Up @@ -911,104 +848,6 @@ div.wicket-modal div.w_content_3 div.messageSuccess, div.wicket-modal div.w_cont
padding: 7px 30px 7px 30px;
}

.cancel {
background: #e54028;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
-ms-border-radius: 3px;
-o-border-radius: 3px;
border-radius: 3px;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
-webkit-transition-property: background;
-moz-transition-property: background;
-o-transition-property: background;
transition-property: background;
-webkit-transition-duration: 0.3s;
-moz-transition-duration: 0.3s;
-o-transition-duration: 0.3s;
transition-duration: 0.3s;
color: #ffffff;
text-shadow: none;
border: none;
height: 32px;
line-height: 32px;
padding: 0px 25.6px;
font-weight: 300;
margin: 0;
text-decoration: none;
text-align: center;
display: inline-block;
}

.cancel:active {
background: darkred;
-webkit-box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.03), inset 0px -1px 1px rgba(255, 255, 255, 0.05), 0px 1px 0px #777777, 0px 3px 3px rgba(0, 0, 0, 0.03);
-moz-box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.3), inset 0px -1px 1px rgba(255, 255, 255, 0.05), 0px 1px 0px #777777, 0px 3px 3px rgba(0, 0, 0, 0.03);
box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.03), inset 0px -1px 1px rgba(255, 255, 255, 0.05), 0px 1px 0px #777777, 0px 3px 3px rgba(0, 0, 0, 0.03);
}
.cancel:hover {
background: #FF530D;
text-decoration: none;
color: #ffffff;
}
.cancel:active {
background: darkred;
-webkit-box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.03), inset 0px -1px 1px rgba(255, 255, 255, 0.05), 0px 1px 0px #777777, 0px 3px 3px rgba(0, 0, 0, 0.03);
-moz-box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.3), inset 0px -1px 1px rgba(255, 255, 255, 0.05), 0px 1px 0px #777777, 0px 3px 3px rgba(0, 0, 0, 0.03);
box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.03), inset 0px -1px 1px rgba(255, 255, 255, 0.05), 0px 1px 0px #777777, 0px 3px 3px rgba(0, 0, 0, 0.03);
}

.confirm {
background: #00B233;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
-ms-border-radius: 3px;
-o-border-radius: 3px;
border-radius: 3px;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
-webkit-transition-property: background;
-moz-transition-property: background;
-o-transition-property: background;
transition-property: background;
-webkit-transition-duration: 0.3s;
-moz-transition-duration: 0.3s;
-o-transition-duration: 0.3s;
transition-duration: 0.3s;
color: #ffffff;
text-shadow: none;
border: none;
height: 32px;
line-height: 32px;
padding: 0px 25.6px;
font-weight: 300;
margin: 0;
text-decoration: none;
text-align: center;
display: inline-block;
}

.confirm:active {
background: darkgreen;
-webkit-box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.03), inset 0px -1px 1px rgba(255, 255, 255, 0.05), 0px 1px 0px #777777, 0px 3px 3px rgba(0, 0, 0, 0.03);
-moz-box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.3), inset 0px -1px 1px rgba(255, 255, 255, 0.05), 0px 1px 0px #777777, 0px 3px 3px rgba(0, 0, 0, 0.03);
box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.03), inset 0px -1px 1px rgba(255, 255, 255, 0.05), 0px 1px 0px #777777, 0px 3px 3px rgba(0, 0, 0, 0.03);
}
.confirm:hover {
background: lightgreen;
text-decoration: none;
color: #ffffff;
}
.confirm:active {
background: darkgreen;
-webkit-box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.03), inset 0px -1px 1px rgba(255, 255, 255, 0.05), 0px 1px 0px #777777, 0px 3px 3px rgba(0, 0, 0, 0.03);
-moz-box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.3), inset 0px -1px 1px rgba(255, 255, 255, 0.05), 0px 1px 0px #777777, 0px 3px 3px rgba(0, 0, 0, 0.03);
box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.03), inset 0px -1px 1px rgba(255, 255, 255, 0.05), 0px 1px 0px #777777, 0px 3px 3px rgba(0, 0, 0, 0.03);
}

.iclPage{
padding-left: 35px;
}
Expand Down