Chorem-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
April 2014
- 3 participants
- 7 discussions
11 Apr '14
See <http://ci.chorem.org/jenkins/job/chorem-nightly/1/>
------------------------------------------
[...truncated 685 lines...]
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/cod…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/cod…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/codehaus/mojo…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/ow2/asm/asm-a…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/maven/…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/codehaus/mojo…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/maven/…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/codehaus/mojo… (5 KB at 111.5 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/maven/…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/maven/… (4 KB at 82.3 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/codehaus/plex…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/codehaus/mojo… (31 KB at 595.9 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/ow2/asm/asm-a… (208 KB at 3101.2 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/maven/… (6 KB at 80.4 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/maven/… (32 KB at 587.7 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/codehaus/plex… (245 KB at 531.9 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer/1.9/an…
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/ow2/asm/asm-all/4.0/asm-all-4.0.jar
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/codehaus/mojo/java-boot-classpath-d…
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-report…
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sink-api/1…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/codehaus/mojo/java-boot-classpath-d… (5 KB at 177.5 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-plugin-te…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-report… (6 KB at 149.6 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.5.6/…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-sink-api/1… (4 KB at 101.3 KB/sec)
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-plugin-te… (32 KB at 1175.3 KB/sec)
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/ow2/asm/asm-all/4.0/asm-all-4.0.jar (208 KB at 3521.7 KB/sec)
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer/1.9/an… (31 KB at 499.8 KB/sec)
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.5.6/… (245 KB at 2422.5 KB/sec)
[INFO] Checking unresolved references to org.codehaus.mojo.signature:java16:1.1
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/cod…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/codehaus/mojo…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/codehaus/mojo… (584 KB at 6709.1 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/codehaus/mojo/signature/java16/1.1/…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/codehaus/mojo/signature/java16/1.1/… (584 KB at 6787.1 KB/sec)
[INFO]
[INFO] --- jredmine-maven-plugin:1.6:generate-changes (jredmine-generate-changes) @ chorem ---
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… (8 KB at 99.1 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/nuiton/jredmi…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/nuiton/jredmi… (8 KB at 220.0 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/jredmine/jredmine-client/1.6…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/nuiton/jredmine/jredmine-client/1.6… (8 KB at 62.8 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/commons…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/commons-codec/com…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/commons-codec/com… (11 KB at 155.2 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.7/commons…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.7/commons… (11 KB at 387.9 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/common…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/common… (47 KB at 483.8 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/26/co…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/26/co… (47 KB at 1738.1 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/httpco…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/httpco… (5 KB at 38.7 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcore/4.2.…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcore/4.2.… (5 KB at 183.0 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/httpco…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/httpco… (10 KB at 207.3 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponent…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcomponent… (10 KB at 337.9 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/cod…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/codehaus/plex…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/codehaus/plex… (3 KB at 38.2 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-i18n/1.0-bet…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-i18n/1.0-bet… (3 KB at 11.8 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/maven/…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/maven/… (19 KB at 242.2 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-changes-…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-changes-… (19 KB at 681.7 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/maven/…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/maven/… (5 KB at 126.2 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-report…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-report… (5 KB at 169.9 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/maven/…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/maven/… (6 KB at 187.7 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-filtering…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-filtering… (6 KB at 216.6 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/xmlrpc…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/xmlrpc… (808 B at 11.6 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/xmlrpc/xmlrpc-client/3.0/xml…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/xmlrpc/xmlrpc-client/3.0/xml… (808 B at 29.2 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/xmlrpc…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/xmlrpc… (12 KB at 235.7 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/xmlrpc/xmlrpc/3.0/xmlrpc-3.0…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/xmlrpc/xmlrpc/3.0/xmlrpc-3.0… (12 KB at 426.2 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/xmlrpc…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/xmlrpc… (854 B at 19.4 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/xmlrpc/xmlrpc-common/3.0/xml…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/xmlrpc/xmlrpc-common/3.0/xml… (854 B at 32.1 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/ws/com…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/ws/com… (6 KB at 90.4 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/ws/commons/ws-commons-util/1…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/ws/commons/ws-commons-util/1… (6 KB at 187.4 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/veloci…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/veloci… (11 KB at 109.3 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/velocity/velocity/1.7/veloci…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/velocity/velocity/1.7/veloci… (11 KB at 392.7 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/commons…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/cod…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/cod…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/dom4j/d…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/apa…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… (105 KB at 1590.6 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/nuiton/jredmi…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/commons-codec/com…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/httpco…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/codehaus/plex…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/maven/…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/nuiton/jredmi… (105 KB at 2624.5 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/maven/…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/codehaus/plex… (12 KB at 291.3 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/maven/…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/maven/… (204 KB at 2424.7 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/codehaus/plex…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/maven/… (17 KB at 337.3 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/maven/…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/commons-codec/com… (254 KB at 2391.7 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/dom4j/dom4j/1.1/d…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/httpco… (223 KB at 2078.2 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/xmlrpc…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/maven/… (42 KB at 625.8 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/xmlrpc…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/codehaus/plex… (60 KB at 1353.0 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/ws/com…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/maven/… (15 KB at 289.1 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/veloci…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/xmlrpc… (43 KB at 863.2 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/xmlrpc… (96 KB at 1709.9 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/ws/com… (35 KB at 895.4 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/apache/veloci… (439 KB at 5045.6 KB/sec)
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/dom4j/dom4j/1.1/d… (447 KB at 2771.5 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/jredmine/jredmine-client/1.6…
[INFO] Downloading: http://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.7/commons…
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcore/4.2.…
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-i18n/1.0-bet…
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-changes-…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.7/commons… (254 KB at 6183.3 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-report…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpcore/4.2.… (223 KB at 4447.4 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-filtering…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/maven/reporting/maven-report… (17 KB at 647.7 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolatio…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-filtering… (42 KB at 1612.8 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-module-xht…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-changes-… (204 KB at 2514.5 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/dom4j/dom4j/1.1/dom4j-1.1.jar
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolatio… (60 KB at 2126.2 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/xmlrpc/xmlrpc-client/3.0/xml…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/maven/doxia/doxia-module-xht… (15 KB at 546.0 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/xmlrpc/xmlrpc-common/3.0/xml…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/xmlrpc/xmlrpc-client/3.0/xml… (43 KB at 1566.6 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/ws/commons/ws-commons-util/1…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/xmlrpc/xmlrpc-common/3.0/xml… (96 KB at 3301.8 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/apache/velocity/velocity/1.7/veloci…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/ws/commons/ws-commons-util/1… (35 KB at 1308.6 KB/sec)
[INFO] Downloaded: http://repo.maven.apache.org/maven2/dom4j/dom4j/1.1/dom4j-1.1.jar (447 KB at 6374.3 KB/sec)
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/apache/velocity/velocity/1.7/veloci… (439 KB at 7440.2 KB/sec)
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/nuiton/jredmine/jredmine-client/1.6… (105 KB at 360.8 KB/sec)
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-i18n/1.0-bet… (12 KB at 38.8 KB/sec)
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO]
[INFO] Chorem ............................................ FAILURE [19.857s]
[INFO] Chorem :: entities ................................ SKIPPED
[INFO] Chorem :: webmotion ............................... SKIPPED
[INFO] ------------------------------------------------------------------------
[INFO] BUILD FAILURE
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 21.322s
[INFO] Finished at: Sat Feb 15 00:21:23 CET 2014
[INFO] Final Memory: 25M/243M
[INFO] ------------------------------------------------------------------------
[ERROR] Failed to execute goal org.nuiton.jredmine:jredmine-maven-plugin:1.6:generate-changes (jredmine-generate-changes) on project chorem: the user 'hudson' could not be retrieve from redmine server. -> [Help 1]
org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.nuiton.jredmine:jredmine-maven-plugin:1.6:generate-changes (jredmine-generate-changes) on project chorem: the user 'hudson' could not be retrieve from redmine server.
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:216)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59)
at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183)
at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:317)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:152)
at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330)
at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238)
at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:134)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:69)
at hudson.remoting.UserRequest.perform(UserRequest.java:118)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:328)
at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:744)
Caused by: org.apache.maven.plugin.MojoExecutionException: the user 'hudson' could not be retrieve from redmine server.
at org.nuiton.jredmine.plugin.AbstractRedmineMojo.failIfSafe(AbstractRedmineMojo.java:396)
at org.nuiton.jredmine.plugin.AbstractRedmineMojoWithProject.init(AbstractRedmineMojoWithProject.java:114)
at org.nuiton.jredmine.plugin.AbstractRedmineMojoWithProjectAndVersion.init(AbstractRedmineMojoWithProjectAndVersion.java:101)
at org.nuiton.jredmine.plugin.GenerateChangesMojo.init(GenerateChangesMojo.java:348)
at org.nuiton.plugin.AbstractPlugin.execute(AbstractPlugin.java:106)
at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:106)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208)
... 30 more
[ERROR]
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR]
[ERROR] For more information about the errors and possible solutions, please read the following articles:
[ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException
Sending e-mails to: chorem-commits(a)list.chorem.org
channel stopped
Skipping sonar analysis due to bad build status FAILURE
1
8
Build failed in Jenkins: chorem-nightly » Chorem :: webmotion #6
by admin+ci-chorem.org@codelutin.com 11 Apr '14
by admin+ci-chorem.org@codelutin.com 11 Apr '14
11 Apr '14
See <http://ci.chorem.org/jenkins/job/chorem-nightly/org.chorem.chorem$chorem-we…>
Changes:
[ymartel] review dependencies
------------------------------------------
[INFO]
[INFO] ------------------------------------------------------------------------
[INFO] Building Chorem :: webmotion 0.3-SNAPSHOT
[INFO] ------------------------------------------------------------------------
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/debux/webmoti…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/debux/webm…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/debux/webmoti… (2 KB at 1.1 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/debux/webm…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/debux/webmoti…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/debux/webmoti… (609 B at 1.1 KB/sec)
[WARNING] The POM for org.antlr:stringtemplate:jar:3.2.1 is invalid, transitive dependencies (if any) will not be available, enable debug logging for more details
[INFO]
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ chorem-webmotion ---
[INFO]
[INFO] --- maven-enforcer-plugin:1.3.1:enforce (ensure-no-container-api) @ chorem-webmotion ---
[INFO]
[INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ chorem-webmotion ---
[INFO]
[INFO] --- helper-maven-plugin:2.1:share-server-secret (get-redmine-login) @ chorem-webmotion ---
[INFO] Exporting server [redmine-chorem.org] username in ${redmine.username}
[INFO] Exporting server [redmine-chorem.org] privateKey in ${redmine.apiKey}
[INFO]
[INFO] --- maven-processor-plugin:1.1:process (default) @ chorem-webmotion ---
[INFO] Processing 44 files(s).
[INFO]
[INFO] --- license-maven-plugin:1.6:update-project-license (attach-licenses) @ chorem-webmotion ---
[INFO] Will create or update license file [agpl_v3] to <http://ci.chorem.org/jenkins/job/chorem-nightly/org.chorem.chorem$chorem-we…>
[INFO]
[INFO] --- license-maven-plugin:1.6:add-third-party (attach-licenses) @ chorem-webmotion ---
[WARNING] Unable to obtain POM for artifact : org.antlr:stringtemplate:jar:3.2.1:compile
org.apache.maven.project.InvalidProjectModelException: 1 problem was encountered while building the effective model
[FATAL] Non-readable POM /var/local/forge/data/chorem.org/maven/repository/org/antlr/stringtemplate/3.2.1/stringtemplate-3.2.1.pom: input contained no data @
for project for project
at org.apache.maven.project.DefaultMavenProjectBuilder.transformError(DefaultMavenProjectBuilder.java:193)
at org.apache.maven.project.DefaultMavenProjectBuilder.buildFromRepository(DefaultMavenProjectBuilder.java:240)
at org.apache.maven.project.DefaultMavenProjectBuilder.buildFromRepository(DefaultMavenProjectBuilder.java:251)
at org.codehaus.mojo.license.api.DefaultDependenciesTool.loadProjectDependencies(DefaultDependenciesTool.java:206)
at org.codehaus.mojo.license.api.DefaultThirdPartyHelper.loadDependencies(DefaultThirdPartyHelper.java:152)
at org.codehaus.mojo.license.AddThirdPartyMojo.loadDependencies(AddThirdPartyMojo.java:288)
at org.codehaus.mojo.license.AbstractAddThirdPartyMojo.init(AbstractAddThirdPartyMojo.java:386)
at org.codehaus.mojo.license.AbstractLicenseMojo.execute(AbstractLicenseMojo.java:174)
at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:133)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153)
at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:108)
at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:76)
at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51)
at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:116)
at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:361)
at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:155)
at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330)
at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238)
at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:134)
at hudson.maven.Maven3Builder.call(Maven3Builder.java:69)
at hudson.remoting.UserRequest.perform(UserRequest.java:118)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:328)
at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:744)
[INFO] Load missing file <http://ci.chorem.org/jenkins/job/chorem-nightly/org.chorem.chorem$chorem-we…>
[WARNING] dependency [javax.servlet--servlet-api--2.5] does not exist in project, remove it from the missing file.
[WARNING] dependency [jakarta-regexp--jakarta-regexp--1.4] does not exist in project, remove it from the missing file.
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/com/goo…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/com/google/code/g…
[INFO] Downloading: http://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.2.4/gson-2.…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/com/tho…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/com/thoughtworks/…
[INFO] Downloading: http://repo.maven.apache.org/maven2/com/thoughtworks/paranamer/paranamer/2.…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/commons…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/commons-configura…
[INFO] Downloading: http://repo.maven.apache.org/maven2/commons-configuration/commons-configura…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/javax/s…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/javax/servlet/jst…
[INFO] Downloading: http://repo.maven.apache.org/maven2/javax/servlet/jstl/1.2/jstl-1.2-third-p…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/javax/v…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/javax/validation/…
[INFO] Downloading: http://repo.maven.apache.org/maven2/javax/validation/validation-api/1.0.0.G…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/net/sou…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/net/sourceforge/j…
[INFO] Downloading: http://repo.maven.apache.org/maven2/net/sourceforge/javacsv/javacsv/2.0/jav…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/ant…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/antlr/ST4/4.0…
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.4/ST4-4.0.4-third-par…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/ant…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/antlr/antlr-r…
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/antlr/antlr-runtime/3.3/antlr-runti…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/bou…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/bouncycastle/…
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk16/1.46/bcpr…
[INFO] Detects third party descriptor /var/local/forge/data/chorem.org/jenkins/workspace/chorem-nightly/trunk/chorem-entities/src/license/THIRD-PARTY.properties
[INFO] Load missing file /var/local/forge/data/chorem.org/jenkins/workspace/chorem-nightly/trunk/chorem-entities/src/license/THIRD-PARTY.properties
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/debux/webm…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/debux/webmoti…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/ecl…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/eclipse/jetty…
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-http/8.1.1.v201…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/ecl…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/eclipse/jetty…
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-io/8.1.1.v20120…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/ecl…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/eclipse/jetty…
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-util/8.1.1.v201…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/ecl…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/eclipse/jetty…
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-websocket/8.1.1…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/hib…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/hibernate/hib…
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/hibernate/hibernate-validator/4.2.0…
[INFO] Detects third party descriptor /var/local/forge/data/chorem.org/maven/repository/org/nuiton/nuiton-config/3.0-alpha-2/nuiton-config-3.0-alpha-2-third-party.properties
[INFO] Load missing file /var/local/forge/data/chorem.org/maven/repository/org/nuiton/nuiton-config/3.0-alpha-2/nuiton-config-3.0-alpha-2-third-party.properties
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… (884 B at 21.6 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/nuiton/nuiton…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/nuiton/nuiton… (884 B at 34.5 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/nuiton-csv/3.0-alpha-3/nuito…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/nuiton/nuiton-csv/3.0-alpha-3/nuito… (884 B at 2.6 KB/sec)
[INFO] Detects third party descriptor /var/local/forge/data/chorem.org/maven/repository/org/nuiton/nuiton-csv/3.0-alpha-3/nuiton-csv-3.0-alpha-3-third-party.properties
[INFO] Load missing file /var/local/forge/data/chorem.org/maven/repository/org/nuiton/nuiton-csv/3.0-alpha-3/nuiton-csv-3.0-alpha-3-third-party.properties
[INFO] Detects third party descriptor /var/local/forge/data/chorem.org/maven/repository/org/nuiton/nuiton-utils/3.0-rc-2/nuiton-utils-3.0-rc-2-third-party.properties
[INFO] Load missing file /var/local/forge/data/chorem.org/maven/repository/org/nuiton/nuiton-utils/3.0-rc-2/nuiton-utils-3.0-rc-2-third-party.properties
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… (859 B at 30.0 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/nuiton/js/nui…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/nuiton/js/nui… (859 B at 24.0 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/js/nuiton-js-angularjs/1.2.1…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/nuiton/js/nuiton-js-angularjs/1.2.1… (859 B at 2.5 KB/sec)
[INFO] Detects third party descriptor /var/local/forge/data/chorem.org/maven/repository/org/nuiton/js/nuiton-js-angularjs/1.2.12-1/nuiton-js-angularjs-1.2.12-1-third-party.properties
[INFO] Load missing file /var/local/forge/data/chorem.org/maven/repository/org/nuiton/js/nuiton-js-angularjs/1.2.12-1/nuiton-js-angularjs-1.2.12-1-third-party.properties
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/nuiton/js/nui…
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/js/nuiton-js-bootstrap/2.3.2…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/nuiton/js/nui…
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/js/nuiton-js-jqplot/1.0.4r11…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/nuiton/js/nui…
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/js/nuiton-js-jquery/1.8.3-1/…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/nuiton/js/nui…
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/js/nuiton-js-jquery-ui/1.9.2…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… (2 KB at 58.5 KB/sec)
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/nuiton/js/nui…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/nuiton/js/nui… (2 KB at 82.5 KB/sec)
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/js/nuiton-js-wro/1.0.2/nuito…
[INFO] Downloaded: http://repo.maven.apache.org/maven2/org/nuiton/js/nuiton-js-wro/1.0.2/nuito… (2 KB at 3.5 KB/sec)
[INFO] Detects third party descriptor /var/local/forge/data/chorem.org/maven/repository/org/nuiton/js/nuiton-js-wro/1.0.2/nuiton-js-wro-1.0.2-third-party.properties
[INFO] Load missing file /var/local/forge/data/chorem.org/maven/repository/org/nuiton/js/nuiton-js-wro/1.0.2/nuiton-js-wro-1.0.2-third-party.properties
[INFO] Detects third party descriptor /var/local/forge/data/chorem.org/maven/repository/org/nuiton/wikitty/wikitty-api/3.11-SNAPSHOT/wikitty-api-3.11-SNAPSHOT-third-party.properties
[INFO] Load missing file /var/local/forge/data/chorem.org/maven/repository/org/nuiton/wikitty/wikitty-api/3.11-SNAPSHOT/wikitty-api-3.11-SNAPSHOT-third-party.properties
[INFO] Detects third party descriptor /var/local/forge/data/chorem.org/maven/repository/org/nuiton/wikitty/wikitty-generators/3.11-SNAPSHOT/wikitty-generators-3.11-SNAPSHOT-third-party.properties
[INFO] Load missing file /var/local/forge/data/chorem.org/maven/repository/org/nuiton/wikitty/wikitty-generators/3.11-SNAPSHOT/wikitty-generators-3.11-SNAPSHOT-third-party.properties
[INFO] Detects third party descriptor /var/local/forge/data/chorem.org/maven/repository/org/nuiton/wikitty/wikitty-jdbc/3.11-SNAPSHOT/wikitty-jdbc-3.11-SNAPSHOT-third-party.properties
[INFO] Load missing file /var/local/forge/data/chorem.org/maven/repository/org/nuiton/wikitty/wikitty-jdbc/3.11-SNAPSHOT/wikitty-jdbc-3.11-SNAPSHOT-third-party.properties
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/wik…
[INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/wik… (2 KB at 24.1 KB/sec)
[INFO] Detects third party descriptor /var/local/forge/data/chorem.org/maven/repository/org/nuiton/wikitty/wikitty-solr/3.11-SNAPSHOT/wikitty-solr-3.11-SNAPSHOT-third-party.properties
[INFO] Load missing file /var/local/forge/data/chorem.org/maven/repository/org/nuiton/wikitty/wikitty-solr/3.11-SNAPSHOT/wikitty-solr-3.11-SNAPSHOT-third-party.properties
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/ref…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/reflections/r…
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/reflections/reflections/0.9.8/refle…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/slf…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/slf4j/slf4j-a…
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.6/slf4j-api-1.7…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/slf…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/org/slf4j/slf4j-l…
[INFO] Downloading: http://repo.maven.apache.org/maven2/org/slf4j/slf4j-log4j12/1.7.6/slf4j-log…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/ro/isdc…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/ro/isdc/wro4j/wro…
[INFO] Downloading: http://repo.maven.apache.org/maven2/ro/isdc/wro4j/wro4j-core/1.7.2/wro4j-co…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/xml-api…
[INFO] Downloading: http://nexus.nuiton.org/nexus/content/groups/chorem-group/xml-apis/xml-apis…
[INFO] Downloading: http://repo.maven.apache.org/maven2/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b…
[INFO] Missing file <http://ci.chorem.org/jenkins/job/chorem-nightly/org.chorem.chorem$chorem-we…> is up-to-date.
[WARNING] There is 1 dependencies with no license :
[WARNING] - dom4j--dom4j--1.6.1
[INFO] Writing third-party file to <http://ci.chorem.org/jenkins/job/chorem-nightly/org.chorem.chorem$chorem-we…>
[INFO] Regenerate missing license file <http://ci.chorem.org/jenkins/job/chorem-nightly/org.chorem.chorem$chorem-we…>
[JENKINS] Archiving disabled
1
3
r414 - in trunk/chorem-webmotion/src/main: java/org/chorem/webmotion/actions/financial java/org/chorem/webmotion/bean/financial resources webapp/WEB-INF/jsp/financial webapp/js webapp/js/financial
by ymartel@users.chorem.org 11 Apr '14
by ymartel@users.chorem.org 11 Apr '14
11 Apr '14
Author: ymartel
Date: 2014-04-11 18:19:46 +0200 (Fri, 11 Apr 2014)
New Revision: 414
Url: http://forge.chorem.org/projects/chorem/repository/revisions/414
Log:
prepare save of expenseAccount \!
Added:
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountEntryEdit.html
trunk/chorem-webmotion/src/main/webapp/js/financial/
trunk/chorem-webmotion/src/main/webapp/js/financial/expenseAccount.js
Modified:
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/ExpenseAccountAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountBean.java
trunk/chorem-webmotion/src/main/resources/mapping
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/ExpenseAccountAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/ExpenseAccountAction.java 2014-04-11 14:16:53 UTC (rev 413)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/ExpenseAccountAction.java 2014-04-11 16:19:46 UTC (rev 414)
@@ -36,6 +36,7 @@
import com.google.common.base.Function;
import com.google.common.collect.Collections2;
import com.google.common.collect.Lists;
+import com.google.gson.Gson;
import org.chorem.ChoremClient;
import org.chorem.entities.CategoryImpl;
import org.chorem.entities.Employee;
@@ -120,14 +121,14 @@
return paginatedResult;
}
- public void saveExpenseAccount(ChoremClient client, String expenseAccountId, Call call) {
- ExpenseAccount expenseAccount = client.restore(ExpenseAccount.class, expenseAccountId);
- if (expenseAccount == null) {
- expenseAccount = new ExpenseAccountImpl();
+ public void saveExpenseAccount(ChoremClient client, String expenseAccountId, ExpenseAccountBean expenseAccount) {
+ ExpenseAccount expenseAccountWikitty = client.restore(ExpenseAccount.class, expenseAccountId);
+ if (expenseAccountWikitty == null) {
+ expenseAccountWikitty = new ExpenseAccountImpl();
}
- Map<String,Object> extractParameters = call.getExtractParameters();
- String contextPath = call.getContext().getServletContext().getContextPath();
- contextPath.length();
+ String json = expenseAccount.toJson();
+ expenseAccount.toString();
+ //TODO ymartel 2014/04/11 just do it
}
public Render findExpenseAccount(ChoremClient client, String expenseAccountId) {
@@ -140,6 +141,7 @@
if (expenseAccount == null) {
expenseAccountBean = new ExpenseAccountBean();
+ expenseAccountBean.setId("new");
//XXX ymartel 2014/04/08 Some Fake datas, just for test
Employee employee = client.findAllByExample(new EmployeeImpl(), 0, 1).get(0);
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountBean.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountBean.java 2014-04-11 14:16:53 UTC (rev 413)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountBean.java 2014-04-11 16:19:46 UTC (rev 414)
@@ -26,6 +26,8 @@
import java.io.Serializable;
import java.util.Set;
+import com.google.gson.Gson;
+
/**
* @author ymartel <martel(a)codelutin.com>
*/
@@ -86,4 +88,8 @@
this.expenseAccountEntries = expenseAccountEntries;
}
+ public String toJson() {
+ Gson gson = new Gson();
+ return gson.toJson(this);
+ }
}
Modified: trunk/chorem-webmotion/src/main/resources/mapping
===================================================================
--- trunk/chorem-webmotion/src/main/resources/mapping 2014-04-11 14:16:53 UTC (rev 413)
+++ trunk/chorem-webmotion/src/main/resources/mapping 2014-04-11 16:19:46 UTC (rev 414)
@@ -14,6 +14,7 @@
* /sales/funnel/partial/* DecoratorFilter.decorate wmDecoratorNo=true
* /crm/export DecoratorFilter.decorate wmDecoratorNo=true
* /project/editProject.html DecoratorFilter.decorate wmDecoratorNo=true
+* /financial/expenseAccounts/expenseAccountEntryEdit.html DecoratorFilter.decorate wmDecoratorNo=true
* /hr/employeeEdit/json/* DecoratorFilter.decorate wmDecoratorNo=true
* /ascii/* DecoratorFilter.decorate wmDecoratorNo=true
* /rest/* DecoratorFilter.decorate wmDecoratorNo=true
@@ -102,6 +103,7 @@
GET /rest/financial/expenseAccounts?page={page}&count={count} action:financial.ExpenseAccountAction.findAllExpenseAccounts page=1,count=20
GET /rest/financial/expenseAccounts/{expenseAccountId} action:financial.ExpenseAccountAction.findExpenseAccount
GET /financial/expenseAccounts view:financial/expenseAccounts.jsp
+GET /financial/expenseAccounts/expenseAccountEntryEdit.html view:financial/expenseAccountEntryEdit.html
GET /financial/expenseAccounts/{expenseAccountId} action:financial.ExpenseAccountAction.findExpenseAccount
PUT /financial/expenseAccounts/{expenseAccountId} action:financial.ExpenseAccountAction.saveExpenseAccount
Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountEntryEdit.html
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountEntryEdit.html (rev 0)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountEntryEdit.html 2014-04-11 16:19:46 UTC (rev 414)
@@ -0,0 +1,9 @@
+ <td><input type="text" ng-model="newExpenseAccountEntry.justificationNumber" name="newExpenseAccountEntry.justificationNumber" size="10"></td>
+ <td><input type="date" ng-model="newExpenseAccountEntry.emittedDate" name="newExpenseAccountEntry.emittedDate" size="10" maxlength="10"></td>
+ <td><input type="text" ng-model="newExpenseAccountEntry.project" name="newExpenseAccountEntry.project" size="4"></td>
+ <td><input type="text" ng-model="newExpenseAccountEntry.description" name="newExpenseAccountEntry.description" class="w100"></td>
+ <td><input type="text" ng-model="newExpenseAccountEntry.category" name="newExpenseAccountEntry.category" class="w100"></td>
+ <td><input type="number" ng-model="newExpenseAccountEntry.amount" name="newExpenseAccountEntry.amount" class="w100"></td>
+ <td><input type="number" ng-model="newExpenseAccountEntry.VAT" name="newExpenseAccountEntry.VAT" class="w100"></td>
+ <td><input type="number" ng-model="newExpenseAccountEntry.total" name="newExpenseAccountEntry.total"></td>
+ <td><a class="btn btn-success" ng-click="addLine()"><i class="icon-pencil icon-white"></i>Validate</a></td>
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp 2014-04-11 14:16:53 UTC (rev 413)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp 2014-04-11 16:19:46 UTC (rev 414)
@@ -27,13 +27,20 @@
<head>
<script data-require="angular-resource(a)1.2.0-rc.3" data-semver="1.2.0-rc.3" src="<c:url value='http://code.angularjs.org/1.2.0-rc.3/angular-resource.js'/>"></script>
<link data-require="bootstrap-css@*" data-semver="3.0.0" rel="stylesheet" href="<c:url value='http://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css'/>" />
+ <script type="text/javascript" src="<c:url value='/js/financial/expenseAccount.js'/>"></script>
+ <script>
+ angular.module('expenseAccountPage').value('expenseAccountInit', {
+ expenseAccount: ${expenseAccount.toJson()},
+ saveURL: "<c:url value="/financial/expenseAccounts"/>"
+ });
+ </script>
</head>
-<div ng-app>
+<div ng-app='expenseAccountPage' ng-controller="expenseAccountView">
<div >
<dl>
- <dd><a href="<c:url value="/wikitty/view/${expenseAccount.employeeId}"/>">${expenseAccount.employeeName}</a></dd>
- <dd>Period : {{expenseAccount.month}} / ${expenseAccount.year}</dd>
+ <dd><a href="<c:url value="/wikitty/view/{{expenseAccount.employeeId}}"/>">{{expenseAccount.employeeName}}</a></dd>
+ <dd>Period : {{expenseAccount.month}} / {{expenseAccount.year}}</dd>
</dl>
</div>
@@ -50,23 +57,24 @@
<th>total</th>
<th>Payment Date</th>
</tr>
- <c:forEach var="expenseEntry" items="${expenseAccount.expenseAccountEntries}">
- <tr>
- <td>${expenseEntry.justificationNumber}</td>
- <td>{{${expenseEntry.emittedDate}| date:'shortDate'}}</td>
- <td><a href="<c:url value="/wikitty/view/${expenseEntry.projectId}"/>">${expenseEntry.projectName}</a></td>
- <td>${expenseEntry.description}</td>
- <td>${expenseEntry.categoryName}</td>
- <td>{{${expenseEntry.amount}|number:2}}</td>
- <td>{{${expenseEntry.VAT}|number:2}}</td>
- <td>{{${expenseEntry.total}|number:2}}</td>
- <td><span ng-if = "${expenseEntry.paymentDate} != 0"> {{${expenseEntry.paymentDate}|date:'shortDate'}}</span></td>
+ <tr ng-repeat="expenseEntry in expenseAccount.expenseAccountEntries">
+ <td>{{expenseEntry.justificationNumber}}</td>
+ <td>{{expenseEntry.emittedDate| date:'shortDate'}}</td>
+ <td><a href="<c:url value="/wikitty/view/{{expenseEntry.projectId}}"/>">{{expenseEntry.projectName}}</a></td>
+ <td>{{expenseEntry.description}}</td>
+ <td>{{expenseEntry.categoryName}}</td>
+ <td>{{expenseEntry.amount|number:2}}</td>
+ <td>{{expenseEntry.VAT|number:2}}</td>
+ <td>{{expenseEntry.total|number:2}}</td>
+ <td><span ng-if = "expenseEntry.paymentDate"> {{expenseEntry.paymentDate|date:'shortDate'}}</span></td>
</tr>
- </c:forEach>
+ <tr ng-if="showNewLine == true" ng-include src="'expenseAccountEntryEdit.html'"></tr>
</table>
</div>
+ <a class="btn btn-success" ng-click="newLine()"><i class="icon-list icon-white"></i> New entry</a>
+ <div ng-if="hasChanged == true">
+ <a class="btn btn-success" ng-click="saveExpenseAccount()"><i class="icon-od icon-white"></i>Save</a>
+ </div>
</div>
-<div>
- <a class="btn btn-success" href="<c:url value="/financial/expenseAccounts/new"/>"><i class="icon-list icon-white"></i> New one</a>
</div>
Added: trunk/chorem-webmotion/src/main/webapp/js/financial/expenseAccount.js
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/js/financial/expenseAccount.js (rev 0)
+++ trunk/chorem-webmotion/src/main/webapp/js/financial/expenseAccount.js 2014-04-11 16:19:46 UTC (rev 414)
@@ -0,0 +1,50 @@
+var app = angular.module('expenseAccountPage', ['ngResource']);
+
+app.controller("expenseAccountView", function($scope, $resource, expenseAccountInit) {
+
+ $scope.showNewLine = false;
+ $scope.expenseAccount = expenseAccountInit.expenseAccount;
+ $scope.saveURL = expenseAccountInit.saveURL;
+
+ $scope.newLine = function() {
+ if ($scope.showNewLine === true) {
+ $scope.showNewLine = false;
+ delete $scope.newExpenseAccountEntry;
+ } else {
+ $scope.showNewLine = true;
+ $scope.newExpenseAccountEntry = {
+ justificationNumber: '',
+ emittedDate : '',
+ project: '',
+ description: '',
+ category: '',
+ amount: '',
+ VAT: '',
+ total: ''
+ };
+ }
+ }
+
+ $scope.addLine = function() {
+
+ $scope.expenseAccount.expenseAccountEntries.push($scope.newExpenseAccountEntry);
+
+ $scope.hasChanged = true;
+ $scope.showNewLine = false;
+ delete $scope.newExpenseAccountEntry;
+ }
+
+ $scope.saveExpenseAccount = function() {
+
+ console.log($scope.expenseAccount)
+
+ url = $scope.saveURL + "/" + $scope.expenseAccount.id;
+
+ $resource('url', $scope.expenseAccount, {'update' : {method:'PUT'}}).update(function(result) {
+ console.log("saved!");
+ });
+ }
+
+
+
+});
1
0
Author: maven-release
Date: 2014-04-11 16:16:53 +0200 (Fri, 11 Apr 2014)
New Revision: 413
Url: http://forge.chorem.org/projects/chorem/repository/revisions/413
Log:
demis-commit
Modified:
trunk/chorem-entities/src/license/THIRD-PARTY.properties
Modified: trunk/chorem-entities/src/license/THIRD-PARTY.properties
===================================================================
--- trunk/chorem-entities/src/license/THIRD-PARTY.properties 2014-04-11 10:23:42 UTC (rev 412)
+++ trunk/chorem-entities/src/license/THIRD-PARTY.properties 2014-04-11 14:16:53 UTC (rev 413)
@@ -1,21 +1,19 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - Apache License
-# - Apache Software License, Version 2.0
# - Apache Software License, version 1.1
# - BSD License
# - BSD style
-# - CDDL
+# - CDDL + GPLv2 with classpath exception
# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
# - Common Public License Version 1.0
# - GNU Lesser General Public License, version 2.1
-# - GPLv2+CE
# - Indiana University Extreme! Lab Software License, vesion 1.1.1
# - Lesser General Public License (LGPL) v 3.0
# - Lesser General Public License (LPGL)
# - Lesser General Public License (LPGL) v 2.1
# - MIT License
+# - New BSD License
# - Public Domain
# - Public domain
# - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC.
@@ -25,10 +23,10 @@
# Please fill the missing licenses for dependencies :
#
#
-#Fri Jun 22 17:47:10 CEST 2012
+#Thu Feb 20 04:44:22 CET 2014
commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
concurrent--concurrent--1.0=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC.
-jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0
-javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
+org.apache.zookeeper--zookeeper--3.4.5=The Apache Software License, Version 2.0
+org.jacorb--jacorb--2.3.1.jbossorg-1=Lesser General Public License (LPGL)
xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License, vesion 1.1.1
1
0
Author: ymartel
Date: 2014-04-11 12:23:42 +0200 (Fri, 11 Apr 2014)
New Revision: 412
Url: http://forge.chorem.org/projects/chorem/repository/revisions/412
Log:
use webmotion 2.4 stable
Modified:
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2014-04-10 14:01:22 UTC (rev 411)
+++ trunk/pom.xml 2014-04-11 10:23:42 UTC (rev 412)
@@ -98,7 +98,7 @@
<servletApiVersion>3.0-alpha-1</servletApiVersion>
<jspApiVersion>2.0</jspApiVersion>
<h2Version>1.3.175</h2Version>
- <webmotionVersion>2.4-SNAPSHOT</webmotionVersion>
+ <webmotionVersion>2.4</webmotionVersion>
<jstlVersion>1.2</jstlVersion>
<nuitonjsAngularjs.version>1.2.12-1</nuitonjsAngularjs.version>
<nuitonjsJquery.version>1.8.3-1</nuitonjsJquery.version>
1
0
r411 - in trunk/chorem-webmotion/src/main: resources webapp/WEB-INF/jsp/financial webapp/WEB-INF/jsp/projects webapp/js
by ymartel@users.chorem.org 10 Apr '14
by ymartel@users.chorem.org 10 Apr '14
10 Apr '14
Author: ymartel
Date: 2014-04-10 16:01:22 +0200 (Thu, 10 Apr 2014)
New Revision: 411
Url: http://forge.chorem.org/projects/chorem/repository/revisions/411
Log:
review way to manage pagination on expenseAccount (make it neutral to be reused)
review draft of expenseAccount view page
Added:
trunk/chorem-webmotion/src/main/webapp/js/paginationTable.js
Removed:
trunk/chorem-webmotion/src/main/webapp/js/expensePagination.js
Modified:
trunk/chorem-webmotion/src/main/resources/mapping
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccounts.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp
trunk/chorem-webmotion/src/main/webapp/js/projectPagination.js
Modified: trunk/chorem-webmotion/src/main/resources/mapping
===================================================================
--- trunk/chorem-webmotion/src/main/resources/mapping 2014-04-09 14:29:44 UTC (rev 410)
+++ trunk/chorem-webmotion/src/main/resources/mapping 2014-04-10 14:01:22 UTC (rev 411)
@@ -13,8 +13,6 @@
* /sales/funnel/json/* DecoratorFilter.decorate wmDecoratorNo=true
* /sales/funnel/partial/* DecoratorFilter.decorate wmDecoratorNo=true
* /crm/export DecoratorFilter.decorate wmDecoratorNo=true
-* /project/json/* DecoratorFilter.decorate wmDecoratorNo=true
-* /financial/json/* DecoratorFilter.decorate wmDecoratorNo=true
* /project/editProject.html DecoratorFilter.decorate wmDecoratorNo=true
* /hr/employeeEdit/json/* DecoratorFilter.decorate wmDecoratorNo=true
* /ascii/* DecoratorFilter.decorate wmDecoratorNo=true
@@ -95,13 +93,14 @@
* /crm/quotation/edit/{id} action:crm.QuotationAction.edit
* /crm/export action:crm.ExportAction.exportContactBase
-GET /project/json/projects?page={page}&count={count} action:project.ProjectsAction.findAllProjects page=1,count=10
+GET /rest/project/projects?page={page}&count={count} action:project.ProjectsAction.findAllProjects page=1,count=10
GET /project/projects view:projects/projects.jsp
-GET /project/editProject view:projects/editProject.html
+GET /project/editProject.html view:projects/editProject.html
PUT /projects/{projectId}/ action:project.ProjectsAction.updateProject
#### Expense Accounts ####
-GET /financial/json/expenseAccounts?year={year}&month={month}&page={page}&count={count} action:financial.ExpenseAccountAction.findAllExpenseAccounts page=1,count=20
+GET /rest/financial/expenseAccounts?page={page}&count={count} action:financial.ExpenseAccountAction.findAllExpenseAccounts page=1,count=20
+GET /rest/financial/expenseAccounts/{expenseAccountId} action:financial.ExpenseAccountAction.findExpenseAccount
GET /financial/expenseAccounts view:financial/expenseAccounts.jsp
GET /financial/expenseAccounts/{expenseAccountId} action:financial.ExpenseAccountAction.findExpenseAccount
PUT /financial/expenseAccounts/{expenseAccountId} action:financial.ExpenseAccountAction.saveExpenseAccount
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp 2014-04-09 14:29:44 UTC (rev 410)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp 2014-04-10 14:01:22 UTC (rev 411)
@@ -29,40 +29,42 @@
<link data-require="bootstrap-css@*" data-semver="3.0.0" rel="stylesheet" href="<c:url value='http://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css'/>" />
</head>
-<div >
- <dl>
- <dd><a href="<c:url value="/wikitty/view/${expenseAccount.employeeId}"/>">${expenseAccount.employeeName}</a></dd>
- <dd>Period : ${expenseAccount.month} / ${expenseAccount.year}</dd>
- </dl>
-</div>
+<div ng-app>
+ <div >
+ <dl>
+ <dd><a href="<c:url value="/wikitty/view/${expenseAccount.employeeId}"/>">${expenseAccount.employeeName}</a></dd>
+ <dd>Period : {{expenseAccount.month}} / ${expenseAccount.year}</dd>
+ </dl>
+ </div>
-<div ng-app>
- <table>
- <tr>
- <th>Justif. Nb</th>
- <th>Emitted Date</th>
- <th>Project</th>
- <th>Description</th>
- <th>Category</th>
- <th>Amount</th>
- <th>VAT</th>
- <th>total</th>
- <th>Payment Date</th>
- </tr>
- <c:forEach var="expenseEntry" items="${expenseAccount.expenseAccountEntries}">
- <tr>
- <td>${expenseEntry.justificationNumber}</td>
- <td>{{${expenseEntry.emittedDate}| date:'shortDate'}}</td>
- <td><a href="<c:url value="/wikitty/view/${expenseEntry.projectId}"/>">${expenseEntry.projectName}</a></td>
- <td>${expenseEntry.description}</td>
- <td>${expenseEntry.categoryName}</td>
- <td>{{${expenseEntry.amount}|number:2}}</td>
- <td>{{${expenseEntry.VAT}|number:2}}</td>
- <td>{{${expenseEntry.total}|number:2}}</td>
- <td><span ng-if = "${expenseEntry.paymentDate} != 0"> {{${expenseEntry.paymentDate}|date:'shortDate'}}</span></td>
- </tr>
- </c:forEach>
- </table>
+ <div>
+ <table>
+ <tr>
+ <th>Justif. Nb</th>
+ <th>Emitted Date</th>
+ <th>Project</th>
+ <th>Description</th>
+ <th>Category</th>
+ <th>Amount</th>
+ <th>VAT</th>
+ <th>total</th>
+ <th>Payment Date</th>
+ </tr>
+ <c:forEach var="expenseEntry" items="${expenseAccount.expenseAccountEntries}">
+ <tr>
+ <td>${expenseEntry.justificationNumber}</td>
+ <td>{{${expenseEntry.emittedDate}| date:'shortDate'}}</td>
+ <td><a href="<c:url value="/wikitty/view/${expenseEntry.projectId}"/>">${expenseEntry.projectName}</a></td>
+ <td>${expenseEntry.description}</td>
+ <td>${expenseEntry.categoryName}</td>
+ <td>{{${expenseEntry.amount}|number:2}}</td>
+ <td>{{${expenseEntry.VAT}|number:2}}</td>
+ <td>{{${expenseEntry.total}|number:2}}</td>
+ <td><span ng-if = "${expenseEntry.paymentDate} != 0"> {{${expenseEntry.paymentDate}|date:'shortDate'}}</span></td>
+ </tr>
+ </c:forEach>
+ </table>
+ </div>
</div>
<div>
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccounts.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccounts.jsp 2014-04-09 14:29:44 UTC (rev 410)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccounts.jsp 2014-04-10 14:01:22 UTC (rev 411)
@@ -29,14 +29,20 @@
<script data-require="ng-table@*" data-semver="0.3.0" src="<c:url value='http://bazalt-cms.com/assets/ng-table/0.3.0/ng-table.js'/>"></script>
<link data-require="ng-table@*" data-semver="0.3.0" rel="stylesheet" href="<c:url value='http://bazalt-cms.com/assets/ng-table/0.3.0/ng-table.css'/>" />
<link data-require="bootstrap-css@*" data-semver="3.0.0" rel="stylesheet" href="<c:url value='http://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css'/>" />
- <script type="text/javascript" src="<c:url value='/js/expensePagination.js'/>"></script>
+ <script type="text/javascript" src="<c:url value='/js/paginationTable.js'/>"></script>
+ <script>
+ angular.module('Pagination').value('paginationInit', {
+ url : "<c:url value="/rest/financial/expenseAccounts"/>",
+ params: {page: 1, count: 10}
+ });
+ </script>
</head>
-<div ng-app="expenseAccountList" ng-controller="PageCtrl">
+<div ng-app="Pagination" ng-controller="PageCtrl">
<div loading-container="tableParams.settings().$loading">
<table ng-table="tableParams" show-filter="false" class="table">
- <tbody ng-repeat="expenseAccount in expenseAccounts">
+ <tbody ng-repeat="expenseAccount in elements">
<tr id="tr{{expenseAccount.id}}" ng-class-odd="'odd'" ng-class-even="'even'">
<td data-title="'Employee'">
<a href="<c:url value="/wikitty/view/{{expenseAccount.employeeId}}"/>">{{expenseAccount.employeeName}}</a>
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp 2014-04-09 14:29:44 UTC (rev 410)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp 2014-04-10 14:01:22 UTC (rev 411)
@@ -31,9 +31,15 @@
<link data-require="ng-table@*" data-semver="0.3.0" rel="stylesheet" href="<c:url value='http://bazalt-cms.com/assets/ng-table/0.3.0/ng-table.css'/>" />
<link data-require="bootstrap-css@*" data-semver="3.0.0" rel="stylesheet" href="<c:url value='http://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css'/>" />
<script type="text/javascript" src="<c:url value='/js/projectPagination.js'/>"></script>
+ <script>
+ angular.module('Pagination').value('paginationInit', {
+ url : "<c:url value="/rest/project/projects"/>",
+ params : {page: 1, count: 10, sorting: {name: 'asc'}}
+ });
+ </script>
</head>
-<div ng-app="projectList" ng-controller="PageCtrl">
+<div ng-app="Pagination" ng-controller="PageCtrl">
<div loading-container="tableParams.settings().$loading">
<table ng-table="tableParams" show-filter="true" class="table">
Deleted: trunk/chorem-webmotion/src/main/webapp/js/expensePagination.js
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/js/expensePagination.js 2014-04-09 14:29:44 UTC (rev 410)
+++ trunk/chorem-webmotion/src/main/webapp/js/expensePagination.js 2014-04-10 14:01:22 UTC (rev 411)
@@ -1,70 +0,0 @@
-/*
- * #%L
- * Chorem :: webmotion
- * $Id$
- * $HeadURL$
- * %%
- * Copyright (C) 2011 - 2014 CodeLutin
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-var app = angular.module('expenseAccountList', ['ngTable', 'ngResource']);
-
-app.controller('PageCtrl',
- function($scope, $timeout, $resource, ngTableParams) {
-
- var Api = $resource('json/expenseAccounts');
-
- $scope.tableParams = new ngTableParams({
- page: 1, // show first page
- count: 20,
- year: 2014,
- month: 03
- }, {
- total: 0, // length of data
- getData: function($defer, params) {
-
- // ajax request to api
- url = params.url();
- Api.get(url, function(data) {
- $timeout(function() {
- // update table params
- params.total(data.total);
- console.log(data);
- // set new data
- $scope.expenseAccounts = data.elements;
- $defer.resolve(data);
- }, 500);
- });
- }
- });
-
-});
-
-angular.module('expenseAccountList')
-.directive('loadingContainer', function () {
- return {
- restrict: 'A',
- scope: false,
- link: function(scope, element, attrs) {
- var loadingLayer = angular.element('<div class="loading"></div>');
- element.append(loadingLayer);
- element.addClass('loading-container');
- scope.$watch(attrs.loadingContainer, function(value) {
- loadingLayer.toggleClass('ng-hide', !value);
- });
- }
- };
-});
\ No newline at end of file
Copied: trunk/chorem-webmotion/src/main/webapp/js/paginationTable.js (from rev 410, trunk/chorem-webmotion/src/main/webapp/js/expensePagination.js)
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/js/paginationTable.js (rev 0)
+++ trunk/chorem-webmotion/src/main/webapp/js/paginationTable.js 2014-04-10 14:01:22 UTC (rev 411)
@@ -0,0 +1,64 @@
+/*
+ * #%L
+ * Chorem :: webmotion
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2011 - 2014 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+var app = angular.module('Pagination', ['ngTable', 'ngResource']);
+
+app.controller('PageCtrl',
+ function($scope, $timeout, $resource, ngTableParams, paginationInit) {
+
+ var Api = $resource(paginationInit.url);
+
+ $scope.tableParams = new ngTableParams(
+ paginationInit.params, {
+ total: 0, // length of data
+ getData: function($defer, params) {
+
+ // ajax request to api
+ url = params.url();
+ Api.get(url, function(data) {
+ $timeout(function() {
+ // update table params
+ params.total(data.total);
+ // set new data
+ $scope.elements = data.elements;
+ $defer.resolve(data);
+ }, 500);
+ });
+ }
+ });
+
+});
+
+angular.module('Pagination').directive('loadingContainer', function () {
+ return {
+ restrict: 'A',
+ scope: false,
+ link: function(scope, element, attrs) {
+ var loadingLayer = angular.element('<div class="loading"></div>');
+ element.append(loadingLayer);
+ element.addClass('loading-container');
+ scope.$watch(attrs.loadingContainer, function(value) {
+ loadingLayer.toggleClass('ng-hide', !value);
+ });
+ }
+ };
+});
\ No newline at end of file
Modified: trunk/chorem-webmotion/src/main/webapp/js/projectPagination.js
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/js/projectPagination.js 2014-04-09 14:29:44 UTC (rev 410)
+++ trunk/chorem-webmotion/src/main/webapp/js/projectPagination.js 2014-04-10 14:01:22 UTC (rev 411)
@@ -20,27 +20,21 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
-var app = angular.module('projectList', ['ngTable', 'ngResource']);
+var app = angular.module('Pagination', ['ngTable', 'ngResource']);
app.controller('PageCtrl',
- function($scope, $timeout, $resource, ngTableParams) {
+ function($scope, $timeout, $resource, ngTableParams, paginationInit) {
- var Api = $resource('json/projects');
+ var Api = $resource(paginationInit.url);
- $scope.tableParams = new ngTableParams({
- page: 1, // show first page
- count: 10,
- sorting: {
- name: 'asc' // initial sorting
- }
- }, {
+ $scope.tableParams = new ngTableParams(
+ paginationInit.params, {
total: 0, // length of data
getData: function($defer, params) {
var sorting = params.sorting();
var orderBy = Object.keys(sorting)[0];
var ordering = orderBy + "." + sorting[orderBy];
- console.log(ordering);
// ajax request to api
url = params.url();
@@ -77,8 +71,7 @@
});
-angular.module('projectList')
-.directive('loadingContainer', function () {
+angular.module('Pagination').directive('loadingContainer', function () {
return {
restrict: 'A',
scope: false,
1
0
Author: ymartel
Date: 2014-04-09 16:29:44 +0200 (Wed, 09 Apr 2014)
New Revision: 410
Url: http://forge.chorem.org/projects/chorem/repository/revisions/410
Log:
- add financial module with start implementation of ExpenseAccounts
- add svn properties & some file headers
Added:
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/ExpenseAccountAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountBean.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountEntryBean.java
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccounts.jsp
trunk/chorem-webmotion/src/main/webapp/js/expensePagination.js
Modified:
trunk/LICENSE.txt
trunk/README.txt
trunk/changelog.txt
trunk/chorem-entities/LICENSE.txt
trunk/chorem-entities/README.txt
trunk/chorem-entities/changelog.txt
trunk/chorem-entities/pom.xml
trunk/chorem-entities/src/license/THIRD-PARTY.properties
trunk/chorem-entities/src/main/java/com/inamik/utils/AbstractTableFormatter.java
trunk/chorem-entities/src/main/java/com/inamik/utils/SimpleTableFormatter.java
trunk/chorem-entities/src/main/java/com/inamik/utils/TableFormatter.java
trunk/chorem-entities/src/main/java/org/chorem/ChoremAction.java
trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java
trunk/chorem-entities/src/main/java/org/chorem/ChoremConfig.java
trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigAction.java
trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigOption.java
trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java
trunk/chorem-entities/src/main/java/org/chorem/ChoremQueryHelper.java
trunk/chorem-entities/src/main/java/org/chorem/ChoremQueryMaker.java
trunk/chorem-entities/src/main/java/org/chorem/ChoremUtil.java
trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java
trunk/chorem-entities/src/main/java/org/chorem/Saint.java
trunk/chorem-entities/src/main/java/org/chorem/entities/EmployeeMigration.java
trunk/chorem-entities/src/main/java/org/chorem/entities/ExpenseClaimStatus.java
trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceMigration.java
trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceStatus.java
trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceableUtil.java
trunk/chorem-entities/src/main/java/org/chorem/entities/Quotation18Migration.java
trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationMigration.java
trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationStatus.java
trunk/chorem-entities/src/main/java/org/chorem/entities/TaskStatus.java
trunk/chorem-entities/src/main/java/org/chorem/entities/VacationMigration.java
trunk/chorem-entities/src/main/java/org/chorem/entities/VacationStatus.java
trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java
trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java
trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java
trunk/chorem-entities/src/main/java/org/chorem/project/TaskCalculation.java
trunk/chorem-entities/src/main/java/org/chorem/project/TotalQuotationCalculation.java
trunk/chorem-entities/src/main/resources/chorem.properties
trunk/chorem-entities/src/main/resources/log4j.properties
trunk/chorem-entities/src/main/xmi/chorem-model.properties
trunk/chorem-entities/src/main/xmi/chorem-model.zargo
trunk/chorem-entities/src/main/xmi/vacations.rst
trunk/chorem-entities/src/site/rst/chorem-entities-base.png
trunk/chorem-entities/src/site/rst/chorem-entities-billy.png
trunk/chorem-entities/src/site/rst/chorem-entities-bonzoms.png
trunk/chorem-entities/src/site/rst/chorem-entities-gepeto.png
trunk/chorem-entities/src/site/rst/dataModel.rst
trunk/chorem-entities/src/site/rst/gepeto.rst
trunk/chorem-entities/src/test/java/org/chorem/ChoremUtilTest.java
trunk/chorem-entities/src/test/java/org/chorem/entities/InvoiceableUtilTest.java
trunk/chorem-web/LICENSE.txt
trunk/chorem-web/README.txt
trunk/chorem-web/changelog.txt
trunk/chorem-web/pom.xml
trunk/chorem-web/src/main/i18n/jsp.rules
trunk/chorem-web/src/main/java/org/chorem/ChoremSession.java
trunk/chorem-web/src/main/java/org/chorem/ChoremUtil.java
trunk/chorem-web/src/main/java/org/chorem/ContactDetailsConstants.java
trunk/chorem-web/src/main/java/org/chorem/JspUtils.java
trunk/chorem-web/src/main/java/org/chorem/action/ChoremBaseAction.java
trunk/chorem-web/src/main/java/org/chorem/action/EntitySearchJsonAction.java
trunk/chorem-web/src/main/java/org/chorem/action/HomeAction.java
trunk/chorem-web/src/main/java/org/chorem/action/SelectWikittyComponentAction.java
trunk/chorem-web/src/main/java/org/chorem/billy/action/QuotationAction.java
trunk/chorem-web/src/main/java/org/chorem/gepeto/ProjectOrderFull.java
trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java
trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java
trunk/chorem-web/src/main/java/org/chorem/gepeto/action/TaskAction.java
trunk/chorem-web/src/main/resources/freemarker.properties
trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties
trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties
trunk/chorem-web/src/main/resources/org/chorem/billy/action/QuotationAction-addQuotation-validation.xml
trunk/chorem-web/src/main/resources/org/chorem/billy/action/QuotationAction-modifyQuotation-validation.xml
trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-addProject-validation.xml
trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-modifyProject-validation.xml
trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectOrderAction-addProjectOrder-validation.xml
trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/TaskAction-addTask-validation.xml
trunk/chorem-web/src/main/resources/struts.properties
trunk/chorem-web/src/main/resources/struts.xml
trunk/chorem-web/src/main/webapp/WEB-INF/decorators.xml
trunk/chorem-web/src/main/webapp/WEB-INF/decorators/billy.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/decorators/bonzoms.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/decorators/cash.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/decorators/gepeto.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/decorators/main.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/addQuotation.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/home.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/menu.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/quotationDetails.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/companies.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/menu.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/persons.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/common/inc/footer.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/common/inc/header.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/common/selectWikittyComponent.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProject.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addTask.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/menu.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectOrderDetails.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projects.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsByYear.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsWithoutQuotation.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/results.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/jsp/home.jsp
trunk/chorem-web/src/main/webapp/WEB-INF/sitemesh.xml
trunk/chorem-web/src/main/webapp/WEB-INF/web.xml
trunk/chorem-web/src/main/webapp/css/style.css
trunk/chorem-web/src/main/webapp/js/chorem.js
trunk/chorem-web/src/main/webapp/template/simple/a-close.ftl
trunk/chorem-web/src/main/webapp/template/simple/form-common.ftl
trunk/chorem-web/src/main/webapp/template/xhtml/controlheader-core.ftl
trunk/chorem-web/src/main/webapp/template/xhtml/file.ftl
trunk/chorem-web/src/main/webapp/template/xhtml/form-close.ftl
trunk/chorem-web/src/main/webapp/template/xhtml/form.ftl
trunk/chorem-web/src/main/webapp/template/xhtml/password.ftl
trunk/chorem-web/src/main/webapp/template/xhtml/submit-close.ftl
trunk/chorem-web/src/main/webapp/template/xhtml/submit.ftl
trunk/chorem-web/src/main/webapp/template/xhtml/text.ftl
trunk/chorem-web/src/main/webapp/template/xhtml/textarea.ftl
trunk/chorem-webmotion/LICENSE.txt
trunk/chorem-webmotion/README.txt
trunk/chorem-webmotion/changelog.txt
trunk/chorem-webmotion/pom.xml
trunk/chorem-webmotion/src/doc/REST_API_Timer.txt
trunk/chorem-webmotion/src/jetty/jetty-context.xml
trunk/chorem-webmotion/src/license/THIRD-PARTY.properties
trunk/chorem-webmotion/src/main/i18n/jsp.rules
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremDateUtil.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremWebMotionUtil.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/PaginatedResult.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdcDashboardAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdminAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/BIAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardHRAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/HrAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/MapWithDefault.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/WikittyRestAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/AccountAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExport.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExportModel.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ExportAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/QuotationAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/ProjectsAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationData.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationStatusAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/TaskData.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AcceptedQuotationsReportAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AccountSalesReportAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/FunnelAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/ProjectSalesReportAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/QuotationYearData.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesData.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerAccountReportAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerProjectReportAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportHelper.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SentQuotationsReportAction.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/AuthenticationFilter.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/ChoremClientFilter.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/DecoratorFilter.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikitty.java
trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikittyJson.java
trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java
trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java
trunk/chorem-webmotion/src/main/resources/i18n/chorem-webmotion_en_GB.properties
trunk/chorem-webmotion/src/main/resources/i18n/chorem-webmotion_fr_FR.properties
trunk/chorem-webmotion/src/main/resources/log4j.properties
trunk/chorem-webmotion/src/main/resources/mapping
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/admin/importExport.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/bi/reportDefinition.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/contact.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/account.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/company.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/editQuotation.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/project.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAdc.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAnnualProfit.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardEmployee.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardMultiProject.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardRequestVacation.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVAT.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editMulti.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editRelated.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editVacationRequest.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employeeEdit.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/index.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/login.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/editProject.html
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/report.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/acceptedQuotation.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/accountSalesReport.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-cancel.html
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-draftToSent.html
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-leadToDraft.html
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToAccepted.html
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToRejected.html
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/projectSalesReport.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/sales.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerAccountReport.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesReport.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/sentQuotation.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/search.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/simpleWikiFields.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/vacationDiv.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionCompany.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionEmployee.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionFinancialTransaction.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionPerson.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionProject.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionQuotation.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionTask.jsp
trunk/chorem-webmotion/src/main/webapp/WEB-INF/nuiton-js.properties
trunk/chorem-webmotion/src/main/webapp/WEB-INF/web.xml
trunk/chorem-webmotion/src/main/webapp/WEB-INF/wikitty.tld
trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml
trunk/chorem-webmotion/src/main/webapp/css/chorem-bi.css
trunk/chorem-webmotion/src/main/webapp/css/chorem-crm.css
trunk/chorem-webmotion/src/main/webapp/css/chorem-sales.css
trunk/chorem-webmotion/src/main/webapp/css/chorem.less
trunk/chorem-webmotion/src/main/webapp/css/employeeEdit.css
trunk/chorem-webmotion/src/main/webapp/css/jquery-ui-timepicker-addon.css
trunk/chorem-webmotion/src/main/webapp/css/jquery.fn.gantt.css
trunk/chorem-webmotion/src/main/webapp/css/ng-grid.min.css
trunk/chorem-webmotion/src/main/webapp/css/select2/select2-spinner.gif
trunk/chorem-webmotion/src/main/webapp/css/select2/select2.css
trunk/chorem-webmotion/src/main/webapp/css/select2/select2.png
trunk/chorem-webmotion/src/main/webapp/css/select2/select2x2.png
trunk/chorem-webmotion/src/main/webapp/css/vacationRequest.css
trunk/chorem-webmotion/src/main/webapp/img/ajax-loader.gif
trunk/chorem-webmotion/src/main/webapp/img/glyphicons-halflings-white.png
trunk/chorem-webmotion/src/main/webapp/img/glyphicons-halflings.png
trunk/chorem-webmotion/src/main/webapp/img/jquery.fn.gantt/grid.png
trunk/chorem-webmotion/src/main/webapp/img/jquery.fn.gantt/icon_sprite.png
trunk/chorem-webmotion/src/main/webapp/img/jquery.fn.gantt/loader_bg.png
trunk/chorem-webmotion/src/main/webapp/img/jquery.fn.gantt/slider_handle.png
trunk/chorem-webmotion/src/main/webapp/js/chorem.js
trunk/chorem-webmotion/src/main/webapp/js/dashboardAdc.js
trunk/chorem-webmotion/src/main/webapp/js/employeeEdit.js
trunk/chorem-webmotion/src/main/webapp/js/jquery-ui-timepicker-addon.js
trunk/chorem-webmotion/src/main/webapp/js/jquery-ui-timepicker-fr.js
trunk/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js
trunk/chorem-webmotion/src/main/webapp/js/jquery.maskedinput-1.3.js
trunk/chorem-webmotion/src/main/webapp/js/js-hypercube.min.js
trunk/chorem-webmotion/src/main/webapp/js/less-1.3.3.js
trunk/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.debug.js
trunk/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.min.js
trunk/chorem-webmotion/src/main/webapp/js/ng-select2.js
trunk/chorem-webmotion/src/main/webapp/js/ng-wikitty.js
trunk/chorem-webmotion/src/main/webapp/js/projectPagination.js
trunk/chorem-webmotion/src/main/webapp/js/salesFunnel.js
trunk/chorem-webmotion/src/main/webapp/js/select2.min.js
trunk/pom.xml
trunk/src/site/resources/images/logos/argouml-logo.png
trunk/src/site/resources/images/logos/jrst-logo.png
trunk/src/site/resources/images/logos/restructuredtext-logo.png
trunk/src/site/rst/calculations.rst
trunk/src/site/rst/chorem-cdc.rst
trunk/src/site/rst/doc-devel.rst
trunk/src/site/rst/index.rst
trunk/src/site/rst/requisite.rst
trunk/src/site/site_fr.xml
Property changes on: trunk/LICENSE.txt
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/README.txt
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/changelog.txt
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-entities/LICENSE.txt
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-entities/README.txt
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-entities/changelog.txt
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-entities/pom.xml
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-entities/src/license/THIRD-PARTY.properties
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-entities/src/main/java/com/inamik/utils/AbstractTableFormatter.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-entities/src/main/java/com/inamik/utils/SimpleTableFormatter.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-entities/src/main/java/com/inamik/utils/TableFormatter.java
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremAction.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/ChoremAction.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/java/org/chorem/ChoremAction.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem entities
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-entities/src/main/java/org/chorem/ChoremAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem entities
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-entities/src/main/java/org/chorem/ChoremClient.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremConfig.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/ChoremConfig.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/java/org/chorem/ChoremConfig.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem entities
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-entities/src/main/java/org/chorem/ChoremConfig.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigAction.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigAction.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigAction.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem entities
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigOption.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigOption.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigOption.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem entities
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-entities/src/main/java/org/chorem/ChoremConfigOption.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem entities
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-entities/src/main/java/org/chorem/ChoremMain.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremQueryHelper.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/ChoremQueryHelper.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/java/org/chorem/ChoremQueryHelper.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem entities
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-entities/src/main/java/org/chorem/ChoremQueryHelper.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremQueryMaker.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/ChoremQueryMaker.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/java/org/chorem/ChoremQueryMaker.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem entities
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-entities/src/main/java/org/chorem/ChoremQueryMaker.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/java/org/chorem/ChoremUtil.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/ChoremUtil.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/java/org/chorem/ChoremUtil.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: entities
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-entities/src/main/java/org/chorem/ChoremUtil.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem entities
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/java/org/chorem/Saint.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/Saint.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/java/org/chorem/Saint.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem entities
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-entities/src/main/java/org/chorem/Saint.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/EmployeeMigration.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/entities/EmployeeMigration.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/java/org/chorem/entities/EmployeeMigration.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -7,8 +7,8 @@
/*
* #%L
* Chorem entities
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-entities/src/main/java/org/chorem/entities/EmployeeMigration.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/ExpenseClaimStatus.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/entities/ExpenseClaimStatus.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/java/org/chorem/entities/ExpenseClaimStatus.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem entities
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-entities/src/main/java/org/chorem/entities/ExpenseClaimStatus.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceMigration.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceMigration.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceMigration.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -7,8 +7,8 @@
/*
* #%L
* Chorem entities
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceMigration.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceStatus.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceStatus.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceStatus.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem entities
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceStatus.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceableUtil.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceableUtil.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceableUtil.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem entities
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-entities/src/main/java/org/chorem/entities/InvoiceableUtil.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/Quotation18Migration.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/entities/Quotation18Migration.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/java/org/chorem/entities/Quotation18Migration.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: entities
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-entities/src/main/java/org/chorem/entities/Quotation18Migration.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationMigration.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationMigration.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationMigration.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem entities
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationMigration.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationStatus.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationStatus.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationStatus.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem entities
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-entities/src/main/java/org/chorem/entities/QuotationStatus.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/TaskStatus.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/entities/TaskStatus.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/java/org/chorem/entities/TaskStatus.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem entities
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-entities/src/main/java/org/chorem/entities/TaskStatus.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/VacationMigration.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/entities/VacationMigration.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/java/org/chorem/entities/VacationMigration.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem entities
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-entities/src/main/java/org/chorem/entities/VacationMigration.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/java/org/chorem/entities/VacationStatus.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/entities/VacationStatus.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/java/org/chorem/entities/VacationStatus.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem entities
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-entities/src/main/java/org/chorem/entities/VacationStatus.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: entities
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-entities/src/main/java/org/chorem/project/AdcCalculation.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: entities
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-entities/src/main/java/org/chorem/project/Calculation.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: entities
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-entities/src/main/java/org/chorem/project/QuotationCalculation.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/java/org/chorem/project/TaskCalculation.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/project/TaskCalculation.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/java/org/chorem/project/TaskCalculation.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: entities
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-entities/src/main/java/org/chorem/project/TaskCalculation.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/java/org/chorem/project/TotalQuotationCalculation.java
===================================================================
--- trunk/chorem-entities/src/main/java/org/chorem/project/TotalQuotationCalculation.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/java/org/chorem/project/TotalQuotationCalculation.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: entities
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-entities/src/main/java/org/chorem/project/TotalQuotationCalculation.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/resources/chorem.properties
===================================================================
--- trunk/chorem-entities/src/main/resources/chorem.properties 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/resources/chorem.properties 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
###
# #%L
# Chorem entities
-# $Id:$
-# $HeadURL:$
+# $Id$
+# $HeadURL$
# %%
# Copyright (C) 2011 - 2012 CodeLutin
# %%
Property changes on: trunk/chorem-entities/src/main/resources/chorem.properties
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-entities/src/main/resources/log4j.properties
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/xmi/chorem-model.properties
===================================================================
--- trunk/chorem-entities/src/main/xmi/chorem-model.properties 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/xmi/chorem-model.properties 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
###
# #%L
# Chorem entities
-# $Id:$
-# $HeadURL:$
+# $Id$
+# $HeadURL$
# %%
# Copyright (C) 2011 - 2012 CodeLutin
# %%
@@ -39,7 +39,7 @@
# ADC
#
org.chorem.entities.ADC.class.tagvalue.version=1.0
-org.chorem.entities.Cancelled.class.tagvalue.toString=%ADC.employeeHR|noemployee%s %ADC.year|noyear%s %ADC.value|novalue$s
+org.chorem.entities.ADC.class.tagvalue.toString=%ADC.employeeHR|noemployee%s %ADC.year|noyear%s %ADC.value|novalue$s
#
@@ -189,6 +189,22 @@
org.chorem.entities.ExpenseClaim.attribute.status.tagvalue.default=UNCHARGEABLE
#
+# ExpenseAccount
+#
+org.chorem.entities.ExpenseAccount.class.tagvalue.version=1.0
+org.chorem.entities.ExpenseAccount.class.tagvalue.preload=ExpenseAccount.employee
+org.chorem.entities.ExpenseAccount.class.tagvalue.toString=%ExpenseAccount.employee$s - %ExpenseAccount.month$s/%ExpenseAccount.year$s
+org.chorem.entities.ExpenseAccount.class.tagvalue.sortOrder=ExpenseAccount.year,ExpenseAccount.month
+
+#
+# ExpenseAccountEntry
+#
+org.chorem.entities.ExpenseAccountEntry.class.tagvalue.version=1.0
+org.chorem.entities.ExpenseAccountEntry.class.tagvalue.toString=%FinancialTransaction.reference$tF-%ExpenseAccountEntry.justificationNumber$tF
+org.chorem.entities.ExpenseAccountEntry.class.tagvalue.preload=FinancialTransaction.beneficiary;FinancialTransaction.category
+org.chorem.entities.ExpenseAccountEntry.class.tagvalue.sortOrder=ExpenseAccountEntry.date
+
+#
# Mission (a mettre ici)
#
#
Property changes on: trunk/chorem-entities/src/main/xmi/chorem-model.properties
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/main/xmi/chorem-model.zargo
===================================================================
(Binary files differ)
Property changes on: trunk/chorem-entities/src/main/xmi/chorem-model.zargo
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Modified: trunk/chorem-entities/src/main/xmi/vacations.rst
===================================================================
--- trunk/chorem-entities/src/main/xmi/vacations.rst 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/main/xmi/vacations.rst 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
.. -
.. * #%L
.. * Chorem entities
-.. * $Id:$
-.. * $HeadURL:$
+.. * $Id$
+.. * $HeadURL$
.. * %%
.. * Copyright (C) 2011 - 2012 CodeLutin
.. * %%
Property changes on: trunk/chorem-entities/src/main/xmi/vacations.rst
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-entities/src/site/rst/chorem-entities-base.png
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/chorem-entities/src/site/rst/chorem-entities-billy.png
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/chorem-entities/src/site/rst/chorem-entities-bonzoms.png
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/chorem-entities/src/site/rst/chorem-entities-gepeto.png
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Modified: trunk/chorem-entities/src/site/rst/dataModel.rst
===================================================================
--- trunk/chorem-entities/src/site/rst/dataModel.rst 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/site/rst/dataModel.rst 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
.. -
.. * #%L
.. * Chorem entities
-.. * $Id:$
-.. * $HeadURL:$
+.. * $Id$
+.. * $HeadURL$
.. * %%
.. * Copyright (C) 2011 - 2012 CodeLutin
.. * %%
Property changes on: trunk/chorem-entities/src/site/rst/dataModel.rst
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/site/rst/gepeto.rst
===================================================================
--- trunk/chorem-entities/src/site/rst/gepeto.rst 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/site/rst/gepeto.rst 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
.. -
.. * #%L
.. * Chorem :: entities
-.. * $Id:$
-.. * $HeadURL:$
+.. * $Id$
+.. * $HeadURL$
.. * %%
.. * Copyright (C) 2011 - 2014 CodeLutin
.. * %%
Property changes on: trunk/chorem-entities/src/site/rst/gepeto.rst
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/test/java/org/chorem/ChoremUtilTest.java
===================================================================
--- trunk/chorem-entities/src/test/java/org/chorem/ChoremUtilTest.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/test/java/org/chorem/ChoremUtilTest.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: entities
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-entities/src/test/java/org/chorem/ChoremUtilTest.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-entities/src/test/java/org/chorem/entities/InvoiceableUtilTest.java
===================================================================
--- trunk/chorem-entities/src/test/java/org/chorem/entities/InvoiceableUtilTest.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-entities/src/test/java/org/chorem/entities/InvoiceableUtilTest.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem entities
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-entities/src/test/java/org/chorem/entities/InvoiceableUtilTest.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/LICENSE.txt
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/README.txt
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/changelog.txt
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/pom.xml
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/i18n/jsp.rules
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/java/org/chorem/ChoremSession.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/java/org/chorem/ChoremUtil.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/java/org/chorem/ContactDetailsConstants.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/java/org/chorem/JspUtils.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/java/org/chorem/action/ChoremBaseAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/java/org/chorem/action/EntitySearchJsonAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/java/org/chorem/action/HomeAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/java/org/chorem/action/SelectWikittyComponentAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/java/org/chorem/billy/action/QuotationAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/java/org/chorem/gepeto/ProjectOrderFull.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/ProjectOrderAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/java/org/chorem/gepeto/action/TaskAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-web/src/main/resources/freemarker.properties
===================================================================
--- trunk/chorem-web/src/main/resources/freemarker.properties 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-web/src/main/resources/freemarker.properties 2014-04-09 14:29:44 UTC (rev 410)
@@ -2,8 +2,8 @@
# #%L
# BOW UI
#
-# $Id: freemarker.properties 333 2011-08-31 12:32:26Z bpoussin $
-# $HeadURL: http://svn.chorem.org/svn/bow/trunk/bow-ui/src/main/resources/freemarker.pr… $
+# $Id$
+# $HeadURL$
# %%
# Copyright (C) 2010 - 2011 CodeLutin
# %%
Property changes on: trunk/chorem-web/src/main/resources/freemarker.properties
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/resources/i18n/chorem-web_en_GB.properties
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/resources/i18n/chorem-web_fr_FR.properties
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/resources/org/chorem/billy/action/QuotationAction-addQuotation-validation.xml
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/resources/org/chorem/billy/action/QuotationAction-modifyQuotation-validation.xml
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-addProject-validation.xml
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectAction-modifyProject-validation.xml
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/ProjectOrderAction-addProjectOrder-validation.xml
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/resources/org/chorem/gepeto/action/TaskAction-addTask-validation.xml
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/resources/struts.properties
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/resources/struts.xml
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/decorators/billy.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/decorators/bonzoms.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/decorators/cash.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/decorators/gepeto.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/decorators/main.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/decorators.xml
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/addQuotation.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/home.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/menu.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/billy/quotationDetails.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/companies.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/menu.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/bonzoms/persons.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/common/inc/footer.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/common/inc/header.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/common/selectWikittyComponent.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProject.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addProjectOrder.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/addTask.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/menu.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectDetails.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectOrderDetails.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projects.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsByYear.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/projectsWithoutQuotation.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/gepeto/results.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/jsp/home.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/sitemesh.xml
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/WEB-INF/web.xml
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/css/style.css
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/js/chorem.js
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-web/src/main/webapp/template/simple/a-close.ftl
===================================================================
--- trunk/chorem-web/src/main/webapp/template/simple/a-close.ftl 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-web/src/main/webapp/template/simple/a-close.ftl 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,6 +1,6 @@
<#--
/*
- * $Id: a-close.ftl 224 2011-02-25 16:57:19Z kmorin $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Property changes on: trunk/chorem-web/src/main/webapp/template/simple/a-close.ftl
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-web/src/main/webapp/template/simple/form-common.ftl
===================================================================
--- trunk/chorem-web/src/main/webapp/template/simple/form-common.ftl 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-web/src/main/webapp/template/simple/form-common.ftl 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,6 +1,6 @@
<#--
/*
- * $Id: form-common.ftl 192 2011-02-14 14:53:06Z tchemit $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Property changes on: trunk/chorem-web/src/main/webapp/template/simple/form-common.ftl
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-web/src/main/webapp/template/xhtml/controlheader-core.ftl
===================================================================
--- trunk/chorem-web/src/main/webapp/template/xhtml/controlheader-core.ftl 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-web/src/main/webapp/template/xhtml/controlheader-core.ftl 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,6 +1,6 @@
<#--
/*
- * $Id: controlheader-core.ftl 192 2011-02-14 14:53:06Z tchemit $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Property changes on: trunk/chorem-web/src/main/webapp/template/xhtml/controlheader-core.ftl
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-web/src/main/webapp/template/xhtml/file.ftl
===================================================================
--- trunk/chorem-web/src/main/webapp/template/xhtml/file.ftl 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-web/src/main/webapp/template/xhtml/file.ftl 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,6 +1,6 @@
<#--
/*
- * $Id: file.ftl 192 2011-02-14 14:53:06Z tchemit $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Property changes on: trunk/chorem-web/src/main/webapp/template/xhtml/file.ftl
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-web/src/main/webapp/template/xhtml/form-close.ftl
===================================================================
--- trunk/chorem-web/src/main/webapp/template/xhtml/form-close.ftl 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-web/src/main/webapp/template/xhtml/form-close.ftl 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,6 +1,6 @@
<#--
/*
- * $Id: form-close.ftl 192 2011-02-14 14:53:06Z tchemit $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Property changes on: trunk/chorem-web/src/main/webapp/template/xhtml/form-close.ftl
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-web/src/main/webapp/template/xhtml/form.ftl
===================================================================
--- trunk/chorem-web/src/main/webapp/template/xhtml/form.ftl 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-web/src/main/webapp/template/xhtml/form.ftl 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,6 +1,6 @@
<#--
/*
- * $Id: form.ftl 192 2011-02-14 14:53:06Z tchemit $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Property changes on: trunk/chorem-web/src/main/webapp/template/xhtml/form.ftl
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-web/src/main/webapp/template/xhtml/password.ftl
===================================================================
--- trunk/chorem-web/src/main/webapp/template/xhtml/password.ftl 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-web/src/main/webapp/template/xhtml/password.ftl 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,6 +1,6 @@
<#--
/*
- * $Id: password.ftl 192 2011-02-14 14:53:06Z tchemit $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Property changes on: trunk/chorem-web/src/main/webapp/template/xhtml/password.ftl
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-web/src/main/webapp/template/xhtml/submit-close.ftl
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-web/src/main/webapp/template/xhtml/submit.ftl
===================================================================
--- trunk/chorem-web/src/main/webapp/template/xhtml/submit.ftl 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-web/src/main/webapp/template/xhtml/submit.ftl 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,6 +1,6 @@
<#--
/*
- * $Id: submit.ftl 192 2011-02-14 14:53:06Z tchemit $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Property changes on: trunk/chorem-web/src/main/webapp/template/xhtml/submit.ftl
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-web/src/main/webapp/template/xhtml/text.ftl
===================================================================
--- trunk/chorem-web/src/main/webapp/template/xhtml/text.ftl 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-web/src/main/webapp/template/xhtml/text.ftl 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,6 +1,6 @@
<#--
/*
- * $Id: text.ftl 192 2011-02-14 14:53:06Z tchemit $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Property changes on: trunk/chorem-web/src/main/webapp/template/xhtml/text.ftl
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-web/src/main/webapp/template/xhtml/textarea.ftl
===================================================================
--- trunk/chorem-web/src/main/webapp/template/xhtml/textarea.ftl 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-web/src/main/webapp/template/xhtml/textarea.ftl 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,6 +1,6 @@
<#--
/*
- * $Id: textarea.ftl 590812 2007-10-31 20:32:54Z apetrelli $
+ * $Id$
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Property changes on: trunk/chorem-web/src/main/webapp/template/xhtml/textarea.ftl
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-webmotion/LICENSE.txt
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-webmotion/README.txt
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-webmotion/changelog.txt
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-webmotion/pom.xml
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-webmotion/src/doc/REST_API_Timer.txt
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/jetty/jetty-context.xml
===================================================================
--- trunk/chorem-webmotion/src/jetty/jetty-context.xml 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/jetty/jetty-context.xml 2014-04-09 14:29:44 UTC (rev 410)
@@ -2,8 +2,8 @@
<!--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/jetty/jetty-context.xml
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-webmotion/src/license/THIRD-PARTY.properties
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-webmotion/src/main/i18n/jsp.rules
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremDateUtil.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremDateUtil.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremDateUtil.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -7,8 +7,8 @@
/*
* #%L
* Chorem webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremDateUtil.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremWebMotionUtil.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremWebMotionUtil.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremWebMotionUtil.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -2,8 +2,8 @@
/*
* #%L
* Chorem webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/ChoremWebMotionUtil.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/PaginatedResult.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/PaginatedResult.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/PaginatedResult.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/PaginatedResult.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdcDashboardAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdcDashboardAction.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdcDashboardAction.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdcDashboardAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdminAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdminAction.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdminAction.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/AdminAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/BIAction.java
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardHRAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardHRAction.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardHRAction.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/DashboardHRAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/EmployeeEditAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/GenericAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/HrAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/HrAction.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/HrAction.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -4,8 +4,8 @@
/*
* #%L
* Chorem webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/HrAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/MapWithDefault.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/MapWithDefault.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/MapWithDefault.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/MapWithDefault.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/WikittyRestAction.java
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/AccountAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/AccountAction.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/AccountAction.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/AccountAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExport.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExport.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExport.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExport.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExportModel.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExportModel.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExportModel.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ContactRowForExportModel.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ExportAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ExportAction.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ExportAction.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/ExportAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/QuotationAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/QuotationAction.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/QuotationAction.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/crm/QuotationAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Added: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/ExpenseAccountAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/ExpenseAccountAction.java (rev 0)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/ExpenseAccountAction.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -0,0 +1,194 @@
+package org.chorem.webmotion.actions.financial;
+
+/*
+ * #%L
+ * Chorem :: webmotion
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2011 - 2014 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+
+import com.google.common.base.Function;
+import com.google.common.collect.Collections2;
+import com.google.common.collect.Lists;
+import org.chorem.ChoremClient;
+import org.chorem.entities.CategoryImpl;
+import org.chorem.entities.Employee;
+import org.chorem.entities.EmployeeImpl;
+import org.chorem.entities.ExpenseAccount;
+import org.chorem.entities.ExpenseAccountImpl;
+import org.chorem.webmotion.PaginatedResult;
+import org.chorem.webmotion.bean.financial.ExpenseAccountBean;
+import org.chorem.webmotion.bean.financial.ExpenseAccountEntryBean;
+import org.debux.webmotion.server.WebMotionController;
+import org.debux.webmotion.server.call.Call;
+import org.debux.webmotion.server.render.Render;
+import org.nuiton.util.DateUtil;
+import org.nuiton.wikitty.query.WikittyQuery;
+import org.nuiton.wikitty.query.WikittyQueryMaker;
+import org.nuiton.wikitty.query.WikittyQueryResult;
+
+/**
+ * @author ymartel <martel(a)codelutin.com>
+ */
+public class ExpenseAccountAction extends WebMotionController {
+
+ public PaginatedResult<ExpenseAccountBean> findAllExpenseAccounts(ChoremClient client, Integer year, Integer mounth, int page, int count) {
+
+ if (mounth == null) {
+ mounth = DateUtil.getMonth(new Date());
+ }
+ if (year == null) {
+ Calendar calendar = Calendar.getInstance();
+ year = calendar.get(Calendar.YEAR);
+ }
+
+ WikittyQuery totalQuery = new WikittyQueryMaker()
+ .select().count(ExpenseAccount.ELEMENT_FIELD_EXPENSEACCOUNT_MONTH).where().and()
+ .exteq(ExpenseAccount.EXT_EXPENSEACCOUNT)
+ .eq(ExpenseAccount.ELEMENT_FIELD_EXPENSEACCOUNT_MONTH, mounth)
+ .eq(ExpenseAccount.ELEMENT_FIELD_EXPENSEACCOUNT_YEAR, year)
+ .end();
+
+ Integer nbExpenseAccounts = client.findByQuery(Integer.class, totalQuery);
+
+ PaginatedResult<ExpenseAccountBean> paginatedResult;
+ if (nbExpenseAccounts > 0) {
+
+ WikittyQuery expAccountsQuery = new WikittyQueryMaker()
+ .where().and()
+ .exteq(ExpenseAccount.EXT_EXPENSEACCOUNT)
+ .eq(ExpenseAccount.ELEMENT_FIELD_EXPENSEACCOUNT_MONTH, mounth)
+ .eq(ExpenseAccount.ELEMENT_FIELD_EXPENSEACCOUNT_YEAR, year)
+ .end()
+ .setOffset((page - 1) * count)
+ .setLimit(page * count);
+
+ WikittyQueryResult<ExpenseAccount> expenseAccounts = client.findAllByQuery(ExpenseAccount.class, expAccountsQuery);
+
+ List<ExpenseAccount> expenseAccountList = expenseAccounts.getAll();
+ Collection<ExpenseAccountBean> expenseAccountBeans = Collections2.transform(expenseAccountList, TRANSFORM_EXPENSE_ACCOUNT_TO_BEAN);
+ paginatedResult = new PaginatedResult<>(Lists.newArrayList(expenseAccountBeans), page, count, nbExpenseAccounts);
+
+ } else {
+
+ //XXX ymartel 2014/04/09 : create fake datas for test
+ Employee employee = client.findAllByExample(new EmployeeImpl(), 0, 1).get(0);
+ ExpenseAccountBean fakeOne = new ExpenseAccountBean();
+ fakeOne.setId("fake");
+ fakeOne.setMonth(03);
+ fakeOne.setYear(2014);
+ fakeOne.setEmployeeName(employee.toString());
+ fakeOne.setEmployeeId(employee.getWikittyId());
+ ExpenseAccountBean fakeTwo = new ExpenseAccountBean();
+ fakeTwo.setId("fake");
+ fakeTwo.setMonth(mounth);
+ fakeTwo.setYear(year);
+ fakeTwo.setEmployeeName(employee.toString());
+ fakeTwo.setEmployeeId(employee.getWikittyId());
+ ArrayList<ExpenseAccountBean> expenseAccounts = new ArrayList<>();
+ expenseAccounts.add(fakeOne);
+ expenseAccounts.add(fakeTwo);
+ paginatedResult = new PaginatedResult<>(expenseAccounts, 1, count, 0);
+ }
+
+ return paginatedResult;
+ }
+
+ public void saveExpenseAccount(ChoremClient client, String expenseAccountId, Call call) {
+ ExpenseAccount expenseAccount = client.restore(ExpenseAccount.class, expenseAccountId);
+ if (expenseAccount == null) {
+ expenseAccount = new ExpenseAccountImpl();
+ }
+ Map<String,Object> extractParameters = call.getExtractParameters();
+ String contextPath = call.getContext().getServletContext().getContextPath();
+ contextPath.length();
+ }
+
+ public Render findExpenseAccount(ChoremClient client, String expenseAccountId) {
+ ExpenseAccount expenseAccount = client.restore(ExpenseAccount.class, expenseAccountId);
+ Set<ExpenseAccountEntryBean> expenseAccountEntries;
+ WikittyQueryResult<CategoryImpl> categoriesResult = client.findAllByExample(new CategoryImpl(), 0, 10);
+ List<CategoryImpl> categories = categoriesResult.getAll();
+
+ ExpenseAccountBean expenseAccountBean = null;
+
+ if (expenseAccount == null) {
+ expenseAccountBean = new ExpenseAccountBean();
+
+ //XXX ymartel 2014/04/08 Some Fake datas, just for test
+ Employee employee = client.findAllByExample(new EmployeeImpl(), 0, 1).get(0);
+ expenseAccountBean.setEmployeeName(employee.toString());
+ expenseAccountBean.setEmployeeId(employee.getWikittyId());
+
+ expenseAccountBean.setMonth(3);
+ expenseAccountBean.setYear(2014);
+
+ int capacity = categories.size();
+ expenseAccountEntries = new HashSet<>(capacity);
+ Random random = new Random();
+ for (CategoryImpl category : categories) {
+ ExpenseAccountEntryBean expenseAccountEntry = new ExpenseAccountEntryBean();
+ int randomInt = random.nextInt(capacity);
+ expenseAccountEntry.setEmittedDate(DateUtil.createDate(01, 03, 2014).getTime());
+ expenseAccountEntry.setDescription("blabla" + randomInt);
+ expenseAccountEntry.setJustificationNumber(String.valueOf(randomInt));
+ double amount = random.nextDouble();
+ expenseAccountEntry.setAmount(amount);
+ double vat = random.nextDouble();
+ expenseAccountEntry.setVAT(vat);
+ expenseAccountEntry.setTotal(amount + vat);
+ expenseAccountEntry.setCategoryName(category.toString());
+ expenseAccountEntry.setProjectName("aucun");
+ if (random.nextBoolean()) {
+ expenseAccountEntry.setPaymentDate(DateUtil.createDate(31, 03, 2014).getTime());
+ }
+ expenseAccountEntries.add(expenseAccountEntry);
+ }
+ expenseAccountBean.setExpenseAccountEntries(expenseAccountEntries);
+
+ }
+
+ return renderView("financial/expenseAccountView.jsp", "expenseAccount", expenseAccountBean);
+ }
+
+
+ Function<ExpenseAccount, ExpenseAccountBean> TRANSFORM_EXPENSE_ACCOUNT_TO_BEAN = new Function<ExpenseAccount, ExpenseAccountBean>() {
+ @Override
+ public ExpenseAccountBean apply(ExpenseAccount expenseAccount) {
+ ExpenseAccountBean expenseAccountBean = new ExpenseAccountBean();
+ expenseAccountBean.setId(expenseAccount.getWikittyId());
+ Employee employee = expenseAccount.getEmployee(false);
+ expenseAccountBean.setEmployeeName(employee != null ? employee.toString() : null);
+ expenseAccountBean.setEmployeeId(employee != null ? employee.getWikittyId() : null);
+ expenseAccountBean.setMonth(expenseAccount.getMonth());
+ expenseAccountBean.setYear(expenseAccount.getYear());
+ return expenseAccountBean;
+ }
+ };
+}
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/financial/ExpenseAccountAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/DashboardProjectAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/GanttAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/ProjectsAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/ProjectsAction.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/ProjectsAction.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/ProjectsAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationData.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationData.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationData.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationData.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationStatusAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationStatusAction.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationStatusAction.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/QuotationStatusAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/TaskData.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/TaskData.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/TaskData.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/project/TaskData.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AcceptedQuotationsReportAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AcceptedQuotationsReportAction.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AcceptedQuotationsReportAction.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AcceptedQuotationsReportAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AccountSalesReportAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AccountSalesReportAction.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AccountSalesReportAction.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/AccountSalesReportAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/FunnelAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/FunnelAction.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/FunnelAction.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/FunnelAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/ProjectSalesReportAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/ProjectSalesReportAction.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/ProjectSalesReportAction.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/ProjectSalesReportAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/QuotationYearData.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/QuotationYearData.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/QuotationYearData.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/QuotationYearData.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesAction.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesAction.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesData.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesData.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesData.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesData.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerAccountReportAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerAccountReportAction.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerAccountReportAction.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerAccountReportAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerProjectReportAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerProjectReportAction.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerProjectReportAction.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesPerProjectReportAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportHelper.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportHelper.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportHelper.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SalesReportHelper.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SentQuotationsReportAction.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SentQuotationsReportAction.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SentQuotationsReportAction.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/actions/sales/SentQuotationsReportAction.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Added: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountBean.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountBean.java (rev 0)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountBean.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -0,0 +1,89 @@
+package org.chorem.webmotion.bean.financial;
+
+/*
+ * #%L
+ * Chorem :: webmotion
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2011 - 2014 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+import java.io.Serializable;
+import java.util.Set;
+
+/**
+ * @author ymartel <martel(a)codelutin.com>
+ */
+public class ExpenseAccountBean implements Serializable {
+
+ protected String id;
+ protected String employeeName;
+ protected String employeeId;
+ protected int month;
+ protected int year;
+ protected Set<ExpenseAccountEntryBean> expenseAccountEntries;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getEmployeeName() {
+ return employeeName;
+ }
+
+ public void setEmployeeName(String employeeName) {
+ this.employeeName = employeeName;
+ }
+
+ public String getEmployeeId() {
+ return employeeId;
+ }
+
+ public void setEmployeeId(String employeeId) {
+ this.employeeId = employeeId;
+ }
+
+ public int getMonth() {
+ return month;
+ }
+
+ public void setMonth(int month) {
+ this.month = month;
+ }
+
+ public int getYear() {
+ return year;
+ }
+
+ public void setYear(int year) {
+ this.year = year;
+ }
+
+ public Set<ExpenseAccountEntryBean> getExpenseAccountEntries() {
+ return expenseAccountEntries;
+ }
+
+ public void setExpenseAccountEntries(Set<ExpenseAccountEntryBean> expenseAccountEntries) {
+ this.expenseAccountEntries = expenseAccountEntries;
+ }
+
+}
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountBean.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Added: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountEntryBean.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountEntryBean.java (rev 0)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountEntryBean.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -0,0 +1,123 @@
+package org.chorem.webmotion.bean.financial;
+
+/*
+ * #%L
+ * Chorem :: webmotion
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2011 - 2014 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+
+import java.io.Serializable;
+
+/**
+ * @author ymartel (martel(a)codelutin.com)
+ */
+public class ExpenseAccountEntryBean implements Serializable {
+
+ protected String categoryName;
+ protected long emittedDate;
+ protected long paymentDate;
+ protected String description;
+ protected String justificationNumber;
+ protected Double amount;
+ protected Double VAT;
+ protected String projectName;
+ protected String projectId;
+ protected Double total;
+
+ public String getCategoryName() {
+ return categoryName;
+ }
+
+ public void setCategoryName(String categoryName) {
+ this.categoryName = categoryName;
+ }
+
+ public long getEmittedDate() {
+ return emittedDate;
+ }
+
+ public void setEmittedDate(long emittedDate) {
+ this.emittedDate = emittedDate;
+ }
+
+ public long getPaymentDate() {
+ return paymentDate;
+ }
+
+ public void setPaymentDate(long paymentDate) {
+ this.paymentDate = paymentDate;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getJustificationNumber() {
+ return justificationNumber;
+ }
+
+ public void setJustificationNumber(String justificationNumber) {
+ this.justificationNumber = justificationNumber;
+ }
+
+ public Double getAmount() {
+ return amount;
+ }
+
+ public void setAmount(Double amount) {
+ this.amount = amount;
+ }
+
+ public Double getVAT() {
+ return VAT;
+ }
+
+ public void setVAT(Double VAT) {
+ this.VAT = VAT;
+ }
+
+ public String getProjectName() {
+ return projectName;
+ }
+
+ public void setProjectName(String projectName) {
+ this.projectName = projectName;
+ }
+
+ public String getProjectId() {
+ return projectId;
+ }
+
+ public void setProjectId(String projectId) {
+ this.projectId = projectId;
+ }
+
+ public Double getTotal() {
+ return total;
+ }
+
+ public void setTotal(Double total) {
+ this.total = total;
+ }
+}
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/bean/financial/ExpenseAccountEntryBean.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/AuthenticationFilter.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/AuthenticationFilter.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/AuthenticationFilter.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/AuthenticationFilter.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/ChoremClientFilter.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/ChoremClientFilter.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/ChoremClientFilter.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/ChoremClientFilter.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/DecoratorFilter.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/DecoratorFilter.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/DecoratorFilter.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/filters/DecoratorFilter.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/injector/InjectorListener.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikitty.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikitty.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikitty.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikitty.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikittyJson.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikittyJson.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikittyJson.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -3,8 +3,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/chorem/webmotion/render/RenderWikittyJson.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyDisplay.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java
===================================================================
--- trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/java/org/wikitty/web/jsptag/WikittyInput.java
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-webmotion/src/main/resources/i18n/chorem-webmotion_en_GB.properties
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-webmotion/src/main/resources/i18n/chorem-webmotion_fr_FR.properties
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/resources/log4j.properties
===================================================================
--- trunk/chorem-webmotion/src/main/resources/log4j.properties 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/resources/log4j.properties 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
###
# #%L
# Chorem webmotion
-# $Id:$
-# $HeadURL:$
+# $Id$
+# $HeadURL$
# %%
# Copyright (C) 2011 - 2012 CodeLutin
# %%
Property changes on: trunk/chorem-webmotion/src/main/resources/log4j.properties
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/resources/mapping
===================================================================
--- trunk/chorem-webmotion/src/main/resources/mapping 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/resources/mapping 2014-04-09 14:29:44 UTC (rev 410)
@@ -14,6 +14,7 @@
* /sales/funnel/partial/* DecoratorFilter.decorate wmDecoratorNo=true
* /crm/export DecoratorFilter.decorate wmDecoratorNo=true
* /project/json/* DecoratorFilter.decorate wmDecoratorNo=true
+* /financial/json/* DecoratorFilter.decorate wmDecoratorNo=true
* /project/editProject.html DecoratorFilter.decorate wmDecoratorNo=true
* /hr/employeeEdit/json/* DecoratorFilter.decorate wmDecoratorNo=true
* /ascii/* DecoratorFilter.decorate wmDecoratorNo=true
@@ -95,10 +96,17 @@
* /crm/export action:crm.ExportAction.exportContactBase
GET /project/json/projects?page={page}&count={count} action:project.ProjectsAction.findAllProjects page=1,count=10
-GET /project/projects.html view:projects/projects.jsp
-GET /project/editProject.html view:projects/editProject.html
+GET /project/projects view:projects/projects.jsp
+GET /project/editProject view:projects/editProject.html
PUT /projects/{projectId}/ action:project.ProjectsAction.updateProject
+#### Expense Accounts ####
+GET /financial/json/expenseAccounts?year={year}&month={month}&page={page}&count={count} action:financial.ExpenseAccountAction.findAllExpenseAccounts page=1,count=20
+GET /financial/expenseAccounts view:financial/expenseAccounts.jsp
+GET /financial/expenseAccounts/{expenseAccountId} action:financial.ExpenseAccountAction.findExpenseAccount
+PUT /financial/expenseAccounts/{expenseAccountId} action:financial.ExpenseAccountAction.saveExpenseAccount
+
+
#
# Wikitty Rest API
#
Property changes on: trunk/chorem-webmotion/src/main/resources/mapping
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/admin/importExport.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/admin/importExport.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/admin/importExport.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem :: webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2014 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/admin/importExport.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/bi/reportDefinition.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/bi/reportDefinition.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/bi/reportDefinition.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/bi/reportDefinition.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/contact.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/contact.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/contact.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/contact.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/account.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/account.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/account.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/account.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/company.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/company.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/company.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem :: webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2014 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/company.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/editQuotation.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/editQuotation.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/editQuotation.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/editQuotation.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/project.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/project.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/project.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem :: webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2014 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/crm/project.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAdc.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAdc.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAdc.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAdc.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAnnualProfit.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAnnualProfit.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAnnualProfit.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardAnnualProfit.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardBudget.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardEmployee.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardEmployee.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardEmployee.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardEmployee.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardInvoice.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardMultiProject.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardMultiProject.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardMultiProject.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardMultiProject.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProfitability.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardProject.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardQuotation.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardRequestVacation.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardRequestVacation.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardRequestVacation.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardRequestVacation.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSingleProject.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardSummary.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVAT.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVAT.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVAT.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVAT.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacation.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationAsked.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardVacationByEmployee.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/dashboardWorkingProjectDaysByEmployee.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/edit.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editMulti.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editMulti.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editMulti.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editMulti.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editRelated.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editRelated.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editRelated.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editRelated.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editVacationRequest.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editVacationRequest.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editVacationRequest.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/editVacationRequest.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employeeEdit.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employeeEdit.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employeeEdit.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/employeeEdit.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp (rev 0)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -0,0 +1,70 @@
+<%--
+ #%L
+ Chorem :: webmotion
+ $Id$
+ $HeadURL$
+ %%
+ Copyright (C) 2011 - 2014 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #L%
+ --%>
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/wikitty.tld" prefix="w"%>
+
+<head>
+ <script data-require="angular-resource(a)1.2.0-rc.3" data-semver="1.2.0-rc.3" src="<c:url value='http://code.angularjs.org/1.2.0-rc.3/angular-resource.js'/>"></script>
+ <link data-require="bootstrap-css@*" data-semver="3.0.0" rel="stylesheet" href="<c:url value='http://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css'/>" />
+</head>
+
+<div >
+ <dl>
+ <dd><a href="<c:url value="/wikitty/view/${expenseAccount.employeeId}"/>">${expenseAccount.employeeName}</a></dd>
+ <dd>Period : ${expenseAccount.month} / ${expenseAccount.year}</dd>
+ </dl>
+</div>
+
+<div ng-app>
+ <table>
+ <tr>
+ <th>Justif. Nb</th>
+ <th>Emitted Date</th>
+ <th>Project</th>
+ <th>Description</th>
+ <th>Category</th>
+ <th>Amount</th>
+ <th>VAT</th>
+ <th>total</th>
+ <th>Payment Date</th>
+ </tr>
+ <c:forEach var="expenseEntry" items="${expenseAccount.expenseAccountEntries}">
+ <tr>
+ <td>${expenseEntry.justificationNumber}</td>
+ <td>{{${expenseEntry.emittedDate}| date:'shortDate'}}</td>
+ <td><a href="<c:url value="/wikitty/view/${expenseEntry.projectId}"/>">${expenseEntry.projectName}</a></td>
+ <td>${expenseEntry.description}</td>
+ <td>${expenseEntry.categoryName}</td>
+ <td>{{${expenseEntry.amount}|number:2}}</td>
+ <td>{{${expenseEntry.VAT}|number:2}}</td>
+ <td>{{${expenseEntry.total}|number:2}}</td>
+ <td><span ng-if = "${expenseEntry.paymentDate} != 0"> {{${expenseEntry.paymentDate}|date:'shortDate'}}</span></td>
+ </tr>
+ </c:forEach>
+ </table>
+</div>
+
+<div>
+ <a class="btn btn-success" href="<c:url value="/financial/expenseAccounts/new"/>"><i class="icon-list icon-white"></i> New one</a>
+</div>
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccountView.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Added: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccounts.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccounts.jsp (rev 0)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccounts.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -0,0 +1,61 @@
+<%--
+ #%L
+ Chorem :: webmotion
+ $Id$
+ $HeadURL$
+ %%
+ Copyright (C) 2011 - 2014 CodeLutin
+ %%
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Affero General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ #L%
+ --%>
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="/WEB-INF/wikitty.tld" prefix="w"%>
+
+<head>
+ <script data-require="angular-resource(a)1.2.0-rc.3" data-semver="1.2.0-rc.3" src="<c:url value='http://code.angularjs.org/1.2.0-rc.3/angular-resource.js'/>"></script>
+ <script data-require="ng-table@*" data-semver="0.3.0" src="<c:url value='http://bazalt-cms.com/assets/ng-table/0.3.0/ng-table.js'/>"></script>
+ <link data-require="ng-table@*" data-semver="0.3.0" rel="stylesheet" href="<c:url value='http://bazalt-cms.com/assets/ng-table/0.3.0/ng-table.css'/>" />
+ <link data-require="bootstrap-css@*" data-semver="3.0.0" rel="stylesheet" href="<c:url value='http://netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.min.css'/>" />
+ <script type="text/javascript" src="<c:url value='/js/expensePagination.js'/>"></script>
+</head>
+
+<div ng-app="expenseAccountList" ng-controller="PageCtrl">
+
+ <div loading-container="tableParams.settings().$loading">
+ <table ng-table="tableParams" show-filter="false" class="table">
+ <tbody ng-repeat="expenseAccount in expenseAccounts">
+ <tr id="tr{{expenseAccount.id}}" ng-class-odd="'odd'" ng-class-even="'even'">
+ <td data-title="'Employee'">
+ <a href="<c:url value="/wikitty/view/{{expenseAccount.employeeId}}"/>">{{expenseAccount.employeeName}}</a>
+ </td>
+ <td data-title="'Month'">
+ {{expenseAccount.month}}
+ </td>
+ <td data-title="'Year'">
+ {{expenseAccount.year}}
+ </td>
+ <td>
+ <a class="btn btn-success" href="<c:url value="/financial/expenseAccounts/{{expenseAccount.id}}"/>">See it</a>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+</div>
+
+<div>
+ <a class="btn btn-success" href="<c:url value="/financial/expenseAccounts/new"/>"><i class="icon-list icon-white"></i> New one</a>
+</div>
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/financial/expenseAccounts.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/hr.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/index.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/index.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/index.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/index.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/login.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/login.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/login.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/login.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/editProject.html
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/editProject.html 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/editProject.html 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<!--
#%L
Chorem :: webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2014 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/editProject.html
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem :: webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2014 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/projects/projects.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/report.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/report.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/report.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/report.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/acceptedQuotation.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/acceptedQuotation.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/acceptedQuotation.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/acceptedQuotation.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/accountSalesReport.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/accountSalesReport.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/accountSalesReport.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/accountSalesReport.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-cancel.html
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-cancel.html 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-cancel.html 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<!--
#%L
Chorem :: webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2014 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-cancel.html
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-draftToSent.html
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-draftToSent.html 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-draftToSent.html 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<!--
#%L
Chorem :: webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2014 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-draftToSent.html
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-leadToDraft.html
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-leadToDraft.html 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-leadToDraft.html 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<!--
#%L
Chorem :: webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2014 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-leadToDraft.html
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToAccepted.html
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToAccepted.html 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToAccepted.html 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<!--
#%L
Chorem :: webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2014 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToAccepted.html
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToRejected.html
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToRejected.html 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToRejected.html 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<!--
#%L
Chorem :: webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2014 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/dialog-sentToRejected.html
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem :: webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2014 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/menu.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/projectSalesReport.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/projectSalesReport.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/projectSalesReport.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/projectSalesReport.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/sales.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/sales.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/sales.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/sales.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesFunnel.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerAccountReport.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerAccountReport.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerAccountReport.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerAccountReport.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesPerProjectReport.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesReport.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesReport.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesReport.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/salesReport.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/sentQuotation.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/sentQuotation.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/sentQuotation.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/salesReports/sentQuotation.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/search.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/search.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/search.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/search.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/simpleWikiFields.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/simpleWikiFields.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/simpleWikiFields.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/simpleWikiFields.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/vacationDiv.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/vacationDiv.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/vacationDiv.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/vacationDiv.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/view.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionCompany.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionCompany.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionCompany.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionCompany.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionEmployee.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionEmployee.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionEmployee.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionEmployee.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionFinancialTransaction.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionFinancialTransaction.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionFinancialTransaction.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2013 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionFinancialTransaction.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionPerson.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionPerson.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionPerson.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionPerson.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionProject.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionProject.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionProject.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionProject.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionQuotation.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionQuotation.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionQuotation.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionQuotation.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionTask.jsp
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionTask.jsp 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionTask.jsp 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<%--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/viewActionTask.jsp
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/nuiton-js.properties
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/nuiton-js.properties 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/nuiton-js.properties 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
###
# #%L
# Chorem :: webmotion
-# $Id:$
-# $HeadURL:$
+# $Id$
+# $HeadURL$
# %%
# Copyright (C) 2011 - 2014 CodeLutin
# %%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/nuiton-js.properties
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/web.xml 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/web.xml 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<!--
#%L
Chorem webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin, Chatellier Eric
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/web.xml
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/wikitty.tld
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<!--
#%L
Chorem :: webmotion
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2014 CodeLutin
%%
Property changes on: trunk/chorem-webmotion/src/main/webapp/WEB-INF/wro.xml
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/css/chorem-bi.css
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/css/chorem-bi.css 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/css/chorem-bi.css 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/webapp/css/chorem-bi.css
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/css/chorem-crm.css
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/css/chorem-crm.css 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/css/chorem-crm.css 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/webapp/css/chorem-crm.css
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/css/chorem-sales.css
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/css/chorem-sales.css 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/css/chorem-sales.css 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/webapp/css/chorem-sales.css
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-webmotion/src/main/webapp/css/chorem.less
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/css/employeeEdit.css
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/css/employeeEdit.css 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/css/employeeEdit.css 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/webapp/css/employeeEdit.css
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/css/jquery-ui-timepicker-addon.css
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/css/jquery-ui-timepicker-addon.css 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/css/jquery-ui-timepicker-addon.css 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/webapp/css/jquery-ui-timepicker-addon.css
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/css/jquery.fn.gantt.css
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/css/jquery.fn.gantt.css 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/css/jquery.fn.gantt.css 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/webapp/css/jquery.fn.gantt.css
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/css/ng-grid.min.css
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/css/ng-grid.min.css 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/css/ng-grid.min.css 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/webapp/css/ng-grid.min.css
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-webmotion/src/main/webapp/css/select2/select2-spinner.gif
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Modified: trunk/chorem-webmotion/src/main/webapp/css/select2/select2.css
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/css/select2/select2.css 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/css/select2/select2.css 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/webapp/css/select2/select2.css
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-webmotion/src/main/webapp/css/select2/select2.png
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/chorem-webmotion/src/main/webapp/css/select2/select2x2.png
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Modified: trunk/chorem-webmotion/src/main/webapp/css/vacationRequest.css
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/css/vacationRequest.css 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/css/vacationRequest.css 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/webapp/css/vacationRequest.css
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-webmotion/src/main/webapp/img/ajax-loader.gif
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/chorem-webmotion/src/main/webapp/img/glyphicons-halflings-white.png
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/chorem-webmotion/src/main/webapp/img/glyphicons-halflings.png
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/chorem-webmotion/src/main/webapp/img/jquery.fn.gantt/grid.png
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/chorem-webmotion/src/main/webapp/img/jquery.fn.gantt/icon_sprite.png
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/chorem-webmotion/src/main/webapp/img/jquery.fn.gantt/loader_bg.png
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/chorem-webmotion/src/main/webapp/img/jquery.fn.gantt/slider_handle.png
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Modified: trunk/chorem-webmotion/src/main/webapp/js/chorem.js
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/js/chorem.js 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2012 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/webapp/js/chorem.js
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/js/dashboardAdc.js
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/js/dashboardAdc.js 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/js/dashboardAdc.js 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/webapp/js/dashboardAdc.js
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/js/employeeEdit.js
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/js/employeeEdit.js 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/js/employeeEdit.js 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/webapp/js/employeeEdit.js
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Added: trunk/chorem-webmotion/src/main/webapp/js/expensePagination.js
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/js/expensePagination.js (rev 0)
+++ trunk/chorem-webmotion/src/main/webapp/js/expensePagination.js 2014-04-09 14:29:44 UTC (rev 410)
@@ -0,0 +1,70 @@
+/*
+ * #%L
+ * Chorem :: webmotion
+ * $Id$
+ * $HeadURL$
+ * %%
+ * Copyright (C) 2011 - 2014 CodeLutin
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
+var app = angular.module('expenseAccountList', ['ngTable', 'ngResource']);
+
+app.controller('PageCtrl',
+ function($scope, $timeout, $resource, ngTableParams) {
+
+ var Api = $resource('json/expenseAccounts');
+
+ $scope.tableParams = new ngTableParams({
+ page: 1, // show first page
+ count: 20,
+ year: 2014,
+ month: 03
+ }, {
+ total: 0, // length of data
+ getData: function($defer, params) {
+
+ // ajax request to api
+ url = params.url();
+ Api.get(url, function(data) {
+ $timeout(function() {
+ // update table params
+ params.total(data.total);
+ console.log(data);
+ // set new data
+ $scope.expenseAccounts = data.elements;
+ $defer.resolve(data);
+ }, 500);
+ });
+ }
+ });
+
+});
+
+angular.module('expenseAccountList')
+.directive('loadingContainer', function () {
+ return {
+ restrict: 'A',
+ scope: false,
+ link: function(scope, element, attrs) {
+ var loadingLayer = angular.element('<div class="loading"></div>');
+ element.append(loadingLayer);
+ element.addClass('loading-container');
+ scope.$watch(attrs.loadingContainer, function(value) {
+ loadingLayer.toggleClass('ng-hide', !value);
+ });
+ }
+ };
+});
\ No newline at end of file
Property changes on: trunk/chorem-webmotion/src/main/webapp/js/expensePagination.js
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-webmotion/src/main/webapp/js/jquery-ui-timepicker-addon.js
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-webmotion/src/main/webapp/js/jquery-ui-timepicker-fr.js
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/webapp/js/jquery.fn.gantt.js
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/chorem-webmotion/src/main/webapp/js/jquery.maskedinput-1.3.js
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/js/js-hypercube.min.js
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/js/js-hypercube.min.js 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/js/js-hypercube.min.js 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/webapp/js/js-hypercube.min.js
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/js/less-1.3.3.js
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/js/less-1.3.3.js 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/js/less-1.3.3.js 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/webapp/js/less-1.3.3.js
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.debug.js
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.debug.js 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.debug.js 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.debug.js
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.min.js
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.min.js 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.min.js 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/webapp/js/ng-grid-2.0.7.min.js
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/js/ng-select2.js
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/js/ng-select2.js 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/js/ng-select2.js 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/webapp/js/ng-select2.js
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/js/ng-wikitty.js
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/js/ng-wikitty.js 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/js/ng-wikitty.js 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/webapp/js/ng-wikitty.js
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/js/projectPagination.js
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/js/projectPagination.js 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/js/projectPagination.js 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/webapp/js/projectPagination.js
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/js/salesFunnel.js
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/js/salesFunnel.js 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/js/salesFunnel.js 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/webapp/js/salesFunnel.js
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/chorem-webmotion/src/main/webapp/js/select2.min.js
===================================================================
--- trunk/chorem-webmotion/src/main/webapp/js/select2.min.js 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/chorem-webmotion/src/main/webapp/js/select2.min.js 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
/*
* #%L
* Chorem :: webmotion
- * $Id:$
- * $HeadURL:$
+ * $Id$
+ * $HeadURL$
* %%
* Copyright (C) 2011 - 2014 CodeLutin
* %%
Property changes on: trunk/chorem-webmotion/src/main/webapp/js/select2.min.js
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/pom.xml
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Property changes on: trunk/src/site/resources/images/logos/argouml-logo.png
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/src/site/resources/images/logos/jrst-logo.png
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Property changes on: trunk/src/site/resources/images/logos/restructuredtext-logo.png
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Modified: trunk/src/site/rst/calculations.rst
===================================================================
--- trunk/src/site/rst/calculations.rst 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/src/site/rst/calculations.rst 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
.. -
.. * #%L
.. * Chorem
-.. * $Id:$
-.. * $HeadURL:$
+.. * $Id$
+.. * $HeadURL$
.. * %%
.. * Copyright (C) 2011 - 2014 CodeLutin
.. * %%
Property changes on: trunk/src/site/rst/calculations.rst
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/src/site/rst/chorem-cdc.rst
===================================================================
--- trunk/src/site/rst/chorem-cdc.rst 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/src/site/rst/chorem-cdc.rst 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
.. -
.. * #%L
.. * chorem
-.. * $Id:$
-.. * $HeadURL:$
+.. * $Id$
+.. * $HeadURL$
.. * %%
.. * Copyright (C) 2011 - 2012 CodeLutin
.. * %%
Property changes on: trunk/src/site/rst/chorem-cdc.rst
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/src/site/rst/doc-devel.rst
===================================================================
--- trunk/src/site/rst/doc-devel.rst 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/src/site/rst/doc-devel.rst 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
.. -
.. * #%L
.. * chorem
-.. * $Id:$
-.. * $HeadURL:$
+.. * $Id$
+.. * $HeadURL$
.. * %%
.. * Copyright (C) 2011 - 2012 CodeLutin
.. * %%
Property changes on: trunk/src/site/rst/doc-devel.rst
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/src/site/rst/index.rst
===================================================================
--- trunk/src/site/rst/index.rst 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/src/site/rst/index.rst 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
.. -
.. * #%L
.. * chorem
-.. * $Id:$
-.. * $HeadURL:$
+.. * $Id$
+.. * $HeadURL$
.. * %%
.. * Copyright (C) 2011 - 2012 CodeLutin
.. * %%
Property changes on: trunk/src/site/rst/index.rst
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/src/site/rst/requisite.rst
===================================================================
--- trunk/src/site/rst/requisite.rst 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/src/site/rst/requisite.rst 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
.. -
.. * #%L
.. * chorem
-.. * $Id:$
-.. * $HeadURL:$
+.. * $Id$
+.. * $HeadURL$
.. * %%
.. * Copyright (C) 2011 - 2012 CodeLutin
.. * %%
Property changes on: trunk/src/site/rst/requisite.rst
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: trunk/src/site/site_fr.xml
===================================================================
--- trunk/src/site/site_fr.xml 2014-03-13 15:19:41 UTC (rev 409)
+++ trunk/src/site/site_fr.xml 2014-04-09 14:29:44 UTC (rev 410)
@@ -1,8 +1,8 @@
<!--
#%L
chorem
- $Id:$
- $HeadURL:$
+ $Id$
+ $HeadURL$
%%
Copyright (C) 2011 - 2012 CodeLutin
%%
Property changes on: trunk/src/site/site_fr.xml
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision HeadURL
Added: svn:eol-style
+ native
1
0