Merge branch 'master' of https://git.bukova.info/repos/git/isspst

src/main/webapp/WEB-INF/locales/zk-label.properties

@@ -69,6 +69,9 @@ UsersGridColumnPersonalID=Osobní číslo
 UsersGridColumnFirstName=Jméno
 UsersGridColumnSureName=Příjmení
 
+AgendaMaterial=Materiál
+MaterialFormTitle=Materiál
+
 ButtonStorno=Storno
 ButtonSave=Uložit
 

src/main/webapp/WEB-INF/spring/root-context.xml

@@ -120,6 +120,10 @@
     	<property name="sessionFactory" ref="sessionFactory"/>
     </bean>
     
+    <bean id="materialDao" class="info.bukova.isspst.dao.jpa.MaterialDaoJPA">
+    	<property name="sessionFactory" ref="sessionFactory"/>
+    </bean>
+    
     <!-- Business logic -->
     <bean id="validator" class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean"/>
     
@@ -171,5 +175,10 @@
 	<bean id="permissionService" class="info.bukova.isspst.services.users.PermissionServiceImpl">
 		<property name="dao" ref="permissionDao"/>
 	</bean>
+	
+	<bean id="materialService" class="info.bukova.isspst.services.material.MaterialServiceImpl">
+		<property name="dao" ref="materialDao"/>
+		<property name="validator" ref="validator"/>
+	</bean>
 		
 </beans>