ServiceLayer - energyType
Servicy, dao a dto pro včechno s roomem.
Service layer - occupant
scaffold some entities
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch scaffold
# Changes to be committed:
#	modified:   pom.xml
#	new file:   src/main/java/cz/muni/fi/pv243/powerconsumption/service/StartupBean.java
#	new file:   src/main/java/cz/muni/fi/pv243/view/InvoiceBean.java
#	new file:   src/main/java/cz/muni/fi/pv243/view/LeaseBean.java
#	new file:   src/main/java/cz/muni/fi/pv243/view/OccupantBean.java
#	new file:   src/main/java/cz/muni/fi/pv243/view/ViewUtils.java
#	modified:   src/main/resources/META-INF/persistence.xml
#	new file:   src/main/webapp/WEB-INF/beans.xml
#	new file:   src/main/webapp/WEB-INF/classes/META-INF/forge.taglib.xml
#	new file:   src/main/webapp/WEB-INF/faces-config.xml
#	new file:   src/main/webapp/WEB-INF/web.xml
#	new file:   src/main/webapp/error.xhtml
#	new file:   src/main/webapp/index.html
#	new file:   src/main/webapp/index.xhtml
#	new file:   src/main/webapp/invoice/create.xhtml
#	new file:   src/main/webapp/invoice/search.xhtml
#	new file:   src/main/webapp/invoice/view.xhtml
#	new file:   src/main/webapp/lease/create.xhtml
#	new file:   src/main/webapp/lease/search.xhtml
#	new file:   src/main/webapp/lease/view.xhtml
#	new file:   src/main/webapp/occupant/create.xhtml
#	new file:   src/main/webapp/occupant/search.xhtml
#	new file:   src/main/webapp/occupant/view.xhtml
#	new file:   src/main/webapp/resources/add.png
#	new file:   src/main/webapp/resources/bootstrap.css
#	new file:   src/main/webapp/resources/false.png
#	new file:   src/main/webapp/resources/favicon.ico
#	new file:   src/main/webapp/resources/forge-logo.png
#	new file:   src/main/webapp/resources/forge-style.css
#	new file:   src/main/webapp/resources/jboss-community.png
#	new file:   src/main/webapp/resources/remove.png
#	new file:   src/main/webapp/resources/scaffold/pageTemplate.xhtml
#	new file:   src/main/webapp/resources/scaffold/paginator.xhtml
#	new file:   src/main/webapp/resources/search.png
#	new file:   src/main/webapp/resources/true.png
#
# Untracked files:
#	.forge_settings
#	.idea/
#	power-consumption.iml
#
implement abstract setEntityManager
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch scaffold
# Changes to be committed:
#	modified:   pom.xml
#	new file:   src/main/java/cz/muni/fi/pv243/powerconsumption/service/StartupBean.java
#	new file:   src/main/java/cz/muni/fi/pv243/view/InvoiceBean.java
#	new file:   src/main/java/cz/muni/fi/pv243/view/LeaseBean.java
#	new file:   src/main/java/cz/muni/fi/pv243/view/OccupantBean.java
#	new file:   src/main/java/cz/muni/fi/pv243/view/ViewUtils.java
#	modified:   src/main/resources/META-INF/persistence.xml
#	new file:   src/main/webapp/WEB-INF/beans.xml
#	new file:   src/main/webapp/WEB-INF/classes/META-INF/forge.taglib.xml
#	new file:   src/main/webapp/WEB-INF/faces-config.xml
#	new file:   src/main/webapp/WEB-INF/web.xml
#	new file:   src/main/webapp/error.xhtml
#	new file:   src/main/webapp/index.html
#	new file:   src/main/webapp/index.xhtml
#	new file:   src/main/webapp/invoice/create.xhtml
#	new file:   src/main/webapp/invoice/search.xhtml
#	new file:   src/main/webapp/invoice/view.xhtml
#	new file:   src/main/webapp/lease/create.xhtml
#	new file:   src/main/webapp/lease/search.xhtml
#	new file:   src/main/webapp/lease/view.xhtml
#	new file:   src/main/webapp/occupant/create.xhtml
#	new file:   src/main/webapp/occupant/search.xhtml
#	new file:   src/main/webapp/occupant/view.xhtml
#	new file:   src/main/webapp/resources/add.png
#	new file:   src/main/webapp/resources/bootstrap.css
#	new file:   src/main/webapp/resources/false.png
#	new file:   src/main/webapp/resources/favicon.ico
#	new file:   src/main/webapp/resources/forge-logo.png
#	new file:   src/main/webapp/resources/forge-style.css
#	new file:   src/main/webapp/resources/jboss-community.png
#	new file:   src/main/webapp/resources/remove.png
#	new file:   src/main/webapp/resources/scaffold/pageTemplate.xhtml
#	new file:   src/main/webapp/resources/scaffold/paginator.xhtml
#	new file:   src/main/webapp/resources/search.png
#	new file:   src/main/webapp/resources/true.png
#
# Untracked files:
#	.forge_settings
#	.idea/
#	power-consumption.iml
#
Service layer - invoice, lease, measurement
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch scaffold
# Changes to be committed:
#	modified:   pom.xml
#	new file:   src/main/java/cz/muni/fi/pv243/powerconsumption/service/StartupBean.java
#	new file:   src/main/java/cz/muni/fi/pv243/view/InvoiceBean.java
#	new file:   src/main/java/cz/muni/fi/pv243/view/LeaseBean.java
#	new file:   src/main/java/cz/muni/fi/pv243/view/OccupantBean.java
#	new file:   src/main/java/cz/muni/fi/pv243/view/ViewUtils.java
#	modified:   src/main/resources/META-INF/persistence.xml
#	new file:   src/main/webapp/WEB-INF/beans.xml
#	new file:   src/main/webapp/WEB-INF/classes/META-INF/forge.taglib.xml
#	new file:   src/main/webapp/WEB-INF/faces-config.xml
#	new file:   src/main/webapp/WEB-INF/web.xml
#	new file:   src/main/webapp/error.xhtml
#	new file:   src/main/webapp/index.html
#	new file:   src/main/webapp/index.xhtml
#	new file:   src/main/webapp/invoice/create.xhtml
#	new file:   src/main/webapp/invoice/search.xhtml
#	new file:   src/main/webapp/invoice/view.xhtml
#	new file:   src/main/webapp/lease/create.xhtml
#	new file:   src/main/webapp/lease/search.xhtml
#	new file:   src/main/webapp/lease/view.xhtml
#	new file:   src/main/webapp/occupant/create.xhtml
#	new file:   src/main/webapp/occupant/search.xhtml
#	new file:   src/main/webapp/occupant/view.xhtml
#	new file:   src/main/webapp/resources/add.png
#	new file:   src/main/webapp/resources/bootstrap.css
#	new file:   src/main/webapp/resources/false.png
#	new file:   src/main/webapp/resources/favicon.ico
#	new file:   src/main/webapp/resources/forge-logo.png
#	new file:   src/main/webapp/resources/forge-style.css
#	new file:   src/main/webapp/resources/jboss-community.png
#	new file:   src/main/webapp/resources/remove.png
#	new file:   src/main/webapp/resources/scaffold/pageTemplate.xhtml
#	new file:   src/main/webapp/resources/scaffold/paginator.xhtml
#	new file:   src/main/webapp/resources/search.png
#	new file:   src/main/webapp/resources/true.png
#
# Untracked files:
#	.forge_settings
#	.idea/
#	power-consumption.iml
#
Arquillian setup
Service layer - measurement, room
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch scaffold
# Changes to be committed:
#	modified:   pom.xml
#	new file:   src/main/java/cz/muni/fi/pv243/powerconsumption/service/StartupBean.java
#	new file:   src/main/java/cz/muni/fi/pv243/view/InvoiceBean.java
#	new file:   src/main/java/cz/muni/fi/pv243/view/LeaseBean.java
#	new file:   src/main/java/cz/muni/fi/pv243/view/OccupantBean.java
#	new file:   src/main/java/cz/muni/fi/pv243/view/ViewUtils.java
#	modified:   src/main/resources/META-INF/persistence.xml
#	new file:   src/main/webapp/WEB-INF/beans.xml
#	new file:   src/main/webapp/WEB-INF/classes/META-INF/forge.taglib.xml
#	new file:   src/main/webapp/WEB-INF/faces-config.xml
#	new file:   src/main/webapp/WEB-INF/web.xml
#	new file:   src/main/webapp/error.xhtml
#	new file:   src/main/webapp/index.html
#	new file:   src/main/webapp/index.xhtml
#	new file:   src/main/webapp/invoice/create.xhtml
#	new file:   src/main/webapp/invoice/search.xhtml
#	new file:   src/main/webapp/invoice/view.xhtml
#	new file:   src/main/webapp/lease/create.xhtml
#	new file:   src/main/webapp/lease/search.xhtml
#	new file:   src/main/webapp/lease/view.xhtml
#	new file:   src/main/webapp/occupant/create.xhtml
#	new file:   src/main/webapp/occupant/search.xhtml
#	new file:   src/main/webapp/occupant/view.xhtml
#	new file:   src/main/webapp/resources/add.png
#	new file:   src/main/webapp/resources/bootstrap.css
#	new file:   src/main/webapp/resources/false.png
#	new file:   src/main/webapp/resources/favicon.ico
#	new file:   src/main/webapp/resources/forge-logo.png
#	new file:   src/main/webapp/resources/forge-style.css
#	new file:   src/main/webapp/resources/jboss-community.png
#	new file:   src/main/webapp/resources/remove.png
#	new file:   src/main/webapp/resources/scaffold/pageTemplate.xhtml
#	new file:   src/main/webapp/resources/scaffold/paginator.xhtml
#	new file:   src/main/webapp/resources/search.png
#	new file:   src/main/webapp/resources/true.png
#
# Untracked files:
#	.forge_settings
#	.idea/
#	power-consumption.iml
#
Implement invoice calculation logic

Added multiple new (unimplemented) methods in services.
Also removed people count from Lease, it made no sense, it's actually a
measurement.
Merge pull request #2 from MartinRumanek/invoice

Invoice
Service - energyPrice, Invoice typo fix
EnergyTypeService unit test
create a update metody vrací DTO objekt
remote server pro testy
Merge pull request #3 from MartinRumanek/service_layer

merge useless branch