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

ItEr26S07CUAsignacionGrupoRecursosAPlanificacionItEr25S07: Removing daily capacity

Browse source
This commit is contained in:
Óscar González Fernández 2009-09-15 17:31:07 +02:00
parent ebfb2de993
commit 0269cd6c67
14 changed files with 31 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java
View file

@ -194,8 +194,6 @@ public abstract class Resource extends BaseEntity{
return new Query();
}
public abstract int getDailyCapacity();
public Set<CriterionSatisfaction> getAllSatisfactions() {
return new HashSet<CriterionSatisfaction>(criterionSatisfactions);
}

24
navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java
View file

@ -3,7 +3,6 @@ package org.navalplanner.business.resources.entities;
import java.util.ArrayList;
import java.util.Set;
import org.hibernate.validator.Min;
import org.hibernate.validator.NotEmpty;
/**
@ -19,9 +18,8 @@ public class Worker extends Resource {
return worker;
}
public static Worker create(String firstName, String surname, String nif,
int dailyHours) {
Worker worker = new Worker(firstName, surname, nif, dailyHours);
public static Worker create(String firstName, String surname, String nif) {
Worker worker = new Worker(firstName, surname, nif);
worker.setNewObject(true);
return worker;
}
@ -35,9 +33,6 @@ public class Worker extends Resource {
@NotEmpty
private String nif;
@Min(0)
private int dailyHours;
/**
* Constructor for hibernate. Do not use!
*/
@ -45,11 +40,10 @@ public class Worker extends Resource {
}
private Worker(String firstName, String surname, String nif, int dailyHours) {
private Worker(String firstName, String surname, String nif) {
this.firstName = firstName;
this.surname = surname;
this.nif = nif;
this.dailyHours = dailyHours;
}
@Override
@ -85,18 +79,6 @@ public class Worker extends Resource {
this.nif = nif;
}
public int getDailyHours() {
return dailyHours;
}
public void setDailyHours(int dailyHours) {
this.dailyHours = dailyHours;
}
public int getDailyCapacity() {
return dailyHours;
}
public boolean satisfiesCriterions(Set<Criterion> criterions) {
ICriterion compositedCriterion = CriterionCompounder.buildAnd(
new ArrayList<ICriterion>(criterions)).getResult();

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

@ -31,7 +31,6 @@
<property name="firstName"/>
<property name="surname"/>
<property name="nif"/>
<property name="dailyHours"/>
</joined-subclass>
</class>

5
navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/DayAssigmentDAOTest.java
View file

@ -46,7 +46,7 @@ public class DayAssigmentDAOTest {
}
private Resource createValidResource() {
Worker worker = Worker.create("first", "surname", "1221332132A", 5);
Worker worker = Worker.create("first", "surname", "1221332132A");
resourceDAO.save(worker);
return worker;
}
@ -77,7 +77,8 @@ public class DayAssigmentDAOTest {
@Test(expected = DataIntegrityViolationException.class)
public void theRelatedResourceMustExistInOrderToSave() {
Worker transientWorker = Worker.create("first", "surname", "1221332132A", 5);
Worker transientWorker = Worker.create("first", "surname",
"1221332132A");
SpecificDayAssigment dayAssigment = SpecificDayAssigment.create(
new LocalDate(2009, 1, 2), 8, transientWorker);
dayAssigmentDAO.save(dayAssigment);

1
navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/ResourceAllocationDAOTest.java
View file

@ -77,7 +77,6 @@ public class ResourceAllocationDAOTest {
worker.setFirstName(UUID.randomUUID().toString());
worker.setSurname(UUID.randomUUID().toString());
worker.setNif(UUID.randomUUID().toString());
worker.setDailyHours(10);
resourceDAO.save(worker);
return worker;
}

4
navalplanner-business/src/test/java/org/navalplanner/business/test/resources/daos/CriterionSatisfactionDAOTest.java
View file

@ -61,7 +61,7 @@ public class CriterionSatisfactionDAOTest {
Criterion criterion = CriterionDAOTest.createValidCriterion();
saveCriterionType(criterion);
criterionDAO.save(criterion);
Worker worker = Worker.create("firstname", "surname", "nif", 4);
Worker worker = Worker.create("firstname", "surname", "nif");
workerDAO.save(worker);
CriterionSatisfaction criterionSatisfaction = CriterionSatisfaction.create(year(year), criterion, worker);
return criterionSatisfaction;
@ -84,7 +84,7 @@ public class CriterionSatisfactionDAOTest {
public void testNotSaveWithTransientCriterionAndWorker() {
Criterion criterion = CriterionDAOTest.createValidCriterion();
saveCriterionType(criterion);
Worker worker = Worker.create("firstname", "surname", "nif", 4);
Worker worker = Worker.create("firstname", "surname", "nif");
CriterionSatisfaction criterionSatisfaction = CriterionSatisfaction.create(year(2007), criterion, worker);
satisfactionDAO.save(criterionSatisfaction);
}

1
navalplanner-business/src/test/java/org/navalplanner/business/test/resources/daos/ResourceDAOTest.java
View file

@ -66,7 +66,6 @@ public class ResourceDAOTest {
worker.setFirstName("First name");
worker.setSurname("Surname");
worker.setNif("NIF");
worker.setDailyHours(8);
return worker;
}

12
navalplanner-business/src/test/java/org/navalplanner/business/test/resources/entities/CriterionSatisfactionTest.java
View file

@ -28,7 +28,7 @@ public class CriterionSatisfactionTest {
@Test
public void testFinish() {
final Criterion criterion = CriterionDAOTest.createValidCriterion();
Worker worker = Worker.create("firstName", "surName", "2333232", 10);
Worker worker = Worker.create("firstName", "surName", "2333232");
CriterionSatisfaction criterionSatisfaction = CriterionSatisfaction.create(year(2000), criterion, worker);
Date end = year(2006);
criterionSatisfaction.finish(end);
@ -42,7 +42,7 @@ public class CriterionSatisfactionTest {
@Test
public void canFinishWhenItStarted() throws Exception {
final Criterion criterion = CriterionDAOTest.createValidCriterion();
Worker worker = Worker.create("firstName", "surName", "2333232", 10);
Worker worker = Worker.create("firstName", "surName", "2333232");
Date start = year(2000);
CriterionSatisfaction criterionSatisfaction = CriterionSatisfaction.create(start, criterion, worker);
criterionSatisfaction.finish(start);
@ -52,7 +52,7 @@ public class CriterionSatisfactionTest {
@Test(expected = IllegalArgumentException.class)
public void testCantFinishBeforeStart() {
final Criterion criterion = CriterionDAOTest.createValidCriterion();
Worker worker = Worker.create("firstName", "surName", "2333232", 10);
Worker worker = Worker.create("firstName", "surName", "2333232");
CriterionSatisfaction criterionSatisfaction = CriterionSatisfaction.create(year(2000), criterion, worker);
criterionSatisfaction.finish(year(1999));
}
@ -60,7 +60,7 @@ public class CriterionSatisfactionTest {
@Test
public void testIsEnforcedAtDate() {
final Criterion criterion = CriterionDAOTest.createValidCriterion();
Worker worker = Worker.create("firstName", "surName", "2333232", 10);
Worker worker = Worker.create("firstName", "surName", "2333232");
CriterionSatisfaction criterionSatisfaction = CriterionSatisfaction.create(year(2000), criterion, worker);
assertTrue(criterionSatisfaction.isEnforcedAt(year(3000)));
assertTrue(criterionSatisfaction.isEnforcedAt(year(2000)));
@ -77,7 +77,7 @@ public class CriterionSatisfactionTest {
@Test
public void testEnforcedAtSomePointInInterval() {
final Criterion criterion = CriterionDAOTest.createValidCriterion();
Worker worker = Worker.create("firstName", "surName", "2333232", 10);
Worker worker = Worker.create("firstName", "surName", "2333232");
CriterionSatisfaction criterionSatisfaction = CriterionSatisfaction.create(year(2000), criterion, worker);
assertTrue(criterionSatisfaction.overlapsWith(Interval.range(
year(2001), year(4000))));
@ -103,7 +103,7 @@ public class CriterionSatisfactionTest {
@Test
public void testCriterionSatisfactionsStartComparator() {
final Criterion criterion = CriterionDAOTest.createValidCriterion();
Worker worker = Worker.create("firstName", "surName", "2333232", 10);
Worker worker = Worker.create("firstName", "surName", "2333232");
Interval[] intervals = { Interval.from(year(1000)),
Interval.range(year(1100), year(9000)),
Interval.point(year(1101)), Interval.from(year(1200)),

32
navalplanner-business/src/test/java/org/navalplanner/business/test/resources/entities/ResourceTest.java
View file

@ -43,7 +43,7 @@ public class ResourceTest {
Criterion other = CriterionDAOTest.createValidCriterion();
CriterionTypeBase type = createTypeThatMatches(false, criterion);
CriterionTypeBase otherType = createTypeThatMatches(false, other);
Worker worker = Worker.create("firstName", "surName", "2333232", 10);
Worker worker = Worker.create("firstName", "surName", "2333232");
assertThat(worker.getSatisfactionsFor(criterion).size(), equalTo(0));
worker.addSatisfaction(new CriterionWithItsType(type, criterion));
assertTrue(criterion.isSatisfiedBy(worker));
@ -56,14 +56,14 @@ public class ResourceTest {
@Test(expected = IllegalArgumentException.class)
public void getSatisfactionsForWrongIntervalThrowsException() {
Worker worker = Worker.create("firstName", "surName", "2333232", 10);
Worker worker = Worker.create("firstName", "surName", "2333232");
worker.query().from(CriterionDAOTest.createValidCriterion())
.enforcedInAll(Interval.range(year(2000), year(1999))).result();
}
@Test(expected = IllegalArgumentException.class)
public void getSatisfactionsForWrongIntervalForCriterionTypeThrowsException() {
Worker worker = Worker.create("firstName", "surName", "2333232", 10);
Worker worker = Worker.create("firstName", "surName", "2333232");
worker.query().from(createTypeThatMatches()).enforcedInAll(
Interval.range(year(2000), year(1999))).current().result();
}
@ -77,7 +77,7 @@ public class ResourceTest {
criterionType, criterion);
CriterionWithItsType otherCriterionWithItsType = new CriterionWithItsType(
createTypeThatMatches(otherCriterion), otherCriterion);
Worker worker = Worker.create("firstName", "surName", "2333232", 10);
Worker worker = Worker.create("firstName", "surName", "2333232");
worker.addSatisfaction(criterionWithItsType, Interval
.from(CriterionSatisfactionDAOTest.year(2000)));
worker.addSatisfaction(otherCriterionWithItsType, Interval
@ -98,7 +98,7 @@ public class ResourceTest {
type, criterion);
CriterionWithItsType otherCriterionWithItsType = new CriterionWithItsType(
type, otherCriterion);
Worker worker = Worker.create("firstName", "surName", "2333232", 10);
Worker worker = Worker.create("firstName", "surName", "2333232");
assertThat(worker.getCurrentCriterionsFor(type).size(), equalTo(0));
worker.addSatisfaction(criterionWithItsType, Interval
.from(CriterionSatisfactionDAOTest.year(2000)));
@ -158,7 +158,7 @@ public class ResourceTest {
CriterionWithItsType otherCriterionWithItsType = new CriterionWithItsType(
createTypeThatMatches(otherCriterion), otherCriterion);
Worker worker = Worker.create("firstName", "surName", "2333232", 10);
Worker worker = Worker.create("firstName", "surName", "2333232");
worker.addSatisfaction(criterionWithItsType, Interval
.from(CriterionSatisfactionDAOTest.year(2000)));
worker.addSatisfaction(criterionWithItsType, Interval
@ -190,7 +190,7 @@ public class ResourceTest {
public void testAddAndRemoveSatisfactions() {
Criterion criterion = CriterionDAOTest.createValidCriterion();
Criterion otherCriterion = CriterionDAOTest.createValidCriterion();
Worker worker = Worker.create("firstName", "surName", "2333232", 10);
Worker worker = Worker.create("firstName", "surName", "2333232");
ICriterionType<Criterion> criterionType = createTypeThatMatches(false,
criterion, otherCriterion);
assertThat(worker.getCurrentSatisfactionsFor(criterion).size(),
@ -228,7 +228,7 @@ public class ResourceTest {
public void testAddAtDate() throws Exception {
Criterion criterion = CriterionDAOTest.createValidCriterion();
Criterion otherCriterion = CriterionDAOTest.createValidCriterion();
Worker worker = Worker.create("firstName", "surName", "2333232", 10);
Worker worker = Worker.create("firstName", "surName", "2333232");
ICriterionType<Criterion> criterionType = createTypeThatMatches(false,
criterion, otherCriterion);
worker.addSatisfaction(new CriterionWithItsType(criterionType,
@ -268,7 +268,7 @@ public class ResourceTest {
public void addOnlyUntilNextCriterionIsActive() {
Criterion criterion = CriterionDAOTest.createValidCriterion();
Criterion otherCriterion = CriterionDAOTest.createValidCriterion();
Worker worker = Worker.create("firstName", "surName", "2333232", 10);
Worker worker = Worker.create("firstName", "surName", "2333232");
ICriterionType<Criterion> criterionType = createTypeThatMatches(false,
criterion, otherCriterion);
worker.addSatisfaction(new CriterionWithItsType(criterionType,
@ -287,7 +287,7 @@ public class ResourceTest {
public void testCantAddOverlappingTotally() {
Criterion criterion = CriterionDAOTest.createValidCriterion();
Criterion otherCriterion = CriterionDAOTest.createValidCriterion();
Worker worker = Worker.create("firstName", "surName", "2333232", 10);
Worker worker = Worker.create("firstName", "surName", "2333232");
ICriterionType<Criterion> criterionType = createTypeThatMatches(false,
criterion, otherCriterion);
worker.addSatisfaction(new CriterionWithItsType(criterionType,
@ -303,7 +303,7 @@ public class ResourceTest {
public void testCantAddIfOverlapsPartially() {
Criterion criterion = CriterionDAOTest.createValidCriterion();
Criterion otherCriterion = CriterionDAOTest.createValidCriterion();
Worker worker = Worker.create("firstName", "surName", "2333232", 10);
Worker worker = Worker.create("firstName", "surName", "2333232");
ICriterionType<Criterion> criterionType = createTypeThatMatches(false,
criterion, otherCriterion);
worker.addSatisfaction(new CriterionWithItsType(criterionType,
@ -319,8 +319,8 @@ public class ResourceTest {
public void testCantAddWrongCriterionSatisfaction() {
Criterion criterion = CriterionDAOTest.createValidCriterion();
Criterion otherCriterion = CriterionDAOTest.createValidCriterion();
Worker worker = Worker.create("firstName", "surName", "2333232", 10);
Worker other = Worker.create("other", "surName", "2333232", 10);
Worker worker = Worker.create("firstName", "surName", "2333232");
Worker other = Worker.create("other", "surName", "2333232");
ICriterionType<Criterion> criterionType = createTypeThatMatches(false,
criterion);
List<CriterionSatisfaction> wrongSatisfactions = new ArrayList<CriterionSatisfaction>();
@ -345,7 +345,7 @@ public class ResourceTest {
public void testAddCriterionSatisfaction() throws Exception {
Criterion criterion = CriterionDAOTest.createValidCriterion();
Worker worker = Worker.create("firstName", "surName", "2333232", 10);
Worker worker = Worker.create("firstName", "surName", "2333232");
ICriterionType<Criterion> criterionType = createTypeThatMatches(false,
criterion);
CriterionSatisfaction satisfaction = createValid(criterion, worker);
@ -365,7 +365,7 @@ public class ResourceTest {
@Test(expected = IllegalStateException.class)
public void shouldntAdd() {
Criterion criterion = CriterionDAOTest.createValidCriterion();
Worker worker = Worker.create("firstName", "surName", "2333232", 10);
Worker worker = Worker.create("firstName", "surName", "2333232");
ICriterionType<?> type = new CriterionTypeBase("prueba", false, false,
false, false) {
@ -490,7 +490,7 @@ public class ResourceTest {
}
private void givenWorker() {
worker = Worker.create("firstName", "surName", "2333232", 10);
worker = Worker.create("firstName", "surName", "2333232");
}
}

1
navalplanner-business/src/test/java/org/navalplanner/business/test/workreports/daos/AbstractWorkReportTest.java
View file

@ -63,7 +63,6 @@ public abstract class AbstractWorkReportTest {
worker.setFirstName(UUID.randomUUID().toString());
worker.setSurname(UUID.randomUUID().toString());
worker.setNif(UUID.randomUUID().toString());
worker.setDailyHours(10);
resourceDAO.save(worker);
return worker;
}

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

@ -51,7 +51,7 @@ public class AsignedHoursToOrderElementModel implements
Iterator<WorkReportLine> iterador = listWRL.iterator();
while (iterador.hasNext()) {
WorkReportLine w = iterador.next();
w.getResource().getDailyCapacity();
w.getResource().getDescription();
w.getOrderElement().getWorkHours();
w.getWorkReport().getDate();
this.asignedDirectHours = this.asignedDirectHours + w.getNumHours();

5
navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul
View file

@ -31,11 +31,6 @@
<label value="${i18n:_('NIF')}" />
<textbox value="@{controller.worker.nif}" />
</row>
<row>
<label value="${i18n:_('Daily hours')}" />
<textbox
value="@{controller.worker.dailyHours}" />
</row>
</rows>
</grid>
</tabpanel>

2
navalplanner-webapp/src/main/webapp/resources/worker/_list.zul
View file

@ -5,7 +5,6 @@
<column label="${i18n:_('First name')}" sort="auto(firstName)" />
<column label="${i18n:_('Surname')}" sort="auto(surname)" />
<column label="${i18n:_('NIF')}" sort="auto(nif)" />
<column label="${i18n:_('Daily hours')}" sort="auto(dailyHours)" />
<column label="${i18n:_('Operations')}" />
</columns>
<rows>
@ -13,7 +12,6 @@
<label value="@{worker.firstName}" />
<label value="@{worker.surname}" />
<label value="@{worker.nif}" />
<label value="@{worker.dailyHours}" />
<hbox>
<button label="${i18n:_('Edit')}"
onClick="controller.goToEditForm(self.getParent().getParent().value);">

1
navalplanner-webapp/src/test/java/org/navalplanner/web/resources/WorkerModelTest.java
View file

@ -29,7 +29,6 @@ public class WorkerModelTest {
IResourceDAO resourceDAOMock = createMock(IResourceDAO.class);
ICriterionDAO criterionServiceMock = createMock(ICriterionDAO.class);
Worker workerToReturn = Worker.create();
workerToReturn.setDailyHours(2);
workerToReturn.setFirstName("firstName");
workerToReturn.setSurname("surname");
workerToReturn.setNif("232344243");