RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4689 commits 1 branch 0 tags 56 MiB
Commit graph

4689 commits

This branch
This branch
All branches
Author SHA1 Message Date
Óscar González Fernández
04fe46a0ab Use not recursive function so all Order children are not loaded 
Order children are not loaded. This avoids query to the database.

FEA: ItEr60S17CambiosPantallaVistaEmpresa
 2010-09-22 20:52:55 +02:00
Óscar González Fernández
fba968b3ab Parametrize useSchedulingDataFor so it can be specified if it's recursive 
By default the behaviour is recursive so existent code is not broken.

FEA: ItEr60S17CambiosPantallaVistaEmpresa
 2010-09-22 20:52:55 +02:00
Óscar González Fernández
fc475b1c34 Expose start and end as IntraDayDates in AllocationResult 
FEA: ItEr60S19TimeUnitDataType
 2010-09-22 18:01:56 +02:00
Óscar González Fernández
b8e7c8668a Expose start and end dates as IntraDayDates 
FEA: ItEr60S19TimeUnitDataType
 2010-09-22 17:53:22 +02:00
Óscar González Fernández
eec45cd955 Use method in date to get start as LocalDate 
FEA: ItEr60S19TimeUnitDataType
 2010-09-22 17:28:24 +02:00
Óscar González Fernández
6eefa8f605 Use IntraDayDates when merging an allocation into a Task 
This way when merging the allocation the new greater precision allowed
by allocation algorithm is not lost.

FEA: ItEr60S19TimeUnitDataType
 2010-09-22 17:28:24 +02:00
Óscar González Fernández
8f978bb9c7 Expose start and end dates of AggregateOfResourceAllocations as IntraDayDates 
FEA: ItEr60S19TimeUnitDataType
 2010-09-22 17:28:24 +02:00
Óscar González Fernández
82cae5cff7 ResourceAllocation#sortByStartDate uses the intraDayStartDate to compare the allocations 
FEA: ItEr60S19TimeUnitDataType
 2010-09-22 17:28:24 +02:00
Óscar González Fernández
2a645b4bca Expose start and endData of ResourceAllocation as IntraDayDate properties 
FEA: ItEr60S19TimeUnitDataType
 2010-09-22 17:28:24 +02:00
Óscar González Fernández
c2d0b3e1c0 Remove unused local variable 
FEA: ItEr60S19TimeUnitDataType
 2010-09-22 17:28:24 +02:00
Óscar González Fernández
ab6417fcf6 untilAllocating now returns a IntraDayDate 
FEA: ItEr60S19TimeUnitDataType
 2010-09-22 17:28:23 +02:00
Óscar González Fernández
0159438d56 Expose endDate and startDate properties of TaskElement as IntraDayDate 
FEA: ItEr60S19TimeUnitDataType
 2010-09-22 17:28:23 +02:00
Óscar González Fernández
9290e0390b If a day is completely filled the end date is moved to the next day 
FEA: ItEr60S19TimeUnitDataType
 2010-09-22 17:28:23 +02:00
Óscar González Fernández
bcde48f536 Rename TaskDate to IntraDayDate 
The new name conveys better the meaning of the class

FEA: ItEr60S19TimeUnitDataType
 2010-09-22 17:28:23 +02:00
Óscar González Fernández
58ae1d53ef Make methods private again 
This method should not be accessible from outside of criterion

FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-22 16:48:39 +02:00
Óscar González Fernández
8836035ace Refactor improve quantities by default in resource allocation window 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-22 16:48:29 +02:00
Manuel Rego Casasnovas
feaa55e6f6 [Bug #599] Fix bug adding a new method when it comes from limiting resources view. 2010-09-22 13:43:12 +02:00
Susana Montes Pedreira
7a17025aef [Bug #647] Improve quantities by default in resource allocation window . 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-22 12:40:54 +02:00
Lorenzo Tilve
a36dc067ee Reviewed styles in assignment function configuration. 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-22 11:49:27 +02:00
Lorenzo Tilve
e5a02f14f1 [Bug #657] Fixed bug. 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-22 11:49:27 +02:00
Lorenzo Tilve
a9db0b03f6 [Bug #658] Fixed bug. 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-22 11:49:27 +02:00
Manuel Rego Casasnovas
b889574640 Added method isInRole to User in order to make it more coherent with SecurityUtils.isUserInRole. 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-21 18:09:45 +02:00
Jacobo Aragunde Pérez
332bbe583d Disable the calculation of the assignedResource attribute in TaskElements from Company view. 
That calculation loaded the relations with ResourceAllocations from DB and
we want to prevent it in that screen.

FEA: ItEr60S17CambiosPantallaVistaEmpresa
 2010-09-21 18:09:41 +02:00
Óscar González Fernández
d37657ea03 The criterions tree must be ordered by criterion type name and criterion name 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-21 18:04:40 +02:00
Óscar González Fernández
0d7cd79ebc Change type to specific allocation when choosing a resource 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-21 18:04:40 +02:00
Manuel Rego Casasnovas
8a78bcaf75 [doc] Integration guide: Small fixes in order to be able to generate a PDF file. 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-21 17:55:03 +02:00
Susana Montes Pedreira
7bef9e9934 [Bug #649] Updates the number of hours of the order lines. 
Updates the number of hours of the order line when this one
is edited with double click.

FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-21 17:49:04 +02:00
Manuel Rego Casasnovas
d1969288d3 [Bug #562] Fixed bug hidden buttons at company view. 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-21 14:39:42 +02:00
Manuel Rego Casasnovas
af9733ea38 [Bug #562] Remove unnecessary code. 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-21 14:39:42 +02:00
Susana Montes Pedreira
cfa5e4b05a [Bug #649] Sets a new constraint to the number of hours of the order lines. 
Updates the number of hours of the order line and if the order line
has more that an hours group, the cell to edit the number of hours will
be disabled and it will be shown a informative message.

FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-21 13:54:31 +02:00
Manuel Rego Casasnovas
ded1a9a7ef [Bug #653] Fixed another issue very related with this bug calling the new method to get all roles. 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-21 13:46:33 +02:00
Manuel Rego Casasnovas
064cc52529 Fixed some permissions issues. 
* Changed menu to hide external companies link when user is not administrator.
* Adding URL to manage work report types as just accessible for ROLE_ADMINISTRATION.

FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-21 13:46:33 +02:00
Óscar González Fernández
5e65841a29 Show the criteria tree sorted 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-21 13:15:28 +02:00
Óscar González Fernández
d012d24d6f [Bug #656] Fix bug 
Checking also if the type is the same

FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-21 13:08:23 +02:00
Óscar González Fernández
278bd3d023 Add javadoc 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-21 12:59:37 +02:00
Óscar González Fernández
12ebc13966 Fix bug 
It was returning all the resources related to some of the
criteria. Now it requires that it's related to all of them.

FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-21 12:59:37 +02:00
Manuel Rego Casasnovas
b8dac18491 [Bug #655] Using "getAllRoles" instead of calculate manually the roles depending on the profiles. 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-21 12:02:50 +02:00
Diego Pino Garcia
176dfbeff8 Added new documentation file explaining the basic structure of NavalPlan 2010-09-21 11:07:04 +02:00
Óscar González Fernández
90d869d6dd Do not call deprecated method 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-20 21:57:32 +02:00
Óscar González Fernández
020f7f7f6b [Bug #646] Fix bug 
Let choose generic machines allocation
 2010-09-20 21:51:44 +02:00
Óscar González Fernández
974cbdfd22 [Bug #645] Rewrite findWorkersMatching using IResourcesSearchModel 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-20 21:51:44 +02:00
Óscar González Fernández
c082a34640 [Bug #645] Provide IResourceSearchModel instead of IResourceDAO so the correct thing is done 
GenericAllocationRow was not taking into account the resource
type. Now it uses IResourceSearchModel so it takes it into account.

FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-20 21:51:43 +02:00
Óscar González Fernández
79c0bcd546 [Bug #645] Take into account the resource type when adding predefined allocations 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-20 21:51:43 +02:00
Óscar González Fernández
3968dbf9dc [Bug #645] Provide ResourceEnum when creating a LimitingAllocationRow wrapping a GenericResourceAllocation 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-20 21:51:43 +02:00
Óscar González Fernández
6fed0b1dcb Do not require to provide a set of criterions for INewAllocationsAdder#addGeneric 
Now any criterion collection can work

FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-20 21:51:42 +02:00
Óscar González Fernández
60c9b6ea9b [Bug #645] Change interface INewAllocationsAdder to require the resource type 
This causes the selectors to need to provide a ResourceEnum (resource
type). By now it's infered from the criteria, but this solution is
ambigous for when the criteria is empty. Several FIXMEs left to
remember this issue.

FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-20 21:51:42 +02:00
Óscar González Fernández
72506c6bd8 [Bug #645] Provide ResourceEnum to GenericAllocationRow 
This makes that generic allocations are created with a ResourceEnum

FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-20 21:51:42 +02:00
Óscar González Fernández
9f923fd6b3 No need to call showSelectedAllocations since it's done from the zul page 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-20 21:51:41 +02:00
Óscar González Fernández
6e9e8956d3 Refactor showSelectedAllocations 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-20 21:51:41 +02:00
Óscar González Fernández
fedfeeaeef Add getCaptionForCriterionsFrom and use it wherever possible 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-20 21:51:41 +02:00