diff --git a/AUTHORS.rst b/AUTHORS.rst index 47c6f704c..08b60279b 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -7,9 +7,11 @@ LibrePlan Team -------------- * Jeroen Baten +* Edwin Zuijdendorp * Bjørn Vos -* Vova Perebykivskiy -* Міша Гожда +* Philippe Poumaroux +* Vova Perebykivskyi +* Paul Luchyn Previous Team Members @@ -30,6 +32,8 @@ Previous Team Members * Óscar González Fernández * Pablo Fernández de la Cigoña Nóvoa * Farruco Sanjurjo Arcay +* Misha Gozda +* Bogdan Bodnarjuk - + + @@ -419,7 +423,7 @@ something similar to the following content: - + @@ -552,27 +556,25 @@ Steps: } Then if you run LibrePlan and go to the new menu entry called *Resources List* -in *Reports* you will be able to generate a report with the resources added as -example data. The report still lacks a good design and format, but at least you -are able to see how the basic functionality of JasperReports in LibrePlan is -integrated. The next step will be to show real data in the report getting it -from database. +in *Reports* you will be able to generate a report with the resources added as example data. +The report still lacks a good design and format, but at least you +are able to see how the basic functionality of JasperReports in LibrePlan is integrated. +The next step will be to show real data in the report getting it from database. .. figure:: img/resources-list-report-example-data-pdf.png - :alt: Resources List report with example data in PDF format +:alt: Resources List report with example data in PDF format :width: 100% - Resources List report with example data in PDF format + Resources List report with example data in PDF format Show real data from database ---------------------------- -Now you need to query database and get information about resources. In order to -follow LibrePlan architecture you are going to create a model that will be in -charge to retrieve information from database, process it if needed and return -the information to the controller. Then controller will send this information to -JasperReports in order to generate the report with real data. +Now you need to query database and get information about resources. +In order to follow LibrePlan architecture you are going to create a model that will be in +charge to retrieve information from database, process it if needed and return the information to the controller. +Then controller will send this information to JasperReports in order to generate the report with real data. Steps: @@ -828,8 +830,8 @@ Steps: } * Modify report file ``resourcesListReport.jrxml`` with iReport to add the new - parameter and show it in some part of the report layout. You could use iReport - for this task, or, for example, add the following lines in XML file:: + parameter and show it in some part of the report layout. + You could use iReport for this task, or, for example, add the following lines in XML file:: diff --git a/doc/src/user/en/20-acerca-de.rst b/doc/src/user/en/20-acerca-de.rst index e9d6991f6..864e5c915 100644 --- a/doc/src/user/en/20-acerca-de.rst +++ b/doc/src/user/en/20-acerca-de.rst @@ -43,6 +43,21 @@ Written by LibrePlan Team -------------- +* Jeroen Baten +* Edwin Zuijdendorp +* Bjørn Vos +* Philippe Poumaroux +* Vova Perebykivskyi +* Paul Luchyn + +Previous Team Members +--------------------- + +* Fernando Bellas Permuy +* José María Casanova Crespo +* Óscar González Fernández +* Pablo Fernández de la Cigoña Nóvoa +* Farruco Sanjurjo Arcay * Cristina Alvariño Pérez * Jacobo Aragunde Pérez * Nacho Barrientos Arias @@ -53,15 +68,8 @@ LibrePlan Team * Diego Pino García * Manuel Rego Casasnovas * Lorenzo Tilve Álvaro - -Previous Team Members ---------------------- - -* Fernando Bellas Permuy -* José María Casanova Crespo -* Óscar González Fernández -* Pablo Fernández de la Cigoña Nóvoa -* Farruco Sanjurjo Arcay +* Misha Gozda +* Bogdan Bodnarjuk Translators ----------- @@ -106,10 +114,10 @@ Public funding Inside the global scope that LibrePlan is designed for regarding planning management, a project was developed to solve some common polanning problems. This project is partially financed by Xunta de Galicia, Ministerio de Industria, Turismo e Comercio, and by the European Union, Fondo Europeo de Desenvolvemento Rexional. .. figure:: images/logos.png - :scale: 100 +:scale: 100 This project was part of Plan Avanza: .. figure:: images/avanza.png - :scale: 100 +:scale: 100 diff --git a/doc/src/user/en/21-communications.rst b/doc/src/user/en/21-communications.rst new file mode 100644 index 000000000..41a248464 --- /dev/null +++ b/doc/src/user/en/21-communications.rst @@ -0,0 +1,9 @@ +Subcontractor work description +############################### + +It is possible to keep this field empty. + +But if you do, you could get errors in communication functionality when multiple emtpy fields exist. + +We recommend to always use a unique work description. + diff --git a/doc/src/user/en/lsr.css b/doc/src/user/en/lsr.css index 81e4c1669..ced6c967a 100644 --- a/doc/src/user/en/lsr.css +++ b/doc/src/user/en/lsr.css @@ -10,7 +10,6 @@ body { background: #ffffff; color: black; margin: 2em; -/* padding: 0em 2em; */ } p.topic-title { @@ -19,7 +18,7 @@ p.topic-title { table.docinfo { text-align: left; - margin: 2em 0em; + margin: 2em 0; } a[href] { @@ -78,18 +77,18 @@ p.rubric { h1.title { color: #003a6b; font-size: 250%; - margin-bottom: 0em; + margin-bottom: 0; } h2.subtitle { color: #003a6b; - border-bottom: 0px; + border-bottom: 0; } h1, h2, h3, h4, h5, h6 { color: #555; background-color: transparent; - margin: 0em; + margin: 0; padding-top: 0.5em; } @@ -138,7 +137,7 @@ dd { div.admonition, div.note, div.tip, div.caution, div.important, div.warning { margin: 2em 2em; - padding: 0em 1em; + padding: 0 1em; border-top: 1px solid #aaa; border-left: 1px solid #aaa; border-bottom: 2px solid #555; @@ -180,7 +179,7 @@ table.docutils { border: 1px solid gray; border-collapse: collapse; width: 100%; - margin: 1.5em 0em; + margin: 1.5em 0; } table.docutils caption { @@ -198,8 +197,8 @@ table.docutils th { div.sidebar { width: 33%; float: right; - margin: 0em 2em; - padding: 0em 1em; + margin: 0 2em; + padding: 0 1em; border-top: 1px solid #aaa; border-left: 1px solid #aaa; border-bottom: 2px solid #555; @@ -207,45 +206,45 @@ div.sidebar { } p.sidebar-title { - margin-bottom: 0em; + margin-bottom: 0; color: #003a6b; border-bottom: 1px solid #aaa; font-weight: bold; } p.sidebar-subtitle { - margin-top: 0em; + margin-top: 0; font-style: italic; color: #003a6b; } div.figure { - text-align: center; + text-align: center; } div.figure img { - background: #f8f8f8; - padding: 0.25em; - border: 1px solid #888; - border-radius: 5px; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; + background: #f8f8f8; + padding: 0.25em; + border: 1px solid #888; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; } div.figure img:hover { - background: #e0e0e0; + background: #e0e0e0; } div.figure p.caption { - text-align: center; - margin-top: 0.1em; - font-style: italic; - color: #444; + text-align: center; + margin-top: 0.1em; + font-style: italic; + color: #444; } pre.literal-block { - padding: 0.15em; - background: #f8f8f8; - border: 1px solid #dfdfdf; - border-left: 0.25em solid #dfdfdf + padding: 0.15em; + background: #f8f8f8; + border: 1px solid #dfdfdf; + border-left: 0.25em solid #dfdfdf } diff --git a/libreplan.spec b/libreplan.spec index b7c6d00dc..8f8c89cb7 100644 --- a/libreplan.spec +++ b/libreplan.spec @@ -1,5 +1,5 @@ Name: libreplan -Version: 1.4.0 +Version: 1.6.0 Release: 1 Summary: Web application for project planning, monitoring and control License: AGPLv3 @@ -10,27 +10,27 @@ Source1: http://downloads.sourceforge.net/project/libreplan/LibrePlan/%{n BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -#BuildRequires: java-1.6.0-openjdk -#BuildRequires: maven2 +#BuildRequires: java-1.8.0-openjdk +#BuildRequires: maven2 #BuildRequires: maven2-common-poms -#BuildRequires: python-docutils +#BuildRequires: python-docutils #BuildRequires: javamail #BuildRequires: javacc #BuildRequires: ant #BuildRequires: jpackage-utils -#BuildRequires: postgresql-server +#BuildRequires: postgresql-server %if 0%{?fedora} || 0%{?centos} Requires: postgresql-jdbc %endif %if 0%{?fedora} >= 17 -Requires: java-1.7.0-openjdk +Requires: java-1.8.0-openjdk %else -Requires: java-1.6.0-openjdk +Requires: java-1.8.0-openjdk %endif Requires: postgresql Requires: postgresql-server -Requires: tomcat6 +Requires: tomcat8 %if 0%{?centos} %else Requires: cutycapt @@ -84,7 +84,7 @@ cp ${CURDIR}/scripts/database/upgrade_*.sql ${RPM_BUILD_ROOT}%{_datadir}/%{name} # Install Policy file #mkdir -p ${RPM_BUILD_ROOT}/etc/tomcat6/policy.d -#cp ${CURDIR}/debian/51libreplan.policy ${RPM_BUILD_ROOT}/etc/tomcat6/policy.d/ +#cp ${CURDIR}/debian/51libreplan.policy ${RPM_BUILD_ROOT}/etc/tomcat8/policy.d/ # Install Tomcat6 configuration file mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}/conf diff --git a/pom.xml b/pom.xml index ca835264f..5679c3306 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 org.libreplan @@ -20,9 +19,9 @@ @@ -38,6 +37,9 @@ true UTF-8 + + 8080 + 9966 @@ -158,12 +160,12 @@ - + thirdparty - http://nexus.libreplan.org/content/repositories/thirdparty + http://nexus.libreplan.org/nexus/content/repositories/test/ @@ -173,10 +175,11 @@ - net.sf.jasperreports - jasperreports - 6.2.2 + net.sf.jasperreports + jasperreports + 6.2.2 + net.sf.jasperreports jasperreports-fonts @@ -185,23 +188,23 @@ - com.igalia.java.zk.components - jasperreportcomponent - 1.0 + com.libreplan.java.zk.components + jasperreportcomponent + 1.1 - com.igalia.java.zk.components + com.libreplan.java.zk.components jfreechartengine - 1.1 + 1.2 - com.igalia.java.zk.components + com.libreplan.java.zk.components customdetailrowcomponent - 1.0.0 + 1.1 @@ -271,10 +274,10 @@ 1.0.1.Final compile - - xml-apis - xml-apis - + + xml-apis + xml-apis + @@ -292,6 +295,18 @@ 4.2.6.RELEASE + + + + + org.aspectj + aspectjweaver + 1.8.9 + + org.springframework @@ -331,18 +346,6 @@ test - - - - - org.aspectj - aspectjweaver - 1.8.9 - - junit @@ -351,7 +354,7 @@ test - + com.jolbox bonecp @@ -366,6 +369,7 @@ 3.4 test + org.easymock easymockclassextension @@ -435,17 +439,19 @@ org.zkoss.zk zul - 5.0.11 + 8.0.1.1 + org.zkoss.zk zkplus - 5.0.11 + 8.0.1.1 + org.zkoss.zk zk - 5.0.11 + 8.0.1.1 org.jruby @@ -454,6 +460,12 @@ + + org.zkoss.zk + zkbind + 8.0.1.1 + + org.jgrapht @@ -591,11 +603,11 @@ timelinez 2.3.1_50 - - org.zkoss.common - zcommon - - + + org.zkoss.common + zcommon + + @@ -614,7 +626,7 @@ br.com.digilabs.jqplot jqplot4java - 1.2.3-javascript + 1.3.2-javascript @@ -626,9 +638,9 @@ - commons-io - commons-io - 2.5 + commons-io + commons-io + 2.5 @@ -693,27 +705,35 @@ ../libreplan-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/ + ../libreplan-webapp/src/main/jasper/completedEstimatedHours_Bundle/ + ../libreplan-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/ + ../libreplan-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonth_Bundle/ + ../libreplan-webapp/src/main/jasper/orderCostsPerResource_Bundle/ + ../libreplan-webapp/src/main/jasper/schedulingProgressPerOrder_Bundle/ + ../libreplan-webapp/src/main/jasper/timeLineRequiredMaterial_Bundle/ + ../libreplan-webapp/src/main/jasper/workingProgressPerTask_Bundle/ + ../libreplan-webapp/src/main/jasper/projectStatus_Bundle/ @@ -799,7 +819,7 @@ maven-surefire-plugin 2.19.1 - alphabetical + alphabetical @@ -813,7 +833,8 @@ target/jetty/jetty-env.xml manual - 9966 + + ${jetty-stop-port} stop @@ -826,35 +847,37 @@ - - ${jdbcDriver.groupId} - ${jdbcDriver.artifactId} - ${jdbcDriver.version} - + + ${jdbcDriver.groupId} + ${jdbcDriver.artifactId} + ${jdbcDriver.version} + - - - com.jolbox - bonecp - 0.8.0.RELEASE - + + + com.jolbox + bonecp + 0.8.0.RELEASE + - - - org.slf4j - slf4j-api - 1.7.21 - - - org.slf4j - slf4j-simple - 1.7.21 - - - com.google.guava - guava - 19.0 - + + + org.slf4j + slf4j-api + 1.7.21 + + + + org.slf4j + slf4j-simple + 1.7.21 + + + + com.google.guava + guava + 19.0 + diff --git a/scripts/functional-tests/common_functions.sah b/scripts/functional-tests/common_functions.sah index ef7a90a82..151298d17 100644 --- a/scripts/functional-tests/common_functions.sah +++ b/scripts/functional-tests/common_functions.sah @@ -175,7 +175,7 @@ function commonResourceEditAssignedCostCategoryForm($element, $name, $cell, $cca _click(_cell("Save")); commonResourceEmptyCategoryDate(); _click(_italic(1, _near(_div("Category name")))); - _click(_cell("z-calendar-wkday z-calendar-seld", _near(_div("Category name")))); + _click(_cell("z-calendar-weekday z-calendar-selected", _near(_div("Category name")))); _click(_cell("Save")); } diff --git a/scripts/functional-tests/data-types/criteria_test.sah b/scripts/functional-tests/data-types/criteria_test.sah index 90c1ba00a..b68a5c363 100644 --- a/scripts/functional-tests/data-types/criteria_test.sah +++ b/scripts/functional-tests/data-types/criteria_test.sah @@ -67,7 +67,7 @@ function criteriaCreateWithHierarchy($type, $name, $name2){ _setValue(_textbox(0, _near(_span("Name"))), $type); _setValue(_textbox(0, _near(_span("New criterion"))), $name); _click(_cell("Add")); - _click(_div(0, _near(_div("z-treecell-cnt z-overflow-hidden")))); + _click(_div(0, _near(_div("z-treecell-content z-overflow-hidden")))); _setValue(_textbox(0, _near(_span("New criterion"))), $name2); _click(_cell("Add")); _assertExists(_span("z-tree-line z-tree-spacer")); @@ -83,7 +83,7 @@ function criteriaCreateWithoutHierarchy($type, $name, $name2){ _click(_cell("OK")); _setValue(_textbox(0, _near(_span("New criterion"))), $name); _click(_cell("Add")); - _click(_div(0, _near(_div("z-treecell-cnt z-overflow-hidden")))); + _click(_div(0, _near(_div("z-treecell-content z-overflow-hidden")))); _setValue(_textbox(0, _near(_span("New criterion"))), $name2); _click(_cell("Add")); _assertExists(_span("z-tree-ico z-tree-firstspacer[1]")); diff --git a/scripts/functional-tests/scheduling/planning_criteria_test.sah b/scripts/functional-tests/scheduling/planning_criteria_test.sah index a68b0d9a1..29d4ef6e2 100644 --- a/scripts/functional-tests/scheduling/planning_criteria_test.sah +++ b/scripts/functional-tests/scheduling/planning_criteria_test.sah @@ -48,7 +48,7 @@ function planningIncludeEndDates($worker, $dates, $dates2){ function planningIncludeCriterionEndDate($dates){ _click(_span("Assigned criteria")); - _setValue(_textbox("z-datebox-inp", _near(_div("Starting date"))), $dates[0]); + _setValue(_textbox("z-datebox-input", _near(_div("Starting date"))), $dates[0]); _setValue(_textbox(3, _near(_div("Starting date"))), $dates[1]); _click(_cell("Save & Continue")); commonWorkerAcctionValidation("saved"); diff --git a/scripts/functional-tests/scheduling/templates_test.sah b/scripts/functional-tests/scheduling/templates_test.sah index 534d06171..b8cf2740b 100644 --- a/scripts/functional-tests/scheduling/templates_test.sah +++ b/scripts/functional-tests/scheduling/templates_test.sah @@ -47,7 +47,7 @@ function templateProjectAssignTemplate($template){ _click(_link("Projects")); _click(_image("ico_add.png")); _setValue(_textbox(0, _near(_span("Name"))), "ProjectTemplate"); - _click(_italic(0, _cell("z-caption-l"))); + _click(_italic(0, _cell(.z-caption-content"))); _click(_div($template)); _click(_cell("Accept")); _click(_image("ico_save.png")); @@ -79,7 +79,7 @@ function templateTaskCreateTemplate(){ function templateTaskAssignTemplate($projectName, $taskName){ commonEditProject($projectName); _click(_cell("Add From Template")); - _click(_italic(0, _cell("z-caption-l"))); + _click(_italic(0, _cell(.z-caption-content"))); _click(_div("taskfortasks")); _click(_cell("Create task")); _click(_image("ico_save.png"));