Commit graph

529 commits

Author SHA1 Message Date
Manuel Rego Casasnovas
727bc642b8 Bump version number to 1.3.3
FEA: ItEr77S03Community
2012-12-21 14:38:48 +01:00
Manuel Rego Casasnovas
87796fcfc8 i18n: Mark some missing strings to be translated
FEA: ItEr77S04BugFixing
2012-12-20 17:44:20 +01:00
Manuel Rego Casasnovas
7813f8a207 Bug #1594: Fix issue opening transaction at DAO if needed
FEA: ItEr77S04BugFixing
2012-12-11 13:55:30 +01:00
Manuel Rego Casasnovas
331106824f Bump version number to 1.3.2
FEA: ItEr77S03Community
2012-11-30 07:41:11 +01:00
Manuel Rego Casasnovas
05132fd5a7 Bug #1562: Fix issue filtering properly resources according to their activation periods
Now the dates filtering the resource load window are checked against the
resources activation periods. Using the following algorithm:

1) If the resource has not activation periods then it should always appear

2) The filter can have null for start and end dates and the activation periods
   can have null for end date. So we should define what to do in each case:

  Let's define some acronyms:
  * Filter Start Date: FSD
  * Filter End Date: FED
  * Activation Period Start Date: APSD (cannot be null)
  * Activation Period End Date: APED

  2.1) FSD is null and FED are null: The resource should appear regardless its
       activation periods

  2.2) FSD is null:
    2.2.1) APED is null: Check if APSD is lower or equals than FED
    2.2.2) APED is not null: Check if APSD is lower or equals than FED or APED
           is lower or equals than FED

  2.3) FED is null:
    2.3.1) APED is null: The resource should appear
    2.3.2) APED is not null: Check if APSD is later or equals than FSD or APED
           is later or equals than FSD

  2.4) FSD is not null and FED is not null:
    2.4.1) APED is null: Check if APSD is between FSD and FED
    2.4.2) APED is not null: Check if activation period overlaps filter period
           at any point

FEA: ItEr77S04BugFixing
2012-11-29 07:16:08 +01:00
Manuel Rego Casasnovas
805f65b9ea Add new field to configure seconds for planning warning
FEA: ItEr77S03Community
2012-11-26 18:06:37 +01:00
Lorenzo Tilve Álvaro
fc424944d1 Exposed project and tasks codes from fundamental properties to generate entry point URLs
FEA: ItEr77S03Community
2012-11-26 16:30:10 +01:00
Manuel Rego Casasnovas
2b07654d61 Add checkbox to mark task as finished in personal timesheets popup
FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-11-22 10:53:12 +01:00
Manuel Rego Casasnovas
a6ef3f34d2 Bug #1553, #1554: Remove unique constraint in DB for OrderElement codes
In order to allow switch tasks codes and avoid the issues changing the code
while creating a child, the unique constraint in DB for field code in
order_element table has been removed.

Instead two new constraints methods have been added:
* OrderElement.checkConstraintUniqueCode()
* Order.checkConstraintUniqueCodeInsideOrder()

FEA: ItEr77S04BugFixing
2012-11-20 09:52:32 +01:00
Manuel Rego Casasnovas
e05678e946 Bug #1553: Fix issue modifying methods toLeaf and toContainer
FEA: ItEr77S04BugFixing
2012-11-19 17:15:41 +01:00
Manuel Rego Casasnovas
babe242b52 Fix problems in service to import personal timesheets
The comparison with the OrderElemen was wrong and it causes that the data stored
was wrong.

Moreover, it was not needed to open the transaction in the bound service method
as it's already opened in PersonalTimesheetModel.

FEA: ItEr77S14BoundUsersWebServices
2012-11-19 10:23:06 +01:00
Manuel Rego Casasnovas
6927955a4a Bug #1556: Fix problems with i18n of the new enum
FEA: ItEr77S04BugFixing
2012-11-16 12:18:05 +01:00
Óscar González Fernández
32a71e85ee Remove other allocation methods with LocalDate parameters
FEA: ItEr77S04BugFixing
2012-11-15 13:15:09 +01:00
Óscar González Fernández
0ba4790c00 Remove some allocation methods with LocalDate parameters
Now the IntraDayDates methods are used. Most of the changes are in the
tests, since they were using the previous LocalDate methods.

FEA: ItEr77S04BugFixing
2012-11-15 13:15:07 +01:00
Óscar González Fernández
bd29c64fe5 Bug #1413: Fix bug
Fix the bug for when calculating the hours.

FEA: ItEr77S04BugFixing
2012-11-15 13:15:04 +01:00
Manuel Rego Casasnovas
b218f380a7 Merge branch 'adapt-planning-according-timesheets' 2012-11-15 12:09:10 +01:00
Manuel Rego Casasnovas
d258b989f9 Merge branch 'libreplan-1.3' into adapt-planning-according-timesheets 2012-11-15 09:45:27 +01:00
Manuel Rego Casasnovas
9e4cbd2484 Show marks from timesheet dates in tasks when showing reported hours bar
FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-11-13 18:37:15 +01:00
Manuel Rego Casasnovas
9bd527c32f Remove assignments after end date for tasks marked as finished in the timesheets
FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-11-13 08:08:16 +01:00
Manuel Rego Casasnovas
a1f4ece458 Disable new, new from template, up, down, indent and unindent buttons in WBS
Depending on selected node and if it's or not updated from templates the
different buttons are enabled or disabled accordingly.

FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-11-12 22:32:38 +01:00
Óscar González Fernández
4780b1fad0 Bug #1413: Fix bug
The methods used to calculate the start and end of the task when
moving the task and when allocating in the form were different. This
caused the length of the task to change when being moved.

Now the method used when moving the task is the one always in use,
because it's more precise.
2012-11-09 12:22:05 +01:00
Óscar González Fernández
d27fabbbeb Bug #1413: Use IntraDayDate when doing allocation
When doing the allocation that calculates RESOURCES_PER_DAY use
IntraDayDates instead of LocalDate so if the first day of the
allocation is partially allocated, the part free is used.

FEA: ItEr77S04BugFixing
2012-11-09 12:22:03 +01:00
Manuel Rego Casasnovas
af5d2b2776 Rename SUBCONTRACTED_PENDING_ORDER to OUTSOURCED
FEA: ItEr77S03Community
2012-11-08 20:01:56 +01:00
Manuel Rego Casasnovas
c1b496fd07 Configure default project status as PRE-SALES
FEA: ItEr77S03Community
2012-11-08 19:54:33 +01:00
Manuel Rego Casasnovas
ddd725ba33 Update order state in database due to new status added to the enum
FEA: ItEr77S03Community
2012-11-08 19:54:33 +01:00
Manuel Rego Casasnovas
17f433128e Add new status in OrderStatusEnum: PRE-SALES and ON HOLD
FEA: ItEr77S03Community
2012-11-08 19:42:49 +01:00
Jacobo Aragunde Pérez
c563997424 Fix visibility issues in OpenJDK 1.7.
Not it's not possible to access private members from a static context.

FEA: ItEr77S04BugFixing
2012-11-08 16:39:51 +01:00
Manuel Rego Casasnovas
4b2b1461d3 New web service returning the personal timesheets data for a task of a bound user
FEA: ItEr77S14BoundUsersWebServices
2012-11-08 12:56:34 +01:00
Manuel Rego Casasnovas
5ebffa666b New web service returning the assigned tasks of a user
It uses MyTasksAreaModel, as the main UI for bound users. The service is only
accessible for bound users.

FEA: ItEr77S14BoundUsersWebServices
2012-11-08 12:56:17 +01:00
Manuel Rego Casasnovas
f25897a6a4 Disable change of scheduling state point in WBS for tasks updated from timesheets
FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-11-07 15:42:43 +01:00
Manuel Rego Casasnovas
acacba7911 Implement main operations in adapt planning command
* TaskElements are marked or not as updatedFromTimesheets
* TaskElement start date is set with a START_IN_FIXED_DATE constraint to the
  first date in the timesheets
* TaskElement end date is set to the last date in the timesheets if this is
  later than the current end date of the task
* Depending on if the task is marked as finishedFromTimesheets, a progress of
  type TIMESHEETS is added or not. If the task is finished, the end date is set
  according to last date in the timesheets
* TaskElement size and position is updated in the Gantt

FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-11-06 19:20:41 +01:00
Manuel Rego Casasnovas
944d59e2b9 Bug #1555: Fix issue adding condition in both UI and web service
FEA: ItEr77S04BugFixing
2012-11-06 15:51:36 +01:00
Manuel Rego Casasnovas
fe0835ef66 Remove properly order element using OrderModel class
In that way we are sure that everything is removed properly. We have to manually
detach the removed element from its parent in order to avoid delete the parent
too.

FEA: ItEr77S13AllowDeleteOrderElements
2012-11-06 11:33:39 +01:00
Manuel Rego Casasnovas
82bad8a1a7 Add new field updatedFromTimesheets to TaskElement
FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-11-05 08:03:41 +01:00
Manuel Rego Casasnovas
a8e57499af Use code instead of id for ResourceHoursService
Using code from now on in order to make it coherent with the rest of services.

FEA: ItEr77S04BugFixing
2012-11-02 17:16:26 +01:00
Manuel Rego Casasnovas
58928b208b Add implementation to calculate if a task is finished according to timesheets
It has been modified the calculation of SumChargedEffort to include the new
field finishedTimesheets.

FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-11-02 13:20:20 +01:00
Manuel Rego Casasnovas
33d43babf7 Add new attribute finishedTimesheets in SumChargedEffort
FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-11-02 13:00:56 +01:00
Manuel Rego Casasnovas
d07686af7e Disable finished checkbox in work reports UI if the task is already finished
FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-11-02 12:36:27 +01:00
Manuel Rego Casasnovas
6c3a915b8d Implement constraint to check that only one WorkReportLine per task is finished
FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-11-02 12:36:21 +01:00
Manuel Rego Casasnovas
69c842350f Add new attribute finished to WorkReportLine
FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-11-02 07:42:37 +01:00
Manuel Rego Casasnovas
e4bd4b980f Create new default progress type TIMESHEETS
The new progress type is read-only, so a new field to mark it in AdvanceType has
been added and used in the UI accordingly.

FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-10-30 13:24:04 +01:00
Manuel Rego Casasnovas
4adc1ec71f Calculate first/last timesheets dates when saving/editing/deleting a timesheet
In order to do that, a set of order elements affected by the lines
added/edit/removed in a timesheet is calculated before saving the timesheet.
Afterwards the first/last dates are recalculated for all the order elements in
the set.

FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-10-30 13:24:04 +01:00
Manuel Rego Casasnovas
460896ee8b Calculate first/last timesheet dates when recalculating a SumChargedEffortDAO
FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-10-30 13:24:04 +01:00
Manuel Rego Casasnovas
ba2ce0371d Add new columns in SumChargedEffort for first and last timesheet date
The first and last date of the task depending on the timesheets will be stored
in these two new fields in SumChargedEffort.

FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-10-30 13:24:04 +01:00
Manuel Rego Casasnovas
47600797d8 Bug #1549: Avoid exception avoiding checking lines resource if there are no lines
In
ExpenseSheet.checkConstraintPersonalExpenseSheetMustHaveTheSameResourceInAllLines
we check that the resource is the same in all the lines. However, if there are
no lines an exception arises.

FEA: ItEr77S04BugFixing
2012-10-25 14:10:24 +02:00
Manuel Rego Casasnovas
270aa99aee Merge branch 'master' into project-status-report 2012-10-25 12:19:50 +02:00
Manuel Rego Casasnovas
b64fc0892e Sort order elements by code in OrderElementDAO.findByLabelsAndCriteria
FEA: ItEr77S09WBSReport
2012-10-25 10:44:56 +02:00
Manuel Rego Casasnovas
d9575754a4 Add query to get OrderElements filtered by labels and criteria
FEA: ItEr77S09WBSReport
2012-10-24 12:35:39 +02:00
Manuel Rego Casasnovas
3681464dc9 Add exclamation mark in status report if hours or cost exceed the expected value
FEA: ItEr77S09WBSReport
2012-10-23 18:10:43 +02:00
Manuel Rego Casasnovas
ac99c98a82 Add project name in tasks when no project is selected in status report
FEA: ItEr77S09WBSReport
2012-10-23 13:56:45 +02:00