Commit graph

518 commits

Author SHA1 Message Date
Susana Montes Pedreira
a31fecf2b0 change the name of the entry Work Reports to be Time Tracking.
FEA: ItEr76S22ExpenseTrackingSystem
2012-04-20 18:39:44 +01:00
Susana Montes Pedreira
8445e59185 Configuring permissions to access and to save the expenses
sheet with the role "Expenses tracking allowed".

FEA: ItEr76S22ExpenseTrackingSystem
2012-04-20 18:38:10 +01:00
Susana Montes Pedreira
aac024645b create expense sheet list and the edition view for each one.
FEA: ItEr76S22ExpenseTrackingSystem
2012-04-20 18:36:06 +01:00
Susana Montes Pedreira
d69a73d188 change Libreplan configuration view and add the expense sheet as a
class whose code can be autogenerated.

FEA: ItEr76S22ExpenseTrackingSystem
2012-04-20 18:25:01 +01:00
Manuel Rego Casasnovas
45b8620102 Merge branch 'master' into project-dashboards 2012-04-10 11:31:52 +02:00
Manuel Rego Casasnovas
b4200e84d3 Bug #1349: Fix translation issue in choosing template pop-up
FEA: ItEr76S04BugFixing
2012-04-09 12:40:17 +02:00
Manuel Rego Casasnovas
3bc613b301 Bug #1349: Mark to translate exception day type
FEA: ItEr76S04BugFixing
2012-04-09 12:39:50 +02:00
Manuel Rego Casasnovas
bccd893fb3 Bug #1349: Fix translation in calendar type
FEA: ItEr76S04BugFixing
2012-04-09 12:38:00 +02:00
Manuel Rego Casasnovas
1eb2bca86c Bug #1298: Mark to translate roles in user and profile edition
FEA: ItEr76S04BugFixing
2012-04-09 11:09:47 +02:00
Manuel Rego Casasnovas
4c9e8d1b52 Remove CutyCaptTimeout
This was removed because of:
* It was not being used since June 2011 when we started to use "cutycapt"
  command instead of "CutyCapt".
* "killall" command added a new dependency that was not marked in the Debian
  packages. This causes some stacktrace in the logs of a fresh installation in a
  Debian server.

FEA: ItEr76S04BugFixing
2012-04-09 09:57:51 +02:00
Manuel Rego Casasnovas
166254f2dd Bug #1406: Add UI validation for name field too
FEA: ItEr76S04BugFixing
2012-04-04 18:33:30 +02:00
Manuel Rego Casasnovas
e2df00309a Bug #1406: Add validation in the UI and also a try catch for possible ValidationExceptions
FEA: ItEr76S04BugFixing
2012-04-04 16:51:15 +02:00
Manuel Rego Casasnovas
f6457e00fc Add a thread to perform SumChargedEffort recalculations
FEA: ItEr76S14ConcurrencyProblemWorkReports
2012-04-04 12:19:34 +02:00
Manuel Rego Casasnovas
3ca40f560a Bug #1400: Move call to do recalculations after doTheSaving
In order to do the recalculations is needed that the order is actually saved, so
it's better to call the DAO after doTheSaving method.

Moreover, now the DAO receive an id and look for the order in database.

FEA: ItEr76S14ConcurrencyProblemWorkReports
2012-04-03 12:54:08 +02:00
Manuel Rego Casasnovas
8262066518 Bug #1400: Fix problem recalculating SumChargedEfforts if some elements are moved in the WBS
If an OrderElement is added or removed in the WBS and it is not a new object,
then the Order is marked to recalculate the SumChargedEfforts. During the Order
saving the SumChargedEfforts are recalculated.

FEA: ItEr76S14ConcurrencyProblemWorkReports
2012-04-02 19:45:00 +02:00
Manuel Rego Casasnovas
dfb0090666 Prevent NPE in OrderElement::getSumChargedEffort()
Now SumChargeEffort objects are not created till some hours are reported, so it
could be null in some cases.

FEA: ItEr76S14ConcurrencyProblemWorkReports
2012-03-30 17:43:39 +02:00
Manuel Rego Casasnovas
abc0e0fe66 Create SumChargedEffort while saving the work reports
FEA: ItEr76S14ConcurrencyProblemWorkReports
2012-03-30 17:43:39 +02:00
Jacobo Aragunde Pérez
2df0bac3d8 Rebase the code of the .zul pages for the templates screen.
I did it so it matches the three file structure we used in many other screens
(main, list, edit).
2012-03-28 20:11:58 +02:00
Manuel Rego Casasnovas
979ac144b1 Merge branch 'money-cost-monitoring-system' 2012-03-27 17:51:02 +02:00
Manuel Rego Casasnovas
8d37e716e6 Merge branch 'libreplan-1.2' into money-cost-monitoring-system 2012-03-27 17:26:21 +02:00
Manuel Rego Casasnovas
88e39eabd8 Show budget information in a read-only field inside task properties tab
FEA: ItEr76S17MoneyCostMonitoringSystem
2012-03-27 10:07:31 +02:00
Manuel Rego Casasnovas
065acc4a29 Change color of money cost bar to a darker one to avoid accessibility issues
FEA: ItEr76S17MoneyCostMonitoringSystem
2012-03-27 09:48:26 +02:00
Manuel Rego Casasnovas
e5f00bb8a1 Bug #1403: Only regenerate codes if isCodeAutogenerated() is true
FEA: ItEr76S04BugFixing
2012-03-26 18:32:57 +02:00
Manuel Rego Casasnovas
16e3d1860e Bug #1403: Only regenerate codes if isCodeAutogenerated() is true
FEA: ItEr76S04BugFixing
2012-03-26 18:30:33 +02:00
Manuel Rego Casasnovas
65fcc3e0f1 Add a map in MoneyCostCalculator to cache calculated values
This prevents to recalculate money cost when it was already calculated before.
The map with the cached values is reseted every time you enter in a project
(when PlanningState is created).

FEA: ItEr76S17MoneyCostMonitoringSystem
2012-03-26 10:39:15 +02:00
Manuel Rego Casasnovas
120534e6ff Disable Money Cost Bar in company view to avoid performance issues
FEA: ItEr76S17MoneyCostMonitoringSystem
2012-03-26 10:27:15 +02:00
Lorenzo Tilve Álvaro
f50806e51e Bug #1289: Added subcontractor name to tasks when showing resources is enabled
The name of the subcontractors are not being displayed when the container is collapsed. The
expected behaviour also might consider painting the parent node differently when it only contains
subcontracted elements.

FEA: ItEr76S04BugFixing
2012-03-24 13:00:06 +01:00
Lorenzo Tilve Álvaro
ff2f2298cf Bug #1289: Added subcontractor name to tasks when showing resources is enabled
The name of the subcontractors are not being displayed when the container is collapsed. The
expected behaviour also might consider painting the parent node differently when it only contains
subcontracted elements.

FEA: ItEr76S04BugFixing
2012-03-24 12:54:16 +01:00
Manuel Rego Casasnovas
73f883127f Improve sentence in "Imputed hours" tab editing a task 2012-03-21 16:02:23 +01:00
Manuel Rego Casasnovas
9819e0cad5 Improve sentence in "Imputed hours" tab editing a task 2012-03-21 16:01:28 +01:00
Manuel Rego Casasnovas
e11ebf485c Add information about budget in "Imputed hours" tab
FEA: ItEr76S17MoneyCostMonitoringSystem
2012-03-21 15:47:58 +01:00
Manuel Rego Casasnovas
80011a0245 Remove unused parameters in CutyPrint.createCSSFile 2012-03-20 18:12:23 +01:00
Manuel Rego Casasnovas
36e14c5c6a Remove unused parameters in CutyPrint.createCSSFile 2012-03-20 18:10:56 +01:00
Manuel Rego Casasnovas
7500675a41 Add option to print money cost bar
FEA: ItEr76S17MoneyCostMonitoringSystem
2012-03-20 17:58:13 +01:00
Manuel Rego Casasnovas
42ea25bd9f Reload budget field in "General data" of templates
FEA: ItEr76S17MoneyCostMonitoringSystem
2012-03-19 18:07:47 +01:00
Manuel Rego Casasnovas
a2e07d0a9b Add field in "General data" tab to show the project budget
For the moment this is a new field called "Calculated budget" till we don't
decide what to do with the other budget related fields.

FEA: ItEr76S17MoneyCostMonitoringSystem
2012-03-19 18:00:29 +01:00
Manuel Rego Casasnovas
aa7fb6dada Print Money Cost Bar proportinal to task size
Create two new methods in IntraDayDate:
* effortUntil
* addEffort

FEA: ItEr76S17MoneyCostMonitoringSystem
2012-03-19 17:51:21 +01:00
Manuel Rego Casasnovas
cb55f928b6 Prevent NPE calculating money cost for a TaskElement
FEA: ItEr76S17MoneyCostMonitoringSystem
2012-03-19 12:52:15 +01:00
Manuel Rego Casasnovas
0d1cff5feb Remove method getMoneyCostBarPercentage from ITaskFundamentalProperties
This method is not need as it's only used in a private method inside
TaskElementAdapter.

FEA: ItEr76S17MoneyCostMonitoringSystem
2012-03-19 12:44:38 +01:00
Manuel Rego Casasnovas
79accc0c66 Improve tooltip message using budget, consumed money and percentage
FEA: ItEr76S17MoneyCostMonitoringSystem
2012-03-19 12:23:18 +01:00
Manuel Rego Casasnovas
ac430aba6a Using the new MoneyCostCalculator to print the new Money Cost bar
FEA: ItEr76S17MoneyCostMonitoringSystem
2012-03-19 12:23:18 +01:00
Manuel Rego Casasnovas
27579c0bfd Fix Money Cost Bar position in containers
FEA: ItEr76S17MoneyCostMonitoringSystem
2012-03-16 13:21:36 +01:00
Manuel Rego Casasnovas
277ef6e947 Add money cost percentage in the tooltip
FEA: ItEr76S17MoneyCostMonitoringSystem
2012-03-16 12:38:23 +01:00
Manuel Rego Casasnovas
c430f8e198 Change CSS for the money cost bar and reported hours bar
* Set a different color for money cost bar
* Configured positions to make both bars visible at the same time

FEA: ItEr76S17MoneyCostMonitoringSystem
2012-03-16 11:57:15 +01:00
Manuel Rego Casasnovas
7626b02235 Change icon for the new money cost bar
It is the same icon like the one for reported hours but using a different color

FEA: ItEr76S17MoneyCostMonitoringSystem
2012-03-16 11:55:34 +01:00
Manuel Rego Casasnovas
abb5851afb Add new money cost bar at this moment using value, icon and color of reported hours
FEA: ItEr76S17MoneyCostMonitoringSystem
2012-03-16 11:51:32 +01:00
Manuel Rego Casasnovas
b3eec587da Merge branch 'libreplan-1.2' into money-cost-monitoring-system 2012-03-16 09:41:23 +01:00
Manuel Rego Casasnovas
2acfead2de Bump version number to 1.2.2
FEA: ItEr76S03Community
2012-03-15 13:40:24 +01:00
Manuel Rego Casasnovas
cc6bef8503 Bump version number to 1.2.2
FEA: ItEr76S03Community
2012-03-15 13:36:50 +01:00
Manuel Rego Casasnovas
d842dc8c52 Wrap gettext plugin inside a new profile i18n to save time while developing
As number of languages is increased, the time used to process them is bigger
every time you do a "mvn clean install". Thanks to this new profile you could
save some timpe passing the following argument "-P-i18n".

FEA: ItEr76S03Community
2012-03-15 08:43:02 +01:00