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

4675 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ó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
Óscar González Fernández
625e204b69 Deprecate ambiguous use of getCaptionFor 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-20 21:51:41 +02:00
Óscar González Fernández
6cd332f6d8 Rename getNames to getCaptionFor 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-20 21:51:40 +02:00
Óscar González Fernández
fa59ac32e1 Fix bug 
A i18n string must not be static final. Otherwise it would always
return the same string instead of using the version for the current
locale.

FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-20 21:51:40 +02:00
Óscar González Fernández
e53b263bff [Bug #645] Add resource type property to GenericResourceAllocation 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-20 21:51:40 +02:00
Óscar González Fernández
a5bfbac403 Fix wrong name 
The method renamed was also used in non limiting allocations

FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-20 21:51:39 +02:00
Óscar González Fernández
e24a04a80e Remove unused method 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-20 21:51:39 +02:00
Óscar González Fernández
32beb5734e [Bug #645] Refactor ResourcesSearchModel 
Now it allows to search only on machines or workers. This will make
easier to fix bugs #645 and #646

FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-20 21:51:29 +02:00
Óscar González Fernández
873d3b6311 Remove method. 
It was dangerous because it returned only the resources at the present
time. It looks like an usual functionality but a lot of times is
mistakenly used when findSatisfyingAllCriterionsAtSomePoint should be
used instead.

FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-20 21:37:51 +02:00
Óscar González Fernández
bc35014aa0 Rename findSatisfyingCriterionsAtSomePoint to findSatisfyingAllCriterionsAtSomePoint and modify behaviour accordingly 
The former function was used incorrectly. The new function has the
right behaviour.

FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-20 21:37:51 +02:00
Óscar González Fernández
7b0e0b59b1 Fix bug 
It was returning the resources satisfaying the criterions at the very
same moment of the query instead of returning the resources that
satisfy the criteria at some point in time. The former is wrong
because if in the future the resource satisfies the criteria, it can
be used in the allocation.

FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-20 21:37:51 +02:00
Óscar González Fernández
ddfedbd6ba When is a generic type all resources shown are returned 
Previously it was only doing this for AllocationType.GENERIC_WORKERS

FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-20 21:37:51 +02:00
Óscar González Fernández
772f2d103f Disable choosing of resources when picking generic machines 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-20 21:37:51 +02:00
Manuel Rego Casasnovas
6b2ecbb288 [Bug #631] Fixed bug reattaching order in order to be navigable. 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-20 20:55:30 +02:00
Manuel Rego Casasnovas
f2e07cb07e Fixed bug disabling create buttons if user does not have the proper permissions. 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
 2010-09-20 20:36:04 +02:00