Commit graph

688 commits

Author SHA1 Message Date
Vova Perebykivskiy
b8b05c03fc Changes to email functionality. 2015-12-07 15:08:53 +02:00
Vova Perebykivskiy
d856912acf Email functionality bug fixes. 2015-12-04 17:27:39 +02:00
Vova Perebykivskiy
6aaae08f42 Add Liquibase 1.5 changelog to changelogs.
Fix compile errors.
Code refactoring.
2015-12-04 14:46:14 +02:00
Vova Perebykivskiy
aa7f135b0e Fix merge conflicts. 2015-12-04 14:44:34 +02:00
Jeroen Baten
2025580e5c Merge branch 'master' of git://github.com/dgray16/libreplan into dgray16-master
Conflicts:
	HACKING.rst
	doc/src/technical/howto-start-development-with-intellij-idea.rst

fixed
2015-12-01 11:45:19 +01:00
Vova Perebykivskiy
788e8880fd Code refactoring.
Add changes to Dashboard Global functionality.
Change i18n for OrderStatusEnum.
Add new values for i18n.
Add css classes for Dashboard Global.
2015-11-30 15:41:09 +02:00
Vova Perebykivskiy
ffca70fbea Add documentation about E-mail sending functionality.
Update JUnit version.
Code refactoring.
Imports optimizations.
Changes to UI of E-mail Templates page.
New values for i18n.
Validations of E-mail functionality.
2015-11-11 15:45:24 +02:00
Vova Perebykivskiy
878e067683 Add possibility to disable E-mail sending with Maven compiler option. 2015-11-10 11:56:42 +02:00
Vova Perebykivskiy
821290f75a Visual improvements to root pom file.
Add license header to many files.
Add new strings to i18n.
Code refactoring.
Add few comments to classes.
Add new method for NotificationModel.
Optimizing imports.
Manually add constraints for email/username at E-mail connector page.
A lot of changes to SendEmail class.
2015-11-09 13:05:43 +02:00
Vova Perebykivskiy
1cafd835d9 Add new connector property.
Add DAOs for EmailNotification/Template.
Add entities for EmailNotification/Template.
Add models for EmailNotification/Template.
Add Hibernate mapping for email tables.
Some changes to resources mapping.
Add classes for job scheduling of emails.
Code refactoring.
Test email button changes.
Add solution to get welcome page URL from system.
Remarks to method that adds new row to notification_queue table.
New role in Spring security.
New content of Edit E-mail templates page.
2015-11-03 10:35:53 +02:00
Vova Perebykivskiy
6e90ca09d0 Add classes for E-mail scheduling job.
All that is referencing to email template - moved into another package.
Add classes/mapping for notification_queue table.
Update Hibernate version in pom file.
Add role to accept email.
2015-10-26 08:50:43 +02:00
Vova Perebykivskiy
7add95e5ca Add files that was rejected by Git. 2015-10-15 18:09:56 +03:00
Vova Perebykivskiy
9adff9de0b Update how-to-start-with-IDEA
Changed quartz scheduler version
Add opportunity to Schedule E-mail class
Add opportunity to test E-mail connector
Minor changes to BaseCRUDController
Add new strings for i18n
Some changes to editJobScheduling form
2015-10-15 17:54:14 +03:00
Jeroen Baten
099e7a9deb debugged 2015-10-11 12:13:28 +02:00
Jeroen Baten
f19ec23ebd Added table definition for email_template
Added 1.5 changes file to changelog
2015-10-11 09:51:32 +02:00
Vova Perebykivskiy
7531b75ac0 bug 1633 fixed 2015-10-09 09:21:07 +02:00
Vova Perebykivskiy
60a108f377 Add edit E-mail template page. 2015-10-06 18:00:43 +03:00
Jeroen Baten
17ef953a86 Bump version numbers in pom files to 1.4.1 2015-07-19 13:55:46 +02:00
Jeroen Baten
d4462121b7 Revert "fixes to the build system"
This reverts commit 5fd7ae4892.
2015-07-19 13:34:26 +02:00
Jeroen Baten
34eab386fa bump version numbers in pom files. 2015-07-17 09:47:32 +02:00
Jeroen Baten
cdf8d48caa Merge pull request #14 from rkfg/fix
Remove outdated hibernate-annotations dependency and fix lazy loading
2015-04-01 15:47:40 +02:00
Jeroen Baten
c764b09575 i18n: Add Norwegian Bokmal language to enum and modify pom.xml to use English userguide 2015-04-01 15:23:08 +02:00
Sergey Shpikin
2dc5e16464 Lazy loading fixed. 2014-07-16 13:50:36 +04:00
Sergey Shpikin
c5d55e5d1e Excessive dependency removed. 2014-07-16 13:49:32 +04:00
Oscar Gonzalez Fernandez
b0d8bf4629 Upgrade Hibernate version
Move to a Hibernate version compatible with Jahira. When running with
Java 8 an exception was caused when initializing the session factory.

java.lang.NoSuchMethodError: org.hibernate.engine.jdbc.spi.JdbcServices.getConnectionProvider()Lorg/hibernate/engine/jdbc/connections/spi/ConnectionProvider;
at org.jadira.usertype.spi.shared.AbstractUserTypeHibernateIntegrator.use42Api(AbstractUserTypeHibernateIntegrator.java:80)
2014-05-07 01:05:16 +02:00
Oscar Gonzalez Fernandez
f27bc7dffc Upgrade to Spring 4.0.3 version
This is the latest stable version available.
2014-05-06 21:16:43 +02:00
Oscar Gonzalez Fernandez
2c7246f868 Remove uses of @NotTransactional
@NotTransactional is deprecrated and in the next major Spring version
is removed.
2014-05-06 21:16:00 +02:00
Oscar Gonzalez Fernandez
7b54a5063e Upgrade Spring to 3.2.8 and Hibernate to 4.2.8
Now Libreplan can be run on Java8.

This implied some changes:

* Latest versions of hibernate use the Bean Validation API. This
  implied renaming the imports and use ConstraintViolationException
  instead of InvalidValue. Besides some constraints had to be renamed,
  otherwise they wouldn't be recognized by Hibernate validation. In
  the new version of Hibernate validator @AssertTrue can only be
  applied to properties. So all methods it was applied to must follow
  the is.* format.

  Automatic execution of Bean Validation API is disabled, otherwise an
  infinite loop would happen. This is because there are some
  validation constraints that do launch queries to the database. This
  causes a flush of the objects in the session and automatic
  validation is called again.

* A new library for persisting JodaTime is necessary since
  joda-time-hibernate is incompatible with hibernate 4. This library
  can automatically register its types for Date conversion so they're
  removed from configuration.

* Now, in some places, an InvalidDataAccessApiUsageException is thrown
  instead of a DataIntegrityViolationException.

  This is because no constraint is violated, the API is being used
  incorrectly because a transient instance is being provided where a
  persisted one was expected.

* In hibernate 4 listeners cannot be configured via properties.
  HibernateDatabaseModificationsListener registers itself in its @PostConstruct method.

* ehcache classes used are now different.
2014-05-06 17:47:15 +02:00
Oscar Gonzalez Fernandez
4633da0140 Upgrade schema files for Spring configuration 2014-05-01 00:53:09 +02:00
Oscar Gonzalez Fernandez
368cbb7fa0 Reorder dependencies in libreplan-business/pom.xml
Follow the order defined in top pom.xml
2014-05-01 00:53:09 +02:00
Oscar Gonzalez Fernandez
bc675c7332 Upgrade Spring version 2014-04-30 20:04:32 +02:00
Oscar Gonzalez Fernandez
80f6f6e0cf Make tests independent of tests order execution
When changing JUnit and Spring version the test failed because of the
different order execution.
2014-04-29 20:15:03 +02:00
Oscar Gonzalez Fernandez
db7ef145a1 Improve test to avoid spurious errors 2014-04-20 18:18:47 +02:00
Oscar Gonzalez Fernandez
18b187fad8 Declare transaction declaratively
Use @Transactional attribute instead of opening transaction manually.
2014-04-20 17:57:42 +02:00
Jeroen Baten
e4b2f5783d Batch of changed english strings, including in po files 2014-03-26 12:36:00 +01:00
miciele Ghiorghis
9f15fecaea project-margins-and-status: added methods to calculate the workhours and budget with the specified margin for the project 2014-03-10 18:39:00 +01:00
miciele Ghiorghis
a8680adcb6 project-margins-and-status: two properties(hoursMargin and budgetMargin) are added to the Order object
The properties are added to hold the project's hours and budget margins
2014-03-10 18:39:00 +01:00
miciele Ghiorghis
3dc79c01cb project-margins-and-status: two columns(hours_margin and budget_margin) are added to the order-table 2014-03-10 18:39:00 +01:00
miciele Ghiorghis
917cf6005f project-margins-and-status: hoursMargin and budgetMargin fields added 2014-03-10 18:38:59 +01:00
Lorenzo Tilve Álvaro
a8eefaaa29 Modified automatic budget cell calculations and rearranged report
The manually introduced budget cell will be representing the total
amount for the budget on that item, and the expenses cell will
show the difference between that total and the resources costs
for the task hours and required criteria.

FEA: ItEr77S17AutomaticBudgeting
2013-07-31 19:57:33 +02:00
Lorenzo Tilve Álvaro
50a6f91b1a Modified calculations for the total column when automatic budgeting enabled
The budget cell will represent the total available budget, and the calculated
read-only total, will be the result of substracting the consumed budget due
to the hours and cost categories of the assinged task criteria.

FEA: ItEr77S17AutomaticBudgeting
2013-07-05 02:22:45 +02:00
Lorenzo Tilve Álvaro
48b29cc6aa Fixed wrong not-null restriction on Criterion to CostCagegory hibernate definition
FEA: ItEr77S17AutomaticBudgeting

This is also fixing the broken test on CriterionDAO
2013-06-20 16:30:04 +02:00
Lorenzo Tilve Álvaro
629f235823 Fixed problems in the algorithm when having criteria both on requirements and hours group
FEA: ItEr77S17AutomaticBudgeting
2013-06-19 12:38:16 +02:00
Lorenzo Tilve Álvaro
37858bb491 Implemented method to obtain criterion cost on HourCostDAO
FEA: ItEr77S17AutomaticBudgeting

Several components were using Criteria collections not initialized on the
planning state, so when adding dinamically new CriterionRequirements
or HourGroups the group hours were not attached.
2013-06-19 12:35:36 +02:00
Lorenzo Tilve Álvaro
b65c34382f Fixes on the resources budget calculation algorithm
FEA: ItEr77S17AutomaticBudgeting
2013-06-19 12:34:11 +02:00
Lorenzo Tilve Álvaro
a10f37d390 Added restriction to avoid deletion of costCategories assigned to criterion
FEA: ItEr77S17AutomaticBudgeting
2013-06-14 10:10:17 +02:00
Lorenzo Tilve Álvaro
4b5586d126 Modified ProjectStatusReport to include the Hours Budget column
FEA: ItEr77S17AutomaticBudgeting
2013-06-13 18:12:22 +02:00
Lorenzo Tilve Álvaro
4baa93d790 Moved criteria based budget calculation methods to OrderElement to use them from the OrderCRUD
FEA: ItEr77S17AutomaticBudgeting
2013-06-13 18:12:21 +02:00
Lorenzo Tilve Álvaro
5df152a9bd Implemented initial version for the budget calculation algorithm
FEA: ItEr77S17AutomaticBudgeting
2013-06-13 18:12:21 +02:00
Lorenzo Tilve Álvaro
25e45b65e8 Included new column for the calculated budget to the WBS
FEA: ItEr77S17AutomaticBudgeting
2013-06-13 18:12:21 +02:00