Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Max Mecklin
/
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 12fbbb8b
authored
May 21, 2010
by
Tuukka Kivilahti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
uh, I forgot one
1 parent
47c09beb
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
1 deletions
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/PlaceMapBeanLocal.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Product.java
code/LanBortalWeb/WebContent/resources/tools/map/placeSelect.xhtml
code/LanBortalWeb/src/fi/insomnia/bortal/view/MapView.java
code/LanBortalBeansClient/ejbModule/fi/insomnia/bortal/beans/PlaceMapBeanLocal.java
View file @
12fbbb8
...
@@ -17,6 +17,8 @@ public interface PlaceMapBeanLocal {
...
@@ -17,6 +17,8 @@ public interface PlaceMapBeanLocal {
void
printPlaceMapToStream
(
OutputStream
outputStream
,
String
filetype
,
Event
event
,
Integer
mapId
,
Integer
userId
,
List
<
Integer
>
placeIds
)
throws
IOException
;
void
printPlaceMapToStream
(
OutputStream
outputStream
,
String
filetype
,
Event
event
,
Integer
mapId
,
Integer
userId
,
List
<
Integer
>
placeIds
)
throws
IOException
;
public
String
getSelectPlaceMapUrl
(
EventMap
activeMap
,
List
<
Place
>
selectedPlaces
,
User
user
);
public
String
getSelectPlaceMapUrl
(
EventMap
activeMap
,
List
<
Place
>
selectedPlaces
,
User
user
);
public
int
selectablePlaceCount
(
User
user
,
Event
currentEvent
);
// public EventMap findMap(int i);
// public EventMap findMap(int i);
}
}
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Product.java
View file @
12fbbb8
...
@@ -53,6 +53,9 @@ public class Product implements EventChildInterface {
...
@@ -53,6 +53,9 @@ public class Product implements EventChildInterface {
@Column
(
name
=
"barcode"
)
@Column
(
name
=
"barcode"
)
private
String
barcode
;
private
String
barcode
;
@Column
(
name
=
"prepaid"
)
private
boolean
prepaid
=
false
;
@OneToMany
(
cascade
=
CascadeType
.
ALL
,
mappedBy
=
"product"
)
@OneToMany
(
cascade
=
CascadeType
.
ALL
,
mappedBy
=
"product"
)
private
List
<
Place
>
places
;
private
List
<
Place
>
places
;
...
@@ -211,5 +214,19 @@ public class Product implements EventChildInterface {
...
@@ -211,5 +214,19 @@ public class Product implements EventChildInterface {
public
List
<
FoodWaveTemplate
>
getFoodWaveTemplates
()
{
public
List
<
FoodWaveTemplate
>
getFoodWaveTemplates
()
{
return
foodWaveTemplates
;
return
foodWaveTemplates
;
}
}
/**
* @return the prepaid
*/
public
boolean
isPrepaid
()
{
return
prepaid
;
}
/**
* @param prepaid the prepaid to set
*/
public
void
setPrepaid
(
boolean
prepaid
)
{
this
.
prepaid
=
prepaid
;
}
}
}
code/LanBortalWeb/WebContent/resources/tools/map/placeSelect.xhtml
View file @
12fbbb8
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
<h:form>
<h:form>
<h:commandButton
image=
"#{mapView.selectPlaceMapUrl}"
actionListener=
"#{mapView.placeSelectActionListener}"
/>
<h:commandButton
image=
"#{mapView.selectPlaceMapUrl}"
actionListener=
"#{mapView.placeSelectActionListener}"
/>
<h:outputText
value=
"#{i18n['placeSelect.left']}: #{mapView.placeLeftToSelect}"
/>
</h:form>
</h:form>
...
...
code/LanBortalWeb/src/fi/insomnia/bortal/view/MapView.java
View file @
12fbbb8
...
@@ -117,4 +117,10 @@ public class MapView {
...
@@ -117,4 +117,10 @@ public class MapView {
public
void
setSessionHandler
(
SessionHandler
sessionHandler
)
{
public
void
setSessionHandler
(
SessionHandler
sessionHandler
)
{
this
.
sessionHandler
=
sessionHandler
;
this
.
sessionHandler
=
sessionHandler
;
}
}
public
String
placeLeftToSelect
()
{
int
totalPlaces
=
placeMapBean
.
selectablePlaceCount
(
sessionHandler
.
getUser
(),
sessionHandler
.
getCurrentEvent
());
return
(
totalPlaces
-
selectedPlaces
.
size
())+
""
;
}
}
}
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