Commit graph

511 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
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
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
Jacobo Aragunde Pérez
2cc39d9dba Fix CriterionSatisfactionDAOTest when run individually.
It failed since the addition of Resource.checkMaxResources().

FEA: ItEr77S04BugFixing
2012-10-23 13:27:57 +02:00
Jacobo Aragunde Pérez
61162ad9fe Fix ResourceDAOTest when run individually.
It failed since the addition of Resource.checkMaxResources().

FEA: ItEr77S04BugFixing
2012-10-23 13:27:56 +02:00
Manuel Rego Casasnovas
535d2e3423 Fix criteria filtering discounting children with invalidated criteria
If any child has the filtering criteria invalidated, it's not taken into account
in order to calculate the values in the parent task that is part of the report.

FEA: ItEr77S09WBSReport
2012-10-22 18:08:54 +02:00
Manuel Rego Casasnovas
242cfa8e35 Implement filtering by criteria
Pending to remove children with invalidated criteria from the calculation of the
data for the containers.

FEA: ItEr77S09WBSReport
2012-10-22 18:08:54 +02:00
Manuel Rego Casasnovas
474b349712 Add filter by labels to project status report
The tasks that will appear in the report are the ones that have directly
assigned all the labels, so the children will be hidden.

FEA: ItEr77S09WBSReport
2012-10-22 18:08:54 +02:00
Manuel Rego Casasnovas
da3a60e7cf Modify project status report to include new data
Add parameters in the controller and data for each colum in the DTOs.

Create a new Util class with utilities for report DTOs.

FEA: ItEr77S09WBSReport
2012-10-22 18:08:54 +02:00
Manuel Rego Casasnovas
9cb91ad3f5 Add transactional readonly in findCode to avoid bug introduced in previous patch
FEA: ItEr77S04BugFixing
2012-10-22 09:42:03 +02:00
Manuel Rego Casasnovas
fd74722614 Use code to go to entry points when possible
Modify entry points converters for entities extending IntegrationEntity in order
to use code instead of id. In that way user can see the code in the UI without
having to query the database.

FEA: ItEr77S04BugFixing
2012-10-19 14:37:20 +02:00
Manuel Rego Casasnovas
f0ebe2f896 Bump version number to 1.3.1
FEA: ItEr77S03Community
2012-10-15 14:12:13 +02:00
Manuel Rego Casasnovas
cf8482d878 Bug #1542: Fix bug getting project end date from children tasks
End date for root task is only updated while saving the project in the method:
SaveCommand.updateRootTaskPosition.

Now the end date is calculated checking the dates of the children tasks and
getting the bigger one.

FEA: ItEr77S04BugFixing
2012-10-15 11:42:12 +02:00
Manuel Rego Casasnovas
b8ae09471d Fix tests broken in commit b940c78826
The problem was that now when a user or resource is saved, it's checked the
limit in the configuration fields. For that reason, we need to load the
configuration data before saving any user or resource.
2012-10-03 10:25:54 +02:00
Manuel Rego Casasnovas
ef8b6f0169 Fix typo in previous commit in message about maximum limit exceeded 2012-10-02 12:40:00 +02:00
Manuel Rego Casasnovas
b940c78826 Add restrictions by number of users and resources
A new column in configuration has been added and it should me modified manually
to limit the number of users and resources.
2012-10-02 11:09:02 +02:00
Jacobo Aragunde Pérez
b7d612b655 Bug #1538: Detect inconsistent states on unsaved scheduling points.
FEA: ItEr77S04BugFixing
2012-10-01 16:40:27 +02:00
Manuel Rego Casasnovas
35f7fca342 Bug #1537: Fix issue getting allocations from memory and not from database
Without this patch the generic allocations were gotten from database, and only
for the criteria in an already stored allocation a replacement for the
allocations in memory was done.

From now on, for each possible criterion, the allocations from database are
recovered, and they are replaced if needed by the new ones in memory.

FEA: ItEr77S04BugFixing
2012-10-01 12:27:52 +02:00
Manuel Rego Casasnovas
2725816ad7 Allow codes of 2 digits for LibrePlan entities
From now on, default size would be 4 digits.
2012-09-24 11:35:04 +02:00
Manuel Rego Casasnovas
1d0d40f449 Bug #1534: Fix query to get info about expenses associated to an order
The query was just getting the tasks with parent the order, but not all the
sub-tasks.

A similar code that for the case of imputed hours has been used for the expenses
case fixing the issue.

FEA: ItEr77S04BugFixing
2012-09-19 12:38:58 +02:00
Manuel Rego Casasnovas
172c9ba195 Using debug method for logging some messages that are meant for debugging 2012-09-14 10:17:50 +02:00