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

4263 commits

This branch
This branch
All branches
Author SHA1 Message Date
Susana Montes Pedreira
d5c7bf25ec ItEr60S04ValidacionEProbasFuncionaisItEr59S04: internationalize the reports. 2010-06-29 12:55:59 +02:00
Óscar González Fernández
91aa30bbf8 ItEr60S08CUAsignacionRecursosLimitantesItEr59S08: Rename AllocationAttempt to AllocationSpec to reflect better meaning. 2010-06-28 15:17:47 +02:00
Óscar González Fernández
553d20b786 ItEr60S08CUAsignacionRecursosLimitantesItEr59S08: Now when doing automatic insertion posterior elements are shifted instead of being reinserted 2010-06-28 15:15:55 +02:00
Óscar González Fernández
e1eeaf9329 ItEr60S08CUAsignacionRecursosLimitantesItEr59S08: When changing the position of a task the queue is notified 2010-06-28 15:01:07 +02:00
Óscar González Fernández
2acc57ddb8 ItEr60S08CUAsignacionRecursosLimitantesItEr59S08: Add method to have a graph with the elements potentially affected by insertion 2010-06-28 14:34:27 +02:00
Óscar González Fernández
cb9c64a716 ItEr60S08CUAsignacionRecursosLimitantesItEr59S08: Add method to get the elements after one element on a queue. 2010-06-28 14:14:48 +02:00
Óscar González Fernández
0cf1f3ebff ItEr60S08CUAsignacionRecursosLimitantesItEr59S08: Refactor. 
Only the allocation is needed so the parameter list reduced to one
parameter. Also renamed to reflect better meaning.
 2010-06-28 14:14:48 +02:00
Óscar González Fernández
d3fcbde23c ItEr60S08CUAsignacionRecursosLimitantesItEr59S08: Add a LimitingResourceQueueElement to the ValidAllocationAttempt. 2010-06-28 14:14:48 +02:00
Óscar González Fernández
b8bef91385 ItEr60S08CUAsignacionRecursosLimitantesItEr59S08: Refactor. Move methods to enum. 2010-06-28 14:14:48 +02:00
Óscar González Fernández
afe96dde85 ItEr60S08CUAsignacionRecursosLimitantesItEr59S08: Make the method generic so it can be reused for another types 2010-06-28 14:14:48 +02:00
Óscar González Fernández
c2a75ee836 ItEr60S08CUAsignacionRecursosLimitantesItEr59S08: The queue on which the allocation is done is known from the AllocationAttempt 2010-06-28 14:14:48 +02:00
Óscar González Fernández
01ecefbb39 ItEr60S08CUAsignacionRecursosLimitantesItEr59S08: Return extra information about the allocation instead of just a boolean 2010-06-28 14:14:48 +02:00
Óscar González Fernández
9a423d0058 ItEr60S08CUAsignacionRecursosLimitantesItEr59S08: Rename method to reflect that inserts on an existent gap 2010-06-28 14:14:48 +02:00
Óscar González Fernández
3330e07a30 ItEr60S08CUAsignacionRecursosLimitantesItEr59S08: Several renames in order to show better its intent. 
These clases are no longer just for gaps but for insertions in
general
 2010-06-28 14:14:48 +02:00
Óscar González Fernández
6cb3d39329 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #541] Fix bug. 
Now it handles nulls
 2010-06-28 14:06:05 +02:00
Manuel Rego Casasnovas
4d5fa2a1e1 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: Updated examples for order service to wrap with an "order-line". 2010-06-28 00:57:07 +02:00
Manuel Rego Casasnovas
01219e9e6a ItEr60S04ValidacionEProbasFuncionaisItEr59S04: Reverted changes in a previous commit coming back to XMLGregorianCalendar for resources service. 
This reverts commit "bafae163". But it does not revert the whole commit, just the changes related with the data type of the date fields in the resource service.
 2010-06-28 00:37:04 +02:00
Susana Montes Pedreira
6637da457c ItEr60S04ValidacionEProbasFuncionaisItEr59S04 : [Bug #539] 
This bug was fixed with the following patch :
ItEr60S04ValidacionEProbasFuncionaisItEr59S04 : It fixes the template screen.

This patch adds to the aplications list of a template the name of the order element.
Also, assigns correctly the template to the order when the order is created
from a template.
 2010-06-24 13:09:08 +02:00
Susana Montes Pedreira
ef5e7f69fd ItEr60S04ValidacionEProbasFuncionaisItEr59S04 : [Bug #538] 
it does not allow to edit the combo, that filters the resources load by name.
 2010-06-24 12:43:14 +02:00
Óscar González Fernández
13806a5566 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: Extract method and do not use contains on a list. 
Contains on a list is a O(n) operation. Using a set instead.
 2010-06-24 12:38:45 +02:00
Susana Montes Pedreira
febb379777 ItEr60S04ValidacionEProbasFuncionaisItEr59S04 : [Bug #536] 
it deletes the repeated criteria, when the resources load are
grouped by criteria.
 2010-06-24 10:04:00 +02:00
Óscar González Fernández
081443ece1 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #519] Fix bug. 
Changing the set instance was interfering with delete-orphan. The
initial persistent set must be kept in order to delete-orphan keep on
working. If a new set is assigned hibernate loses track of the
removals done and doesn't delete the orphans. Instead of assigning to
new set, the advanceMeasurements set is reset to the new contents.
 2010-06-23 18:53:58 +02:00
Óscar González Fernández
d50f6d7e75 Revert "ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #519] Fix bug." 
This reverts commit 50ce3f3802. Wrong
fix for the bug. The mapping is right and the association was updated
correctly but the measurements keep on existing.
 2010-06-23 18:53:14 +02:00
Óscar González Fernández
50ce3f3802 ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #519] Fix bug. 
Removing inverse. When a set is mapped with inverse=true it modifies
the association based on the other side of the association, in this
case the advanceAssignment property at AdvanceMeasurement. The
advanceAssignment property at AdvanceMeasurement was correctly set at
null and the set has cascade all-delete-orphan. This could make you
think that it should remove the AdvanceMeasurement. But in the moment
that Hibernate tries to apply the cascade the AdvanceMeasurement has
been removed from the set so it doesn't try to apply the changes.
 2010-06-23 17:20:35 +02:00
Jacobo Aragunde Pérez
0141ac1859 ItEr60S05DocumentacionFormacionItEr59S05: Updated Galician translation files. 2010-06-23 13:47:35 +02:00
Jacobo Aragunde Pérez
10382dfab2 ItEr60S05DocumentacionFormacionItEr59S05: Updated Spanish translation files. 2010-06-23 13:47:26 +02:00
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