[Bug #845] Fix bug
Make uniform the layout of assigned criteria tab for machines. FEA : ItEr70S04BugFixing
This commit is contained in:
Susana Montes Pedreira
parent
c832553c9c
commit
ef893e3b5b
9 changed files with 48 additions and 200 deletions
|
|
@ -185,14 +185,7 @@ public class CriterionsController extends GenericForwardComposer {
|
|||
}
|
||||
}
|
||||
|
||||
public void changeStartDate(Component comp,Date value){
|
||||
CriterionSatisfactionDTO criterionSatisfactionDTO =
|
||||
(CriterionSatisfactionDTO)((Row) comp.getParent()).getValue();
|
||||
validateCriterionWithItsType(criterionSatisfactionDTO,comp);
|
||||
reload();
|
||||
}
|
||||
|
||||
public void changeEndDate(Component comp,Date value){
|
||||
public void changeDate(Component comp) {
|
||||
CriterionSatisfactionDTO criterionSatisfactionDTO =
|
||||
(CriterionSatisfactionDTO)((Row) comp.getParent()).getValue();
|
||||
validateCriterionWithItsType(criterionSatisfactionDTO,comp);
|
||||
|
|
@ -236,7 +229,6 @@ public class CriterionsController extends GenericForwardComposer {
|
|||
};
|
||||
}
|
||||
|
||||
|
||||
private void validateEndDate(Component comp, Object value){
|
||||
CriterionSatisfactionDTO criterionSatisfactionDTO =
|
||||
(CriterionSatisfactionDTO)((Row) comp.getParent()).getValue();
|
||||
|
|
|
|||
|
|
@ -52,9 +52,8 @@ import org.zkoss.zk.ui.event.KeyEvent;
|
|||
import org.zkoss.zk.ui.event.MouseEvent;
|
||||
import org.zkoss.zk.ui.util.GenericForwardComposer;
|
||||
import org.zkoss.zul.Bandbox;
|
||||
import org.zkoss.zul.Checkbox;
|
||||
import org.zkoss.zul.Column;
|
||||
import org.zkoss.zul.Combobox;
|
||||
import org.zkoss.zul.Comboitem;
|
||||
import org.zkoss.zul.Constraint;
|
||||
import org.zkoss.zul.Datebox;
|
||||
import org.zkoss.zul.Grid;
|
||||
|
|
@ -75,14 +74,14 @@ public class CriterionsMachineController extends GenericForwardComposer {
|
|||
|
||||
private IAssignedMachineCriterionsModel assignedMachineCriterionsModel;
|
||||
|
||||
private Combobox comboboxFilter;
|
||||
|
||||
private Grid listingCriterions;
|
||||
|
||||
private IMessagesForUser messages;
|
||||
|
||||
private Component messagesContainer;
|
||||
|
||||
private Checkbox criterionFilterCheckbox;
|
||||
|
||||
public CriterionsMachineController() {
|
||||
|
||||
}
|
||||
|
|
@ -105,12 +104,15 @@ public class CriterionsMachineController extends GenericForwardComposer {
|
|||
}
|
||||
|
||||
public List<CriterionSatisfactionDTO> getCriterionSatisfactionDTOs() {
|
||||
Comboitem comboitem = comboboxFilter.getSelectedItem();
|
||||
if((comboitem != null) && (comboitem.getLabel().equals("in force"))) {
|
||||
return assignedMachineCriterionsModel
|
||||
.getFilterCriterionSatisfactions();
|
||||
}
|
||||
return assignedMachineCriterionsModel.getAllCriterionSatisfactions();
|
||||
List<CriterionSatisfactionDTO> list = new ArrayList<CriterionSatisfactionDTO>();
|
||||
if (criterionFilterCheckbox.isChecked()) {
|
||||
list.addAll(assignedMachineCriterionsModel
|
||||
.getFilterCriterionSatisfactions());
|
||||
} else {
|
||||
list.addAll(assignedMachineCriterionsModel
|
||||
.getAllCriterionSatisfactions());
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
public void addCriterionSatisfaction() {
|
||||
|
|
@ -186,7 +188,7 @@ public class CriterionsMachineController extends GenericForwardComposer {
|
|||
}
|
||||
}
|
||||
|
||||
public void changeDate(Component comp){
|
||||
public void changeDate(Component comp) {
|
||||
CriterionSatisfactionDTO criterionSatisfactionDTO =
|
||||
(CriterionSatisfactionDTO)((Row) comp.getParent()).getValue();
|
||||
validateCriterionWithItsType(criterionSatisfactionDTO,comp);
|
||||
|
|
@ -230,6 +232,9 @@ public class CriterionsMachineController extends GenericForwardComposer {
|
|||
private void validateStartDate(Component comp, Object value) {
|
||||
CriterionSatisfactionDTO criterionSatisfactionDTO = (CriterionSatisfactionDTO) ((Row) comp
|
||||
.getParent()).getValue();
|
||||
if (value == null) {
|
||||
throw new WrongValueException(comp, _("Start date cannot be null"));
|
||||
}
|
||||
if (!criterionSatisfactionDTO.isLessToEndDate((Date) value)) {
|
||||
throw new WrongValueException(
|
||||
comp,
|
||||
|
|
|
|||
|
|
@ -74,11 +74,10 @@ msgstr "existen múltiples calendarios de recursos con el nombre {0}"
|
|||
#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:38
|
||||
#: navalplanner-webapp/src/main/webapp/templates/_list.zul:33
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:43
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:43
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:36
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:39
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:45
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:107
|
||||
|
|
@ -130,10 +129,6 @@ msgstr "existen múltiples calendarios de recursos con el nombre {0}"
|
|||
msgid "Operations"
|
||||
msgstr "Operaciones"
|
||||
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:29
|
||||
msgid "Add criterion"
|
||||
msgstr "Añadir criterio"
|
||||
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:134
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:194
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:149
|
||||
|
|
@ -434,8 +429,7 @@ msgstr "Para interpolar se necesitan al menos dos tramos"
|
|||
msgid "Login name"
|
||||
msgstr "Nombre de usuario"
|
||||
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:43
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:34
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:43
|
||||
msgid "Current"
|
||||
msgstr "Actual"
|
||||
|
||||
|
|
@ -828,11 +822,10 @@ msgstr "Es necesario un MessagesContainer"
|
|||
msgid "Project element code"
|
||||
msgstr "Código de la tarea"
|
||||
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:41
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:41
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:68
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:43
|
||||
#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:60
|
||||
msgid "Ending date"
|
||||
msgstr "Fecha de fin"
|
||||
|
|
@ -2294,7 +2287,6 @@ msgstr "Trabajo realizado desde la fecha de inicio:"
|
|||
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:849
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:44
|
||||
#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:158
|
||||
#: navalplanner-webapp/src/main/webapp/orders/_list.zul:34
|
||||
#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:49
|
||||
|
|
@ -2366,7 +2358,6 @@ msgstr "Asignación de progreso"
|
|||
#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:181
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:204
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:439
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:33
|
||||
#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:26
|
||||
msgid "All"
|
||||
msgstr "Todo"
|
||||
|
|
@ -2883,8 +2874,7 @@ msgstr "el filtro ya existe"
|
|||
msgid "missing code in a calendar data version"
|
||||
msgstr "falta el código en los datos de versión de un calendario"
|
||||
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:39
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:41
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:39
|
||||
#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:45
|
||||
#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:26
|
||||
msgid "Criterion name"
|
||||
|
|
@ -5202,7 +5192,7 @@ msgstr ""
|
|||
"Otra tarea en la misma rama ya está informando de un progreso para este "
|
||||
"formulario de calidad"
|
||||
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:31
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:31
|
||||
msgid "Show only current satisfied criteria"
|
||||
msgstr "Mostrar solo los criterios satisfechos actualmente"
|
||||
|
||||
|
|
@ -5612,10 +5602,6 @@ msgstr "instancia no encontrada"
|
|||
msgid "criterion names must be unique inside a criterion type"
|
||||
msgstr "el nombre del criterio debe ser único dentro de un tipo de criterio"
|
||||
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:30
|
||||
msgid "Filters"
|
||||
msgstr "Filtros"
|
||||
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:78
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TemplateFinder.java:51
|
||||
|
|
@ -5786,7 +5772,7 @@ msgstr "Probabilidad %"
|
|||
msgid "This label type already is assigned to the work report type."
|
||||
msgstr "Este tipo de etiqueta ya está asignado al tipo de parte de trabajo."
|
||||
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:26
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:26
|
||||
#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:27
|
||||
msgid "New criterion"
|
||||
msgstr "Criterio nuevo"
|
||||
|
|
@ -5897,12 +5883,11 @@ msgstr "Compatible con navegadores Chrome, Firefox, Safari y Epiphany"
|
|||
msgid "Select the calendar"
|
||||
msgstr "Seleccionar el calendario"
|
||||
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:40
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:40
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:27
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:32
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:67
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:24
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:42
|
||||
#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:55
|
||||
#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:93
|
||||
#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:43
|
||||
|
|
@ -6203,7 +6188,7 @@ msgstr ""
|
|||
#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:149
|
||||
#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:76
|
||||
#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:113
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:28
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:28
|
||||
#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:29
|
||||
#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:84
|
||||
#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:126
|
||||
|
|
@ -6422,7 +6407,6 @@ msgid "Help on authentication (opens a new window)"
|
|||
msgstr "Ayuda sobre la identificación (abre una ventana nueva)"
|
||||
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:30
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:23
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:29
|
||||
msgid "Assigned criteria"
|
||||
msgstr "Criterios asignados"
|
||||
|
|
@ -6546,10 +6530,9 @@ msgstr "Precio total"
|
|||
#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:41
|
||||
#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:90
|
||||
#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:54
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:87
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:87
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:51
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:45
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:89
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:68
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:116
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:131
|
||||
|
|
|
|||
|
|
@ -72,11 +72,10 @@ msgstr "existen múltiples calendarios de recursos co nome {0}"
|
|||
#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:38
|
||||
#: navalplanner-webapp/src/main/webapp/templates/_list.zul:33
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:43
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:43
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:36
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:39
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:45
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:107
|
||||
|
|
@ -128,10 +127,6 @@ msgstr "existen múltiples calendarios de recursos co nome {0}"
|
|||
msgid "Operations"
|
||||
msgstr "Operacións"
|
||||
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:29
|
||||
msgid "Add criterion"
|
||||
msgstr "Engadir criterio"
|
||||
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:134
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:194
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:149
|
||||
|
|
@ -430,8 +425,7 @@ msgstr "Para a interpolación necesítanse alo menos dous tramos"
|
|||
msgid "Login name"
|
||||
msgstr "Nome de usuario"
|
||||
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:43
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:34
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:43
|
||||
msgid "Current"
|
||||
msgstr "Actual"
|
||||
|
||||
|
|
@ -821,11 +815,10 @@ msgstr "É necesario un MessagesContainer"
|
|||
msgid "Project element code"
|
||||
msgstr "Código da tarefa"
|
||||
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:41
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:41
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:68
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:43
|
||||
#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:60
|
||||
msgid "Ending date"
|
||||
msgstr "Data de fin"
|
||||
|
|
@ -2284,7 +2277,6 @@ msgstr "Traballo realizado desde a data de inicio:"
|
|||
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:849
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:44
|
||||
#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:158
|
||||
#: navalplanner-webapp/src/main/webapp/orders/_list.zul:34
|
||||
#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:49
|
||||
|
|
@ -2356,7 +2348,6 @@ msgstr "Asignacións de progreso"
|
|||
#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:181
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:204
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:439
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:33
|
||||
#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:26
|
||||
msgid "All"
|
||||
msgstr "Todo"
|
||||
|
|
@ -2869,8 +2860,7 @@ msgstr "o filtro xa existe"
|
|||
msgid "missing code in a calendar data version"
|
||||
msgstr "falta código nos datos de versión dun calendario"
|
||||
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:39
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:41
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:39
|
||||
#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:45
|
||||
#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:26
|
||||
msgid "Criterion name"
|
||||
|
|
@ -5183,7 +5173,7 @@ msgstr ""
|
|||
"Outra tarefa na mesma rama xa está informando dun progreso para este "
|
||||
"formulario de calidade"
|
||||
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:31
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:31
|
||||
msgid "Show only current satisfied criteria"
|
||||
msgstr "Mostrar só os criterios satisfeitos actualmente"
|
||||
|
||||
|
|
@ -5592,10 +5582,6 @@ msgstr "instancia non atopada"
|
|||
msgid "criterion names must be unique inside a criterion type"
|
||||
msgstr "o nome do criterio debe ser único dentro dun tipo de criterio"
|
||||
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:30
|
||||
msgid "Filters"
|
||||
msgstr "Filtros"
|
||||
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:78
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TemplateFinder.java:51
|
||||
|
|
@ -5766,7 +5752,7 @@ msgstr "Probabilidade %"
|
|||
msgid "This label type already is assigned to the work report type."
|
||||
msgstr "Este tipo de etiqueta xa está asignado ao tipo de parte de traballo."
|
||||
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:26
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:26
|
||||
#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:27
|
||||
msgid "New criterion"
|
||||
msgstr "Criterio novo"
|
||||
|
|
@ -5877,12 +5863,11 @@ msgstr "Compatible cos navegadores Chrome, Firefox, Safari e Epiphany"
|
|||
msgid "Select the calendar"
|
||||
msgstr "Seleccionar o calendario"
|
||||
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:40
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:40
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:27
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:32
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:67
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:24
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:42
|
||||
#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:55
|
||||
#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:93
|
||||
#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:43
|
||||
|
|
@ -6181,7 +6166,7 @@ msgstr ""
|
|||
#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:149
|
||||
#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:76
|
||||
#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:113
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:28
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:28
|
||||
#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:29
|
||||
#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:84
|
||||
#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:126
|
||||
|
|
@ -6400,7 +6385,6 @@ msgid "Help on authentication (opens a new window)"
|
|||
msgstr "Axuda sobre a identificación (abre unha ventana nova)"
|
||||
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:30
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:23
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:29
|
||||
msgid "Assigned criteria"
|
||||
msgstr "Criterios asignados"
|
||||
|
|
@ -6524,10 +6508,9 @@ msgstr "Prezo total"
|
|||
#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:41
|
||||
#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:90
|
||||
#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:54
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:87
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:87
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:51
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:45
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:89
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:68
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:116
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:131
|
||||
|
|
|
|||
|
|
@ -73,11 +73,10 @@ msgstr ""
|
|||
#: navalplanner-webapp/src/main/webapp/templates/_advances.zul:38
|
||||
#: navalplanner-webapp/src/main/webapp/templates/_list.zul:33
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_costCategoryAssignment.zul:37
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:43
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:43
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:36
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:30
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_list.zul:39
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:45
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:35
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:54
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:107
|
||||
|
|
@ -129,10 +128,6 @@ msgstr ""
|
|||
msgid "Operations"
|
||||
msgstr ""
|
||||
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:29
|
||||
msgid "Add criterion"
|
||||
msgstr ""
|
||||
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:134
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/ws/costcategories/impl/CostCategoryConverter.java:194
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/ws/workreports/impl/WorkReportConverter.java:149
|
||||
|
|
@ -423,8 +418,7 @@ msgstr ""
|
|||
msgid "Login name"
|
||||
msgstr ""
|
||||
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:43
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:34
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:43
|
||||
msgid "Current"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -798,11 +792,10 @@ msgstr ""
|
|||
msgid "Project element code"
|
||||
msgstr ""
|
||||
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:41
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:41
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:28
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:68
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:25
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:43
|
||||
#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:60
|
||||
msgid "Ending date"
|
||||
msgstr ""
|
||||
|
|
@ -2241,7 +2234,6 @@ msgstr ""
|
|||
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:849
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:44
|
||||
#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:158
|
||||
#: navalplanner-webapp/src/main/webapp/orders/_list.zul:34
|
||||
#: navalplanner-webapp/src/main/webapp/subcontract/reportAdvances.zul:49
|
||||
|
|
@ -2313,7 +2305,6 @@ msgstr ""
|
|||
#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java:181
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java:204
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadController.java:439
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:33
|
||||
#: navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskStatusEnum.java:26
|
||||
msgid "All"
|
||||
msgstr ""
|
||||
|
|
@ -2812,8 +2803,7 @@ msgstr ""
|
|||
msgid "missing code in a calendar data version"
|
||||
msgstr ""
|
||||
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:39
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:41
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:39
|
||||
#: navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul:45
|
||||
#: navalplanner-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul:26
|
||||
msgid "Criterion name"
|
||||
|
|
@ -5085,7 +5075,7 @@ msgid ""
|
|||
"quality form"
|
||||
msgstr ""
|
||||
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:31
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:31
|
||||
msgid "Show only current satisfied criteria"
|
||||
msgstr ""
|
||||
|
||||
|
|
@ -5478,10 +5468,6 @@ msgstr ""
|
|||
msgid "criterion names must be unique inside a criterion type"
|
||||
msgstr ""
|
||||
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:30
|
||||
msgid "Filters"
|
||||
msgstr ""
|
||||
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:78
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java:31
|
||||
#: navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TemplateFinder.java:51
|
||||
|
|
@ -5648,7 +5634,7 @@ msgstr ""
|
|||
msgid "This label type already is assigned to the work report type."
|
||||
msgstr ""
|
||||
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:26
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:26
|
||||
#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:27
|
||||
msgid "New criterion"
|
||||
msgstr ""
|
||||
|
|
@ -5759,12 +5745,11 @@ msgstr ""
|
|||
msgid "Select the calendar"
|
||||
msgstr ""
|
||||
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:40
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:40
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:27
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:32
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_localizations.zul:67
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_editWorkRelationship.zul:24
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:42
|
||||
#: navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul:55
|
||||
#: navalplanner-webapp/src/main/webapp/orders/_edition.zul:93
|
||||
#: navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul:43
|
||||
|
|
@ -6050,7 +6035,7 @@ msgstr ""
|
|||
#: navalplanner-webapp/src/main/java/org/navalplanner/web/tree/TreeComponent.java:149
|
||||
#: navalplanner-webapp/src/main/webapp/planner/_tabPanelLimitingResourceAllocation.zul:76
|
||||
#: navalplanner-webapp/src/main/webapp/planner/_tabPanelNonLimitingResourceAllocation.zul:113
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:28
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:28
|
||||
#: navalplanner-webapp/src/main/webapp/resources/criterions/_criterionsTree.zul:29
|
||||
#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:84
|
||||
#: navalplanner-webapp/src/main/webapp/reports/orderCostsPerResource.zul:126
|
||||
|
|
@ -6266,7 +6251,6 @@ msgid "Help on authentication (opens a new window)"
|
|||
msgstr ""
|
||||
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul:30
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:23
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_editMachine.zul:29
|
||||
msgid "Assigned criteria"
|
||||
msgstr ""
|
||||
|
|
@ -6390,10 +6374,9 @@ msgstr ""
|
|||
#: navalplanner-webapp/src/main/webapp/labels/_listLabelTypes.zul:41
|
||||
#: navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul:90
|
||||
#: navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul:54
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_criterions.zul:87
|
||||
#: navalplanner-webapp/src/main/webapp/resources/_criterions.zul:87
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_listVirtualWorkers.zul:51
|
||||
#: navalplanner-webapp/src/main/webapp/resources/worker/_workRelationships.zul:45
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul:89
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:68
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:116
|
||||
#: navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul:131
|
||||
|
|
|
|||
|
|
@ -75,11 +75,11 @@
|
|||
|
||||
<datebox value="@{criterionSatisfactionDTO.startDate}"
|
||||
constraint="@{assignedCriterionsController.validateStartDate}"
|
||||
onChange="assignedCriterionsController.changeStartDate(self,self.value);" width="150px"/>
|
||||
onChange="assignedCriterionsController.changeDate(self);" width="150px"/>
|
||||
|
||||
<datebox value="@{criterionSatisfactionDTO.endDate}"
|
||||
constraint="@{assignedCriterionsController.validateEndDate}"
|
||||
onChange="assignedCriterionsController.changeEndDate(self,self.value);" width="150px"/>
|
||||
onChange="assignedCriterionsController.changeDate(self);" width="150px"/>
|
||||
|
||||
<checkbox checked="@{criterionSatisfactionDTO.current}" disabled="true" />
|
||||
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
<?component name="criterions" inline="true" macroURI="_machineCriterions.zul"?>
|
||||
<?component name="criterions" inline="true" macroURI="../_criterions.zul"?>
|
||||
<?component name="resourceCalendar" inline="true" macroURI="_calendar.zul"?>
|
||||
<?component name="machineConfigurationUnits" inline="true" macroURI="_machineConfigurationUnits.zul"?>
|
||||
<?component name="costCategoryAssignment" inline="true" macroURI="../_costCategoryAssignment.zul"?>
|
||||
|
|
|
|||
|
|
@ -1,98 +0,0 @@
|
|||
<!--
|
||||
This file is part of NavalPlan
|
||||
|
||||
Copyright (C) 2009-2010 Fundación para o Fomento da Calidade Industrial e
|
||||
Desenvolvemento Tecnolóxico de Galicia
|
||||
Copyright (C) 2010-2011 Igalia, S.L.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU Affero General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU Affero General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Affero General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
<vbox id="criterionsContainer">
|
||||
<vbox id="messagesContainer"/>
|
||||
<panel title="${i18n:_('Assigned criteria')}" border="normal">
|
||||
<panelchildren>
|
||||
<hbox align="center">
|
||||
<separator bar="false" spacing="40px" orient="horizontal"/>
|
||||
<separator bar="false" spacing="20px" orient="vertical"/>
|
||||
<button onClick="assignedCriterionsController.addCriterionSatisfaction();"
|
||||
label="${i18n:_('Add criterion')}" />
|
||||
<label class="subtitulo" value="${i18n:_('Filters')}:" />
|
||||
<combobox id="comboboxFilter"
|
||||
onSelect="assignedCriterionsController.reload();">
|
||||
<comboitem label="${i18n:_('All')}" />
|
||||
<comboitem label="${i18n:_('Current')}" />
|
||||
</combobox>
|
||||
<separator bar="false" spacing="20px" orient="vertical"/>
|
||||
</hbox>
|
||||
<newdatasortablegrid id="listingCriterions" mold="paging" pageSize="10" fixedLayout="true"
|
||||
model="@{assignedCriterionsController.criterionSatisfactionDTOs}">
|
||||
<columns>
|
||||
<newdatasortablecolumn label="${i18n:_('Criterion name')}" sort="auto(criterionAndType)" sortDirection="ascending" />
|
||||
<newdatasortablecolumn label="${i18n:_('Starting date')}" sort="auto(startDate)" width="200px" align="center"/>
|
||||
<newdatasortablecolumn label="${i18n:_('Ending date')}" sort="auto(endDate)" width="200px" align="center"/>
|
||||
<newdatasortablecolumn label="${i18n:_('State')}" sort="auto(state)" width="70px" align="center"/>
|
||||
<newdatasortablecolumn label="${i18n:_('Operations')}" width="70px" align="center"/>
|
||||
</columns>
|
||||
<rows>
|
||||
<row self="@{each='criterionSatisfactionDTO'}" value="@{criterionSatisfactionDTO}">
|
||||
<hbox>
|
||||
<!-- Select criterion -->
|
||||
<bandbox onChanging = "assignedCriterionsController.onChangingText(event);"
|
||||
constraint="no empty" width="400px"
|
||||
visible="@{criterionSatisfactionDTO.newObject}"
|
||||
value = "@{criterionSatisfactionDTO.criterionAndType}"
|
||||
ctrlKeys="#down" onCtrlKey="assignedCriterionsController.onCtrlKey(event);">
|
||||
<bandpopup>
|
||||
<listbox width="500px" height="150px" fixedLayout="true"
|
||||
model="@{assignedCriterionsController.criterionWithItsTypes}"
|
||||
onSelect="assignedCriterionsController.selectCriterionAndType(self.selectedItem,
|
||||
self.parent.parent,self.parent.parent.parent.parent.value);"
|
||||
onOk="assignedCriterionsController.onOK(event);">
|
||||
<listhead>
|
||||
<listheader label="Type" />
|
||||
<listheader label="Criterion" />
|
||||
</listhead>
|
||||
<listitem self="@{each='criterionWithItsType'}" value="@{criterionWithItsType}"
|
||||
onClick="assignedCriterionsController.onClick(event);">
|
||||
<listcell label="@{criterionWithItsType.type.name}" />
|
||||
<listcell label="@{criterionWithItsType.nameHierarchy}" />
|
||||
</listitem>
|
||||
</listbox>
|
||||
</bandpopup>
|
||||
</bandbox>
|
||||
<label visible="@{criterionSatisfactionDTO.oldObject}"
|
||||
value="@{criterionSatisfactionDTO.criterionAndType}"/>
|
||||
</hbox>
|
||||
<datebox id="startDate" value="@{criterionSatisfactionDTO.startDate}"
|
||||
constraint="@{assignedCriterionsController.validateStartDate}"
|
||||
onChange="assignedCriterionsController.changeDate(self);" width="150px"/>
|
||||
|
||||
<datebox id="endDate" value="@{criterionSatisfactionDTO.endDate}"
|
||||
constraint="@{assignedCriterionsController.validateEndDate}"
|
||||
onChange="assignedCriterionsController.changeDate(self);" width="150px"/>
|
||||
|
||||
<label value="@{criterionSatisfactionDTO.state}"/>
|
||||
|
||||
<button sclass="icono" image="/common/img/ico_borrar1.png"
|
||||
hoverImage="/common/img/ico_borrar.png"
|
||||
tooltiptext="${i18n:_('Delete')}"
|
||||
onClick="assignedCriterionsController.remove(self.parent.value);">
|
||||
</button>
|
||||
</row>
|
||||
</rows>
|
||||
</newdatasortablegrid>
|
||||
</panelchildren>
|
||||
</panel>
|
||||
</vbox>
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
<?component name="localizations" inline="true" macroURI="_localizations.zul"?>
|
||||
<?component name="workRelationships" inline="true" macroURI="_workRelationships.zul"?>
|
||||
<?component name="resourceCalendar" inline="true" macroURI="_calendar.zul"?>
|
||||
<?component name="criterions" inline="true" macroURI="_criterions.zul"?>
|
||||
<?component name="criterions" inline="true" macroURI="../_criterions.zul"?>
|
||||
<?component name="costCategoryAssignment" inline="true" macroURI="../_costCategoryAssignment.zul"?>
|
||||
<window id="${arg.top_id}" title="${arg.title}">
|
||||
<tabbox>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue