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

ItEr42S17CUGravacionModelosUnidadesTraballoItEr41S20: Moving materials related classes to their own package withing web.orders

Browse source
This commit is contained in:
Óscar González Fernández 2010-01-06 21:38:32 +01:00
parent c62a1152ea
commit 0c22be0a7c
6 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
View file

@ -41,6 +41,7 @@ import org.navalplanner.web.common.Level;
import org.navalplanner.web.common.MessagesForUser;
import org.navalplanner.web.common.OnlyOneVisible;
import org.navalplanner.web.common.Util;
import org.navalplanner.web.orders.materials.AssignedMaterialsToOrderElementController;
import org.navalplanner.web.planner.order.IOrderPlanningGate;
import org.navalplanner.web.tree.TreeComponent;
import org.navalplanner.web.users.OrderAuthorizationController;

1
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
View file

@ -25,6 +25,7 @@ import org.navalplanner.business.orders.entities.OrderElement;
import org.navalplanner.business.orders.entities.OrderLine;
import org.navalplanner.business.orders.entities.OrderLineGroup;
import org.navalplanner.web.common.Util;
import org.navalplanner.web.orders.materials.AssignedMaterialsToOrderElementController;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.SuspendNotAllowedException;
import org.zkoss.zk.ui.event.Event;

3
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedMaterialsToOrderElementController.java → navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsToOrderElementController.java
View file

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.web.orders;
package org.navalplanner.web.orders.materials;
import static org.navalplanner.web.I18nHelper._;
@ -37,6 +37,7 @@ import org.navalplanner.business.materials.entities.MaterialAssignment;
import org.navalplanner.business.materials.entities.MaterialCategory;
import org.navalplanner.business.orders.entities.OrderElement;
import org.navalplanner.web.common.Util;
import org.navalplanner.web.orders.IOrderElementModel;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.SuspendNotAllowedException;

3
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedMaterialsToOrderElementModel.java → navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsToOrderElementModel.java
View file

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.web.orders;
package org.navalplanner.web.orders.materials;
import java.math.BigDecimal;
import java.util.ArrayList;
@ -33,6 +33,7 @@ import org.navalplanner.business.materials.entities.MaterialAssignment;
import org.navalplanner.business.materials.entities.MaterialCategory;
import org.navalplanner.business.orders.daos.IOrderElementDAO;
import org.navalplanner.business.orders.entities.OrderElement;
import org.navalplanner.web.orders.IOrderElementModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;

3
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IAssignedMaterialsToOrderElementModel.java → navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/IAssignedMaterialsToOrderElementModel.java
View file

@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.web.orders;
package org.navalplanner.web.orders.materials;
import java.math.BigDecimal;
import java.util.List;
@ -27,6 +27,7 @@ import org.navalplanner.business.materials.entities.Material;
import org.navalplanner.business.materials.entities.MaterialAssignment;
import org.navalplanner.business.materials.entities.MaterialCategory;
import org.navalplanner.business.orders.entities.OrderElement;
import org.navalplanner.web.orders.IOrderElementModel;
import org.zkoss.zul.TreeModel;

2
navalplanner-webapp/src/main/webapp/orders/_listOrderElementMaterials.zul
View file

@ -19,7 +19,7 @@
-->
<vbox id="${arg.id}"
apply="org.navalplanner.web.orders.AssignedMaterialsToOrderElementController" >
apply="org.navalplanner.web.orders.materials.AssignedMaterialsToOrderElementController" >
<zscript>
Object[] unitTypes = org.navalplanner.business.materials.entities.UnitTypeEnum