Commit graph

754 commits

Author SHA1 Message Date
Manuel Rego Casasnovas
5d07599594 Bug #1609: Fix problem using a different transaction in validation methods
In order to avoid to have the same user in the session twice, the validation
query of User entity has been done in a different transaction.

The issue happens with resources too, so the same solution has been used in
both cases.

FEA: ItEr77S04BugFixing
2013-02-22 12:39:27 +01:00
miciele Ghiorghis
4aae86335e tim-connector: added attribute key and connectorId and removed code and label attributes
- attributes key and connectorId added
- modified findBys with this new change
- modified other files affected by this change
2013-02-21 17:32:19 +01:00
miciele Ghiorghis
81479a1850 tim-connector: comments improved and NotNull annotations added 2013-02-14 11:48:55 +01:00
Manuel Rego Casasnovas
6898dbdbf1 tim-connector: Rename page to "Job Scheduling" and associated files
* Renamed .zul file and page to "Job Scheduling".
* Include ROLE_JOB_SCHEDULING in default profile SYSTEMS_ADMINISTRATOR.

FEA: ItEr77S16JiraAndTimConnectorContributionIntegration
2013-02-13 13:59:11 +01:00
Lorenzo Tilve Álvaro
35e1644cee Merge branch 'master' into filtering-improvements
FEA: ItEr77S15FilteringEnhancements
2013-02-13 12:19:45 +01:00
Manuel Rego Casasnovas
dc15df3d2e tim-connector: Add protected default constructor for Hibernate to new entities
Include proper comments warning about not using it directly.

FEA: ItEr77S16JiraAndTimConnectorContributionIntegration
2013-02-11 13:47:23 +01:00
Manuel Rego Casasnovas
7fe5eb2350 Keep tasks converted into containers also in the filtered WBS
This allows to add a task over a leaf in a filtered WBS, and being able to keep
seeing the 3 elements: the new container (with the name of the previous leaf),
the previous leaf without name and the new task added.

It's easier to understand with an example. Imagine you have the following WBS:
* Task 1
* Task 2

And you filter by task name using "2", then you'll have:
* Task 2

Then you select "Task 2" and add a new task called "Subtask A".

Without this patch you'll only see:
* Task 2 (the new container using the name of the old leaf)
  |- Subtask A (the new task)

However, it's better you see the following
* Task 2 (the new container using the name of the old leaf)
  |- (empty task) (the old leaf that you should rename)
  |- Subtask A (the new task)

FEA: ItEr77S15FilteringEnhancements
2013-02-08 13:53:44 +01:00
Miciele Ghiorghis
48cdded3e0 Tim-connector: Classes renamed according Libreplan naming convention
DTO classes are renamed to class-name with suffix DTO according to Libreplan naming convention
Modified all classes which are affected by the renamed classes
Comments and author information added where applicable
Test cases modified
2013-02-08 11:16:19 +01:00
Miciele Ghiorghis
b622b68589 Tim-connector: Two mapping resource added
AppProperties.hbm.xml and JosSchedulerConfiguration.hb.mxl are added
2013-02-08 11:16:18 +01:00
Miciele Ghiorghis
21c65717a8 Tim-connector: Three new tables added
Three tables added:
order_sync_info: holds the order synchronization information
app_properties: holds app configuration properties
job_scheduler_configuratiion: holds job to be scheduled
Both app_properties and job_scheduler_configurations are filled with default values
2013-02-08 11:16:18 +01:00
Miciele Ghiorghis
3f606eab3c Tim-connector: An implementation of method findByOrderElementAndChildrenFilteredByDate
To find all WorkReportLines of an order between 2 dates
2013-02-08 11:16:18 +01:00
Miciele Ghiorghis
1ce4477c84 Tim-connector: new search method added
findByOrderElementAndChildrenFilteredByDate added, to find all workReportLines of an order between 2 dates
2013-02-08 11:16:18 +01:00
Miciele Ghiorghis
9463d94a84 Tim-connector: Method getWorkReportLines added
getWorkReportLines: gets all WorkReportLines of this order specified between start and end date.
2013-02-08 11:16:18 +01:00
Miciele Ghiorghis
ddce4b2f1d Tim-connector: Hibernate mapping for OrderSyncInfo is added 2013-02-08 11:16:18 +01:00
Miciele Ghiorghis
23b24f46fd Tim-connector: A new ROLE for job scheduler added 2013-02-08 11:16:18 +01:00
Miciele Ghiorghis
3ee39bcffe Tim-connector: Hibernate mapping file for JobSchedulerConfiguration 2013-02-08 11:16:16 +01:00
Miciele Ghiorghis
4ffd4e5b50 Tim-connector: Hibernate mapping file for AppProperties 2013-02-08 11:16:16 +01:00
Miciele Ghiorghis
f1762336ee Tim-connector: OrderSyncInfo entity 2013-02-08 11:16:16 +01:00
Miciele Ghiorghis
07c2ccaec9 Tim-connector: DAO for OrderSyncInfo
An implementation of the interface IOrderSyncInfoDAO
2013-02-08 11:16:16 +01:00
Miciele Ghiorghis
b459606e72 Tim-connector: Contract for OrderSyncInfo
An interface that OrderSyncInfoDAO implements.
2013-02-08 11:16:16 +01:00
Miciele Ghiorghis
8869325b60 Tim-connector: JobSchedulerConfiguration entity 2013-02-08 11:16:16 +01:00
Miciele Ghiorghis
ed26857809 Tim-connector: AppProperties entity 2013-02-08 11:16:16 +01:00
Miciele Ghiorghis
f985a65a94 Tim-connector: DAO for JobSchedulerConfiguration
An implementation of IJobSchedulerConfigurationDAO
2013-02-08 11:16:16 +01:00
Miciele Ghiorghis
5418fc21b0 Tim-connector: Contract for JobSchedulerConfigurationDAO
An interface that JobSchedulerConfigurationDAO implements
2013-02-08 11:16:16 +01:00
Miciele Ghiorghis
3ba555853f Tim-connector: Contract for AppPropertiesDAO
An interface that AppPropertiesDAO implements
2013-02-08 11:16:16 +01:00
Miciele Ghiorghis
fa310807db Tim-connector: DAO for AppProperties
DAO for AppProperties. Implementation of the interface IAppPropertiesDAO
2013-02-08 11:16:16 +01:00
Lorenzo Tilve Álvaro
6b4ee3641c Reverted unnecesary changes on Label and Criterion save operations to clear removed entities
Since the "foreign key" constraint with onDelete parameter introduced into liquibase is handling
at database level the integrity, the external operations to clean the setting values are not longer
needed.

FEA: ItEr77S15FilteringEnhancements
2013-02-08 09:26:22 +01:00
Lorenzo Tilve Álvaro
46ba611952 Added foreign key with onDelete clause on user to label and criterion relationships
FEA: ItEr77S15FilteringEnhancements
2013-02-08 09:26:22 +01:00
Lorenzo Tilve Álvaro
880f51704a Forced deletion of Label and Criterion parameters and session bandboxes after entities deletion
FEA: ItEr77S15FilteringEnhancements
2013-02-07 03:08:30 +01:00
Lorenzo Tilve Álvaro
eefd4026fd Modified getOrdersIdsByDates query to get the intersecting projects between start and end dates
In this way it's possible to get all the projects for wich some part of their lenght is
comprehended between the defined start and end dates, with the previous strategy only the
projects which were completely included in the interval were being listed.

FEA: ItEr77S15FilteringEnhancements
2013-02-06 09:40:43 +01:00
Manuel Rego Casasnovas
d1108540ee Fix syntax error in orders query
If the list of unscheduled projects is empty, the restriction shouldn't be added
or it'll cause a syntax error due to an empty list "o.id IN ()".

FEA: ItEr77S15FilteringEnhancements
2013-02-05 13:03:35 +01:00
Manuel Rego Casasnovas
58b963f30f Include unscheduled projects in orders query
When you import a project from the web service, the task elements are not
created yet, so we need to return these projects in the query otherwise they
will be not visible at all for the users.

FEA: ItEr77S15FilteringEnhancements
2013-02-05 12:42:11 +01:00
Manuel Rego Casasnovas
f02d6f8a8d Fix syntax error in orders query
Change "=" for "IN".

FEA: ItEr77S15FilteringEnhancements
2013-02-05 12:42:03 +01:00
Manuel Rego Casasnovas
86e1d77791 New query in OrderDAO to get projects filtered
The new query receives several params from the filters (dates, labels, criteria,
customer and state) and returns the filtered orders.

For the moment it's only used to get the initial list of orders for the projects
list window.

FEA: ItEr77S15FilteringEnhancements
2013-02-04 14:24:45 +01:00
Lorenzo Tilve Álvaro
58ad890227 Merge branch 'master' into filtering-improvements 2013-02-01 13:14:53 +01:00
Lorenzo Tilve Álvaro
ed69a6e7bc Imported configured or previously used criterion into resourcesLoad filtering
FEA: ItEr77S15FilteringEnhancements
2013-02-01 13:13:05 +01:00
Lorenzo Tilve Álvaro
82d78afec4 Moved method to generate label name and type pattern for finders to Label class
FEA: ItEr77S15FilteringEnhancements
2013-02-01 13:12:59 +01:00
Lorenzo Tilve Álvaro
32641a5919 Included persistence information for resources load criterion filter property
FEA: ItEr77S15FilteringEnhancements
2013-02-01 13:12:46 +01:00
Lorenzo Tilve Álvaro
13a4473d3f Created Criterion configuration bandbox on user settings to filter Resources Load results
FEA: ItEr77S15FilteringEnhancements
2013-02-01 13:12:46 +01:00
Lorenzo Tilve Álvaro
dcd7cd8c09 Refactored to OrderStatusEnum static method to get default visible project status 2013-02-01 13:12:46 +01:00
Lorenzo Tilve Álvaro
bd5914b011 Fixed Hibernate relationship to store project label filtering preferences
FEA: ItEr77S15FilteringEnhancements
2013-02-01 13:12:46 +01:00
Manuel Rego Casasnovas
cdc140c7c8 jira-integration: Increase size of field jiraLabels
As this field could be used to store a list of labels, it's better that it's
longer than 255 chars.

FEA: ItEr77S16JiraAndTimConnectorContributionIntegration
2013-02-01 11:30:04 +01:00
miciele Ghiorghis
78e1d7b10b Jira-integration: classes renamed and basic comments added 2013-02-01 09:53:24 +01:00
Manuel Rego Casasnovas
25d1461263 jira-integration: Rename jiraLabelUrl to jiraLabels
Due to previous commit, this field could save a URL or a list of labels, so the
name has been changed to avoid misunderstandings.

FEA: ItEr77S16JiraAndTimConnectorContributionIntegration
2013-01-31 17:13:24 +01:00
Manuel Rego Casasnovas
52a0e89071 jira-integration: Add predefined WorkReportType for JIRA connector
* The predefined type will have a line description value to store comments in
  each line.
* As for the case of personal timesheets the new type will be hidden for the
  users in the list of timesheets templates.

FEA: ItEr77S16JiraAndTimConnectorContributionIntegration
2013-01-30 17:13:33 +01:00
Manuel Rego Casasnovas
72ada7c634 jira-integration: Disable hours edition in JIRA issues
For tasks that are JIRA issues the hours fields will be readonly.

FEA: ItEr77S16JiraAndTimConnectorContributionIntegration
2013-01-30 14:01:39 +01:00
Manuel Rego Casasnovas
2a359993ce jira-integration: Refactorization related to paint a link in the WBS if the task is a JIRA issue
* A new method isJiraIssue has been added to OrderElement checking if the code
  uses the JIRA prefix or not.
* The method Util.bind has been removed as it was specific of this link and only
  used in one place.
* To calculate issue code for the link it has been used StringUtils.removeStart.

TODO: Pending to disable hours in WBS if the task is a JIRA issue.

FEA: ItEr77S16JiraAndTimConnectorContributionIntegration
2013-01-30 13:43:40 +01:00
Manuel Rego Casasnovas
cbc7c3c169 jira-integration: Add checkings to prevent remove or disable type of work hours for JIRA connector
FEA: ItEr77S16JiraAndTimConnectorContributionIntegration
2013-01-30 11:16:50 +01:00
Manuel Rego Casasnovas
ae3b7610f1 jira-integration: Modify bootstraps in order to set JiraConfiguration properly
* Renamed PersonalTimesheetsTypeOfWorkHoursBootstrap to
  ConfigurationTypeOfWorkHoursBootstrapa in order to set up TypeOfWorkHours for
  both personal timesheets and Jira connector.
* Modified ConfigurationBootstrap to ensure that the JiraConfiguration is
  created properly.
* Removed unneeded code in ConfigurationModel.

FEA: ItEr77S16JiraAndTimConnectorContributionIntegration
2013-01-30 11:16:50 +01:00
Manuel Rego Casasnovas
44dca50bc9 jira-integration: Add new field jiraConnectorTypeOfWorkHours in JiraConfiguration
* The new field is added in JiraConfiguration similar to field
Configuration.personalTimesheetsTypeOfWorkHours.
* Added required bits for Hibernate mapping and Liquibase database changes.
* Modified Jira connector configuration UI to include the new field.

FEA: ItEr77S16JiraAndTimConnectorContributionIntegration
2013-01-30 11:16:50 +01:00