Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Codecrew
/
Moya
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
30
Merge Requests
2
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 2c9e4f1a
authored
Nov 08, 2014
by
Tuomas Riihimäki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add width and height to EventMap
1 parent
690b826c
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
12 deletions
code/moya-beans/ejbModule/fi/codecrew/moya/beans/BootstrapBean.java
code/moya-database/src/main/java/fi/codecrew/moya/model/EventMap.java
code/moya-web/src/main/java/fi/codecrew/moya/servlet/PlaceMap.java → code/moya-web/src/main/java/fi/codecrew/moya/servlet/PlaceMapServlet.java
code/moya-beans/ejbModule/fi/codecrew/moya/beans/BootstrapBean.java
View file @
2c9e4f1
...
@@ -244,7 +244,10 @@ public class BootstrapBean implements BootstrapBeanLocal {
...
@@ -244,7 +244,10 @@ public class BootstrapBean implements BootstrapBeanLocal {
"ALTER TABLE food_wave_templates ADD COLUMN wait_payments_minutes integer DEFAULT null;"
,
"ALTER TABLE food_wave_templates ADD COLUMN wait_payments_minutes integer DEFAULT null;"
,
});
});
dbUpdates
.
add
(
new
String
[]
{
"ALTER TABLE maps ADD COLUMN width integer"
,
"ALTER TABLE maps ADD COLUMN height integer"
,
});
}
// start_time timestamp without time zone,
}
// start_time timestamp without time zone,
...
@@ -298,16 +301,16 @@ public class BootstrapBean implements BootstrapBeanLocal {
...
@@ -298,16 +301,16 @@ public class BootstrapBean implements BootstrapBeanLocal {
dbModelFacade
.
create
(
dBm
);
dbModelFacade
.
create
(
dBm
);
}
}
}
}
// We will never run this again with empty database
// We will never run this again with empty database
// public void saneDefaults() {
// public void saneDefaults() {
// User adminUser = userFacade.findByLogin("admin");
// User adminUser = userFacade.findByLogin("admin");
// if (adminUser == null) {
// if (adminUser == null) {
// adminUser = new User();
// adminUser = new User();
// adminUser.setLogin("admin");
// adminUser.setLogin("admin");
// // adminUser.setSuperadmin(true);
// // adminUser.setSuperadmin(true);
// adminUser.resetPassword("admin");
// adminUser.resetPassword("admin");
// userFacade.create(adminUser);
// userFacade.create(adminUser);
// }
// }
// }
// }
}
}
code/moya-database/src/main/java/fi/codecrew/moya/model/EventMap.java
View file @
2c9e4f1
...
@@ -74,6 +74,12 @@ public class EventMap extends GenericEntity {
...
@@ -74,6 +74,12 @@ public class EventMap extends GenericEntity {
@Lob
@Lob
private
String
notes
;
private
String
notes
;
@Column
()
private
Integer
width
;
@Column
()
private
Integer
height
;
public
EventMap
()
{
public
EventMap
()
{
super
();
super
();
}
}
...
@@ -138,4 +144,20 @@ public class EventMap extends GenericEntity {
...
@@ -138,4 +144,20 @@ public class EventMap extends GenericEntity {
return
notes
;
return
notes
;
}
}
public
Integer
getWidth
()
{
return
width
;
}
public
void
setWidth
(
Integer
width
)
{
this
.
width
=
width
;
}
public
Integer
getHeight
()
{
return
height
;
}
public
void
setHeight
(
Integer
height
)
{
this
.
height
=
height
;
}
}
}
code/moya-web/src/main/java/fi/codecrew/moya/servlet/PlaceMap.java
→
code/moya-web/src/main/java/fi/codecrew/moya/servlet/PlaceMap
Servlet
.java
View file @
2c9e4f1
File moved
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