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

ItEr44S11CUImportarTraballoRealizadoPorSubcontrataItEr43S14: Removed option to export criterion requirements from subcontracted tasks.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2010-01-21 11:45:39 +01:00 • committed by Javier Moran Rua
parent 0bdf1689d5
commit 5e21263dfe
3 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SubcontractedTaskData.java
View file

@ -58,7 +58,6 @@ public class SubcontractedTaskData extends BaseEntity {
result.labelsExported = subcontractedTaskData.labelsExported;
result.materialAssignmentsExported = subcontractedTaskData.materialAssignmentsExported;
result.hoursGroupsExported = subcontractedTaskData.hoursGroupsExported;
result.criterionRequirementsExported = subcontractedTaskData.criterionRequirementsExported;
return create(result);
}
@ -79,7 +78,6 @@ public class SubcontractedTaskData extends BaseEntity {
private Boolean labelsExported;
private Boolean materialAssignmentsExported;
private Boolean hoursGroupsExported;
private Boolean criterionRequirementsExported;
/**
* Constructor for hibernate. Do not use!
@ -187,21 +185,6 @@ public class SubcontractedTaskData extends BaseEntity {
this.hoursGroupsExported = hoursGroupsExported;
}
public Boolean isCriterionRequirementsExported() {
if (criterionRequirementsExported == null) {
return false;
}
return criterionRequirementsExported;
}
public void setCriterionRequirementsExported(
Boolean criterionRequirementsExported) {
if (criterionRequirementsExported == null) {
criterionRequirementsExported = false;
}
this.criterionRequirementsExported = criterionRequirementsExported;
}
@NotNull(message = "subcontratation date not specified")
public Date getSubcontratationDate() {
return subcontratationDate;
@ -218,7 +201,6 @@ public class SubcontractedTaskData extends BaseEntity {
this.labelsExported = subcontratedTask.labelsExported;
this.materialAssignmentsExported = subcontratedTask.materialAssignmentsExported;
this.hoursGroupsExported = subcontratedTask.hoursGroupsExported;
this.criterionRequirementsExported = subcontratedTask.criterionRequirementsExported;
}
@AssertTrue(message = "external company should be subcontractor")

1
navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/Tasks.hbm.xml
View file

@ -108,7 +108,6 @@
<property name="labelsExported" />
<property name="materialAssignmentsExported" />
<property name="hoursGroupsExported" />
<property name="criterionRequirementsExported" />
</class>

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

@ -259,8 +259,6 @@
checked="@{subController.subcontractedTaskData.materialAssignmentsExported}" />
<checkbox label="${i18n:_('Hours groups')}"
checked="@{subController.subcontractedTaskData.hoursGroupsExported}" />
<checkbox label="${i18n:_('Criterion requirements')}"
checked="@{subController.subcontractedTaskData.criterionRequirementsExported}" />
</vbox>
</row>
</rows>