Commit graph

337 commits

Author SHA1 Message Date
Susana Montes Pedreira
350538c6fd fix the ExpenseSheetTestDAO
FEA: ItEr76S24AdapatingProjectsToExpenses
2012-05-11 19:22:41 +01:00
Manuel Rego Casasnovas
9b73598c65 Bug #1428: Rename customAssignedEffortForResource to setAssignedEffortForResource
FEA: ItEr76S04BugFixing
2012-05-11 13:03:48 +02:00
Óscar González Fernández
c52aedb4b6 Bug #1428: Take into account the load of the other allocations when reassigning
For example when moving a task the bug #1428 could happen.
2012-05-11 13:03:48 +02:00
Óscar González Fernández
7afcef6525 Bug #1428: Fix bug
Provide a IAssignedEffortForResource that takes into account the
allocations being done.

mb:e98367a8-015e-492e-bffd-56ebbaca7720
2012-05-11 13:03:40 +02:00
Óscar González Fernández
628f192be4 Bug #1428: Bring all files related to IAssignedEffortForResource to one unique file 2012-05-11 13:03:36 +02:00
Óscar González Fernández
6a8b0ba9c8 Revert "Bug #1428: Possible fix"
This reverts commit 0a51bbdca0.
2012-05-11 13:02:51 +02:00
Óscar González Fernández
91ea28a56c Bug #1431: Sort the EffortModifications too
The method for sorting RespurcesPerDayModifications is generalized to
support EffortModication.
2012-05-11 13:02:46 +02:00
Óscar González Fernández
a56796f1da Bug #1431: Fix problem in commit 9d5e3d88dd
The provided list could be immutable and fail when being sorted. This exception happened when ordering:

java.lang.UnsupportedOperationException
	at java.util.Collections$UnmodifiableList$1.set(Collections.java:1203)
	at java.util.Collections.sort(Collections.java:180)
	at org.libreplan.business.planner.entities.ResourceAllocation.sortResourceAllocations(ResourceAllocation.java:227)
	at org.libreplan.business.planner.entities.ResourceAllocation.allocating(ResourceAllocation.java:213)
	at org.libreplan.business.planner.entities.Task.doAllocation(Task.java:774)
	at org.libreplan.business.planner.entities.Task.reassign(Task.java:744)
	at org.libreplan.business.planner.entities.Task.access$5(Task.java:730)
	at org.libreplan.business.planner.entities.Task$1.doReassignment(Task.java:527)
	at org.libreplan.business.planner.entities.Task$1.moveTo(Task.java:523)
	at org.libreplan.business.planner.entities.TaskElement$4.moveTo(TaskElement.java:360)
	at org.libreplan.web.planner.TaskElementAdapter$Adapter$TaskElementWrapper$1.setBeginDate(TaskElementAdapter.java:432)
	at org.libreplan.web.planner.TaskElementAdapter$Adapter$TaskElementWrapper$1.moveTo(TaskElementAdapter.java:453)
	at org.zkoss.ganttz.data.Task$2.moveTo(Task.java:180)
	at org.zkoss.ganttz.TaskComponent$9.doIt(TaskComponent.java:373)
	at org.zkoss.ganttz.data.Task$3.doIt(Task.java:141)
	at org.libreplan.web.planner.TaskElementAdapter$Adapter$TaskElementWrapper$2$1.execute(TaskElementAdapter.java:517)
2012-05-11 13:02:09 +02:00
Jacobo Aragunde Pérez
2a1e7d3db6 Bug #1442: Fix regression.
FEA: ItEr76S04BugFixing
2012-05-10 12:14:49 +02:00
Manuel Rego Casasnovas
8bfe22bf57 Trying to fix tests related with unbound users in UserDAOTest
FEA: ItEr76S27ResourceBinding
2012-05-10 09:06:43 +02:00
Manuel Rego Casasnovas
fd5794f57b Improve UserDAOTest adding a new check for getUnboundUsers method
FEA: ItEr76S27ResourceBinding
2012-05-10 08:58:15 +02:00
Manuel Rego Casasnovas
8ea9b30196 Fix UserDAOTest that was failing in some cases
FEA: ItEr76S27ResourceBinding
2012-05-10 08:15:17 +02:00
Diego Pino
dc4da28f90 Refactor code
Moved code for calculating resource load values related with an Order to
new class: OrderResourceLoadCalculator

FEA: ItEr76S15OrganizingPerProjectDashboard
2012-05-09 23:46:04 +02:00
Manuel Rego Casasnovas
27baee6450 Fix problem with MySQL and description TEXT field in expense_sheet
The problem is that the type has to be specified in the hbm.xml and also an
issue with Hibernate and the field type.

FEA: ItEr76S04BugFixing
2012-05-09 17:12:12 +02:00
Manuel Rego Casasnovas
8b74637777 Update Liquibase to 2.0.5
FEA: ItEr76S04BugFixing
2012-05-09 16:57:50 +02:00
Manuel Rego Casasnovas
acb938db6b Fix issues with MySQL in some Liquibase changes
* renameColumn needs columnDataType to be defined in MySQL

FEA: ItEr76S04BugFixing
2012-05-09 16:53:55 +02:00
Manuel Rego Casasnovas
da64d3bd26 Replace "Login name" for "Username"
FEA: ItEr76S27ResourceBinding
2012-05-09 13:36:48 +02:00
Manuel Rego Casasnovas
42baf46926 Refactor users list to use a RowRenderer
Add several methods in Util class to make easier renderers implementation.

FEA: ItEr76S27ResourceBinding
2012-05-09 13:01:54 +02:00
Manuel Rego Casasnovas
521aa36bfc Disable first and last name in user edition if user is bound to any resource
FEA: ItEr76S27ResourceBinding
2012-05-09 13:01:54 +02:00
Manuel Rego Casasnovas
dd501faba8 Move logic to remove order authorizations when removing a user to UserDAO
* Create a new method UserDao.remove(User user) that is in charge of remove
  OrderAuthorizations and the User too
* Use this method from UserModel

FEA: ItEr76S27ResourceBinding
2012-05-09 13:01:54 +02:00
Manuel Rego Casasnovas
372f4d1650 Change user Listbox for a BandboxSearch
* Create finder UserBandboxFinder
* Modify BandboxSearch behavior to call save action on "selectedElement"
  attribute

FEA: ItEr76S27ResourceBinding
2012-05-09 12:51:11 +02:00
Manuel Rego Casasnovas
81bc21f791 Modify worker edition UI to add the chance to bound a worker to a user
FEA: ItEr76S27ResourceBinding
2012-05-09 12:51:11 +02:00
Manuel Rego Casasnovas
8706e7b421 Add assert to check that a limiting or virtual resource is not bound to any user 2012-05-09 12:51:11 +02:00
Manuel Rego Casasnovas
11b11a485d Add assert to check that a worker is not bound to a user already bound with other worker
FEA: ItEr76S27ResourceBinding
2012-05-09 12:51:11 +02:00
Manuel Rego Casasnovas
9a011d35e9 Create basic UI to bound a user to a worker
FEA: ItEr76S27ResourceBinding
2012-05-09 12:51:11 +02:00
Manuel Rego Casasnovas
24bb2f50e2 Add relationship between and Worker and User
FEA: ItEr76S27ResourceBinding
2012-05-09 12:51:11 +02:00
Susana Montes Pedreira
00378d039a Merge branch 'master' into expenses-tracking 2012-05-09 10:51:43 +01:00
Susana Montes Pedreira
7364bb000d Merge branch 'master' into subcontracting 2012-05-08 18:16:09 +01:00
Susana Montes Pedreira
fc29bfeae4 adds some tests to check that the expenses calculation works properly.
FEA: ItEr76S24AdapatingProjectsToExpenses
2012-05-08 10:37:10 +01:00
Susana Montes Pedreira
91e4454517 changes the method getCostOfHours to getHoursMoneyCost
in order to fix the Test.

FEA: ItEr76S24AdapatingProjectsToExpenses
2012-05-08 09:08:15 +01:00
Susana Montes Pedreira
369874f7ee Includes the currency format in the expenses module, and
in the report of order cost per resource.

FEA: ItEr76S24AdapatingProjectsToExpenses
2012-05-08 07:40:10 +01:00
Diego Pino
963217996e Code refactoring
* EarnedValueCalculator calculates 'Earned Value' generic indicators
* Generic indicators are those indicators that are calculated out of BCWP,
ACWP and BCWS
* EarnedValueChartFillers call EarnedValueCalculator to get the real
values of the indicators and plot them in the chart.

FEA: ItEr76S15OrganizingPerProjectDashboard
2012-05-07 19:58:53 +02:00
Diego Pino
65fea45d02 Rename 'EarnedValueCalculator' to 'OrderEarnedValueCalculator'
FEA: ItEr76S15OrganizingPerProjectDashboard
2012-05-07 19:58:53 +02:00
Diego Pino
a68efea35b Code refactoring
Create utility class 'CompanyEarnedValueCalculator' for calculating all Earned Value indicators related with Company

FEA: ItEr76S15OrganizingPerProjectDashboard
2012-05-07 19:58:53 +02:00
Diego Pino
f0ab50f78f Code refactoring
Create utility class 'EarnedValueCalculator' for calculating all earned value measurements related with an Order

FEA: ItEr76S15OrganizingPerProjectDashboard
2012-05-07 19:58:49 +02:00
Jacobo Aragunde Pérez
36b03ea1e7 Bug #1433: Fix the problem when there are multiple levels of tasks involved.
FEA: ItEr76S04BugFixing
2012-05-07 16:42:32 +02:00
Jacobo Aragunde Pérez
5edf9998ff Bug #1433: Small code refactor of this bug fix.
FEA: ItEr76S04BugFixing
2012-05-07 16:42:32 +02:00
Jacobo Aragunde Pérez
73b4f99e33 Bug #1433: Make sure that old TaskSources are deleted also in the case of parent tasks.
It fixes the other part of the bug, when a task is the only child of a container and
it is unscheduled, so the TaskSource of the parent is deleted too.

FEA: ItEr76S04BugFixing
2012-05-07 16:42:32 +02:00
Jacobo Aragunde Pérez
a25fac6146 Bug #1433: Make sure that old TaskSources are deleted when a task is unscheduled and re-scheduled.
This fixes the bug partially. It still fails when the task is the only child of
a container.

FEA: ItEr76S04BugFixing
2012-05-07 16:42:32 +02:00
Susana Montes Pedreira
d7ca618627 Merge branch 'master' into expenses-tracking 2012-05-07 13:49:37 +01:00
Susana Montes Pedreira
4da11d0f19 Modify the Project cost report to include a new area called
Expenses, per OrderElement.

FEA: ItEr76S24AdapatingProjectsToExpenses
2012-05-07 11:02:26 +01:00
Susana Montes Pedreira
df19131dd4 Include the cost because of expenses in the WBS imputed hours
pop-up and updates the costs bar in Gantt chart with expenses.

FEA: ItEr76S24AdapatingProjectsToExpenses
2012-05-07 08:03:30 +01:00
Susana Montes Pedreira
ed31f2b559 create or update the sumExpenses when the expenseSheet is saved.
FEA: ItEr76S24AdapatingProjectsToExpenses
2012-05-04 18:38:54 +01:00
Manuel Rego Casasnovas
398355295f Bug #1431: Fix test because of now allocations are sorted (specific before generic)
FEA: ItEr76S04BugFixing
2012-05-04 08:15:38 +02:00
Manuel Rego Casasnovas
56043972c7 Bug #1431: Fix test creating a standard list instead of an unmodifiable list
FEA: ItEr76S04BugFixing
2012-05-04 08:11:10 +02:00
Manuel Rego Casasnovas
9d5e3d88dd Bug #1431: Fix issue sorting allocations (first the specific ones)
FEA: ItEr76S04BugFixing
2012-05-03 17:38:24 +02:00
Manuel Rego Casasnovas
0a51bbdca0 Bug #1428: Possible fix
Attaching day assignments to resources and detaching them later once the
allocation is done as they will be attached in a different method again.

FEA: ItEr76S04BugFixing
2012-05-03 17:33:18 +02:00
Jacobo Aragunde Pérez
bded052097 Moved code attribute from InfoComponent to new class InfoComponentWithCode to fix regression.
FEA: ItEr76S26RemoveExternalCodeFromTemplates
2012-05-03 11:38:04 +02:00
Jacobo Aragunde Pérez
b24c84cd10 Moved database changeset to the correct file.
FEA: ItEr76S26RemoveExternalCodeFromTemplates
2012-04-30 09:57:42 +02:00
Jacobo Aragunde Pérez
801ffc456e Remove code attribute from OrderElementTemplate entity and from DB.
FEA: ItEr76S26RemoveExternalCodeFromTemplates
2012-04-28 13:08:28 +02:00