Commit graph

4124 commits

Author SHA1 Message Date
Manuel Rego Casasnovas
db1078f1f2 [Bug #1094] Made changes to fix the issue and use "cutycapt" command.
FEA: ItEr75S10PrintingSupportItEr74S05
2011-06-30 08:00:51 +02:00
Manuel Rego Casasnovas
bc618ec55d Added an extra grid in settings to format the page like others.
FEA: ItEr75S07UserSettings
2011-06-29 17:52:17 +02:00
Cristina Alvarino
c2699389fe Refactoring options about planning charts expanded to value per user
FEA: ItEr75S07UserSettings
2011-06-29 17:24:15 +02:00
Óscar González Fernández
2e7dba3925 [Bug #1100] Fix bug
Using new component compatible with ZK5 for reports.

FEA: ItEr75S04BugFixing
2011-06-29 16:04:31 +02:00
Óscar González Fernández
d2c759bb03 Merge branch 'migration-to-ZK5' into master
Conflicts:
	ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java
	ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
	navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java

FEA: ItEr75S08MigrationZK5
2011-06-28 20:00:26 +02:00
Óscar González Fernández
b709cbc5ed Fix ClassCastException on EffortDurationBox
It only happens with ZK5. Marshal and unmarshal are needed.

FEA: ItEr75S08MigrationZK5
2011-06-28 19:41:22 +02:00
Óscar González Fernández
129550fd99 Remove still present spurious throws clauses
FEA: ItEr75S08MigrationZK5
2011-06-28 19:18:40 +02:00
Óscar González Fernández
48ac38c138 ScriptsComponent and associated clases no longer needed
Now zk package mechanism for grouping scripts is used.

FEA: ItEr75S08MigrationZK5
2011-06-28 19:09:49 +02:00
Óscar González Fernández
cc77593c9f Remove no longer necessary throws clauses
FEA: ItEr75S08MigrationZK5
2011-06-28 18:33:03 +02:00
Óscar González Fernández
7bc19f827d Don't pollute throws clauses
Extracting method that produces a warning when failing to set the sort
property of a Column.

FEA: ItEr75S08MigrationZK5
2011-06-28 18:20:19 +02:00
Manuel Rego Casasnovas
c50dbd372c Fixed translation issue with language combo.
FEA: ItEr75S07UserSettings
2011-06-28 18:14:50 +02:00
Manuel Rego Casasnovas
4257197149 Changed language como for listbox with mold select.
FEA: ItEr75S07UserSettings
2011-06-28 18:13:33 +02:00
Manuel Rego Casasnovas
cbf91d069d Fixed copyright header of configuration.zul file.
FEA: ItEr75S03CommunityMaterial
2011-06-28 17:36:35 +02:00
Cristina Alvarino
6dcbf26ef4 Create language configuration option for user
FEA: ItEr75S07UserSettings
2011-06-28 17:13:19 +02:00
Susana Montes Pedreira
867076e8fd [Bug #1088] fix the representation of the chart of earned value month and upper zoom
levels.

There is two ways for represent the chart (by day and by week). By week, the hours
is the average of the hours of whole week.

FEA: ItEr75S04BugFixing
2011-06-27 14:33:16 +02:00
Óscar González Fernández
7e759bafed Remove no longer needed js files
FEA: ItEr75S08MigrationZK5
2011-06-24 20:14:41 +02:00
Óscar González Fernández
475ae8b380 Mixin position restorer into QueueListComponent
FEA: ItEr75S08MigrationZK5
2011-06-24 20:11:33 +02:00
Óscar González Fernández
124a1bb666 Add missing function adjustTimeTrackerSize
FEA: ItEr75S08MigrationZK5
2011-06-24 19:45:34 +02:00
Óscar González Fernández
bae087dff9 [Bug #1096] Fix bug
Consider also the deadline when calculating the initial zoom level.

FEA: ItEr75S04BugFixing
2011-06-22 14:03:00 +02:00
Manuel Rego Casasnovas
4ae60ee70d [Bug #1095] Fixed issue using header parameter of CutyCapt to set Accept-Language.
FEA: ItEr75S04BugFixing
2011-06-20 19:06:47 +02:00
Óscar González Fernández
0eb573bc55 Use method in SecurityUtils to get current user
The direct use of SecurityContextHolder is discouraged.
2011-06-17 13:45:10 +02:00
Cristina Alvarino
a1a980b3a7 Added method getLoggedUser() in SecurityUtils class 2011-06-17 13:32:19 +02:00
Manuel Rego Casasnovas
6d28f88394 [Bug #1090] Added JavaScript removed in one of the previous patches.
FEA: ItEr74S04BugFixing
2011-06-16 18:29:10 +02:00
Manuel Rego Casasnovas
18c91cbbe4 [Bug #1090] Removed unused variables in UserModel.
FEA: ItEr74S04BugFixing
2011-06-16 18:29:03 +02:00
Manuel Rego Casasnovas
02841699b8 [Bug #1090] Avoid pass Configuration to MandatoryUser.
FEA: ItEr74S04BugFixing
2011-06-16 18:28:57 +02:00
Manuel Rego Casasnovas
64c12cf941 [Bug #1090] Fixed hidden warnings if user is disabled.
FEA: ItEr74S04BugFixing
2011-06-16 18:28:48 +02:00
Manuel Rego Casasnovas
37994c73b7 [Bug #971] Fixed reseting Tree model to null.
FEA: ItEr74S04BugFixing
2011-06-16 12:37:05 +02:00
Óscar González Fernández
8da37d7244 [Bug #1091] Fix bug
Prevent entering workable days values that conflict with the
consolidation if exists.

FEA: ItEr74S04BugFixing
2011-06-09 13:26:14 +02:00
Diego Pino Garcia
5edb0c7e68 [Bug #975] Cannot apply Sigmoid function is resource allocation has consolidated days
Created class AssignmentFunctionCombobox, this combobox encapsulates
the business logic related with the combobox that is used for selecting
what type of assigmentFunction to apply

FEA: ItEr74S04BugFixing
2011-06-09 12:21:22 +02:00
Óscar González Fernández
bc7c4a8b4e [Bug #1084] Fix bug
Use floating point arithmetic if the fraction overflows

FEA: ItEr74S04BugFixing
2011-06-08 19:24:09 +02:00
Manuel Rego Casasnovas
64a2eda02a [i18n] Fixed wrong translation of project in some reports.
FEA: ItEr74S04BugFixing
2011-06-06 23:02:04 +02:00
Manuel Rego Casasnovas
de23a1ff42 [i18n] Fixed uppercase/lowercases incoherences.
FEA: ItEr74S04BugFixing
2011-06-06 23:01:57 +02:00
Óscar González Fernández
0e118ea1b6 [Bug #1084] Fix bug
Use floating point arithmetic if the fraction overflows

FEA: ItEr74S04BugFixing
2011-06-06 19:19:32 +02:00
Óscar González Fernández
8370d66ebb Avoid where possible to mark a method as throws Exception
FEA: ItEr74S04BugFixing
2011-06-06 18:06:02 +02:00
Óscar González Fernández
8671d73a8c Avoid creation of array by reflection
FEA: ItEr74S04BugFixing
2011-06-06 18:06:02 +02:00
Óscar González Fernández
07d335ab17 Review methods that provide variables that are known to be null
FEA: ItEr74S04BugFixing
2011-06-06 18:06:01 +02:00
Óscar González Fernández
9f11338947 Implement missing equals or add warning to classes that have a natural ordering
FEA: ItEr74S04BugFixing
2011-06-06 18:06:01 +02:00
Óscar González Fernández
b40a5eed12 Remove unnecessary null checks
FEA: ItEr74S04BugFixing
2011-06-06 18:06:01 +02:00
Óscar González Fernández
af5ca60af2 Mark classes as static when not referencing outer class
FEA: ItEr74S04BugFixing
2011-06-06 18:06:01 +02:00
Óscar González Fernández
1a54013e7e Avoid the use of Number constructors
They look bad and are more inefficient.

FEA: ItEr74S04BugFixing
2011-06-06 18:06:01 +02:00
Óscar González Fernández
7d0103b250 Fix possible NPE
FEA: ItEr74S04BugFixing
2011-06-06 14:09:31 +02:00
Óscar González Fernández
f4fc8f53d3 Fix NPE if provided allocation is null
FEA: ItEr74S04BugFixing
2011-06-06 14:09:29 +02:00
Óscar González Fernández
d7e7634028 Avoid NPE if editedValue is null
FEA: ItEr74S04BugFixing
2011-06-06 11:29:15 +02:00
Óscar González Fernández
f56fe6ba8d Merge branch 'master' into migration-to-ZK5-merging
Conflicts:
	NEWS
	debian/changelog
	ganttzk/pom.xml
	ganttzk/src/main/java/org/zkoss/ganttz/DependencyComponent.java
	ganttzk/src/main/java/org/zkoss/ganttz/GanttPanel.java
	ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java
	ganttzk/src/main/java/org/zkoss/ganttz/util/LongOperationFeedback.java
	ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
	ganttzk/src/main/resources/web/ganttz/zul/timetracker/timetrackersecondlevel.zul
	navalplanner-business/pom.xml
	navalplanner-webapp/pom.xml
	navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/IBaseCalendarModel.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/ExtendedJasperreport.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/NewAllocationSelector.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/externalcompanies/ExternalCompanyDTO.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloController.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationController.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/ChartFiller.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/reports/NavalplannerReport.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/reports/OrderCostsPerResourceReport.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java
	navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/NewAllocationSelectorController.java
	navalplanner-webapp/src/main/resources/i18n/es.po
	navalplanner-webapp/src/main/resources/i18n/gl.po
	navalplanner-webapp/src/main/resources/i18n/keys.pot
	navalplanner-webapp/src/main/webapp/calendars/_edition.zul
	navalplanner-webapp/src/main/webapp/externalcompanies/_listExternalCompanies.zul
	navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
	navalplanner-webapp/src/main/webapp/orders/_projectDetails.zul
	navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementMaterials.zul
	navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul
	navalplanner-webapp/src/main/webapp/planner/order.zul
	navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul
	navalplanner-webapp/src/main/webapp/reports/schedulingProgressPerOrderReport.zul
	navalplanner-webapp/src/main/webapp/reports/timeLineMaterialReport.zul
	navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul
	navalplanner-webapp/src/main/webapp/resources/machine/_machineCriterions.zul
	navalplanner-webapp/src/main/webapp/resources/search/allocation_selector.zul
	navalplanner-webapp/src/main/webapp/workreports/workReportQuery.zul
	pom.xml
2011-06-03 18:42:09 +02:00
Manuel Rego Casasnovas
9459be7464 [i18n] Fixed typo in progress with all tasks.
FEA: ItEr74S04BugFixing
2011-06-03 13:35:10 +02:00
Manuel Rego Casasnovas
c358afbc28 [i18n] Fixed typo in "criterions" using "criteria".
FEA: ItEr74S04BugFixing
2011-06-03 13:35:00 +02:00
Manuel Rego Casasnovas
03c1945001 [i18n] Updated Spanish and Galician translations.
FEA: ItEr74S03CommunityMaterialItEr73S03
2011-06-03 13:17:45 +02:00
Manuel Rego Casasnovas
22f85d2ee4 [i18n] Fixed issue in keys generator and updated keys.pot files.
FEA: ItEr74S04BugFixing
2011-06-03 13:17:39 +02:00
Manuel Rego Casasnovas
def4d3f931 [i18n] Updated Spanish and Galician translations.
FEA: ItEr74S03CommunityMaterialItEr73S03
2011-06-03 12:33:08 +02:00
Manuel Rego Casasnovas
62d78ebc3b [i18n] Fixed translation of "progress" to Galician and Spanish.
FEA: ItEr74S04BugFixing
2011-06-03 11:02:04 +02:00