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

555 commits

Author SHA1 Message Date
Susana Montes Pedreira
2008ea6744 Merge branch 'master' into subcontracting-merger-master 2012-04-10 16:36:55 +01:00
Susana Montes Pedreira
97dbaa267c Refactor the class EndDateCommunicationToCustomer to be 
EndDateCommunication.

FEA: ItEr76S21UpdateEndDateToCustomer
 2012-04-10 12:35:26 +01:00
Susana Montes Pedreira
fb435bb60c add tests to check out end dates requested from 
subcontract to customer are correctly reported.

FEA: ItEr76S21UpdateEndDateToCustomer
 2012-04-10 11:26:34 +01:00
Manuel Rego Casasnovas
45b8620102 Merge branch 'master' into project-dashboards 2012-04-10 11:31:52 +02:00
Susana Montes Pedreira
eeb54d23d5 change the precision of delivery date requested by the customer in the subcontract pop-up. 
FEA: ItEr76S21UpdateEndDateToCustomer
 2012-04-10 09:32:33 +01:00
Susana Montes Pedreira
b631512889 if the project is regular, the tables of the delivery dates, requested by the subcontractor, 
and of the delivery dates, requested by the customer, wont be shown in the general tab.

FEA: ItEr76S21UpdateEndDateToCustomer
 2012-04-10 09:16:44 +01:00
Susana Montes Pedreira
c0eb800993 modify the subcontract pop-up to view the information of the end dates communicated 
by subcontractors and add a button to update the deadline of the task.

FEA: ItEr76S21UpdateEndDateToCustomer
 2012-04-10 09:06:49 +01:00
Susana Montes Pedreira
41c0334196 set the new end date communications to customers as not transient 
object anymore.

FEA: ItEr76S21UpdateEndDateToCustomer
 2012-04-10 08:52:44 +01:00
Susana Montes Pedreira
f7a991e25d modify the view of communications received from subcontractors to show 
the end date communications correctly.

FEA: ItEr76S21UpdateEndDateToCustomer
 2012-04-10 08:47:43 +01:00
Susana Montes Pedreira
b3a5f2226d Adaptation of the XML message to send end date communications 
from subcontractor to customer

FEA: ItEr76S21UpdateEndDateToCustomer
 2012-04-10 08:38:38 +01:00
Manuel Rego Casasnovas
b4200e84d3 Bug #1349: Fix translation issue in choosing template pop-up 
FEA: ItEr76S04BugFixing
 2012-04-09 12:40:17 +02:00
Manuel Rego Casasnovas
3bc613b301 Bug #1349: Mark to translate exception day type 
FEA: ItEr76S04BugFixing
 2012-04-09 12:39:50 +02:00
Manuel Rego Casasnovas
bccd893fb3 Bug #1349: Fix translation in calendar type 
FEA: ItEr76S04BugFixing
 2012-04-09 12:38:00 +02:00
Manuel Rego Casasnovas
1eb2bca86c Bug #1298: Mark to translate roles in user and profile edition 
FEA: ItEr76S04BugFixing
 2012-04-09 11:09:47 +02:00
Manuel Rego Casasnovas
4c9e8d1b52 Remove CutyCaptTimeout 
This was removed because of:
* It was not being used since June 2011 when we started to use "cutycapt"
  command instead of "CutyCapt".
* "killall" command added a new dependency that was not marked in the Debian
  packages. This causes some stacktrace in the logs of a fresh installation in a
  Debian server.

FEA: ItEr76S04BugFixing
 2012-04-09 09:57:51 +02:00
Manuel Rego Casasnovas
166254f2dd Bug #1406: Add UI validation for name field too 
FEA: ItEr76S04BugFixing
 2012-04-04 18:33:30 +02:00
Manuel Rego Casasnovas
e2df00309a Bug #1406: Add validation in the UI and also a try catch for possible ValidationExceptions 
FEA: ItEr76S04BugFixing
 2012-04-04 16:51:15 +02:00
Susana Montes Pedreira
c8406864eb Refactor the class OrderElementWithAdvanceMeasurementsDTO to be 
OrderElementWithAdvanceMeasurementsOrEndDateDTO.

FEA: ItEr76S21UpdateEndDateToCustomer
 2012-04-04 12:47:22 +01:00
Susana Montes Pedreira
c4860c55f7 modify the screen "Send to customers" to detect that there is a new 
end date pending to send from a subcontractor to its customer.

FEA: ItEr76S21UpdateEndDateToCustomer
 2012-04-04 12:14:14 +01:00
Susana Montes Pedreira
02d674c64e modify the General Data tab of a project in order to include 
the table to manage the end date communications to customer.

FEA: ItEr76S21UpdateEndDateToCustomer
 2012-04-04 12:13:28 +01:00
Manuel Rego Casasnovas
f6457e00fc Add a thread to perform SumChargedEffort recalculations 
FEA: ItEr76S14ConcurrencyProblemWorkReports
 2012-04-04 12:19:34 +02:00
Manuel Rego Casasnovas
3ca40f560a Bug #1400: Move call to do recalculations after doTheSaving 
In order to do the recalculations is needed that the order is actually saved, so
it's better to call the DAO after doTheSaving method.

Moreover, now the DAO receive an id and look for the order in database.

FEA: ItEr76S14ConcurrencyProblemWorkReports
 2012-04-03 12:54:08 +02:00
Manuel Rego Casasnovas
8262066518 Bug #1400: Fix problem recalculating SumChargedEfforts if some elements are moved in the WBS 
If an OrderElement is added or removed in the WBS and it is not a new object,
then the Order is marked to recalculate the SumChargedEfforts. During the Order
saving the SumChargedEfforts are recalculated.

FEA: ItEr76S14ConcurrencyProblemWorkReports
 2012-04-02 19:45:00 +02:00
Susana Montes Pedreira
3a54b63419 Avoid to delete a subcontractor progress that has been sent in subcontractor. 
FEA : ItEr76S19PreventingSubcontractorProgressesItEr75S31
 2012-04-02 12:17:46 +01:00
Susana Montes Pedreira
ff3c4f0c04 Include a column with the name of the project and other with the "Delivery date, 
and make the list sortable by the column "communication" or "company".

FEA: ItEr75S32AnA15S04UpdateDeliveringDateInSubcontracting
 2012-03-30 21:59:25 +01:00
Susana Montes Pedreira
5cd943b1af Fix the error for what the column "Communication" was not being updated. 
FEA: ItEr75S32AnA15S04UpdateDeliveringDateInSubcontracting
 2012-03-30 21:36:07 +01:00
Manuel Rego Casasnovas
dfb0090666 Prevent NPE in OrderElement::getSumChargedEffort() 
Now SumChargeEffort objects are not created till some hours are reported, so it
could be null in some cases.

FEA: ItEr76S14ConcurrencyProblemWorkReports
 2012-03-30 17:43:39 +02:00
Manuel Rego Casasnovas
abc0e0fe66 Create SumChargedEffort while saving the work reports 
FEA: ItEr76S14ConcurrencyProblemWorkReports
 2012-03-30 17:43:39 +02:00
Susana Montes Pedreira
d15a75d1db Changes the "General data" tab about subcontracting module. 
Include a field called Project Type to the "Customer information area" and
add a new column to specify which is the current delivery date, and set the
Deadline of the project to read-only mode.

FEA: ItEr75S32AnA15S04UpdateDeliveringDateInSubcontracting
 2012-03-30 13:07:12 +01:00
Susana Montes Pedreira
1d95d90c2e make the list sortable by default by state,but using alphabetic sort, 
but the first tasks will be the pending tasks.

FEA: ItEr75S32AnA15S04UpdateDeliveringDateInSubcontracting
 2012-03-29 13:34:23 +01:00
Susana Montes Pedreira
c075e4434a include the hour, minute precision in the communication date received 
from customers.

FEA: ItEr75S32AnA15S04UpdateDeliveringDateInSubcontracting
 2012-03-29 10:58:48 +01:00
Susana Montes Pedreira
4a9bb627c9 Fix the layout of the screen "to customers" in subcontractor module. 
FEA: ItEr74S04BugFixing
 2012-03-29 08:56:22 +01:00
Jacobo Aragunde Pérez
2df0bac3d8 Rebase the code of the .zul pages for the templates screen. 
I did it so it matches the three file structure we used in many other screens
(main, list, edit).
 2012-03-28 20:11:58 +02:00
Manuel Rego Casasnovas
979ac144b1 Merge branch 'money-cost-monitoring-system' 2012-03-27 17:51:02 +02:00
Manuel Rego Casasnovas
8d37e716e6 Merge branch 'libreplan-1.2' into money-cost-monitoring-system 2012-03-27 17:26:21 +02:00
Manuel Rego Casasnovas
88e39eabd8 Show budget information in a read-only field inside task properties tab 
FEA: ItEr76S17MoneyCostMonitoringSystem
 2012-03-27 10:07:31 +02:00
Manuel Rego Casasnovas
065acc4a29 Change color of money cost bar to a darker one to avoid accessibility issues 
FEA: ItEr76S17MoneyCostMonitoringSystem
 2012-03-27 09:48:26 +02:00
Manuel Rego Casasnovas
e5f00bb8a1 Bug #1403: Only regenerate codes if isCodeAutogenerated() is true 
FEA: ItEr76S04BugFixing
 2012-03-26 18:32:57 +02:00
Manuel Rego Casasnovas
16e3d1860e Bug #1403: Only regenerate codes if isCodeAutogenerated() is true 
FEA: ItEr76S04BugFixing
 2012-03-26 18:30:33 +02:00
Susana Montes Pedreira
6f52035e8b update the deadline of the task and of the order in the 
subcontract side when a new deliver date is sent.

FEA: ItEr75S32AnA15S04UpdateDeliveringDateInSubcontracting
 2012-03-26 16:26:35 +01:00
Susana Montes Pedreira
be35cb76ce save the subcontract communication date if you send a subcontract 
communication and the previous state is Failed_Sent.

FEA: ItEr75S32AnA15S04UpdateDeliveringDateInSubcontracting
 2012-03-26 16:21:47 +01:00
Susana Montes Pedreira
7d9374e5db manage a optimistic locking exception which happens due to 
a subcontracted task has been modified by other instance.

FEA: ItEr75S28CustomerIncommingCommunicationsLists
 2012-03-26 16:15:41 +01:00
Susana Montes Pedreira
deeeac579f set the fields of the subcontraction pop-up to read-only mode 
when a subcontracted task has been sent.

FEA: ItEr75S32AnA15S04UpdateDeliveringDateInSubcontracting
 2012-03-26 16:07:13 +01:00
Manuel Rego Casasnovas
65fcc3e0f1 Add a map in MoneyCostCalculator to cache calculated values 
This prevents to recalculate money cost when it was already calculated before.
The map with the cached values is reseted every time you enter in a project
(when PlanningState is created).

FEA: ItEr76S17MoneyCostMonitoringSystem
 2012-03-26 10:39:15 +02:00
Manuel Rego Casasnovas
120534e6ff Disable Money Cost Bar in company view to avoid performance issues 
FEA: ItEr76S17MoneyCostMonitoringSystem
 2012-03-26 10:27:15 +02:00
Lorenzo Tilve Álvaro
f50806e51e Bug #1289: Added subcontractor name to tasks when showing resources is enabled 
The name of the subcontractors are not being displayed when the container is collapsed. The
expected behaviour also might consider painting the parent node differently when it only contains
subcontracted elements.

FEA: ItEr76S04BugFixing
 2012-03-24 13:00:06 +01:00
Lorenzo Tilve Álvaro
ff2f2298cf Bug #1289: Added subcontractor name to tasks when showing resources is enabled 
The name of the subcontractors are not being displayed when the container is collapsed. The
expected behaviour also might consider painting the parent node differently when it only contains
subcontracted elements.

FEA: ItEr76S04BugFixing
 2012-03-24 12:54:16 +01:00
Susana Montes Pedreira
86a6341911 set the correct class to the button delete "Delivery date". 
FEA: ItEr75S32AnA15S04UpdateDeliveringDateInSubcontracting
 2012-03-23 16:51:27 +00:00
Susana Montes Pedreira
b66af392e7 set the fields "Subcontracting date" and "Subcontracting communication 
date" in the subcontractor pop-up in read only mode.

FEA: ItEr75S32AnA15S04UpdateDeliveringDateInSubcontracting
 2012-03-23 16:48:24 +00:00
Susana Montes Pedreira
6a6b52e98a set the progress values, which are sent from a 
subcontrated task, in read only mode.

FEA: ItEr75S31PreventingSubcontractorProgresses
 2012-03-23 10:52:50 +00:00