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

ItEr37S06ValidacionEProbasFuncionaisItEr36S07: Fix with configuration unit criterion requirement combobox

Browse source
This commit is contained in:
Lorenzo Tilve 2009-12-06 20:45:01 +01:00 • committed by Javier Moran Rua
parent ae9048e5fe
commit a4cf5ec392
9 changed files with 65 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java
View file

@ -56,6 +56,13 @@ public class AssignedMachineCriterionsModel implements IAssignedMachineCriterion
applicableResources.add(ResourceEnum.MACHINE);
}
private static List<ResourceEnum> applicableWorkerResources = new ArrayList<ResourceEnum>();
static {
applicableWorkerResources.add(ResourceEnum.RESOURCE);
applicableWorkerResources.add(ResourceEnum.WORKER);
}
@Override
@Transactional(readOnly = true)
public void prepareForEdit(Resource resource) {
@ -180,12 +187,31 @@ public class AssignedMachineCriterionsModel implements IAssignedMachineCriterion
return criterionsWithItsTypes;
}
@Override
@Transactional(readOnly = true)
public List<CriterionWithItsType> getCriterionWorkersWithItsType() {
criterionsWithItsTypes = new ArrayList<CriterionWithItsType>();
List<CriterionType> listTypes = getCriterionWorkersTypes();
for (CriterionType criterionType : listTypes) {
Set<Criterion> listCriterion = getDirectCriterions(criterionType);
getCriterionWithItsType(criterionType, listCriterion);
}
return criterionsWithItsTypes;
}
@Transactional(readOnly = true)
private List<CriterionType> getCriterionTypes() {
return criterionTypeDAO
.getCriterionTypesByResources(applicableResources);
}
@Transactional(readOnly = true)
private List<CriterionType> getCriterionWorkersTypes() {
return criterionTypeDAO
.getCriterionTypesByResources(applicableWorkerResources);
}
private void getCriterionWithItsType(CriterionType type,
Set<Criterion> children) {
for (Criterion criterion : children) {

3
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/IAssignedMachineCriterionsModel.java
View file

@ -48,6 +48,8 @@ public interface IAssignedMachineCriterionsModel {
List<CriterionWithItsType> getCriterionWithItsType();
List<CriterionWithItsType> getCriterionWorkersWithItsType();
Set<CriterionSatisfactionDTO> getFilterCriterionSatisfactions();
void prepareForEdit(Resource resource);
@ -67,4 +69,5 @@ public interface IAssignedMachineCriterionsModel {
void validate() throws ValidationException, IllegalStateException;
void confirm() throws ValidationException, IllegalStateException;
}

8
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineConfigurationController.java
View file

@ -22,22 +22,30 @@ package org.navalplanner.web.resources.machine;
import static org.navalplanner.web.I18nHelper._;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
import org.navalplanner.business.resources.daos.ICriterionTypeDAO;
import org.navalplanner.business.resources.entities.Criterion;
import org.navalplanner.business.resources.entities.CriterionType;
import org.navalplanner.business.resources.entities.CriterionWithItsType;
import org.navalplanner.business.resources.entities.MachineWorkerAssignment;
import org.navalplanner.business.resources.entities.MachineWorkersConfigurationUnit;
import org.navalplanner.business.resources.entities.ResourceEnum;
import org.navalplanner.business.resources.entities.Worker;
import org.navalplanner.web.common.IMessagesForUser;
import org.navalplanner.web.common.Level;
import org.navalplanner.web.common.MessagesForUser;
import org.navalplanner.web.common.Util;
import org.navalplanner.web.common.components.Autocomplete;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.WrongValueException;
import org.zkoss.zk.ui.util.GenericForwardComposer;

6
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java
View file

@ -164,6 +164,12 @@ public class AssignedCriterionsModel implements IAssignedCriterionsModel {
return criterionsWithItsTypes;
}
@Override
@Transactional(readOnly = true)
public List<CriterionWithItsType> getCriterionWorkersWithItsType() {
return getCriterionWithItsType();
}
private List<CriterionType> getCriterionTypes() {
return criterionTypeDAO
.getCriterionTypesByResources(applicableResources);

4
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java
View file

@ -97,6 +97,10 @@ public class CriterionsController extends GenericForwardComposer {
return assignedCriterionsModel.getCriterionWithItsType();
}
public List<CriterionWithItsType> getCriterionWorkersWithItsTypes() {
return assignedCriterionsModel.getCriterionWorkersWithItsType();
}
public void reload() {
Util.reloadBindings(listingCriterions);
forceSortGridSatisfaction();

5
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java
View file

@ -91,6 +91,11 @@ public class CriterionsMachineController extends GenericForwardComposer {
return assignedMachineCriterionsModel.getCriterionWithItsType();
}
public List<CriterionWithItsType> getCriterionWorkersWithItsTypes() {
// othermodel
return assignedMachineCriterionsModel.getCriterionWorkersWithItsType();
}
public void reload() {
Util.reloadBindings(listingCriterions);
}

3
navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/IAssignedCriterionsModel.java
View file

@ -7,6 +7,7 @@ package org.navalplanner.web.resources.worker;
import java.util.List;
import java.util.Set;
import org.navalplanner.business.common.exceptions.ValidationException;
import org.navalplanner.business.resources.entities.CriterionWithItsType;
import org.navalplanner.business.resources.entities.Worker;
@ -45,4 +46,6 @@ public interface IAssignedCriterionsModel {
public boolean checkNotAllowSimultaneousCriterionsPerResource(
CriterionSatisfactionDTO satisfaction);
List<CriterionWithItsType> getCriterionWorkersWithItsType();
}

8
navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css
View file

@ -945,3 +945,11 @@ tr.z-tree-row-seld, tr.z-list-item-seld,
.earned-parameter-column {
width: 70px;
}
.z-panel-header {
/* color: #0F3B82; */
}
.z-panel-body {
padding: 10px;
/* border-color: #0F3B82; */
}

4
navalplanner-webapp/src/main/webapp/resources/machine/_machineConfigurationUnits.zul
View file

@ -83,7 +83,7 @@
<bandbox value = "@{criterionSatisfactionDTO.criterionAndType}" width="300px">
<bandpopup>
<listbox width="500px" height="150px" fixedLayout="true"
model="@{assignedCriterionsController.criterionWithItsTypes}"
model="@{assignedCriterionsController.criterionWorkersWithItsTypes}"
onSelect="configurationController.selectCriterionRequirement(self.selectedItem,self.parent.parent)">
<listhead>
<listheader label="Type" />
@ -134,4 +134,4 @@
</row>
</rows>
</grid>
</vbox>
</vbox>