now you can select multible readers

code/moya-web/WebContent/info/index.xhtml

@@ -30,7 +30,8 @@
 		</ui:define>
 		</ui:define>
 		<ui:define name="content">
 		<ui:define name="content">
 			<infoview:userselector />
 			<infoview:userselector />
-			<reader:readerlist />
+			<br /><br /><br /><br /><br /><br />
+			<reader:multireaderselect />
 			
 			
 			
 			
 			
 			

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/reader/ReaderListDataView.java

@@ -18,6 +18,8 @@
  */
  */
 package fi.codecrew.moya.web.cdiview.reader;
 package fi.codecrew.moya.web.cdiview.reader;
 
 
+import java.util.ArrayList;
+
 import javax.ejb.EJB;
 import javax.ejb.EJB;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.context.RequestScoped;
 import javax.faces.model.ListDataModel;
 import javax.faces.model.ListDataModel;
@@ -72,5 +74,30 @@ public class ReaderListDataView extends GenericCDIView {
 		return null;
 		return null;
 	}
 	}
 	
 	
+	public void selectMultipleReaders() {
+		if(readers.isRowAvailable()) {
+			readerNameContainer.addReader(readers.getRowData().getId());
+		}
+	}
+	
+	
+	public ListDataModel<Reader> getSelectedReaders() {
+		ArrayList<Reader> readers = new ArrayList<Reader>();
+		
+		for(Integer rid : readerNameContainer.getReaders()) {
+			Reader r = readerbean.getReader(rid);
+			
+			if(r != null)
+				readers.add(r);
+		}
+		
+		return new ListDataModel<Reader>(readers);
+	}
 
 
 }
 }
+
+
+
+
+
+

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/reader/ReaderNameContainer.java

@@ -44,11 +44,12 @@ public class ReaderNameContainer implements Serializable {
 	 * @return first selected reader, or null if no reader selected
 	 * @return first selected reader, or null if no reader selected
 	 */
 	 */
 	public Integer getReaderId() {
 	public Integer getReaderId() {
-		if(readers == null)
+		if(getReaders().size() == 0)
 			return null;
 			return null;
 		
 		
 		return readers.get(0);
 		return readers.get(0);
 	}
 	}
+	
 
 
 	/**
 	/**
 	 * Use this function when using readers in "only one reader" -mode
 	 * Use this function when using readers in "only one reader" -mode
@@ -65,6 +66,12 @@ public class ReaderNameContainer implements Serializable {
 		}
 		}
 	}
 	}
 	
 	
+	public void addReader(Integer readerId) {
+		if(!getReaders().contains(readerId)) {
+			getReaders().add(readerId);
+		}
+	}
+	
 	public List<Integer> getReaders() {
 	public List<Integer> getReaders() {
 		if(readers == null)
 		if(readers == null)
 			readers = new ArrayList<Integer>();
 			readers = new ArrayList<Integer>();

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/reader/ReaderView.java

@@ -331,7 +331,7 @@ public class ReaderView extends GenericCDIView {
 				return true;
 				return true;
 			
 			
 			// is new code newer than previous code?
 			// is new code newer than previous code?
-			if(event.getUpdatetime().getTime() < event.getUpdatetime().getTime())
+			if(lastReadEvent.getUpdatetime().getTime() < event.getUpdatetime().getTime())
 				return true;
 				return true;
 		}
 		}