Commit f5010ba8 by Tuukka Kivilahti

now you can select multible readers

1 parent 0b317d62
......@@ -30,7 +30,8 @@
</ui:define>
<ui:define name="content">
<infoview:userselector />
<reader:readerlist />
<br /><br /><br /><br /><br /><br />
<reader:multireaderselect />
......
......@@ -18,6 +18,8 @@
*/
package fi.codecrew.moya.web.cdiview.reader;
import java.util.ArrayList;
import javax.ejb.EJB;
import javax.enterprise.context.RequestScoped;
import javax.faces.model.ListDataModel;
......@@ -72,5 +74,30 @@ public class ReaderListDataView extends GenericCDIView {
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);
}
}
......@@ -44,12 +44,13 @@ public class ReaderNameContainer implements Serializable {
* @return first selected reader, or null if no reader selected
*/
public Integer getReaderId() {
if(readers == null)
if(getReaders().size() == 0)
return null;
return readers.get(0);
}
/**
* Use this function when using readers in "only one reader" -mode
* @param readerId to set, or null to clear all readers
......@@ -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() {
if(readers == null)
readers = new ArrayList<Integer>();
......
......@@ -331,7 +331,7 @@ public class ReaderView extends GenericCDIView {
return true;
// is new code newer than previous code?
if(event.getUpdatetime().getTime() < event.getUpdatetime().getTime())
if(lastReadEvent.getUpdatetime().getTime() < event.getUpdatetime().getTime())
return true;
}
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!