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

ItEr19S08CUCreacionProxectoPlanificacionItEr18S08: Added popup to edit a task from main planner to Scheduling view.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2009-07-29 19:04:14 +02:00 • committed by Javier Moran Rua
parent 9452bc1d12
commit 997666f04b
7 changed files with 98 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/EditTaskCommand.java Normal file
View file

@ -0,0 +1,39 @@
package org.navalplanner.web.planner;
import org.navalplanner.business.planner.entities.TaskElement;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.zkoss.ganttz.TaskEditFormComposer;
import org.zkoss.ganttz.extensions.IContextWithPlannerTask;
/**
* Command to edit a {@link TaskElement}.
*
* @author Manuel Rego Casasnovas <mrego@igalia.com>
*/
@Component
@Scope(BeanDefinition.SCOPE_PROTOTYPE)
public class EditTaskCommand implements IEditTaskCommand {
private TaskEditFormComposer taskEditFormComposer;
@Override
public void doAction(IContextWithPlannerTask<TaskElement> context,
TaskElement task) {
taskEditFormComposer.showEditFormFor(context.getRelativeTo(), context
.getTask());
}
@Override
public String getName() {
return "Edit";
}
@Override
public void setTaskEditFormComposer(
TaskEditFormComposer taskEditFormComposer) {
this.taskEditFormComposer = taskEditFormComposer;
}
}

16
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IEditTaskCommand.java Normal file
View file

@ -0,0 +1,16 @@
package org.navalplanner.web.planner;
import org.navalplanner.business.planner.entities.TaskElement;
import org.zkoss.ganttz.TaskEditFormComposer;
import org.zkoss.ganttz.extensions.ICommandOnTask;
/**
* Contract for {@link EditTaskCommand} <br />
*
* @author Manuel Rego Casasnovas <mrego@igalia.com>
*/
public interface IEditTaskCommand extends ICommandOnTask<TaskElement> {
void setTaskEditFormComposer(TaskEditFormComposer taskEditFormComposer);
}

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IOrderPlanningModel.java
View file

@ -2,6 +2,7 @@ package org.navalplanner.web.planner;
import org.navalplanner.business.orders.entities.Order;
import org.navalplanner.business.planner.entities.TaskElement;
import org.zkoss.ganttz.TaskEditFormComposer;
import org.zkoss.ganttz.adapters.PlannerConfiguration;
/**
@ -15,6 +16,7 @@ public interface IOrderPlanningModel {
void createConfiguration(Order order,
ResourceAllocationController resourceAllocationController,
TaskEditFormComposer taskEditFormComposer,
ConfigurationOnTransaction onTransaction);
}

8
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningController.java
View file

@ -10,6 +10,7 @@ import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.zkoss.ganttz.Planner;
import org.zkoss.ganttz.TaskEditFormComposer;
import org.zkoss.ganttz.adapters.PlannerConfiguration;
/**
@ -27,6 +28,12 @@ public class OrderPlanningController implements
return resourceAllocationController;
}
private TaskEditFormComposer taskEditFormComposer = new TaskEditFormComposer();
public TaskEditFormComposer getTaskEditFormComposer() {
return taskEditFormComposer;
}
@Autowired
private IURLHandlerRegistry urlHandlerRegistry;
@ -41,6 +48,7 @@ public class OrderPlanningController implements
@Override
public void showSchedule(Order order) {
model.createConfiguration(order, resourceAllocationController,
taskEditFormComposer,
new ConfigurationOnTransaction() {
@Override

8
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/OrderPlanningModel.java
View file

@ -15,6 +15,7 @@ import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.zkoss.ganttz.TaskEditFormComposer;
import org.zkoss.ganttz.adapters.IStructureNavigator;
import org.zkoss.ganttz.adapters.PlannerConfiguration;
@ -47,6 +48,7 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
@Transactional(readOnly = true)
public void createConfiguration(Order order,
ResourceAllocationController resourceAllocationController,
TaskEditFormComposer taskEditFormComposer,
ConfigurationOnTransaction onTransaction) {
Order orderReloaded = reload(order);
if (!orderReloaded.isSomeTaskElementScheduled())
@ -67,6 +69,10 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
splitCommand.setState(planningState);
configuration.addCommandOnTask(splitCommand);
IEditTaskCommand editTaskCommand = getEditTaskCommand();
editTaskCommand.setTaskEditFormComposer(taskEditFormComposer);
configuration.setEditTaskCommand(editTaskCommand);
onTransaction.use(configuration);
}
@ -143,6 +149,8 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
protected abstract ISplitTaskCommand getSplitCommand();
protected abstract IEditTaskCommand getEditTaskCommand();
private Order reload(Order order) {
try {
return orderService.find(order.getId());

1
navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-config.xml
View file

@ -20,6 +20,7 @@
<lookup-method name="getSaveCommand" bean="saveCommand"/>
<lookup-method name="getResourceAllocationCommand" bean="resourceAllocationCommand"/>
<lookup-method name="getSplitCommand" bean="splitTaskCommand"/>
<lookup-method name="getEditTaskCommand" bean="editTaskCommand"/>
</bean>
<context:component-scan base-package="org.navalplanner.web"/>

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

@ -18,6 +18,30 @@
<div id="idContextMenuTaskAssigment"></div>
</planner>
<popup width="300px" apply="${planningController.taskEditFormComposer}">
<grid>
<rows>
<row>
${c:l('task.name')}
<textbox id="name" />
</row>
<row>
${c:l('task.start')}
<datebox id="startDateBox" compact="true" />
</row>
<row>
${c:l('task.end')}
<datebox id="endDateBox" compact="true" />
</row>
<row>
${c:l('task.notes')}
<textbox id="notes" />
</row>
</rows>
</grid>
<button id="ok" label=" ${c:l('task.ok')}" />
</popup>
<window id="resourceAllocationWindow" visible="false" apply="${allocationController}">
<vbox>
<label value="Required criterions" />