WCAG: Course Timetabling

- a few additional improvements, including
  - Room Groups: alt for default room group check
  - Saved Timetables: ARIA labels for the list boxes
  - Suggestions: improved keyboard accessibility
  - Conflict-Based Statistics: improved keyboard accessibility

Author: tomas-muller

JavaSource/org/unitime/timetable/gwt/client/rooms/RoomGroupsTable.java

@@ -183,9 +183,11 @@ protected Widget getCell(final GroupInterface group, final RoomGroupsColumn colu
 		case ABBREVIATION:
 			return new Label(group.getAbbreviation() == null ? "" : group.getAbbreviation(), false);
 		case DEFAULT:
-			if (group.isDefault())
-				return new Image(RESOURCES.on());
-			else
+			if (group.isDefault()) {
+				Image on = new Image(RESOURCES.on());
+				on.setAltText(MESSAGES.exportTrue());
+				return on; 
+			} else
 				return null;
 		case DEPARTMENT:
 			return new DepartmentCell(true, iProperties, group.getDepartment());

JavaSource/org/unitime/timetable/gwt/client/solver/DataTable.java

@@ -132,7 +132,7 @@ public String getName() {
 			}
 			int rowIdx = addRow(row, line);
 			if (row.isSelected()) {
-				getRowFormatter().setStyleName(rowIdx, "unitime-TableRowSelected");
+				getRowFormatter().addStyleName(rowIdx, "unitime-TableRowSelected");
 			}
 		}
 		for (int i = 0; i < table.getHeader().length; i++)

JavaSource/org/unitime/timetable/gwt/client/solver/ListSolutionsPage.java

@@ -52,12 +52,15 @@
 import org.unitime.timetable.gwt.shared.SolverInterface.SolverOwner;
 import org.unitime.timetable.gwt.shared.TableInterface.TableRowInterface;
 
+import com.google.gwt.aria.client.Id;
+import com.google.gwt.aria.client.Roles;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.event.logical.shared.ValueChangeEvent;
 import com.google.gwt.event.logical.shared.ValueChangeHandler;
 import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.TakesValue;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.ui.HTML;
@@ -368,9 +371,13 @@ public void onClick(ClickEvent event) {
 			if (load && iSolverConfig != null) {
 				P loadPanel = new P("load-panel");
 				P configLabel = new P("config-label"); configLabel.setText(MESSAGES.propSolverConfig()); loadPanel.add(configLabel);
+				configLabel.getElement().setId(DOM.createUniqueId());
+				Roles.getListboxRole().setAriaLabelledbyProperty(iSolverConfig.getElement(), Id.of(configLabel.getElement()));
 				loadPanel.add(iSolverConfig);
 				if (iSolverHost != null) {
 					P hostLabel = new P("host-label"); hostLabel.setText(MESSAGES.propSolverHost()); loadPanel.add(hostLabel);
+					hostLabel.getElement().setId(DOM.createUniqueId());
+					Roles.getListboxRole().setAriaLabelledbyProperty(iSolverHost.getElement(), Id.of(hostLabel.getElement()));
 					loadPanel.add(iSolverHost);
 				}
 				AriaButton button = new AriaButton(MESSAGES.opSolverLoad()); button.addClickHandler(createClickHandler(iTableHeader, SolutionOperation.LOAD));
@@ -422,11 +429,17 @@ public void onMouseClick(TableEvent<TableRowInterface> event) {
 				iSolverOwner.addItem(owner.getName(), owner.getId().toString());
 			}
 			P ownerLabel = new P("owner-label"); ownerLabel.setText(MESSAGES.propSolverOwner()); loadPanel.add(ownerLabel);
+			ownerLabel.getElement().setId(DOM.createUniqueId());
+			Roles.getListboxRole().setAriaLabelledbyProperty(iSolverOwner.getElement(), Id.of(ownerLabel.getElement()));
 			loadPanel.add(iSolverOwner);
 			P configLabel = new P("config-label"); configLabel.setText(MESSAGES.propSolverConfig()); loadPanel.add(configLabel);
 			loadPanel.add(iSolverConfig);
+			configLabel.getElement().setId(DOM.createUniqueId());
+			Roles.getListboxRole().setAriaLabelledbyProperty(iSolverConfig.getElement(), Id.of(configLabel.getElement()));
 			if (iSolverHost != null) {
 				P hostLabel = new P("host-label"); hostLabel.setText(MESSAGES.propSolverHost()); loadPanel.add(hostLabel);
+				hostLabel.getElement().setId(DOM.createUniqueId());
+				Roles.getListboxRole().setAriaLabelledbyProperty(iSolverHost.getElement(), Id.of(hostLabel.getElement()));
 				loadPanel.add(iSolverHost);
 			}
 			AriaButton button = new AriaButton(MESSAGES.opSolverLoadEmptySolution()); button.addClickHandler(createClickHandler(iTableHeader, SolutionOperation.LOAD_EMPTY));

JavaSource/org/unitime/timetable/gwt/client/solver/suggestions/AssignmentTable.java

@@ -25,6 +25,7 @@
 import java.util.TreeSet;
 
 import org.unitime.timetable.gwt.client.TimeHint;
+import org.unitime.timetable.gwt.client.aria.ImageButton;
 import org.unitime.timetable.gwt.client.rooms.RoomHint;
 import org.unitime.timetable.gwt.client.solver.SolverCookie;
 import org.unitime.timetable.gwt.client.widgets.P;
@@ -53,7 +54,6 @@
 import com.google.gwt.user.client.ui.HasHorizontalAlignment;
 import com.google.gwt.user.client.ui.Widget;
 import com.google.gwt.user.client.ui.HasHorizontalAlignment.HorizontalAlignmentConstant;
-import com.google.gwt.user.client.ui.Image;
 import com.google.gwt.user.client.ui.Label;
 
 /**
@@ -206,9 +206,10 @@ protected Widget getCell(final ClassAssignmentDetails details, final AssignmentC
 		case CLASS:
 			if (iCanRemove) {
 				P clazz = new P("class");
-				Image image = new Image(RESOURCES.delete());
+				ImageButton image = new ImageButton(RESOURCES.delete());
 				image.addStyleName("delete");
 				image.setTitle(MESSAGES.titleRemoveSelectedClassAssignment(details.getClazz().getName()));
+				image.setAltText(MESSAGES.titleRemoveSelectedClassAssignment(details.getClazz().getName()));
 				image.addClickHandler(new ClickHandler() {
 					@Override
 					public void onClick(ClickEvent event) {

JavaSource/org/unitime/timetable/gwt/client/solver/suggestions/CurrentAssignment.java

@@ -170,7 +170,7 @@ else if (details.getRoom() != null)
 		} else {
 			iRooms = null;
 		}
-		if (details.getClazz().nrRooms() > 0 && details.getClazz().getRoomCapacity() > 0)
+		if (details.getClazz().nrRooms() > 0 && details.getClazz().getRoomCapacity() > 0 && details.getClazz().getRoomCapacity() < Integer.MAX_VALUE)
 			addRow(MESSAGES.propMinimumRoomSize(), new Label(String.valueOf(details.getClazz().getRoomCapacity())));
 		if (details.getClazz().getNote() != null && !details.getClazz().getNote().isEmpty()) {
 			addRow(MESSAGES.propNote(), new HTML(details.getClazz().getNote()));

JavaSource/org/unitime/timetable/gwt/client/solver/suggestions/SelectedSuggestion.java

@@ -77,33 +77,33 @@ protected void onRemove(ClassAssignmentDetails details) {
 					iContext.remove(details.getClazz());
 				}
 			};
+			at.addMouseClickListener(new MouseClickListener<ClassAssignmentDetails>() {
+				@Override
+				public void onMouseClick(TableEvent<ClassAssignmentDetails> event) {
+					if (event.getData() != null) iContext.select(event.getData().getClazz());
+				}
+			});
 			for (ClassAssignmentDetails d: suggestion.getDifferentAssignments()) {
 				at.addRow(d);
 				if (d.hasConflict()) at.setColumnVisible(at.getCellIndex(AssignmentTable.AssignmentColumn.CONSTRAINT), true);
 			}
 			addHeaderRow(MESSAGES.headerSelectedAssignment());
 			addRow(at);
+		}
+		if (suggestion.hasUnresolvedConflicts()) {
+			AssignmentTable at = new AssignmentTable(iContext.getProperties(), true, false);
 			at.addMouseClickListener(new MouseClickListener<ClassAssignmentDetails>() {
 				@Override
 				public void onMouseClick(TableEvent<ClassAssignmentDetails> event) {
 					if (event.getData() != null) iContext.select(event.getData().getClazz());
 				}
 			});
-		}
-		if (suggestion.hasUnresolvedConflicts()) {
-			AssignmentTable at = new AssignmentTable(iContext.getProperties(), true, false);
 			for (ClassAssignmentDetails d: suggestion.getUnresolvedConflicts()) {
 				at.addRow(d);
 				if (d.hasConflict()) at.setColumnVisible(at.getCellIndex(AssignmentTable.AssignmentColumn.CONSTRAINT), true);
 			}
 			addHeaderRow(MESSAGES.headerConflictingAssignments());
 			addRow(at);
-			at.addMouseClickListener(new MouseClickListener<ClassAssignmentDetails>() {
-				@Override
-				public void onMouseClick(TableEvent<ClassAssignmentDetails> event) {
-					if (event.getData() != null) iContext.select(event.getData().getClazz());
-				}
-			});
 		}
 		if (suggestion.getUnassignedVariables() != suggestion.getBaseUnassignedVariables())
 			addRow(MESSAGES.propNotAssignedClasses(), new HTML(iContext.dispNumber(suggestion.getUnassignedVariables(),suggestion.getBaseUnassignedVariables()), false));

WebContent/styles/unitime.css

@@ -6305,6 +6305,7 @@ unitime-RoomSharingWidget .legend .blank {
 	cursor: pointer;
 	cursor: hand;
 	padding-right: 1px;
+	margin: 1px 5px 0px 5px;
 }
 
 .unitime-ClassAssignmentTable .classes .label {
@@ -6370,6 +6371,11 @@ unitime-RoomSharingWidget .legend .blank {
 
 .unitime-ConflictBasedStatistics .cbs-node {
 	white-space: nowrap;
+	padding: 1px 3px 1px 3px;
+}
+
+.unitime-ConflictBasedStatistics:focus-within .gwt-TreeItem-selected .cbs-node {
+	background: #d3def6 url(../unitime/gwt/standard/images/hborder.png) repeat-x 0px -1463px;
 }
 
 .unitime-ConflictBasedStatistics table {
@@ -8613,6 +8619,14 @@ unitime-RoomSharingWidget .legend .blank {
 	white-space: nowrap;
 }
 
+.unitime-RoomGroupEdit .unitime-Rooms .pref-2 {
+	background: white;
+}
+
+.unitime-RoomFeatureEdit .unitime-Rooms .pref-2 {
+	background: white;
+}
+
 .pref-3 {
 	background-color: #DCB43C;
 	color: black;
@@ -8696,6 +8710,10 @@ unitime-RoomSharingWidget .legend .blank {
 	height: 24px;
 }
 
+.unitime-FocusableTable .focusable-cell {
+	min-width: 24px;
+}
+
 .unitime-CourseCurriculaTable {
 	width: 100%;
 }
@@ -8725,6 +8743,10 @@ unitime-RoomSharingWidget .legend .blank {
 	outline: 1px solid blue !important;
 }
 
+.gwt-Tree .gwt-TreeItem-selected .gwt-Label {
+    background: inherit;
+}
+
 .unitime-ExamOwnersTable .unitime-ImageButton {
 	vertical-align: text-top;
 	margin: 1px 5px 0px 5px;