IS_Trebic/isspst
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
František Přibyl
2014-08-29 12:40:30 +02:00
parent f6feb001a7 b92c0ddd35
commit a22be88e47
37 changed files with 717 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/webapp/WEB-INF/gmail.properties
+1
View File
@@ -0,0 +1 @@
gmail.restrictDomain=
src/main/webapp/WEB-INF/locales/zk-label.properties
+1
View File
@@ -274,6 +274,7 @@ Login=Přihlásit
Loggingin=Přihlášení
Logout=Odhlásit
WrongNameOrPassword=Špatné jméno nebo heslo
LoginViaGoogle=Přihlásit účtem Google
DateFormat=dd. MM. yyyy
src/main/webapp/WEB-INF/reports/tripBill.jasper
BIN
View File
Binary file not shown.
src/main/webapp/WEB-INF/reports/tripBill.jrxml
+10 -4
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="tripBill" pageWidth="612" pageHeight="792" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="f59e8277-a431-4cdc-abaa-c82c1cf193af">
<property name="ireport.zoom" value="2.0"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="518"/>
<property name="ireport.x" value="593"/>
<property name="ireport.y" value="432"/>
<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
<defaultValueExpression><![CDATA["/home/pepa/Dokumenty/dev/java/isspst/"]]></defaultValueExpression>
</parameter>
@@ -39,6 +39,7 @@
<field name="total" class="java.math.BigDecimal">
<fieldDescription><![CDATA[total]]></fieldDescription>
</field>
<field name="requirement.downPayment" class="java.math.BigDecimal"/>
<background>
<band splitType="Stretch"/>
</background>
@@ -328,8 +329,8 @@ tuzemské pracovní cesty]]></text>
<text><![CDATA[K vyúčtování pracovní cesty připojuji počet příloh]]></text>
</staticText>
<staticText>
<reportElement uuid="c83e0050-7bac-43fa-8182-728243f702c2" x="243" y="107" width="328" height="15"/>
<textElement>
<reportElement uuid="c83e0050-7bac-43fa-8182-728243f702c2" x="1" y="107" width="570" height="15"/>
<textElement textAlignment="Center">
<font isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
<text><![CDATA[Prohlašuji, že jsem všechny údaje uvedl úplně a správně.]]></text>
@@ -354,6 +355,11 @@ tuzemské pracovní cesty]]></text>
<line>
<reportElement uuid="452bba4b-d293-4253-92c3-5fa58f58ea53" x="-1" y="168" width="572" height="1"/>
</line>
<textField pattern="###0.00;-###0.00" isBlankWhenNull="true">
<reportElement uuid="d5aa48e6-f801-4633-b18b-ccc7358da1e3" x="477" y="3" width="56" height="43"/>
<textElement textAlignment="Right" verticalAlignment="Middle"/>
<textFieldExpression><![CDATA[$F{requirement.downPayment}]]></textFieldExpression>
</textField>
</band>
</summary>
</jasperReport>
src/main/webapp/WEB-INF/reports/tripRequirement.jasper
BIN
View File
Binary file not shown.
src/main/webapp/WEB-INF/reports/tripRequirement.jrxml
+27 -6
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="tripRequirement" pageWidth="612" pageHeight="792" columnWidth="572" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="0b7fa2d2-d452-4a1f-b1c0-2d8e16a22525">
<property name="ireport.zoom" value="0.75"/>
<property name="ireport.zoom" value="1.5"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
<property name="ireport.y" value="96"/>
<style name="table">
<box>
<pen lineWidth="1.0" lineColor="#000000"/>
@@ -44,6 +44,8 @@
<field name="requirement.passengers" class="java.util.Collection"/>
<field name="requirement.vehicle" class="info.bukova.isspst.data.Vehicle"/>
<field name="requirement.vehicle.code" class="java.lang.String"/>
<field name="requirement.requireDownPayment" class="java.lang.Boolean"/>
<field name="requirement.downPayment" class="java.math.BigDecimal"/>
<background>
<band splitType="Stretch"/>
</background>
@@ -52,14 +54,14 @@
<staticText>
<reportElement uuid="50f96189-2183-4afd-915d-b5342375e988" x="0" y="30" width="572" height="20"/>
<textElement textAlignment="Center">
<font size="16" isBold="true" isPdfEmbedded="true"/>
<font size="16" isBold="true" pdfFontName="Helvetica-Bold" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[Cestovní příkaz]]></text>
</staticText>
<staticText>
<reportElement uuid="5b2dc2ca-188e-4636-b617-dd5c1132246b" x="0" y="50" width="572" height="20"/>
<textElement textAlignment="Center">
<font size="16" isBold="true"/>
<font size="16" isBold="true" pdfFontName="Helvetica-Bold"/>
</textElement>
<text><![CDATA[k tuzemské pracovní cestě]]></text>
</staticText>
@@ -80,7 +82,7 @@
<staticText>
<reportElement uuid="a3e2a5d3-ea50-48bd-94ea-4530f6624b52" x="0" y="51" width="572" height="20"/>
<textElement textAlignment="Center">
<font size="12"/>
<font size="12" pdfFontName="Helvetica-Bold"/>
</textElement>
<text><![CDATA[Souhlasím s vysláním na pracovní cestu]]></text>
</staticText>
@@ -105,7 +107,7 @@
<staticText>
<reportElement uuid="a2912fef-ae4a-4c7e-b08c-3f5f6b92a534" x="0" y="157" width="572" height="20"/>
<textElement textAlignment="Center">
<font size="16" isBold="true" isPdfEmbedded="true"/>
<font size="16" isBold="true" pdfFontName="Helvetica-Bold" isPdfEmbedded="true"/>
</textElement>
<text><![CDATA[PODMÍNKY PRACOVNÍ CESTY]]></text>
</staticText>
@@ -286,6 +288,25 @@ L - letadlo, P - pěšky, T - taxi]]></text>
<line>
<reportElement uuid="0e93a41e-d13e-4f12-83cb-70d69bb3c0fb" x="0" y="442" width="572" height="1"/>
</line>
<staticText>
<reportElement uuid="548c1550-c12d-42b3-a297-c9be96dbb2e8" x="144" y="76" width="31" height="20">
<printWhenExpression><![CDATA[$F{requirement.requireDownPayment}]]></printWhenExpression>
</reportElement>
<textElement/>
<text><![CDATA[Ano]]></text>
</staticText>
<staticText>
<reportElement uuid="e06aba6d-b74d-4ab1-9737-1134a6ac6519" x="144" y="76" width="32" height="20">
<printWhenExpression><![CDATA[$F{requirement}.getRequireDownPayment() == null || $F{requirement}.getRequireDownPayment() == false]]></printWhenExpression>
</reportElement>
<textElement/>
<text><![CDATA[Ne]]></text>
</staticText>
<textField pattern="###0.00;-###0.00" isBlankWhenNull="true">
<reportElement uuid="ac95738d-56c8-4ee2-8721-cad00e1b06e4" x="144" y="398" width="57" height="20"/>
<textElement textAlignment="Right"/>
<textFieldExpression><![CDATA[$F{requirement.downPayment}]]></textFieldExpression>
</textField>
</band>
</detail>
</jasperReport>
src/main/webapp/WEB-INF/spring/gmail-auth.xml
+14
View File
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:security="http://www.springframework.org/schema/security"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd">
<bean id="gmailUserService" class="info.bukova.isspst.services.users.GmailUserService">
<constructor-arg ref="userService"/>
<constructor-arg ref="roleService"/>
<property name="restrictDomain" value="${gmail.restrictDomain}"/>
</bean>
</beans>
src/main/webapp/WEB-INF/spring/ldap-auth.xml
+2 -6
View File
@@ -19,12 +19,8 @@
</bean>
<bean id="authenticator" class="org.springframework.security.ldap.authentication.BindAuthenticator">
<constructor-arg ref="contextSource"/>
<property name="userDnPatterns">
<list>
<value>${ldap.userDNPattern}</value>
</list>
</property>
<constructor-arg ref="contextSource"/>
<property name="userDnPatterns" value="#{'${ldap.userDNPattern}'.split(';')}"/>
</bean>
<bean id="populator" class="info.bukova.isspst.security.AuthPopulator">
src/main/webapp/WEB-INF/spring/root-context.xml
+44 -4
View File
@@ -27,6 +27,7 @@
<value>/WEB-INF/jdbc.properties</value>
<value>/WEB-INF/ldap.properties</value>
<value>/WEB-INF/mail.properties</value>
<value>/WEB-INF/gmail.properties</value>
</list>
</property>
</bean>
@@ -36,7 +37,10 @@
class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close"
p:driverClassName="${jdbc.driverClassName}"
p:url="${jdbc.databaseurl}" p:username="${jdbc.username}"
p:password="${jdbc.password}"></bean>
p:password="${jdbc.password}">
<property name="validationQuery" value="SELECT 1"/>
<property name="testOnBorrow" value="true"/>
</bean>
<bean id="sessionFactory"
class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
@@ -71,8 +75,32 @@
<property name="permissionEvaluator" ref="permissionEvaluator" />
</bean>
<bean id="permissionEvaluator" class="info.bukova.isspst.security.IsspstPermissionEvaluator">
<property name="workgroupService" ref="workgroupServiceNoTx"/>
<bean id="permissionEvaluator" class="info.bukova.isspst.security.IsPermissionEvaluator">
<!-- <property name="workgroupService" ref="workgroupServiceNoTx"/> -->
</bean>
<bean id="serviceEval" class="info.bukova.isspst.security.ServiceEvaluator"/>
<bean id="wgServiceEval" class="info.bukova.isspst.security.WorkgroupAwareServiceEvaluator">
<constructor-arg ref="workgroupServiceNoTx"/>
</bean>
<bean id="requirementEval" class="info.bukova.isspst.security.RequirementFilterEvaluator">
<constructor-arg ref="workgroupServiceNoTx"/>
</bean>
<bean id="evalHolder" class="info.bukova.isspst.security.EvaluatorsHolder">
<property name="globalEvaluators">
<map>
<entry key="#{T(info.bukova.isspst.services.Service)}" value-ref="serviceEval"/>
</map>
</property>
<property name="specialEvaluators">
<map>
<entry key="#{T(info.bukova.isspst.services.Service)}" value-ref="wgServiceEval"/>
<entry key="#{T(info.bukova.isspst.data.RequirementBase)}" value-ref="requirementEval"/>
</map>
</property>
</bean>
<security:http auto-config="true" use-expressions="true">
@@ -85,12 +113,24 @@
authentication-failure-handler-ref="loginFail"
authentication-success-handler-ref="loginSuccess"/>
<security:http-basic/>
<security:openid-login authentication-failure-handler-ref="loginFail"
authentication-success-handler-ref="loginSuccess"
user-service-ref="gmailUserService">
<security:attribute-exchange identifier-match="https://www.google.com/.*">
<security:openid-attribute name="email" type="http://schema.openid.net/contact/email" required="true" />
<security:openid-attribute name="firstName" type="http://axschema.org/namePerson/first" required="true" />
<security:openid-attribute name="lastName" type="http://axschema.org/namePerson/last" required="true" />
</security:attribute-exchange>
</security:openid-login>
<security:logout invalidate-session="true"/>
</security:http>
<import resource="database-auth.xml"/>
<import resource="gmail-auth.xml"/>
<!-- <import resource="ldap-auth.xml"/> -->
<import resource="mail-services.xml"/>
<bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">