Ó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
Óscar González Fernández
47072040b5
Remove enforceAllRestrictions call
...
It was done to force the showing of the constraint violations after
the components have been created. Now this is not needed thanks to the
support for receiving pending of notification events.
FEA: ItEr74S04BugFixing
2011-05-10 17:56:36 +02:00
Óscar González Fernández
28d642376a
[Bug #1045 ] Fix bug
...
Avoid to execute some constraint violations when they are not in a ZK
context.
FEA: ItEr74S04BugFixing
2011-05-05 18:42:11 +02:00
Diego Pino Garcia
3a1b50c2c2
[Bug #829 ] Don't let user change the type of a dependency between a Limiting Task and any other type of Task
...
FEA: ItEr69S04BugFixing
2011-01-31 15:22:57 +01:00
Jacobo Aragunde Pérez
2876a85b92
Merge commit 'navalplan-1.0.1' into HEAD
...
Conflicts:
ganttzk/src/main/java/org/zkoss/ganttz/Planner.java
ganttzk/src/main/resources/i18n/keys.pot
ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul
ganttzk/src/main/resources/web/ganttz/zul/timetracker/timetrackersecondlevel.zul
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java
navalplanner-webapp/src/main/resources/i18n/keys.pot
navalplanner-webapp/src/main/resources/logos
navalplanner-webapp/src/main/webapp/calendars/_edition.zul
navalplanner-webapp/src/main/webapp/common/configuration.zul
navalplanner-webapp/src/main/webapp/orders/_listOrderElementAdvances.zul
navalplanner-webapp/src/main/webapp/orders/_listOrderElementAuthorizations.zul
navalplanner-webapp/src/main/webapp/orders/_listOrderElementHours.zul
navalplanner-webapp/src/main/webapp/orders/_listOrderElementTaskQualityForms.zul
navalplanner-webapp/src/main/webapp/orders/_orderFilter.zul
navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul
navalplanner-webapp/src/main/webapp/orders/components/_orderElementTree.zul
2011-01-21 12:55:30 +01:00
Manuel Rego Casasnovas
59dae6bb43
Updated NavalPlan license headers to 2011.
...
FEA: ItEr68S03CommunityMaterialItEr67S03
2011-01-19 18:40:35 +01:00
Lorenzo Tilve
0b0deafe4f
After moving tasks its violated depedendences are displayed with different style
...
FEA: ItEr68S04BugFixing
2011-01-14 12:06:44 +01:00
Óscar González Fernández
ec11dab825
Notify when a constraint is satisfied too
...
FEA: ItEr65S06BugFixing
2010-12-15 13:24:00 +01:00
Óscar González Fernández
bb53ec7060
Merge branch 'master' into migration-to-ZK5-dev
...
Conflicts:
ganttzk/src/main/java/org/zkoss/ganttz/DependencyComponent.java
ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java
ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/chart/ChartFiller.java
pom.xml
2010-10-26 17:17:49 +02:00
Óscar González Fernández
31a5eb4c25
Use GanttDates in GanttDiagramGraph when enforcing constraints and dependencies
...
FEA: ItEr61S08TimeUnitConfigurablePlanning
2010-10-07 01:44:46 +02:00
Farruco Sanjurjo
13e75134ac
Added renderProperties method for DependencyComponent
...
* Right now it'll be used for setting properties at the widget needed by the mold
FEA: ItEr02S03MigracionZK5
2010-08-27 14:23:16 +02:00
Manuel Rego Casasnovas
35dd2ac6fa
ItEr60S03XestionDaComunidadeItEr59S03: Updated license headers to 2010.
2010-07-19 09:47:20 +02:00
Manuel Rego Casasnovas
977005d82f
ItEr60S03XestionDaComunidadeItEr59S03: Updated license headers to 2010.
2010-07-19 09:36:44 +02:00
Manuel Rego Casasnovas
ad8aa713b5
ItEr46S07ImplantacionAplicacionItEr45S07: Set project name at license headers.
2010-02-04 07:00:28 +01:00
Óscar González Fernández
94be25b58c
ItEr33S14CUCreacionUnidadesPlanificacion: When a dependency is violated, it's notified to the component
2009-11-09 01:27:03 +01:00
Óscar González Fernández
46a901746a
ItEr33S14CUCreacionUnidadesPlanificacion: DependencyComponent now has a reference to Dependency
2009-11-09 01:27:03 +01:00
Óscar González Fernández
b636354971
ItEr33S08ValidacionEProbasFuncionaisItEr32S09: Converting one line if statements to block
2009-11-04 01:33:22 +01:00
Manuel Rego Casasnovas
2588a73d8a
ItEr28S04XestionDaComunidadeItEr27S04: Added license header to files.
2009-10-01 19:13:37 +02:00
Óscar González Fernández
3577620603
ItEr22S12CUVistaRecursosTempoPorProxectoItEr21S07: Removing access to context from DependencyComponent
2009-08-18 15:35:12 +02:00
Óscar González Fernández
25208ebe52
ItEr22S12CUVistaRecursosTempoPorProxectoItEr21S07: When the type changes a new dependency is created.
2009-08-18 15:35:12 +02:00
Óscar González Fernández
2ff7e7b5ee
ItEr22S12CUVistaRecursosTempoPorProxectoItEr21S07: Now context is responsible of removing the graphical component.
2009-08-18 15:35:12 +02:00
Óscar González Fernández
99d5c21a4a
ItEr22S12CUVistaRecursosTempoPorProxectoItEr21S07: The dependency associated is retrieved dinamically.
2009-08-18 15:35:12 +02:00
Óscar González Fernández
4d49e4c662
ItEr22S12CUVistaRecursosTempoPorProxectoItEr21S07: Passing context to DependencyComponent.
2009-08-18 15:35:12 +02:00
Lorenzo Tilve
fed9b20915
ItEr21S06XestionDaComunidadeItEr20S06: Renamed GanttZK module to 'ganttzk' from previous 'navalplanner-gantt-zk'
...
* Might be necessary to reimport ganttzk module in the IDE to load the components
2009-08-14 14:48:53 +02:00
