Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Antti Väyrynen
/
Moya
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit f5010ba8
authored
Oct 23, 2014
by
Tuukka Kivilahti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
now you can select multible readers
1 parent
0b317d62
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
3 deletions
code/moya-web/WebContent/info/index.xhtml
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/reader/ReaderListDataView.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/reader/ReaderNameContainer.java
code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/reader/ReaderView.java
code/moya-web/WebContent/info/index.xhtml
View file @
f5010ba
...
@@ -30,7 +30,8 @@
...
@@ -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
View file @
f5010ba
...
@@ -18,6 +18,8 @@
...
@@ -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 {
...
@@ -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
View file @
f5010ba
...
@@ -44,12 +44,13 @@ public class ReaderNameContainer implements Serializable {
...
@@ -44,12 +44,13 @@ 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
* @param readerId to set, or null to clear all readers
* @param readerId to set, or null to clear all readers
...
@@ -65,6 +66,12 @@ public class ReaderNameContainer implements Serializable {
...
@@ -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
View file @
f5010ba
...
@@ -331,7 +331,7 @@ public class ReaderView extends GenericCDIView {
...
@@ -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
(
e
vent
.
getUpdatetime
().
getTime
()
<
event
.
getUpdatetime
().
getTime
())
if
(
lastReadE
vent
.
getUpdatetime
().
getTime
()
<
event
.
getUpdatetime
().
getTime
())
return
true
;
return
true
;
}
}
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment