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

Renamed "order" to "project" and "order element" to "task" in all the strings.

Browse source 
FEA: ItEr65S06BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2010-12-16 22:02:28 +01:00
parent d55b9950c6
commit 4918307f0c
68 changed files with 150 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/CriterionRequirementHandler.java
View file

@ -536,7 +536,7 @@ public abstract class CriterionRequirementHandler<T, S, R> implements
} else {
final Criterion criterion = newRequirement.getCriterion();
throw new IllegalStateException(_(
" The {0} already exist into other order element",
" The {0} already exist into other task",
criterion.getName()));
}
}

4
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java
View file

@ -417,7 +417,7 @@ public class HoursGroup extends IntegrationEntity implements Cloneable,
repeatedHoursGroup = ((OrderLineGroup) order).findRepeatedHoursGroupCode();
if (repeatedHoursGroup != null) {
throw new ValidationException(_(
"Repeated Hours Group code {0} in Order {1}",
"Repeated Hours Group code {0} in Project {1}",
repeatedHoursGroup.getCode(), repeatedHoursGroup
.getParentOrderLine().getName()));
}
@ -427,7 +427,7 @@ public class HoursGroup extends IntegrationEntity implements Cloneable,
.findRepeatedHoursGroupCodeInDB(order.getHoursGroups());
if (repeatedHoursGroup != null) {
throw new ValidationException(_(
"Repeated Hours Group code {0} in Order {1}",
"Repeated Hours Group code {0} in Project {1}",
repeatedHoursGroup.getCode(), repeatedHoursGroup
.getParentOrderLine().getName()));
}

10
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java
View file

@ -650,7 +650,7 @@ public abstract class OrderElement extends IntegrationEntity implements
for (DirectAdvanceAssignment directAdvanceAssignment : directAdvanceAssignments) {
if (directAdvanceAssignment.getReportGlobalAdvance()) {
throw new DuplicateValueTrueReportGlobalAdvanceException(
_("Cannot spread two advances in the same order element"),
_("Cannot spread two advances in the same task"),
this, OrderElement.class);
}
}
@ -674,7 +674,7 @@ public abstract class OrderElement extends IntegrationEntity implements
if (AdvanceType.equivalentInDB(directAdvanceAssignment
.getAdvanceType(), newAdvanceAssignment.getAdvanceType())) {
throw new DuplicateAdvanceAssignmentForOrderElementException(
_("Duplicate Advance Assignment For Order Element"),
_("Duplicate Advance Assignment For Task"),
this,
OrderElement.class);
}
@ -701,7 +701,7 @@ public abstract class OrderElement extends IntegrationEntity implements
if (AdvanceType.equivalentInDB(directAdvanceAssignment
.getAdvanceType(), newAdvanceAssignment.getAdvanceType())) {
throw new DuplicateAdvanceAssignmentForOrderElementException(
_("Duplicate Advance Assignment For Order Element"),
_("Duplicate Advance Assignment For Task"),
this,
OrderElement.class);
}
@ -1305,7 +1305,7 @@ public abstract class OrderElement extends IntegrationEntity implements
repeatedOrder = ((OrderLineGroup) order).findRepeatedOrderCode();
if (repeatedOrder != null) {
throw new ValidationException(_(
"Repeated Order code {0} in Order {1}",
"Repeated Project code {0} in Project {1}",
repeatedOrder.getCode(), repeatedOrder.getName()));
}
}
@ -1315,7 +1315,7 @@ public abstract class OrderElement extends IntegrationEntity implements
.findRepeatedOrderCodeInDB(order);
if (repeatedOrder != null) {
throw new ValidationException(_(
"Repeated Order code {0} in Order {1}",
"Repeated Project code {0} in Project {1}",
repeatedOrder.getCode(), repeatedOrder.getName()));
}
}

4
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java
View file

@ -896,7 +896,7 @@ public class OrderLineGroup extends OrderElement implements
for (AdvanceAssignment advanceAssignment : advanceAssignments) {
if (advanceAssignment.getReportGlobalAdvance()) {
throw new DuplicateValueTrueReportGlobalAdvanceException(
_("Cannot spread two advances in the same order element"),
_("Cannot spread two advances in the same task"),
this, OrderElement.class);
}
}
@ -1055,4 +1055,4 @@ public class OrderLineGroup extends OrderElement implements
return result;
}
}
}

2
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderStatusEnum.java
View file

@ -31,7 +31,7 @@ public enum OrderStatusEnum {
OFFERED(_("OFFERED")), ACCEPTED(_("ACCEPTED")), STARTED(_("STARTED")), FINISHED(
_("FINISHED")), CANCELLED(_("CANCELLED")), SUBCONTRACTED_PENDING_ORDER(
_("SUBCONTRACTED PENDING ORDER")), STORED(_("STORED"));
_("SUBCONTRACTED PENDING PROJECT")), STORED(_("STORED"));
private String description;

4
navalplanner-business/src/main/java/org/navalplanner/business/templates/entities/OrderTemplate.java
View file

@ -44,7 +44,7 @@ public class OrderTemplate extends OrderLineGroupTemplate {
return create(beingBuilt, order);
}
@NotNull(message = "order calendar not specified")
@NotNull(message = "project calendar not specified")
private BaseCalendar calendar;
@Override
@ -69,7 +69,7 @@ public class OrderTemplate extends OrderLineGroupTemplate {
@Override
public String getType() {
return _("Order");
return _("Project");
}
}

6
navalplanner-business/src/main/java/org/navalplanner/business/users/entities/UserRole.java
View file

@ -32,9 +32,9 @@ public enum UserRole {
ROLE_ADMINISTRATION(_("Administration")),
ROLE_WS_READER(_("Web service reader")),
ROLE_WS_WRITER(_("Web service writer")),
ROLE_READ_ALL_ORDERS(_("All orders read allowed")),
ROLE_EDIT_ALL_ORDERS(_("All orders edition allowed")),
ROLE_CREATE_ORDER(_("Order creation allowed"));
ROLE_READ_ALL_ORDERS(_("All projects read allowed")),
ROLE_EDIT_ALL_ORDERS(_("All projects edition allowed")),
ROLE_CREATE_ORDER(_("Project creation allowed"));
private final String displayName;

4
navalplanner-webapp/src/main/java/org/navalplanner/web/common/TemplateModel.java
View file

@ -336,11 +336,11 @@ public class TemplateModel implements ITemplateModel {
}
private IDesktopUpdate showStart(final int ordersNumber) {
return sendMessage(_("Reassigning {0} orders", ordersNumber));
return sendMessage(_("Reassigning {0} projects", ordersNumber));
}
private IDesktopUpdate showProgress(int remaining) {
return sendMessage(_("{0} orders reassignation remaining", remaining));
return sendMessage(_("{0} projects reassignation remaining", remaining));
}
private IDesktopUpdate sendMessage(final String message) {

4
navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderBandboxFinder.java
View file

@ -43,7 +43,7 @@ public class OrderBandboxFinder extends BandboxFinder implements IBandboxFinder
@Autowired
private IOrderDAO orderDAO;
private final String headers[] = { _("Order"), _("Order code") };
private final String headers[] = { _("Project"), _("Project code") };
@Override
@Transactional(readOnly = true)
@ -95,4 +95,4 @@ public class OrderBandboxFinder extends BandboxFinder implements IBandboxFinder
};
}
}

4
navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java
View file

@ -45,8 +45,8 @@ public class OrderElementBandboxFinder extends BandboxFinder implements IBandbox
@Autowired
private IOrderElementDAO orderElementDAO;
private final String headers[] = { _("Order"), _("Order code"),
_("Order element"), _("Order element code") };
private final String headers[] = { _("Project"), _("Project code"),
_("Task"), _("Task code") };
@Override
@Transactional(readOnly = true)

2
navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java
View file

@ -203,7 +203,7 @@ public class QueueComponent extends XulElement implements
final OrderElement order = getRootOrder(task);
StringBuilder result = new StringBuilder();
result.append(_("Order: {0} ", order.getName()));
result.append(_("Project: {0} ", order.getName()));
result.append(_("Task: {0} ", task.getName()));
result.append(_("Completed: {0}% ", element.getAdvancePercentage().multiply(new BigDecimal(100))));

2
navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java
View file

@ -516,7 +516,7 @@ public class MaterialsController extends
}
else {
messagesForUser.showMessage(Level.ERROR,
_("Cannot delete that material because it is assigned to an order."));
_("Cannot delete that material because it is assigned to a project."));
}
}

2
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java
View file

@ -301,7 +301,7 @@ public class AssignedTaskQualityFormsToOrderElementController extends
messages
.showMessage(
Level.ERROR,
_("Another order element in the same branch is already reporting advance for this quality form"));
_("Another task in the same branch is already reporting advance for this quality form"));
tmpCheckbox.setChecked(false);
}
}

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

@ -121,7 +121,7 @@ public class OrderCRUDController extends GenericForwardComposer {
String orderElementName;
if (invalidValue.getBean() instanceof Order) {
orderElementName = _("Order");
orderElementName = _("Project");
} else {
orderElementName = ((OrderElement) invalidValue
.getBean()).getName();
@ -179,7 +179,7 @@ public class OrderCRUDController extends GenericForwardComposer {
showCreateButtons(false);
orderModel.prepareCreationFrom(template);
prepareEditWindow();
showEditWindow(_("Create order from Template"));
showEditWindow(_("Create project from Template"));
}
@Resource
@ -647,7 +647,7 @@ public class OrderCRUDController extends GenericForwardComposer {
}
else {
try {
Messagebox.show(_("You don't have read access to this order"),
Messagebox.show(_("You don't have read access to this project"),
_("Information"), Messagebox.OK, Messagebox.INFORMATION);
goToList();
} catch (InterruptedException e) {
@ -719,7 +719,7 @@ public class OrderCRUDController extends GenericForwardComposer {
saveOrderAuthorizations();
try {
Messagebox.show(_("Order saved"), _("Information"),
Messagebox.show(_("Project saved"), _("Information"),
Messagebox.OK, Messagebox.INFORMATION);
} catch (InterruptedException e) {
throw new RuntimeException(e);
@ -842,7 +842,7 @@ public class OrderCRUDController extends GenericForwardComposer {
}
else {
try {
Messagebox.show(_("You don't have permissions to edit this order"),
Messagebox.show(_("You don't have permissions to edit this project"),
_("Information"), Messagebox.OK, Messagebox.INFORMATION);
} catch (InterruptedException e) {
throw new RuntimeException(e);
@ -857,7 +857,7 @@ public class OrderCRUDController extends GenericForwardComposer {
.showMessage(
Level.ERROR,
_(
"You can not remove the order \"{0}\" because of any of its order elements are already in use in some work reports and the order just exists in the current scenario",
"You can not remove the project \"{0}\" because of any of its tasks are already in use in some work reports and the project just exists in the current scenario",
order.getName()));
} else {
orderModel.remove(order);
@ -875,7 +875,7 @@ public class OrderCRUDController extends GenericForwardComposer {
showCreateButtons(false);
} else {
try {
Messagebox.show(_("The order has no scheduled elements"),
Messagebox.show(_("The project has no scheduled elements"),
_("Information"), Messagebox.OK, Messagebox.INFORMATION);
} catch (InterruptedException e) {
throw new RuntimeException(e);
@ -884,7 +884,7 @@ public class OrderCRUDController extends GenericForwardComposer {
}
else {
try {
Messagebox.show(_("You don't have read access to this order"),
Messagebox.show(_("You don't have read access to this project"),
_("Information"), Messagebox.OK, Messagebox.INFORMATION);
} catch (InterruptedException e) {
throw new RuntimeException(e);
@ -907,7 +907,7 @@ public class OrderCRUDController extends GenericForwardComposer {
public void initEdit(Order order) {
if (!orderModel.userCanRead(order, SecurityUtils.getSessionUserLoginName())) {
try {
Messagebox.show(_("Sorry, you do not have permissions to access this order"),
Messagebox.show(_("Sorry, you do not have permissions to access this project"),
_("Information"), Messagebox.OK, Messagebox.INFORMATION);
} catch (InterruptedException e) {
throw new RuntimeException(e);
@ -922,7 +922,7 @@ public class OrderCRUDController extends GenericForwardComposer {
}
prepareEditWindow();
showEditWindow(_("Edit order"));
showEditWindow(_("Edit project"));
}
private void resetTabControllers() {
@ -1030,7 +1030,7 @@ public class OrderCRUDController extends GenericForwardComposer {
showOrderElementFilter();
hideCreateButtons();
prepareEditWindow();
showEditWindow(_("Create order"));
showEditWindow(_("Create project"));
}
public ProjectDetailsController getCreationPopup() {

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

@ -116,7 +116,7 @@ public class OrderElementController extends GenericForwardComposer {
&& (!StringUtils.isBlank(getOrderElement().getName()))) {
name = ": " + getOrderElement().getName();
}
return _("Edit order element {0}", name);
return _("Edit task {0}", name);
}
public void setupManageOrderElementAdvancesController()

10
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java
View file

@ -203,7 +203,7 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
private void showSelectAnElementMessageBox() {
try {
Messagebox.show(_("Choose an order element "
Messagebox.show(_("Choose a task "
+ "to operate on it"));
} catch (InterruptedException e) {
throw new RuntimeException(e);
@ -252,8 +252,8 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
try {
Messagebox
.show(
_("Templates can only be created from already existent order elements.\n"
+ "Newly order elements cannot be used."),
_("Templates can only be created from already existent tasks.\n"
+ "Newly tasks cannot be used."),
_("Operation cannot be done"), Messagebox.OK,
Messagebox.INFORMATION);
} catch (InterruptedException e) {
@ -265,7 +265,7 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
final String codeOrderElement) {
try {
Messagebox.show(_("the " + dateboxName
+ "datebox of the order element " + codeOrderElement
+ "datebox of the task " + codeOrderElement
+ " could not be created.\n"),
_("Operation cannot be done"), Messagebox.OK,
Messagebox.INFORMATION);
@ -1033,7 +1033,7 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
.showMessage(
Level.ERROR,
_(
"You can not remove the order element \"{0}\" because of this or any of its children are already in use in some work reports",
"You can not remove the task \"{0}\" because of this or any of its children are already in use in some work reports",
element.getName()));
} else {
super.remove(element);

2
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java
View file

@ -69,7 +69,7 @@ public class OrderElementTreeModel extends EntitiesTree<OrderElement> {
protected OrderElement createNewElement() {
OrderElement newOrderElement = OrderLine
.createOrderLineWithUnfixedPercentage(0);
newOrderElement.setName(_("New order element"));
newOrderElement.setName(_("New task"));
return newOrderElement;
}

6
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java
View file

@ -559,8 +559,8 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
try {
int status = Messagebox
.show(
_("Confirm creating a new order version for this scenario and derived. Are you sure?"),
_("New order version"), Messagebox.OK
_("Confirm creating a new project version for this scenario and derived. Are you sure?"),
_("New project version"), Messagebox.OK
| Messagebox.CANCEL, Messagebox.QUESTION);
return (Messagebox.OK == status);
} catch (InterruptedException e) {
@ -631,7 +631,7 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel {
}
} catch (InstanceNotFoundException e) {
throw new ValidationException(_(""
+ "It not could remove the order element "
+ "It not could remove the task "
+ orderElement.getName()));
}
}

2
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrdersTreeComponent.java
View file

@ -67,7 +67,7 @@ public class OrdersTreeComponent extends TreeComponent {
columns.add(codeColumn);
columns.add(nameAndDescriptionColumn);
columns.add(new OrdersTreeColumn(_("Hours"), "hours",
_("Total order element hours")) {
_("Total task hours")) {
@Override
protected void doCell(OrderElementTreeitemRenderer treeRenderer,

4
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
View file

@ -226,7 +226,7 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
@Override
public String getName() {
return _("Create new order");
return _("Create new project");
}
@Override
@ -247,7 +247,7 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
@Override
public String getName() {
return _("Create new order from template");
return _("Create new project from template");
}
@Override

4
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SaveCommand.java
View file

@ -538,8 +538,8 @@ public class SaveCommand implements ISaveCommand {
private boolean userAcceptsCreateANewOrderVersion() {
try {
int status = Messagebox
.show(_("Confirm creating a new order version for this scenario and derived. Are you sure?"),
_("New order version"), Messagebox.OK
.show(_("Confirm creating a new project version for this scenario and derived. Are you sure?"),
_("New project version"), Messagebox.OK
| Messagebox.CANCEL, Messagebox.QUESTION);
return (Messagebox.OK == status);
} catch (InterruptedException e) {

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

@ -42,7 +42,7 @@ import org.zkoss.zul.Label;
public class LimitingResourcesTabCreator {
/* Unnecesary */
private static String ORDER_LIMITING_RESOURCES_VIEW = _("Limiting resources (order)");
private static String ORDER_LIMITING_RESOURCES_VIEW = _("Limiting resources (project)");
public static ITab create(Mode mode,
LimitingResourcesController LimitingResourcesController,

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

@ -306,7 +306,7 @@ public class PlanningTabCreator {
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs.appendChild(new Label(PLANNIFICATION));
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs.appendChild(new Label(_("Order Scheduling")));
breadcrumbs.appendChild(new Label(_("Project Scheduling")));
if (mode.isOf(ModeType.ORDER)) {
Label nameLabel = new Label(order.getName());

2
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskController.java
View file

@ -112,7 +112,7 @@ public class CompletedEstimatedHoursPerTaskController extends NavalplannerReport
final Order order = getSelectedOrder();
if (order == null) {
throw new WrongValueException(bandboxSelectOrder,
_("Please, select an order"));
_("Please, select a project"));
}
super.showReport(jasperreport);
}

4
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceController.java
View file

@ -132,12 +132,12 @@ public class OrderCostsPerResourceController extends GenericForwardComposer {
public void onSelectOrder() {
Order order = (Order) bdOrders.getSelectedElement();
if (order == null) {
throw new WrongValueException(bdOrders, _("please, select a order"));
throw new WrongValueException(bdOrders, _("please, select a project"));
}
boolean result = orderCostsPerResourceModel.addSelectedOrder(order);
if (!result) {
throw new WrongValueException(bdOrders,
_("This order has already been added."));
_("This project has already been added."));
} else {
Util.reloadBindings(lbOrders);
}

4
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceModel.java
View file

@ -115,7 +115,7 @@ public class OrderCostsPerResourceModel implements IOrderCostsPerResourceModel {
if (orders.isEmpty()) {
Order order = Order.create();
order.setName(_("All orders"));
order.setName(_("All projects"));
workingHoursPerWorkerList.add(createEmptyDTO(order,
emptyWorker, wrl));
} else {
@ -172,7 +172,7 @@ public class OrderCostsPerResourceModel implements IOrderCostsPerResourceModel {
private WorkReportLine createEmptyWorkReportLine(Worker worker) {
OrderLine leaf = OrderLine.create();
leaf.setCode(_("All order tasks"));
leaf.setCode(_("All project tasks"));
TypeOfWorkHours w = TypeOfWorkHours.create();
w.setDefaultPrice(new BigDecimal(0));

4
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java
View file

@ -97,13 +97,13 @@ public class SchedulingProgressPerOrderController extends NavalplannerReportCont
public void onSelectOrder() {
Order order = (Order) bdOrders.getSelectedElement();
if (order == null) {
throw new WrongValueException(bdOrders, _("please, select a order"));
throw new WrongValueException(bdOrders, _("please, select a project"));
}
boolean result = schedulingProgressPerOrderModel
.addSelectedOrder(order);
if (!result) {
throw new WrongValueException(bdOrders,
_("This order has already been added."));
_("This project has already been added."));
} else {
Util.reloadBindings(lbOrders);
}

4
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java
View file

@ -102,13 +102,13 @@ public class TimeLineRequiredMaterialController extends
public void onSelectOrder() {
Order order = (Order) bdOrders.getSelectedElement();
if (order == null) {
throw new WrongValueException(bdOrders, _("please, select a order"));
throw new WrongValueException(bdOrders, _("please, select a project"));
}
boolean result = timeLineRequiredMaterialModel
.addSelectedOrder(order);
if (!result) {
throw new WrongValueException(bdOrders,
_("This order has already been added."));
_("This project has already been added."));
} else {
Util.reloadBindings(lbOrders);
}

4
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java
View file

@ -133,7 +133,7 @@ public class WorkingArrangementsPerOrderController extends NavalplannerReportCon
public void showReport(ExtendedJasperreport jasperreport) {
if (getSelectedOrder() == null) {
throw new WrongValueException(bdOrder, _("Please, select an order"));
throw new WrongValueException(bdOrder, _("Please, select a project"));
}
super.showReport(jasperreport);
}
@ -212,4 +212,4 @@ public class WorkingArrangementsPerOrderController extends NavalplannerReportCon
Util.reloadBindings(lbCriterions);
}
}
}

2
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskController.java
View file

@ -108,7 +108,7 @@ public class WorkingProgressPerTaskController extends NavalplannerReportControll
final Order order = getSelectedOrder();
if (order == null) {
throw new WrongValueException(bandboxSelectOrder,
_("Please, select an order"));
_("Please, select a project"));
}
super.showReport(jasperreport);
}

4
navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java
View file

@ -484,7 +484,7 @@ public class ResourceLoadController implements Composer {
task);
} else {
try {
Messagebox.show(_("The order has no scheduled elements"),
Messagebox.show(_("The project has no scheduled elements"),
_("Information"), Messagebox.OK,
Messagebox.INFORMATION);
} catch (InterruptedException e) {
@ -494,7 +494,7 @@ public class ResourceLoadController implements Composer {
} else {
try {
Messagebox
.show(_("You don't have read access to this order"),
.show(_("You don't have read access to this project"),
_("Information"), Messagebox.OK,
Messagebox.INFORMATION);
} catch (InterruptedException e) {

6
navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java
View file

@ -455,7 +455,7 @@ public class ResourceLoadModel implements IResourceLoadModel {
}
LoadTimeLine group = new LoadTimeLine(buildTimeLine(criterion,
"Other orders", "global-generic", allocations,
"Other projects", "global-generic", allocations,
getCurrentTimeLineRole(null)),
buildTimeLinesGroupForOrder(
criterion, byOrder));
@ -624,7 +624,7 @@ public class ResourceLoadModel implements IResourceLoadModel {
}
TimeLineRole<BaseEntity> role = getCurrentTimeLineRole(null);
LoadTimeLine group = new LoadTimeLine(buildTimeLine(resource,
_("Other orders"), resourceAllocations, "resource", role),
_("Other projects"), resourceAllocations, "resource", role),
buildTimeLinesGroupForOrder(resource, byOrder));
return group;
}
@ -1104,4 +1104,4 @@ class PeriodsBuilder {
return result;
}
}
}

2
navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersController.java
View file

@ -162,7 +162,7 @@ public class TransferOrdersController extends GenericForwardComposer {
transferOrdersModel.transfer(order);
Util.reloadBindings(destinationScenarioOrders);
messagesForUser.showMessage(Level.INFO,
_("Order {0} transfered", order
_("Project {0} transfered", order
.getName()));
} catch (ValidationException e) {
messagesForUser.showInvalidValues(e);

6
navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java
View file

@ -157,7 +157,7 @@ public class TransferOrdersModel implements ITransferOrdersModel {
.getOrderVersionFor(sourceScenario);
if (sourceOrderVersion == null) {
throw new RuntimeException(
"OrderVersion must not be null for source scenario");
"Project version must not be null for source scenario");
}
OrderVersion destinationOrderVersion = order
@ -166,7 +166,7 @@ public class TransferOrdersModel implements ITransferOrdersModel {
&& (sourceOrderVersion.getId().equals(destinationOrderVersion
.getId()))) {
throw new ValidationException(
_("Order version is the same in source and destination scenarios"));
_("Project version is the same in source and destination scenarios"));
}
order.useSchedulingDataFor(sourceOrderVersion);
@ -195,4 +195,4 @@ public class TransferOrdersModel implements ITransferOrdersModel {
}
}
}
}

4
navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java
View file

@ -108,7 +108,7 @@ public abstract class TreeComponent extends HtmlMacroComponent {
protected final Column schedulingStateColumn = new Column(
_("Scheduling state"),
"scheduling_state",
_("Complete, Partially or Not Scheduled. (Drag and drop to move order elements)")) {
_("Complete, Partially or Not Scheduled. (Drag and drop to move tasks)")) {
@Override
public <T extends ITreeNode<T>> void doCell(
@ -158,6 +158,6 @@ public abstract class TreeComponent extends HtmlMacroComponent {
}
public String getRemoveElementLabel() {
return _("Delete order element");
return _("Delete task");
}
}

2
navalplanner-webapp/src/main/java/org/navalplanner/web/users/OrderAuthorizationModel.java
View file

@ -123,7 +123,7 @@ public class OrderAuthorizationModel implements IOrderAuthorizationModel {
replaceOrder(newOrder);
}
}catch (InstanceNotFoundException e) {
InvalidValue invalidValue = new InvalidValue(_("Order does not exist"),
InvalidValue invalidValue = new InvalidValue(_("Project does not exist"),
OrderAuthorization.class, "order", order, null);
throw new ValidationException(invalidValue);
}

8
navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java
View file

@ -307,7 +307,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
if (!getWorkReport()
.checkConstraintOrderElementMustBeNotNullIfIsSharedByLines()) {
showInvalidMessage(bandboxSelectOrderElementInHead,
_("Order Element code cannot be null"));
_("Task code cannot be null"));
return false;
}
return true;
@ -360,7 +360,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
} else if (workReportLine.getOrderElement() == null) {
BandboxSearch bandboxOrder = getTextboxOrder(row);
if (bandboxOrder != null) {
String message = _("The order element code cannot be null");
String message = _("The task code cannot be null");
bandboxOrder.clear();
showInvalidMessage(bandboxOrder, message);
}
@ -748,7 +748,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
if (!getWorkReport().getWorkReportType()
.getOrderElementIsSharedInLines()) {
NewDataSortableColumn columnCode = new NewDataSortableColumn();
columnCode.setLabel(_("Order Code"));
columnCode.setLabel(_("Project Code"));
columnCode.setSclass("order-code-column");
columns.appendChild(columnCode);
}
@ -1598,7 +1598,7 @@ public class WorkReportCRUDController extends GenericForwardComposer implements
return workReportModel.findOrderElement(orderElement.getCode());
} catch (InstanceNotFoundException e) {
throw new WrongValueException(bandboxFilterOrderElement,
_("OrderElement not found"));
_("Task not found"));
}
}
return null;

14
navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/OrderElementConverter.java
View file

@ -554,7 +554,7 @@ public final class OrderElementConverter {
if (orderElementDTO instanceof OrderLineDTO) {
if (!(orderElement instanceof OrderLine)) {
throw new ValidationException(_(
"Order element {0} : OrderLineGroup is incompatible type with {1}"
"Task {0} : Task group is incompatible type with {1}"
+ orderElement.getCode(), orderElement
.getClass().getName()));
}
@ -577,7 +577,7 @@ public final class OrderElementConverter {
if (orderElementDTO instanceof OrderDTO) {
if (!(orderElement instanceof Order)) {
throw new ValidationException(_(
"Order element {0} : Order is incompatible type with {1}"
"Task {0} : Project is incompatible type with {1}"
+ orderElement.getCode(), orderElement
.getClass().getName()));
@ -610,7 +610,7 @@ public final class OrderElementConverter {
} else { // orderElementDTO instanceof OrderLineGroupDTO
if (!(orderElement instanceof OrderLineGroup)) {
throw new ValidationException(_(
"Order element {0} : OrderLineGroup is incompatible type with {1}"
"Task {0} : Task group is incompatible type with {1}"
+ orderElement.getCode(), orderElement
.getClass().getName()));
}
@ -623,7 +623,7 @@ public final class OrderElementConverter {
} else {
if (checkConstraintUniqueOrderCode(orderElementDTO)) {
throw new ValidationException(
_("Order element {0} : Duplicate code in DB"
_("Task {0} : Duplicate code in DB"
+ orderElementDTO.code));
}
if (checkConstraintUniqueHoursGroupCode(orderElementDTO)) {
@ -815,11 +815,11 @@ public final class OrderElementConverter {
.addSubcontractorAdvanceAssignment();
} catch (DuplicateValueTrueReportGlobalAdvanceException e) {
throw new ValidationException(
_("Duplicate value true report global Advance for order element "
_("Duplicate value true report global Advance for task"
+ orderElement.getCode()));
} catch (DuplicateAdvanceAssignmentForOrderElementException e) {
throw new ValidationException(
_("Duplicate advance assignment for order element "
_("Duplicate advance assignment for task "
+ orderElement.getCode()));
}
}
@ -842,4 +842,4 @@ public final class OrderElementConverter {
.getValue());
}
}
}

10
navalplanner-webapp/src/main/java/org/navalplanner/ws/subcontract/impl/SubcontractServiceREST.java
View file

@ -151,7 +151,7 @@ public class SubcontractServiceREST implements ISubcontractService {
final OrderElementDTO orderElementDTO = subcontractedTask.orderElementDTO;
if (orderElementDTO == null) {
throw new ViolationError(subcontractedTask.subcontractedCode,
"order element not specified");
"task not specified");
}
try {
adHocTransactionService
@ -199,7 +199,7 @@ public class SubcontractServiceREST implements ISubcontractService {
String code = entitySequenceDAO.getNextEntityCode(EntityNameEnum.ORDER);
if (code == null) {
throw new ViolationError(subcontractedTaskDataDTO.orderElementDTO.code,
"unable to generate the code for the new order, please try again later");
"unable to generate the code for the new project, please try again later");
}
order.setCode(code);
@ -236,7 +236,7 @@ public class SubcontractServiceREST implements ISubcontractService {
order.generateOrderElementCodes(numberOfDigits);
} catch (NonUniqueResultException e) {
throw new ViolationError("",
"There are several active order sequences");
"There are several active project sequences");
} catch (InstanceNotFoundException e) {
throw new ViolationError("",
"It does not exist any activated code sequence.");
@ -254,7 +254,7 @@ public class SubcontractServiceREST implements ISubcontractService {
order.useSchedulingDataFor(version);
order.add(orderElement);
order.setName(_("Order from client"));
order.setName(_("Project from client"));
order.setInitDate(orderElement.getInitDate());
order.setDeadline(orderElement.getDeadline());
order.setCalendar(getDefaultCalendar());
@ -284,4 +284,4 @@ public class SubcontractServiceREST implements ISubcontractService {
Util.generateInstanceId(1, code), message);
}
}
}

8
navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java
View file

@ -92,7 +92,7 @@ public final class WorkReportConverter {
} catch (InstanceNotFoundException e) {
workReport.setOrderElement(null);
throw new ValidationException(
_("There is no order element with this code"));
_("There is no task with this code"));
}
}
@ -164,7 +164,7 @@ public final class WorkReportConverter {
} catch (InstanceNotFoundException e) {
workReportLine.setOrderElement(null);
throw new ValidationException(
_("There is no order element with this code"));
_("There is no task with this code"));
}
}
@ -459,7 +459,7 @@ public final class WorkReportConverter {
workReport.setOrderElement(orderElement);
} catch (InstanceNotFoundException e) {
throw new ValidationException(
_("There is no order element with this code"));
_("There is no task with this code"));
}
}
}
@ -522,7 +522,7 @@ public final class WorkReportConverter {
workReportLine.setOrderElement(orderElement);
} catch (InstanceNotFoundException e) {
throw new ValidationException(
_("There is no order element with this code"));
_("There is no task with this code"));
}
/* Step 3.4: Update the type of work hours. */

2
navalplanner-webapp/src/main/webapp/common/configuration.zul
View file

@ -153,7 +153,7 @@
checked="@{configurationController.expandCompanyPlanningViewCharts}"
onCheck="configurationController.reloadGeneralConfiguration();" />
<checkbox
label="${i18n:_('Order view')}"
label="${i18n:_('Project view')}"
checked="@{configurationController.expandOrderPlanningViewCharts}"
onCheck="configurationController.reloadGeneralConfiguration();" />
</row>

2
navalplanner-webapp/src/main/webapp/limitingresources/limitingResourcesLayout.zul
View file

@ -130,7 +130,7 @@
tooltiptext="Select/deselect all"/>
</hbox>
</newdatasortablecolumn>
<newdatasortablecolumn label="${i18n:_('Order')}" sort="auto(lower(orderName))"/>
<newdatasortablecolumn label="${i18n:_('Project')}" sort="auto(lower(orderName))"/>
<newdatasortablecolumn label="${i18n:_('Task')}" sort="auto(lower(taskName))"/>
<newdatasortablecolumn label="${i18n:_('Resource / Criteria')}" sort="auto(resourceOrCriteria)"/>
<newdatasortablecolumn label="${i18n:_('Earlier starting date')}" sort="auto(date)"/>

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

@ -30,7 +30,7 @@
macroURI="/orders/components/_listOrderElementMaterials.zul"?>
<?component name="listOrderElementTaskQualityForms" inline="true" macroURI="_listOrderElementTaskQualityForms.zul"?>
<window id="${arg.top_id}" title="@{i18n:_('Edit order element')}"
<window id="${arg.top_id}" title="@{i18n:_('Edit task')}"
width="950px" left="50px" top="50px"
closable="true" visible="false">

4
navalplanner-webapp/src/main/webapp/orders/_list.zul
View file

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<window id="${arg.top_id}" title="${i18n:_('Orders list')}">
<window id="${arg.top_id}" title="${i18n:_('Projects list')}">
<grid id="listing" model="@{controller.orders}" mold="paging"
pageSize="10" fixedLayout="true"
rowRenderer= "@{controller.ordersRowRender}"
@ -36,4 +36,4 @@
</columns>
</grid>
</window>
</window>

4
navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul
View file

@ -107,7 +107,7 @@
<separator bar="false" spacing="80px" orient="vertical"/>
<!-- Total hours order element -->
<panel title="${i18n:_('Total hours order element')}"
<panel title="${i18n:_('Total hours task')}"
style="overflow:auto" >
<panelchildren>
<grid fixedLayout="true">
@ -118,7 +118,7 @@
<rows>
<row>
<label
value="${i18n:_('Total hours order element')}:" />
value="${i18n:_('Total hours task')}:" />
<hbox align="center">
<intbox id="orderElementTotalHours"
visible="@{criterionRequirementsController.editableHoursGroup}"

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

@ -56,7 +56,7 @@
</row>
<row>
<label
value="${i18n:_('Sum of all order line elements imputed hours')}" />
value="${i18n:_('Sum of all task leafs imputed hours')}" />
<label id="totalIDC"
value="@{assignedHoursToOrderElementController.hoursChildren}" />
</row>

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

@ -28,7 +28,7 @@
</columns>
<rows>
<row>
<label value="${i18n:_('Order element name')}" />
<label value="${i18n:_('Task name')}" />
<textbox id="name"
value="@{detailsController.orderElement.name}"
constraint="no empty:${i18n:_('Cannot be empty or null')}" width="500px" />

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

@ -33,6 +33,6 @@
<textbox id="filterNameOrderElement" width="50px"
onOK="treeController.onApplyFilter()" />
<button image="/common/img/ico_filter.png" style="margin-top: -4px"
tooltiptext="${i18n:_('Apply filtering to order elements satisfying required criteria')}"
tooltiptext="${i18n:_('Apply filtering to tasks satisfying required criteria')}"
onClick="treeController.onApplyFilter()"/>
</hbox>

4
navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul
View file

@ -29,8 +29,8 @@
<datebox id="filterFinishDate" constraint = "@{orderFilterController.checkConstraintFinishDate}"/>
<label value="${i18n:_('sub elements')}"/>
<checkbox id="checkIncludeOrderElements"
tooltiptext="${i18n:_('Apply filtering to order elements satisfying required criteria')}" />
tooltiptext="${i18n:_('Apply filtering to tasks satisfying required criteria')}" />
<button image="/common/img/ico_filter.png" style="margin-top: -4px"
tooltiptext="${i18n:_('Apply filtering to order elements satisfying required criteria')}"
tooltiptext="${i18n:_('Apply filtering to tasks satisfying required criteria')}"
onClick="orderFilterController.onApplyFilter()"/>
</hbox>

6
navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul
View file

@ -30,7 +30,7 @@
<templateFinderPopup id="templateFinderPopup" acceptButtonLabel="${i18n:_('Create Order')}" caption="${i18n:_('Choosing Template')}" />
<button id="createOrderButton" image="/common/img/ico_add.png" sclass="planner-icon"
tooltiptext="${i18n:_('Create new order')}" onClick="controller.goToCreateForm()"
tooltiptext="${i18n:_('Create New Project')}" onClick="controller.goToCreateForm()"
visible="false" />
<button id="createOrderFromTemplateButton" image="/common/img/ico_copy.png" sclass="planner-icon"
@ -38,7 +38,7 @@
visible="false" />
<button id="saveOrderAndContinueButton" image="/common/img/ico_save.png" sclass="planner-icon"
tooltiptext="${i18n:_('Save Order')}" onClick="controller.saveAndContinue();" />
tooltiptext="${i18n:_('Save Project')}" onClick="controller.saveAndContinue();" />
<hbox id="orderFilter" visible="false"/>
<vbox id="orderElementFilter" />
@ -52,4 +52,4 @@
</div>
</center>
</borderlayout>
</zk>
</zk>

18
navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul
View file

@ -27,8 +27,8 @@
<hbox valign="pack" style="margin-bottom:4px;" width="100%">
<hbox valign="pack">
<templateFinderPopup id="templateFinderPopupAtTree" acceptButtonLabel="${i18n:_('Create Order Element')}" caption="${i18n:_('Choosing Template')}" />
<label value="${i18n:_('New order element:')}" />
<templateFinderPopup id="templateFinderPopupAtTree" acceptButtonLabel="${i18n:_('Create Task')}" caption="${i18n:_('Choosing Template')}" />
<label value="${i18n:_('New task:')}" />
<textbox value="" id="newOrderElementName" width="150px"
onOK="treeController.addElement(self.parent);" disabled="true" />
<label value="${i18n:_('Hours:')}" />
@ -43,31 +43,31 @@
</hbox><hbox style="float:right" valign="pack">
<label value="${i18n:_('Selected node:')}" />
<button id="editOrderElementButton" sclass="icono" image="/common/img/ico_editar1.png"
tooltiptext="${i18n:_('Edit selected order element')}"
tooltiptext="${i18n:_('Edit selected task')}"
onClick="treeController.editSelectedOrderElement();" />
<button id="createTemplateButton" sclass="icono" image="/common/img/ico_derived1.png"
hoverImage="/common/img/ico_derived.png"
tooltiptext="${i18n:_('Create template from selected order element')}"
tooltiptext="${i18n:_('Create template from selected task')}"
onClick="treeController.createTemplateFromSelectedOrderElement();" />
<button id="downButton" sclass="icono" image="/common/img/ico_bajar1.png"
hoverImage="/common/img/ico_bajar.png"
tooltiptext="${i18n:_('Move selected order element down')}"
tooltiptext="${i18n:_('Move selected task down')}"
onClick="treeController.moveSelectedOrderElementDown();" />
<button id="upButton" sclass="icono" image="/common/img/ico_subir1.png"
hoverImage="/common/img/ico_subir.png"
tooltiptext="${i18n:_('Move selected order element up')}"
tooltiptext="${i18n:_('Move selected task up')}"
onClick="treeController.moveSelectedOrderElementUp();" />
<button id="leftButton" sclass="icono" image="/common/img/ico_izq1.png"
hoverImage="/common/img/ico_izq.png"
tooltiptext="${i18n:_('Unindent selected order element')}"
tooltiptext="${i18n:_('Unindent selected task')}"
onClick="treeController.unindentSelectedOrderElement();" />
<button id="rightButton" sclass="icono" image="/common/img/ico_derecha1.png"
hoverImage="/common/img/ico_derecha.png"
tooltiptext="${i18n:_('Indent selected order element')}"
tooltiptext="${i18n:_('Indent selected task')}"
onClick="treeController.indentSelectedOrderElement();" />
<button id="deleteOrderElementButton" sclass="icono" image="/common/img/ico_borrar1.png"
hoverImage="/common/img/ico_borrar.png"
tooltiptext="${i18n:_('Delete selected order element')}"
tooltiptext="${i18n:_('Delete selected task')}"
onClick="treeController.deleteSelectedOrderElement();" />
</hbox></hbox>
<vbox width="100%">

6
navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul
View file

@ -28,7 +28,7 @@
<n:label>${i18n:_('External overload')}</n:label>
</hbox>
<hbox pack="center" sclass="legend-row" tooltiptext="${i18n:_('Overload due to current order')}">
<hbox pack="center" sclass="legend-row" tooltiptext="${i18n:_('Overload due to current project')}">
<n:div class="overload-order"/>
<n:label>${i18n:_('Overload')}</n:label>
</hbox>
@ -43,11 +43,11 @@
<n:label>${i18n:_('External load')}</n:label>
</hbox>
<hbox pack="center" sclass="legend-row" tooltiptext="${i18n:_('Load due to current order')}">
<hbox pack="center" sclass="legend-row" tooltiptext="${i18n:_('Load due to current project')}">
<n:div class="other" />
<n:label>${i18n:_('Load')}</n:label>
</hbox>
</vbox>
</zk>
</zk>

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

@ -38,7 +38,7 @@
<tabpanels>
<tabpanel>
<!-- Order element information -->
<panel title="${i18n:_('Order Element Information')}:" border="normal">
<panel title="${i18n:_('Task Information')}:" border="normal">
<panelchildren>
<grid id="gridLimitingOrderElementHours">

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

@ -38,7 +38,7 @@
<tabpanel>
<hbox align="end">
<groupbox closable="false" height="170px">
<caption label="${i18n:_('Order Element Information')}" />
<caption label="${i18n:_('Task Information')}" />
<vbox align="center">
<grid id="orderElementHoursGrid">
<columns>

4
navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul
View file

@ -61,11 +61,11 @@
</panel>
<!-- Select orders -->
<panel title="${i18n:_('Filter by orders')}"
<panel title="${i18n:_('Filter by projects')}"
border="normal"
style="overflow:auto">
<panelchildren>
<label value="${i18n:_('OrderElement Code')}:" />
<label value="${i18n:_('Project Code')}:" />
<bandboxSearch id="bandboxSelectOrder"
finder="OrderBandboxFinder"
model="@{controller.orders}"

2
navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul
View file

@ -72,7 +72,7 @@
</panel>
<!-- Select orders -->
<panel title="${i18n:_('Filter by orders')}"
<panel title="${i18n:_('Filter by projects')}"
border="normal"
style="overflow:auto">
<panelchildren>

2
navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul
View file

@ -97,7 +97,7 @@
</panel>
<!-- Select orders -->
<panel title="${i18n:_('Filter by orders')}"
<panel title="${i18n:_('Filter by projects')}"
border="normal"
style="overflow:auto">
<panelchildren>

2
navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul
View file

@ -76,7 +76,7 @@
</panel>
<!-- Select orders -->
<panel title="${i18n:_('Filter by orders')}"
<panel title="${i18n:_('Filter by projects')}"
border="normal"
style="overflow:auto">
<panelchildren>

4
navalplanner-webapp/src/main/webapp/reports/workingArrangementsPerOrderReport.zul
View file

@ -42,11 +42,11 @@
border="normal" >
<!-- Select orders -->
<panel title="${i18n:_('Filter by orders')}"
<panel title="${i18n:_('Filter by projects')}"
border="normal"
style="overflow:auto">
<panelchildren>
<label value="${i18n:_('OrderElement Code')}:" />
<label value="${i18n:_('Task Code')}:" />
<bandboxSearch id="bdOrder"
finder="OrderBandboxFinder"
model="@{controller.allOrders}"

4
navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul
View file

@ -61,11 +61,11 @@
</panel>
<!-- Select orders -->
<panel title="${i18n:_('Filter by orders')}"
<panel title="${i18n:_('Filter by projects')}"
border="normal"
style="overflow:auto">
<panelchildren>
<label value="${i18n:_('OrderElement Code')}:" />
<label value="${i18n:_('Task Code')}:" />
<bandboxSearch id="bandboxSelectOrder"
finder="OrderBandboxFinder"
model="@{controller.orders}"

4
navalplanner-webapp/src/main/webapp/scenarios/_edition.zul
View file

@ -42,7 +42,7 @@
rows="5" width="300px" />
</row>
<row>
<label value="${i18n:_('Orders')}" />
<label value="${i18n:_('Projects')}" />
<listbox model="@{scenarioController.orders}">
<listhead>
<listheader label="${i18n:_('Code')}" />
@ -67,4 +67,4 @@
sclass="cancel-button global-action" />
</hbox>
</window>
</window>

2
navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul
View file

@ -39,7 +39,7 @@
rowRenderer="@{controller.reportAdvancesOrderRenderer}"
mold="paging" pageSize="10" fixedLayout="true">
<columns>
<column label="${i18n:_('Order code')}"/>
<column label="${i18n:_('Project code')}"/>
<column label="${i18n:_('Customer reference code')}"/>
<column label="${i18n:_('Name')}"/>
<column label="${i18n:_('Date last advance reported')}"/>

2
navalplanner-webapp/src/main/webapp/subcontract/subcontractedTasks.zul
View file

@ -44,7 +44,7 @@
<column label="${i18n:_('Communication')}" sort="auto(communicationdate)"
tooltiptext="${i18n:_('Communication date')}" />
<column label="${i18n:_('Company')}" tooltiptext="${i18n:_('External company')}" sort="auto(externalcompany)" />
<column label="${i18n:_('Order code')}" tooltiptext="${i18n:_('Order code')}" />
<column label="${i18n:_('Project code')}" tooltiptext="${i18n:_('Project code')}" />
<column label="${i18n:_('Subcontracted code')}" tooltiptext="${i18n:_('Subcontracted code')}" />
<column label="${i18n:_('Task name')}" tooltiptext="${i18n:_('Task name')}" />
<column label="${i18n:_('Description')}" tooltiptext="${i18n:_('Work description')}" />

2
navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul
View file

@ -38,7 +38,7 @@
class="org.navalplanner.web.templates.quality.QualityFormAssignerComponent"
macroURI="/templates/_assignedQualityForms.zul" ?>
<window id="editTemplateWindow" title="${i18n:_('Edit order element')}"
<window id="editTemplateWindow" title="${i18n:_('Edit task')}"
width="950px" left="50px" top="50px"
closable="true" onClose="self.visible = false; event.stopPropagation()"
visible="false" >

8
navalplanner-webapp/src/main/webapp/templates/_historicalAssignment.zul
View file

@ -31,9 +31,9 @@
<grid height="200px" fixedLayout="true"
model="@{historicalAssignment.orderElementsWithThisAssignedTemplate}">
<columns>
<column label="${i18n:_('Order code')}" sort="orderCode" sortDirection="descending"/>
<column label="${i18n:_('Order Name')}" width="250px" sort="auto(name)" sortDirection="descending"/>
<column label="${i18n:_('Order element code')}" sort="auto(name)" sortDirection="descending"/>
<column label="${i18n:_('Project code')}" sort="orderCode" sortDirection="descending"/>
<column label="${i18n:_('Project Name')}" width="250px" sort="auto(name)" sortDirection="descending"/>
<column label="${i18n:_('Project element code')}" sort="auto(name)" sortDirection="descending"/>
<column label="${i18n:_('Estimated hours')}" />
<column label="${i18n:_('worked hours')}" />
<column label="${i18n:_('Operations')}" align="center" width="100px" />
@ -54,4 +54,4 @@
</panel>
</vbox>
</vbox>
</zk>
</zk>

4
navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul
View file

@ -87,7 +87,7 @@
</hbox>
</row>
<row>
<label value="${i18n:_('Order Element')}:" />
<label value="${i18n:_('Task')}:" />
<hbox>
<listbox visible = "@{controller.editable}"
id="listOrderElementPosition" mold="select"
@ -187,4 +187,4 @@
label="${i18n:_('Close')}"
sclass="cancel-button global-action"/>
</window>
</window>

2
navalplanner-webapp/src/main/webapp/workreports/workReport.zul
View file

@ -165,7 +165,7 @@
selectedItem="@{controller.workReport.resource}"/>
</row>
<row visible = "@{controller.workReport.workReportType.orderElementIsSharedInLines}">
<label value="${i18n:_('OrderElement Code')}:" />
<label value="${i18n:_('Task Code')}:" />
<bandboxSearch id="bandboxSelectOrderElementInHead"
finder="OrderElementBandboxFinder"
model="@{controller.orderElements}"

6
navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul
View file

@ -41,7 +41,7 @@
<label value="${i18n:_('Resource :')}"/>
<autocomplete id="filterResource" buttonVisible="true"
finder="ResourceFinder"/>
<label value="${i18n:_('order element :')}"/>
<label value="${i18n:_('task :')}"/>
<bandboxSearch id="bandboxFilterOrderElement" widthBandbox="285px" widthListbox="700px"
finder="OrderElementBandboxFinder" model="@{controller.orderElements}"/>
<label value="${i18n:_('from')}"/>
@ -67,7 +67,7 @@
<column id="date" label="${i18n:_('Date')}" width="200px" align="center"
sort="auto(date)" sortDirection="ascending"/>
<column label="${i18n:_('Resource')}" width="200px" align="center"/>
<column label="${i18n:_('Order Element Code')}" width="200px" align="center"/>
<column label="${i18n:_('Task Code')}" width="200px" align="center"/>
<column label="${i18n:_('Start hour')}" width="80px" align="center"/>
<column label="${i18n:_('Finish hour')}" width="80px" align="center"/>
<column label="${i18n:_('Hours')}" width="80px" align="center"/>
@ -123,7 +123,7 @@
selectedItem="@{controller.workReport.resource}"/>
</row>
<row visible = "@{controller.workReport.workReportType.orderElementIsSharedInLines}">
<label value="${i18n:_('OrderElement Code')}:" />
<label value="${i18n:_('Task Code')}:" />
<bandboxSearch id="bandboxSelectOrderElementInHead"
finder="OrderElementBandboxFinder"
model="@{controller.orderElements}"