Commit graph

360 commits

Author SHA1 Message Date
Manuel Rego Casasnovas
36e6952a80 Fix ResourceWorkedHoursDTO that was not working properly
FEA: ItEr76S04BugFixing
2012-06-04 15:35:15 +02:00
Manuel Rego Casasnovas
72610b07f2 Add possibility to create monthly timesheets from work reports list
A pop-up asking for date and worker will be shown.

If the timesheet doesn't exist it will be created, if it already exists it will
be edited.

FEA: ItEr76S28UserDashboard
2012-06-01 13:21:39 +02:00
Manuel Rego Casasnovas
e5dda1f10f Add method in WorkReportType to check if it is a monthly timesheet
FEA: ItEr76S28UserDashboard
2012-06-01 11:47:19 +02:00
Diego Pino
6ebcf7f830 Bug #1457: Wrong value of labels CRITICAL_PATH_DURATION and CRITICAL_PATH_NUMHOURS
FEA: ItEr76S04BugFixing
2012-05-31 20:43:29 +02:00
Manuel Rego Casasnovas
a96d500851 Fix typo in Hibernate mapping of Configuration class
FEA: ItEr76S04BugFixing
2012-05-31 07:50:17 +02:00
Manuel Rego Casasnovas
991599fc80 Add total work column in monthly timesheets area
FEA: ItEr76S28UserDashboard
2012-05-30 16:29:19 +02:00
Manuel Rego Casasnovas
346214c2ce Add total row to monthly timesheets
Create a new class MonthlyTimesheetRow to manage this kind of special like total
or capacity in the future.

FEA: ItEr76S28UserDashboard
2012-05-29 13:07:47 +02:00
Manuel Rego Casasnovas
00412428dd Prevent to remove or disable the configured TypeOfWorkHours for monthly timesheets
FEA: ItEr76S28UserDashboard
2012-05-28 17:31:49 +02:00
Manuel Rego Casasnovas
b3266192d6 Create special bootstrap to set the new field to define the TypeOfWorkHours of monthlytimesheets.
It uses the TypeOfWorkHours called "Default" if it exists, if not it uses the
first active TypeOfWorkHours in the database.

FEA: ItEr76S28UserDashboard
2012-05-28 17:18:52 +02:00
Manuel Rego Casasnovas
ded6030838 Add new configuration field to define the TypeOfWorkHours for monthly timesheets.
FEA: ItEr76S28UserDashboard
2012-05-28 17:15:55 +02:00
Diego Pino
780120fcb9 Fix bug: Return 0 if budgetAtCompletion has no elements
FEA: ItEr76S15OrganizingPerProjectDashboard
2012-05-25 11:53:12 +02:00
Manuel Rego Casasnovas
6f7ec19908 Bump version number to 1.2.4
FEA: ItEr76S03Community
2012-05-23 13:43:11 +02:00
Manuel Rego Casasnovas
df0765db0b First basic implementation of monthly timesheet edition grid
For the moment:
* It shows in the header the timesheet date and resource
* It only shows the tasks where the resource is assigned
* It is using the first TypeOfWorkHours found (this need to be fixed in the
  future)
* The work report code is not being generated correctly yet

FEA: ItEr76S28UserDashboard
2012-05-23 10:44:44 +02:00
Manuel Rego Casasnovas
7261ab856b Show the list of monthly timesheets in the user dashboard
FEA: ItEr76S28UserDashboard
2012-05-23 10:34:08 +02:00
Manuel Rego Casasnovas
73ae28b5b8 i18n: Add Czech language to enum and modify pom.xml to use English userguide 2012-05-22 23:32:36 +02:00
Manuel Rego Casasnovas
763b816d16 Add new work report type to be used in monthly timesheets
Modify WorkReportTypeBootstrap to check that the monthly timesheets is always in the database.

FEA: ItEr76S28UserDashboard
2012-05-22 11:36:54 +02:00
Manuel Rego Casasnovas
13124ee951 Bug #1450: Fix issue rounding when setting budget scale.
FEA: ItEr76S04BugFixing
2012-05-21 16:47:14 +02:00
Jacobo Aragunde Pérez
ff40beddbd Bug #1447: Remove the test checking the creation of NOT_LATER_THAN constraint when a deadline is set.
FEA: ItEr76S04BugFixing
2012-05-21 10:07:16 +02:00
Diego Pino
3b4dcdc79c Turn on batch-fetching for collections in several entities
FEA: ItEr76S18CacheTuning
2012-05-18 13:25:26 +02:00
Diego Pino
eb1fadf42b Turn on second-level cache
FEA: ItEr76S18CacheTuning
2012-05-18 13:25:00 +02:00
Manuel Rego Casasnovas
fb53b79249 First implementation of my tasks area
Pending to add the operations column

FEA: ItEr76S28UserDashboard
2012-05-16 17:33:22 +02:00
Jacobo Aragunde Pérez
06fc5b7be6 Bug #1447: Prevent the creation of NOT_LATER_THAN constraint when a deadline is set.
FEA: ItEr76S04BugFixing
2012-05-16 13:52:16 +02:00
Óscar González Fernández
7377461d24 Add some Javadoc to AssignedEffortForResource class 2012-05-14 12:50:23 +02:00
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