RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr24S08CUAsignacionGrupoRecursosAPlanificacionItEr23S10: [FixBug] Added Save task button

Browse source
This commit is contained in:
Diego Pino Garcia 2009-09-07 01:06:19 +02:00 • committed by Óscar González Fernández
parent c4acadced6
commit a4f19c2dec
4 changed files with 37 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IResourceAllocationModel.java
View file

@ -142,4 +142,9 @@ public interface IResourceAllocationModel {
*/
void cancel();
/**
* Save task
*/
void save();
}

29
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ResourceAllocationController.java
View file

@ -77,9 +77,9 @@ public class ResourceAllocationController extends GenericForwardComposer {
resourceAllocationModel.setTask(task);
resourceAllocationModel.setGanttTask(ganttTask);
// Add generic resources to resources list
updateGenericResourceAllocationPercentage();
// Add new generic resources to resources list
addGenericResources();
Util.reloadBindings(window);
try {
window.doModal();
@ -90,6 +90,17 @@ public class ResourceAllocationController extends GenericForwardComposer {
}
}
/**
* GenericResourceAllocationPercentage initial value is the sum of all
* {@link ResourceAllocation} percentages
*/
private void updateGenericResourceAllocationPercentage() {
BigDecimal genericPercentage = resourceAllocationModel
.getSumPercentageResourceAllocations();
genericResourceAllocationPercentage.setValue(genericPercentage
.scaleByPowerOfTen(2).setScale(2, BigDecimal.ROUND_HALF_EVEN));
}
/**
* Check how many {@link ResourceAllocation} object can be assigned to this
* {@link Task} and add them to {@link ResourceAllocation} list
@ -217,13 +228,23 @@ public class ResourceAllocationController extends GenericForwardComposer {
}
public void cancel() {
clear();
self.setVisible(false);
close();
resourceAllocationModel.cancel();
}
private void close() {
self.setVisible(false);
clear();
}
private void clear() {
genericResourceAllocationPercentage.setValue(null);
resourcesList.getItems().clear();
}
public void save() {
resourceAllocationModel.save();
close();
}
/**

6
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ResourceAllocationModel.java
View file

@ -306,4 +306,10 @@ public class ResourceAllocationModel implements IResourceAllocationModel {
task.clearResourceAllocations();
}
@Override
@Transactional
public void save() {
taskElementDAO.save(task);
}
}

2
navalplanner-webapp/src/main/webapp/planner/order.zul
View file

@ -106,7 +106,7 @@
</listbox>
<hbox>
<button label="${i18n:_('Save')}" />
<button label="${i18n:_('Save')}" onClick="allocationController.save()" />
<button label="${i18n:_('Cancel')}" onClick="allocationController.cancel()" />
<button label="${i18n:_('Search resources...')}"
onClick="allocationController.showSearchResources()" />