autocommit: prepare branch i18n_OO

--HG--
branch : i18n_OO

src/main/java/org/olat/course/nodes/vitero/ViteroPeekViewController.java

@@ -85,6 +85,7 @@ public class ViteroPeekViewController extends BasicController {
 		listenTo(tableCtrl);
 		
 		// dummy header key, won't be used since setDisplayTableHeader is set to false
+		tableCtrl.addColumnDescriptor(new DefaultColumnDescriptor("vc.table.group", ViteroBookingDataModel.Column.name.ordinal(), null, ureq.getLocale()));
 		tableCtrl.addColumnDescriptor(new DefaultColumnDescriptor("vc.table.begin", ViteroBookingDataModel.Column.begin.ordinal(), null, ureq.getLocale()));
 		tableCtrl.addColumnDescriptor(new DefaultColumnDescriptor("vc.table.end", ViteroBookingDataModel.Column.end.ordinal(), null, ureq.getLocale()));
 		tableCtrl.setTableDataModel(new ViteroBookingDataModel(bookings));

src/main/java/org/olat/modules/vitero/manager/ViteroManager.java

@@ -669,13 +669,13 @@ public class ViteroManager extends BasicManager implements UserDataDeletable {
 		return roomSizes;
 	}
 	
-	public int createGroup()
+	public int createGroup(String groupName)
 	throws VmsNotAvailableException {
 		try {
 			GroupServiceStub groupWs = getGroupWebService();
 			GroupServiceStub.CreateGroupRequest createRequest = new GroupServiceStub.CreateGroupRequest();
 			GroupServiceStub.Groupnamecustomerid groupInfos = new GroupServiceStub.Groupnamecustomerid();
-			groupInfos.setGroupname("OLAT-" + UUID.randomUUID().toString().replace("-", ""));
+			groupInfos.setGroupname(groupName + "_OLAT_" + UUID.randomUUID().toString().replace("-", ""));
 			groupInfos.setCustomerid(viteroModule.getCustomerId());
 			createRequest.setGroup(groupInfos);
 			
@@ -878,7 +878,8 @@ public class ViteroManager extends BasicManager implements UserDataDeletable {
 
 		try {
 			//a group per meeting
-			int groupId = createGroup();
+			String groupName = vBooking.getGroupName();
+			int groupId = createGroup(groupName);
 			if(groupId < 0) {
 				return new ViteroStatus(ErrorCode.unkown);
 			}

src/main/java/org/olat/modules/vitero/model/ViteroBooking.java

@@ -36,6 +36,7 @@ public class ViteroBooking {
 	
 	private int bookingId;
 	private int groupId;
+	private String groupName;
 	private Date start;
 	private int startBuffer;
 	private Date end;
@@ -85,6 +86,14 @@ public class ViteroBooking {
 		this.groupId = groupId;
 	}
 
+	public String getGroupName() {
+		return groupName;
+	}
+
+	public void setGroupName(String groupName) {
+		this.groupName = groupName;
+	}
+
 	public int getRoomSize() {
 		return roomSize;
 	}

src/main/java/org/olat/modules/vitero/ui/ViteroAdminBookingRawInfosController.java

@@ -68,7 +68,13 @@ public class ViteroAdminBookingRawInfosController extends FormBasicController {
 		uifactory.addStaticTextElement("booking.roomSize", Integer.toString(booking.getRoomSize()), formLayout);
 		uifactory.addStaticTextElement("group.numOfParticipants", Integer.toString(group.getNumOfParticipants()), formLayout);
 		uifactory.addStaticTextElement("group.id", Integer.toString(group.getGroupId()), formLayout);
-		uifactory.addStaticTextElement("group.name", group.getName(), formLayout);
+		
+		String name = group.getName();
+		int sepIndex = name.indexOf("_OLAT_");
+		if(sepIndex > 0) {
+			name = name.substring(0, sepIndex);
+		}
+		uifactory.addStaticTextElement("group.name", name, formLayout);
 
 		MultipleSelectionElement autoSignIn = uifactory.addCheckboxesHorizontal("booking.autoSignIn", formLayout, autoSignInKeys, autoSignInValues, null);
 		if(booking.isAutoSignIn()) {

src/main/java/org/olat/modules/vitero/ui/ViteroBookingDataModel.java

@@ -73,6 +73,10 @@ public class ViteroBookingDataModel implements TableDataModel {
 	public Object getValueAt(int row, int col) {
 		ViteroBooking booking = getObject(row);
 		switch(Column.values()[col]) {
+			case name: {
+				String name = booking.getGroupName();
+				return name;
+			}
 			case begin: return booking.getStart();
 			case end: return booking.getEnd();
 			case roomSize: {
@@ -122,6 +126,7 @@ public class ViteroBookingDataModel implements TableDataModel {
 	}
 
 	public enum Column {
+		name,
 		begin,
 		end,
 		roomSize,

src/main/java/org/olat/modules/vitero/ui/ViteroBookingEditController.java

@@ -29,12 +29,14 @@ import org.olat.core.gui.components.form.flexible.FormItemContainer;
 import org.olat.core.gui.components.form.flexible.elements.DateChooser;
 import org.olat.core.gui.components.form.flexible.elements.MultipleSelectionElement;
 import org.olat.core.gui.components.form.flexible.elements.SingleSelection;
+import org.olat.core.gui.components.form.flexible.elements.TextElement;
 import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
 import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
 import org.olat.core.gui.control.Controller;
 import org.olat.core.gui.control.Event;
 import org.olat.core.gui.control.WindowControl;
 import org.olat.core.id.OLATResourceable;
+import org.olat.core.util.StringHelper;
 import org.olat.group.BusinessGroup;
 import org.olat.modules.vitero.manager.ViteroManager;
 import org.olat.modules.vitero.manager.VmsNotAvailableException;
@@ -52,6 +54,7 @@ import org.olat.modules.vitero.model.ViteroStatus;
  */
 public class ViteroBookingEditController extends FormBasicController {
 	
+	private TextElement groupName;
 	private DateChooser beginChooser;
 	private DateChooser endChooser;
 	private SingleSelection beginBufferEl;
@@ -106,6 +109,11 @@ public class ViteroBookingEditController extends FormBasicController {
 			setFormWarning("new.booking.warning");
 		}
 		
+		String name = booking.getGroupName();
+		groupName = uifactory.addTextElement("group.name", "group.name", 32, name, formLayout);
+		groupName.setMandatory(true);
+		groupName.setEnabled(editable);
+		
 		//begin
 		beginChooser = uifactory.addDateChooser("booking.begin", "", formLayout);
 		beginChooser.setDisplaySize(21);
@@ -161,6 +169,18 @@ public class ViteroBookingEditController extends FormBasicController {
 	@Override
 	protected boolean validateFormLogic(UserRequest ureq) {
 		boolean allOk = true;
+		
+		String name = groupName.getValue();
+		groupName.clearError();
+		if(StringHelper.containsNonWhitespace(name)) {
+			if(name.contains("_")) {
+				groupName.setErrorKey("error.bookingName", null);
+				allOk &= false;
+			}
+		} else {
+			groupName.setErrorKey("form.legende.mandatory", null);
+			allOk &= false;
+		}
 
 		Date begin = beginChooser.getDate();
 		if(beginChooser.isEnabled()) {
@@ -200,6 +220,9 @@ public class ViteroBookingEditController extends FormBasicController {
 
 	@Override
 	protected void formOK(UserRequest ureq) {
+		String name = groupName.getValue();
+		booking.setGroupName(name);
+
 		Date begin = beginChooser.getDate();
 		booking.setStart(begin);
 		

src/main/java/org/olat/modules/vitero/ui/ViteroBookingsAdminController.java

@@ -83,7 +83,8 @@ public class ViteroBookingsAdminController extends BasicController {
 		
 		tableCtr = new TableController(tableConfig, ureq, getWindowControl(), getTranslator());
 		listenTo(tableCtr);
-		
+
+		tableCtr.addColumnDescriptor(new DefaultColumnDescriptor("group.name", ViteroBookingDataModel.Column.name.ordinal(), null, ureq.getLocale()));
 		tableCtr.addColumnDescriptor(new DefaultColumnDescriptor("booking.begin", ViteroBookingDataModel.Column.begin.ordinal(), null, ureq.getLocale()));
 		tableCtr.addColumnDescriptor(new DefaultColumnDescriptor("booking.end", ViteroBookingDataModel.Column.end.ordinal(), null, ureq.getLocale()));
 		tableCtr.addColumnDescriptor(new DefaultColumnDescriptor("booking.roomSize", ViteroBookingDataModel.Column.roomSize.ordinal(), null, ureq.getLocale()));

src/main/java/org/olat/modules/vitero/ui/ViteroBookingsController.java

@@ -75,6 +75,7 @@ public class ViteroBookingsController extends BasicController {
 		tableConfig.setColumnMovingOffered(true);
 		tableConfig.setSortingEnabled(true);
 		tableCtr = new TableController(tableConfig, ureq, wControl, getTranslator());
+		tableCtr.addColumnDescriptor(new DefaultColumnDescriptor("group.name", ViteroBookingDataModel.Column.name.ordinal(), null, ureq.getLocale()));
 		tableCtr.addColumnDescriptor(new DefaultColumnDescriptor("booking.begin", ViteroBookingDataModel.Column.begin.ordinal(), null, ureq.getLocale()));
 		tableCtr.addColumnDescriptor(new DefaultColumnDescriptor("booking.end", ViteroBookingDataModel.Column.end.ordinal(), null, ureq.getLocale()));
 		

src/main/java/org/olat/modules/vitero/ui/ViteroBookingsEditController.java

@@ -39,6 +39,7 @@ import org.olat.core.gui.control.generic.closablewrapper.CloseableModalControlle
 import org.olat.core.gui.control.generic.modal.DialogBoxController;
 import org.olat.core.gui.control.generic.modal.DialogBoxUIFactory;
 import org.olat.core.id.OLATResourceable;
+import org.olat.core.util.StringHelper;
 import org.olat.course.editor.NodeEditController;
 import org.olat.group.BusinessGroup;
 import org.olat.modules.vitero.manager.ViteroManager;
@@ -249,6 +250,14 @@ public class ViteroBookingsEditController extends FormBasicController {
 		public ViteroBooking getMeeting() {
 			return meeting;
 		}
+		
+		public String getGroupName() {
+			String name = meeting.getGroupName();
+			if(StringHelper.containsNonWhitespace(name)) {
+				return name;
+			}
+			return "";
+		}
 
 		public Date getBegin() {
 			return meeting.getStart();

src/main/java/org/olat/modules/vitero/ui/ViteroRoomsOverviewController.java

@@ -67,7 +67,8 @@ public class ViteroRoomsOverviewController extends BasicController {
 		
 		tableCtr = new TableController(tableConfig, ureq, getWindowControl(), getTranslator());
 		listenTo(tableCtr);
-		
+
+		tableCtr.addColumnDescriptor(new DefaultColumnDescriptor("group.name", ViteroBookingDataModel.Column.name.ordinal(), null, ureq.getLocale()));
 		tableCtr.addColumnDescriptor(new DefaultColumnDescriptor("booking.begin", ViteroBookingDataModel.Column.begin.ordinal(), null, ureq.getLocale()));
 		tableCtr.addColumnDescriptor(new DefaultColumnDescriptor("booking.end", ViteroBookingDataModel.Column.end.ordinal(), null, ureq.getLocale()));
 		tableCtr.addColumnDescriptor(new DefaultColumnDescriptor("booking.roomSize", ViteroBookingDataModel.Column.roomSize.ordinal(), null, ureq.getLocale()));

src/main/java/org/olat/modules/vitero/ui/ViteroUserToGroupController.java

@@ -299,14 +299,14 @@ public class ViteroUserToGroupController extends BasicController {
 			this.selfParticipants.addAll(selfParticipants);
 			
 			//remove duplicates
-			coaches.removeAll(owners);
+			this.coaches.removeAll(owners);
 			
-			participants.removeAll(owners);
-			participants.removeAll(coaches);
+			this.participants.removeAll(owners);
+			this.participants.removeAll(coaches);
 			
-			selfParticipants.remove(owners);
-			selfParticipants.remove(coaches);
-			selfParticipants.remove(participants);
+			this.selfParticipants.removeAll(owners);
+			this.selfParticipants.removeAll(coaches);
+			this.selfParticipants.removeAll(participants);
 		}
 
 		public List<Identity> getOwners() {

src/main/java/org/olat/modules/vitero/ui/_content/edit.html

@@ -3,6 +3,7 @@
 	$r.contextHelpWithWrapper("org.olat.modules.vitero.ui","ced-vitero-config.html","help.hover.vitero")
 	<table>
 		<tr>
+			<td>$r.translate("group.name")</td>
 			<td>$r.translate("booking.begin")</td>
 			<td>$r.translate("booking.end")</td>
 			<td colspan="3"></td>
@@ -10,6 +11,7 @@
 		
 		#foreach($bookingDisplay in $bookingDisplays)
 			<tr>
+				<td>$bookingDisplay.groupName</td>
 				<td>$r.formatDateAndTime($bookingDisplay.begin)</td>
 				<td>$r.formatDateAndTime($bookingDisplay.end)</td>
 				<td>