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.
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.
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.
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.
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.
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
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.
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
Revert " ItEr59S04ValidacionEProbasFuncionaisItEr58S04: [Bug #497] It
also needed to reload the resources that are gotten from the day
assignments."
This reverts commit 401ac50fd9.
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.
