Commit graph

1150 commits

Author SHA1 Message Date
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
3542769a35 Sort timesheet entries descending by date in bound users service
FEA: ItEr77S14BoundUsersWebServices
2012-11-15 08:18:11 +01:00
Manuel Rego Casasnovas
e7aec7ccd3 Include project code in tasks list service for bound users
FEA: ItEr77S14BoundUsersWebServices
2012-11-15 07:23:43 +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
6177a5eee0 Bug #1560: Fire property change for task dates after closing allocation pop-up
FEA: ItEr77S04BugFixing
2012-11-13 13:59:25 +01:00
Manuel Rego Casasnovas
c9a638e4f3 Bug #1559: Remove WorkReportLines with zero effort in personal timesheets
FEA: ItEr77S04BugFixing
2012-11-13 12:22:49 +01:00
Manuel Rego Casasnovas
38cbd25d06 Add feedback message for user while adapting planning
FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-11-13 11:05:58 +01:00
Manuel Rego Casasnovas
1e0abf1299 Only adapt task leafs according to timesheets
FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-11-13 10:58:36 +01:00
Manuel Rego Casasnovas
51f3d75038 Invalidate planner in order to repaint dependencies after updating tasks in Gantt
FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-11-13 10:54:29 +01:00
Manuel Rego Casasnovas
48b4783524 Update tasks in Gantt after adapting start and end date of all tasks
First all tasks are proccesed and the start and end date adapted accordingly.
Then all the tasks updated from timesheets are updated in the Gantt view.

FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-11-13 10:53:00 +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
b8f17c7235 Disable drag & drop for tasks updated from timesheets in the WBS
FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-11-12 23:05:04 +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
Manuel Rego Casasnovas
43d4b9b805 Remove unused code in TreeController
FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-11-12 19:54:21 +01:00
Manuel Rego Casasnovas
5fda1969a4 Prevent tasks updated from timesheets to be reassigned
FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-11-12 19:14:15 +01:00
Manuel Rego Casasnovas
8e8c12dd74 Disable advanced allocation window for tasks updated from timesheets
FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-11-12 15:42:51 +01:00
Manuel Rego Casasnovas
62d9221e6f Disable tasks movement for tasks updated from timesheets
Mark updatedFromTimesheets is reseted before adapting the planing in order to
move the tasks if needed.

FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-11-12 15:30:25 +01:00
Manuel Rego Casasnovas
2c98e99d63 Disable resource allocation pop-up for tasks updated from timesheets
FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-11-12 13:00:44 +01:00
Jacobo Aragunde Pérez
b45c6de136 Bug #1517: Select the parent row in the WBS when it's transformed into a
container.

FEA: ItEr77S04BugFixing
2012-11-09 14:06:59 +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
fac20ff303 Add new service to import personal timesheets data
FEA: ItEr77S14BoundUsersWebServices
2012-11-08 12:56:40 +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
4397d43133 Disable constraints combo in tasks updated from timesheets
FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-11-07 15:42:43 +01:00
Manuel Rego Casasnovas
80601c2034 Set properly task position for tasks updated from timesheets even if dependencies have priority
The task is marked as fixed if it has been updated from timesheets even in the
case that dependencies have priority and it should be moved to a different
position. The dependencies will appear as violated.

FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-11-07 15:42:33 +01:00
Manuel Rego Casasnovas
98eeed0801 Fix remove order elements service test in MySQL
It was working properly in PostgreSQL but not in MySQL. Now it is passing in both.

FEA: ItEr77S13AllowDeleteOrderElements
2012-11-07 11:39:46 +01:00
Manuel Rego Casasnovas
2d9af66f15 Wrap concurrent modification exceptions in the web services inside a proper DTO
FEA: ItEr77S04BugFixing
2012-11-07 08:36:05 +01:00
Manuel Rego Casasnovas
dfe39ab7cb Add missing class ErrorDTO used in commit 7306b124de
FEA: ItEr77S13AllowDeleteOrderElements
2012-11-07 07:01:20 +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
774b97a26b Add test for new delete order elements service
FEA: ItEr77S13AllowDeleteOrderElements
2012-11-06 12:49:48 +01:00
Manuel Rego Casasnovas
7306b124de Include validations in the new service to remove order elements
FEA: ItEr77S13AllowDeleteOrderElements
2012-11-06 11:33:39 +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
7c24830ef6 Convert parent in leaf if the element removed was the only child
FEA: ItEr77S13AllowDeleteOrderElements
2012-11-05 15:54:34 +01:00
Manuel Rego Casasnovas
4ea3d95c96 Basic implementation of DELETE operation in order elements web service
FEA: ItEr77S13AllowDeleteOrderElements
2012-11-05 15:54:13 +01:00
Manuel Rego Casasnovas
e9365ed1b0 Add new button to adapt planning according to timesheets
It has been added a new method ICommand.isPlannerCommand() to define if a button
should be added in the planner toolbar or in the common toolbar (save and cancel
buttons).

For the moment, we are using a hard-coded value to know how many buttons we
should add in the plannerToolbar. At this moment we have 2 buttons: reassign and
adapt planning.

FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-11-05 09:52:23 +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
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
a8ba46e505 Add checkbox in work reports standard edition UI
FEA: ItEr77S12AdaptPlanningAccordingTimesheets
2012-11-02 09:31:07 +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
283cab8d23 Add filter by order authorizations in project status report
If you just filter by labels/criteria and you don't choose any specific project.
You were able to see tasks from projects that you are not allowed to read. Now
this is fixed.

FEA: ItEr77S09WBSReport
2012-10-25 12:52:56 +02:00
Manuel Rego Casasnovas
270aa99aee Merge branch 'master' into project-status-report 2012-10-25 12:19:50 +02:00
Manuel Rego Casasnovas
7f5d6c4ace Reset MoneyCostCalculator before generating project status report
If you generate the report and afterwards you report some expenses in a project,
the MoneyCostCalculator cache still keep the previous value for the report.

Now the MoneyCostCalculator cache is reseted every time the report is generated.

FEA: ItEr77S09WBSReport
2012-10-25 12:08:53 +02:00
Manuel Rego Casasnovas
1a8ab420f0 Add hours and cost mark in status report header too
FEA: ItEr77S09WBSReport
2012-10-25 11:23:03 +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
1ca57a5a00 Marking with red color special cases in project status report
FEA: ItEr77S09WBSReport
2012-10-23 18:57:19 +02:00