RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4237 commits 1 branch 0 tags 56 MiB
Commit graph

4237 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jacobo Aragunde Pérez
4140ec7e2b ItEr60S05DocumentacionFormacionItEr59S05: Updated keys files. 2010-06-23 13:46:57 +02:00
Jacobo Aragunde Pérez
e074a5e860 ItEr60S05DocumentacionFormacionItEr59S05: Corrected some English literals. 2010-06-23 13:46:49 +02:00
Óscar González Fernández
17b2f90927 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: Only remove versions if they are not used at another scenario. 2010-06-23 11:13:16 +02:00
Óscar González Fernández
399b317bf5 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #514] Add some delete cascades. 
This way the constraint errors are avoided.
 2010-06-23 00:07:47 +02:00
Óscar González Fernández
defb0ae34e ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #514] Fix deleted entity would be resaved by cascade. 
Also refactorings and when the order has no versions left it's removed.
 2010-06-23 00:07:32 +02:00
Óscar González Fernández
5b5375e577 Merge branch 'scenarios' into master 
The conflicts are due to some cherry-picked commits from master that
were integrated into scenarios but had conflicts.

Conflicts:
	navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java
 2010-06-22 14:45:16 +02:00
Óscar González Fernández
717234f2db ItEr60S04ValidacionEProbasFuncionaisItEr59S04: It must return a new state for the new scenario. 2010-06-22 14:14:05 +02:00
Óscar González Fernández
70b71aed76 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #497] Fix bug. 
When calling
ResourceAllocation#mergeAssignmentsAndResourcesPerDay(Scenario,
ResourceAllocation<?>) switchToScenario is called. This was causing
for the specific allocations an unnecessary copy of the
assignments. This caused this newly created assignments to be
associated to the resource, generating other load in the chart.
 2010-06-22 14:14:05 +02:00
Óscar González Fernández
11d9990cc8 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: Change tabs for spaces 2010-06-22 14:14:05 +02:00
Óscar González Fernández
fa21d3e444 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #529] Fix bug by reverting the commit that introduced it. 
Revert " ItEr59S04ValidacionEProbasFuncionaisItEr58S04: [Bug #497]
Resources are reloaded in order to show the load chart."

This reverts commit 75017c9fe8.

Conflicts:

	navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
 2010-06-22 14:14:05 +02:00
Óscar González Fernández
60e4f47fa1 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #529] Fix bug by reverting commit that introduced it. 
Revert " ItEr59S04ValidacionEProbasFuncionaisItEr58S04: [Bug #497] It
also needed to reload the resources that are gotten from the day
assignments."

This reverts commit 401ac50fd9.
 2010-06-22 14:14:05 +02:00
Susana Montes Pedreira
2a8bb34702 ItEr60S04ValidacionEProbasFuncionaisItEr59S04 : [Bug #537] 
it puts the task correctly when the zoom is at the week level.
 2010-06-22 13:55:04 +02:00
Susana Montes Pedreira
1020df71dd ItEr60S04ValidacionEProbasFuncionaisItEr59S04 : It fixes the template screen. 
Changes the statistics of the template. A order element is finished
if its spread advance is 100%.
If the order is not in the current scenario and the user clicks the
button that shows the order planning, it will show a information message.
 2010-06-22 12:26:53 +02:00
Jacobo Aragunde Pérez
80a239417e ItEr60S12MellorasGlobalesRendementoItEr59S22: Corrected the index on the relation between CalendarData and BaseCalendar. 
The indexed attribute was incorrect.
 2010-06-21 19:47:49 +02:00
Jacobo Aragunde Pérez
1f8c4202cf ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #490] Fixed bug using LocalDate objects to make the comparison. 2010-06-21 19:34:41 +02:00
Jacobo Aragunde Pérez
02b59c55c5 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #532] Calculate total capability correctly when the filter by criteria is being used. 2010-06-21 18:15:06 +02:00
Jacobo Aragunde Pérez
6b6603e251 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #535] Fix bug, checking the criteria from the bandbox in first place. 2010-06-21 18:14:53 +02:00
Jacobo Aragunde Pérez
f1bfed4b51 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #532] Fix bug, retrieve correctly the DayAssignments from the selected Criteria when in 'filter by criteria' mode. 2010-06-21 17:57:44 +02:00
Manuel Rego Casasnovas
3971221313 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: Update resources per day value at allocation grid. 2010-06-16 18:37:35 +02:00
Manuel Rego Casasnovas
056bcfddc3 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: Fixing problems calculating ResourcesPerDay value for ResourceAllocation. 2010-06-16 18:37:32 +02:00
Jacobo Aragunde Pérez
ddb26229fe ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #533] Fix bug resetting the Model to the default 'by resources' filter when entering that screen. 2010-06-16 18:23:21 +02:00
Manuel Rego Casasnovas
3afe0985e5 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: Modified AllocationRow to show the information updated when reloading in the allocation grid. 2010-06-16 17:58:18 +02:00
Óscar González Fernández
6402032da2 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #526] Use the same objects. 
It was not finding the allocations at the map because there were
different instances for the same criterions on the db.
 2010-06-16 00:00:35 +02:00
Óscar González Fernández
75da2dbba0 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #526] Fix bug. 
Check for null.
 2010-06-15 23:34:27 +02:00
Óscar González Fernández
096ac8e338 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: Remove unused variables 2010-06-15 23:10:08 +02:00
Lorenzo Tilve
e4e94a5d79 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: Changed styles for assignment window main buttons 2010-06-15 22:29:22 +02:00
Lorenzo Tilve
a9f45ae93a ItEr60S04ValidacionEProbasFuncionaisItEr59S04: Revamped styles of non limiting resources assignment window 2010-06-15 22:16:09 +02:00
Lorenzo Tilve
e2aa3d3fae ItEr60S04ValidacionEProbasFuncionaisItEr59S04: Changed style for advanced allocation consolidated cells 2010-06-15 22:16:06 +02:00
Lorenzo Tilve
9063231ed0 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: Changed icons for assignment and consolidation context menus 2010-06-15 22:16:04 +02:00
Lorenzo Tilve
dc455a0261 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: After changing assignment type its associated tab is focused 2010-06-15 22:16:01 +02:00
Lorenzo Tilve
5ccfaa95bb ItEr60S04ValidacionEProbasFuncionaisItEr59S04: Added interval label to queue tooltip 2010-06-15 22:15:55 +02:00
Manuel Rego Casasnovas
be0dc524f4 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: Reload allocations grid when some changes are applied. 2010-06-15 21:42:50 +02:00
Óscar González Fernández
ded85c356d ItEr60S04ValidacionEProbasFuncionaisItEr59S04: After saving load the order from the DB. 
This allows the avoiding of lots of dontPoseAsTransientAnymore.
 2010-06-15 20:32:40 +02:00
Susana Montes Pedreira
c3fc7664c2 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: Fixing bug. 
it recalculates and reloads the data when change the worked hours.
 2010-06-15 20:07:24 +02:00
Susana Montes Pedreira
bd1e2bae16 ItEr60S04ValidacionEProbasFuncionaisItEr59S04:[Bug #517] 
Checks if the type of resource is not null.
Initializes to zero the hours if it are null.
 2010-06-15 20:07:22 +02:00
Óscar González Fernández
9c70ac77ec ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #527] Fix bug. 
After saving the entities must be marked as no transient.
 2010-06-15 19:33:05 +02:00
Susana Montes Pedreira
1d95948ba8 ItEr59S04ValidacionEProbasFuncionaisItEr58S04: Fixing test. 
Check the test orderElementTest correctly.
 2010-06-15 19:08:28 +02:00
Jacobo Aragunde Pérez
d9e5c0c266 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #501] Fixes bug: the length of unassigned tasks changes with the hours of the related order element. 2010-06-15 19:03:34 +02:00
Óscar González Fernández
51ad035263 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: Move validation annotation from field to method. 
Validation annotations on fields causes problems when the entity is a
proxy.
 2010-06-15 18:13:03 +02:00
Óscar González Fernández
83f73040ba ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #527] Validate the resource allocation. 
This should avoid to save day assignments with null containers.
 2010-06-15 18:08:42 +02:00
Diego Pino Garcia
437ef05741 ItEr60S08CUAsignacionRecursosLimitantesItEr59S08: Fix bug, avoid rendering limiting resources view twice 2010-06-15 15:36:55 +02:00
Lorenzo Tilve
8ebe502c7e ItEr60S07RFAspectosGraficosRecursoLimitantesItEr59S07: Queue elements display order deadline if task has not an specific one 2010-06-15 12:57:39 +02:00
Lorenzo Tilve
e141c0e1c7 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #504] Fixing bug 2010-06-15 12:57:35 +02:00
Lorenzo Tilve
2d985fa041 ItEr59S07RFAspectosGraficosRecursoLimitantesItEr58S08: Revamped appearance of asignment windows 2010-06-15 12:57:32 +02:00
Jacobo Aragunde Pérez
ce652caa1a ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #498] Make a task with consolidated advances immovable due to dependencies. 2010-06-15 12:24:19 +02:00
Jacobo Aragunde Pérez
1e148349e2 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #498] Delete a redundand function call. 
The call to isLimitingAndHasDayAssignments() is already done from inside canBeExplicitlyMoved().
 2010-06-15 12:23:29 +02:00
Diego Pino Garcia
6d92362f96 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #522] Avoid to be able to do a limiting resource allocation from a scenario different from master 2010-06-15 11:51:01 +02:00
Manuel Rego Casasnovas
fe85ca28be ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #523] Removing of advance consolidation was not working properly. The original hours calculation was wrong. 2010-06-15 11:12:10 +02:00
Susana Montes Pedreira
228c4675b2 ItEr59S04ValidacionEProbasFuncionaisItEr58S04 : Fixing bug. 
the calculated advance is modified to check  precision.
 2010-06-15 11:12:07 +02:00
Óscar González Fernández
833c1b1eba ItEr59S04ValidacionEProbasFuncionaisItEr58S04: [Bug #521] Fix bug. 
Switching allocations to scenario after being created so it has not to
be done on each use case.
 2010-06-14 23:53:41 +02:00