Update root files.
Merge root files from ZK branch.
This commit is contained in:
Vova Perebykivskyi
Dgray16
parent
e13b31248c
commit
ad57fbfb38
15 changed files with 228 additions and 173 deletions
|
|
@ -7,9 +7,11 @@ LibrePlan Team
|
|||
--------------
|
||||
|
||||
* Jeroen Baten <jeroen@libreplan-enterprise.com>
|
||||
* Edwin Zuijdendorp <edwin@zuydendorp.nl>
|
||||
* Bjørn Vos <bjorn@libreplan-enterprise.com>
|
||||
* Vova Perebykivskiy <vova@libreplan-enterprise.com>
|
||||
* Міша Гожда <misha@libreplan-enterprise.com>
|
||||
* Philippe Poumaroux <philippe.poumaroux@free.fr>
|
||||
* Vova Perebykivskyi <vova@libreplan-enterprise.com>
|
||||
* Paul Luchyn <ddiamondbbackk@gmail.com>
|
||||
|
||||
|
||||
Previous Team Members
|
||||
|
|
@ -30,6 +32,8 @@ Previous Team Members
|
|||
* Óscar González Fernández <ogonzalez@igalia.com>
|
||||
* Pablo Fernández de la Cigoña Nóvoa <pcigonha@igalia.com>
|
||||
* Farruco Sanjurjo Arcay <fsanjurjo@igalia.com>
|
||||
* Misha Gozda <misha@libreplan-enterprise.com>
|
||||
* Bogdan Bodnarjuk <b.bodnarjuk@libreplan-enterprise.com
|
||||
|
||||
|
||||
Translators
|
||||
|
|
|
|||
11
HACKING.rst
11
HACKING.rst
|
|
@ -332,6 +332,12 @@ Ubuntu/Debian
|
|||
|
||||
In Ubuntu Lucid 10.04 remove ``libqtwebkit-dev`` package.
|
||||
|
||||
* Install::
|
||||
|
||||
# apt-get install cutycapt
|
||||
|
||||
If it doesn't work. Try to do it:
|
||||
|
||||
* Download source code::
|
||||
|
||||
$ svn co https://cutycapt.svn.sourceforge.net/svnroot/cutycapt cutycapt
|
||||
|
|
@ -409,9 +415,8 @@ Debian/Ubuntu
|
|||
|
||||
# apt-get install make python-docutils texlive-latex-base texlive-latex-recommended texlive-latex-extra textlive-fonts-recommended
|
||||
|
||||
* Go to the directory where the documentation you want to generate
|
||||
is. For example, if you want to generate the user manual in
|
||||
English::
|
||||
* Go to the directory where the documentation you want to generate is.
|
||||
For example, if you want to generate the user manual in English::
|
||||
|
||||
# cd doc/src/user/en
|
||||
|
||||
|
|
|
|||
|
|
@ -427,6 +427,9 @@ Instructions:
|
|||
|
||||
# Example location: C:/Program Files/Apache Software Foundation/Tomcat 6.0/bin/Tomcat6.exe
|
||||
|
||||
If you will face SKIP_IDENTIFIER_CHECK error, refer to:
|
||||
http://stackoverflow.com/questions/24546304/how-to-skip-java-reserve-keyword-identifier-check-in-tomcat
|
||||
|
||||
* Go to http://localhost:8080/libreplan
|
||||
|
||||
Logs
|
||||
|
|
@ -528,3 +531,4 @@ Where the different parameters have the following meaning:
|
|||
.. NOTE::
|
||||
|
||||
Take into account that size of PermGen is additional to heap size.
|
||||
Since JDK8(b75) you will not see java.lang.OutOfMemoryError: PermGen space.
|
||||
|
|
|
|||
1
NEWS.rst
1
NEWS.rst
|
|
@ -20,6 +20,7 @@ Thanks to all the contributors to this new version:
|
|||
* Vova Perebykivskyi
|
||||
* Bodgan Bodnarjuk
|
||||
* Jeroen Baten
|
||||
* Paul Luchyn
|
||||
|
||||
Changes
|
||||
~~~~~~~
|
||||
|
|
|
|||
20
README.rst
20
README.rst
|
|
@ -88,16 +88,16 @@ Features
|
|||
Requirements
|
||||
------------
|
||||
|
||||
* *JRE 7* or *JRE 6* - Java Runtime Environment
|
||||
* *JRE 8* - Java Runtime Environment
|
||||
|
||||
Project depends on Java 6 or 7 and JRE is needed in order to run it
|
||||
Project depends on Java 8 JRE is needed in order to run it
|
||||
|
||||
* *PostgreSQL* - Object-relational SQL database
|
||||
|
||||
A database server is needed. You could use *PostgreSQL* or *MySQL* as you
|
||||
prefer.
|
||||
|
||||
* *Tomcat 7* or Tomcat 6* - Servlet and JSP engine
|
||||
* *Tomcat 8* - Servlet and JSP engine
|
||||
|
||||
Server to deploy the application. You could use *Jetty* instead.
|
||||
|
||||
|
|
@ -122,26 +122,26 @@ Availability
|
|||
------------
|
||||
|
||||
The cutting-edge version of this project is always available from the Git
|
||||
repository at https://github.com/Igalia/libreplan.
|
||||
repository at https://github.com/LibrePlan/libreplan
|
||||
|
||||
Released versions are available at
|
||||
http://sourceforge.net/projects/libreplan/files/.
|
||||
http://sourceforge.net/projects/libreplan/files/
|
||||
|
||||
|
||||
Webpage
|
||||
-------
|
||||
|
||||
You can find more information about *LibrePlan* at
|
||||
http://www.libreplan.com/.
|
||||
http://www.libreplan.org/home/
|
||||
|
||||
For information related with *LibrePlan* development you can visit the wiki at
|
||||
http://wiki.libreplan.org/.
|
||||
http://wiki.libreplan.org/twiki/bin/view/LibrePlan
|
||||
|
||||
|
||||
Reporting bugs
|
||||
--------------
|
||||
|
||||
Please use the bug tracker to report bugs at http://bugs.libreplan.org/.
|
||||
Please use the bug tracker to report bugs at http://bugs.libreplan.org/
|
||||
|
||||
|
||||
License
|
||||
|
|
@ -165,5 +165,5 @@ Please see ``AUTHORS`` file for more information about the authors.
|
|||
|
||||
.. [1] http://en.wikipedia.org/wiki/Work_Breakdown_Structure
|
||||
.. [2] http://en.wikipedia.org/wiki/Earned_Value_Management
|
||||
.. [3] http://www.fsf.org/licensing/licenses/agpl.html
|
||||
.. [4] http://www.fundacioncalidade.org/
|
||||
.. [3] http://www.gnu.org/licenses/agpl.html
|
||||
.. [4] http://gain.xunta.gal/
|
||||
|
|
|
|||
|
|
@ -11,11 +11,10 @@ How To Create A New Report In LibrePlan
|
|||
Commons Attribution-ShareAlike 3.0 licence, available in
|
||||
http://creativecommons.org/licenses/by-sa/3.0/.
|
||||
:Abstract:
|
||||
LibrePlan uses **JasperReports** [1]_ to create reports in the application. This
|
||||
document tries to explain how to create a new report in LibrePlan.
|
||||
LibrePlan uses **JasperReports** [1]_ to create reports in the application.
|
||||
This document tries to explain how to create a new report in LibrePlan.
|
||||
|
||||
During this tutorial you are going to create a report that will show the list of
|
||||
resources in LibrePlan.
|
||||
During this tutorial you are going to create a report that will show the list of resources in LibrePlan.
|
||||
|
||||
.. contents:: Table of Contents
|
||||
|
||||
|
|
@ -167,8 +166,8 @@ charge to manage users interaction with report interface and call the proper
|
|||
methods to generate the report itself and show it to the user.
|
||||
|
||||
There is already a controller called ``LibrePlanReportController`` which
|
||||
implements most of the stuff needed for report controllers. So, controllers for
|
||||
new reports are going to extend this class and re-implement some methods.
|
||||
implements most of the stuff needed for report controllers.
|
||||
So, controllers for new reports are going to extend this class and re-implement some methods.
|
||||
|
||||
Steps:
|
||||
|
||||
|
|
@ -335,8 +334,7 @@ Steps:
|
|||
layout and save it with the name of the new report
|
||||
``resourcesListReport.jrxml`` in the same folder.
|
||||
|
||||
This will allow us to keep coherence between reports in regard to design,
|
||||
header, footer, etc.
|
||||
This will allow us to keep coherence between reports in regard to design, header, footer, etc.
|
||||
|
||||
* Set report name to ``resourcesList``.
|
||||
|
||||
|
|
@ -392,7 +390,13 @@ something similar to the following content:
|
|||
::
|
||||
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="resourcesList" pageWidth="595" pageHeight="842" columnWidth="535" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" resourceBundle="resourcesList" uuid="f83422af-00de-4fa5-b137-580b559f1453">
|
||||
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports
|
||||
http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="resourcesList" pageWidth="595" pageHeight="842"
|
||||
columnWidth="535" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20"
|
||||
resourceBundle="resourcesList" uuid="f83422af-00de-4fa5-b137-580b559f1453">
|
||||
|
||||
<property name="ireport.zoom" value="1.0"/>
|
||||
<property name="ireport.x" value="0"/>
|
||||
<property name="ireport.y" value="0"/>
|
||||
|
|
@ -419,7 +423,7 @@ something similar to the following content:
|
|||
</textElement>
|
||||
<textFieldExpression><![CDATA[$R{subtitle}]]></textFieldExpression>
|
||||
</textField>
|
||||
<image scaleImage="RetainShape">
|
||||
<image scaleImage="RetainShape" isLazy="true">
|
||||
<reportElement uuid="e033fa20-c68f-4716-9b43-e1435be185a8" x="318" y="0" width="180" height="53"/>
|
||||
<imageExpression><![CDATA[$P{logo}]]></imageExpression>
|
||||
</image>
|
||||
|
|
@ -552,11 +556,10 @@ 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
|
||||
|
|
@ -568,11 +571,10 @@ from database.
|
|||
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::
|
||||
|
||||
<parameter name="type" class="java.lang.String"/>
|
||||
|
||||
|
|
|
|||
|
|
@ -43,6 +43,21 @@ Written by
|
|||
LibrePlan Team
|
||||
--------------
|
||||
|
||||
* Jeroen Baten <jeroen@libreplan-enterprise.com>
|
||||
* Edwin Zuijdendorp <edwin@zuydendorp.nl>
|
||||
* Bjørn Vos <bjorn@libreplan-enterprise.com>
|
||||
* Philippe Poumaroux <philippe.poumaroux@free.fr>
|
||||
* Vova Perebykivskyi <vova@libreplan-enterprise.com>
|
||||
* Paul Luchyn <ddiamondbbackk@gmail.com>
|
||||
|
||||
Previous Team Members
|
||||
---------------------
|
||||
|
||||
* Fernando Bellas Permuy <fbellas@udc.es>
|
||||
* José María Casanova Crespo <jmcasanova@igalia.com>
|
||||
* Óscar González Fernández <ogonzalez@igalia.com>
|
||||
* Pablo Fernández de la Cigoña Nóvoa <pcigonha@igalia.com>
|
||||
* Farruco Sanjurjo Arcay <fsanjurjo@igalia.com>
|
||||
* Cristina Alvariño Pérez <cristina.alvarino@cafedered.es>
|
||||
* Jacobo Aragunde Pérez <jaragunde@igalia.com>
|
||||
* Nacho Barrientos Arias <nacho@igalia.com>
|
||||
|
|
@ -53,15 +68,8 @@ LibrePlan Team
|
|||
* Diego Pino García <dpino@igalia.com>
|
||||
* Manuel Rego Casasnovas <rego@igalia.com>
|
||||
* Lorenzo Tilve Álvaro <ltilve@igalia.com>
|
||||
|
||||
Previous Team Members
|
||||
---------------------
|
||||
|
||||
* Fernando Bellas Permuy <fbellas@udc.es>
|
||||
* José María Casanova Crespo <jmcasanova@igalia.com>
|
||||
* Óscar González Fernández <ogonzalez@igalia.com>
|
||||
* Pablo Fernández de la Cigoña Nóvoa <pcigonha@igalia.com>
|
||||
* Farruco Sanjurjo Arcay <fsanjurjo@igalia.com>
|
||||
* Misha Gozda <misha@libreplan-enterprise.com>
|
||||
* Bogdan Bodnarjuk <b.bodnarjuk@libreplan-enterprise.com>
|
||||
|
||||
Translators
|
||||
-----------
|
||||
|
|
|
|||
9
doc/src/user/en/21-communications.rst
Normal file
9
doc/src/user/en/21-communications.rst
Normal file
|
|
@ -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.
|
||||
|
||||
|
|
@ -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,14 +206,14 @@ 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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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,7 +10,7 @@ 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: java-1.8.0-openjdk
|
||||
#BuildRequires: maven2
|
||||
#BuildRequires: maven2-common-poms
|
||||
#BuildRequires: python-docutils
|
||||
|
|
@ -24,13 +24,13 @@ BuildArch: noarch
|
|||
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
|
||||
|
|
|
|||
87
pom.xml
87
pom.xml
|
|
@ -1,7 +1,6 @@
|
|||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
|
||||
http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.libreplan</groupId>
|
||||
|
|
@ -20,9 +19,9 @@
|
|||
|
||||
|
||||
<!--
|
||||
Default values for properties. These default values are expected
|
||||
to be valid for most profiles. Specific profiles can overwrite
|
||||
values when necessary.
|
||||
Default values for properties.
|
||||
These default values are expected to be valid for most profiles.
|
||||
Specific profiles can overwrite values when necessary.
|
||||
-->
|
||||
<properties>
|
||||
<!-- Data source properties -->
|
||||
|
|
@ -38,6 +37,9 @@
|
|||
<default.emailSendingEnabled>true</default.emailSendingEnabled>
|
||||
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
|
||||
<jetty-port>8080</jetty-port>
|
||||
<jetty-stop-port>9966</jetty-stop-port>
|
||||
</properties>
|
||||
|
||||
|
||||
|
|
@ -158,12 +160,12 @@
|
|||
|
||||
</profiles>
|
||||
|
||||
|
||||
<!-- TODO make changes to http://nexus.libreplan.org/nexus/content/repositories/thirdparty -->
|
||||
<repositories>
|
||||
<!-- LibrePlan repository -->
|
||||
<repository>
|
||||
<id>thirdparty</id>
|
||||
<url>http://nexus.libreplan.org/content/repositories/thirdparty</url>
|
||||
<url>http://nexus.libreplan.org/nexus/content/repositories/test/</url>
|
||||
</repository>
|
||||
</repositories>
|
||||
|
||||
|
|
@ -177,6 +179,7 @@
|
|||
<artifactId>jasperreports</artifactId>
|
||||
<version>6.2.2</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>net.sf.jasperreports</groupId>
|
||||
<artifactId>jasperreports-fonts</artifactId>
|
||||
|
|
@ -185,23 +188,23 @@
|
|||
|
||||
<!-- GPL Jasperreport Component for ZK -->
|
||||
<dependency>
|
||||
<groupId>com.igalia.java.zk.components</groupId>
|
||||
<groupId>com.libreplan.java.zk.components</groupId>
|
||||
<artifactId>jasperreportcomponent</artifactId>
|
||||
<version>1.0</version>
|
||||
<version>1.1</version>
|
||||
</dependency>
|
||||
|
||||
<!-- GPL JFreechartEngine for ZK -->
|
||||
<dependency>
|
||||
<groupId>com.igalia.java.zk.components</groupId>
|
||||
<groupId>com.libreplan.java.zk.components</groupId>
|
||||
<artifactId>jfreechartengine</artifactId>
|
||||
<version>1.1</version>
|
||||
<version>1.2</version>
|
||||
</dependency>
|
||||
|
||||
<!-- GPL detailrow Component for ZK -->
|
||||
<dependency>
|
||||
<groupId>com.igalia.java.zk.components</groupId>
|
||||
<groupId>com.libreplan.java.zk.components</groupId>
|
||||
<artifactId>customdetailrowcomponent</artifactId>
|
||||
<version>1.0.0</version>
|
||||
<version>1.1</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Gettext commons -->
|
||||
|
|
@ -292,6 +295,18 @@
|
|||
<version>4.2.6.RELEASE</version>
|
||||
</dependency>
|
||||
|
||||
<!--
|
||||
Various Application Context utilities, including EhCache, JavaMail, Quartz, and Freemarker integration.
|
||||
We use QuartzJobBean.
|
||||
-->
|
||||
|
||||
<!-- AspectJ Weaver -->
|
||||
<dependency>
|
||||
<groupId>org.aspectj</groupId>
|
||||
<artifactId>aspectjweaver</artifactId>
|
||||
<version>1.8.9</version>
|
||||
</dependency>
|
||||
|
||||
<!-- Spring context support -->
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
|
|
@ -331,18 +346,6 @@
|
|||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<!--
|
||||
Various Application Context utilities, including EhCache, JavaMail, Quartz, and Freemarker integration.
|
||||
We use QuartzJobBean.
|
||||
-->
|
||||
|
||||
<!-- AspectJ Weaver -->
|
||||
<dependency>
|
||||
<groupId>org.aspectj</groupId>
|
||||
<artifactId>aspectjweaver</artifactId>
|
||||
<version>1.8.9</version>
|
||||
</dependency>
|
||||
|
||||
<!-- JUnit -->
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
|
|
@ -351,7 +354,7 @@
|
|||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- datasource for testing -->
|
||||
<!-- Datasource for testing -->
|
||||
<dependency>
|
||||
<groupId>com.jolbox</groupId>
|
||||
<artifactId>bonecp</artifactId>
|
||||
|
|
@ -366,6 +369,7 @@
|
|||
<version>3.4</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.easymock</groupId>
|
||||
<artifactId>easymockclassextension</artifactId>
|
||||
|
|
@ -435,17 +439,19 @@
|
|||
<dependency>
|
||||
<groupId>org.zkoss.zk</groupId>
|
||||
<artifactId>zul</artifactId>
|
||||
<version>5.0.11</version>
|
||||
<version>8.0.1.1</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.zkoss.zk</groupId>
|
||||
<artifactId>zkplus</artifactId>
|
||||
<version>5.0.11</version>
|
||||
<version>8.0.1.1</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.zkoss.zk</groupId>
|
||||
<artifactId>zk</artifactId>
|
||||
<version>5.0.11</version>
|
||||
<version>8.0.1.1</version>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>org.jruby</groupId>
|
||||
|
|
@ -454,6 +460,12 @@
|
|||
</exclusions>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.zkoss.zk</groupId>
|
||||
<artifactId>zkbind</artifactId>
|
||||
<version>8.0.1.1</version>
|
||||
</dependency>
|
||||
|
||||
<!-- JGraphT -->
|
||||
<dependency>
|
||||
<groupId>org.jgrapht</groupId>
|
||||
|
|
@ -614,7 +626,7 @@
|
|||
<dependency>
|
||||
<groupId>br.com.digilabs.jqplot</groupId>
|
||||
<artifactId>jqplot4java</artifactId>
|
||||
<version>1.2.3-javascript</version>
|
||||
<version>1.3.2-javascript</version>
|
||||
</dependency>
|
||||
|
||||
<!-- MPXJ Library -->
|
||||
|
|
@ -693,27 +705,35 @@
|
|||
<resource>
|
||||
<directory>../libreplan-webapp/src/main/jasper/workingArrangementsPerOrder_Bundle/</directory>
|
||||
</resource>
|
||||
|
||||
<resource>
|
||||
<directory>../libreplan-webapp/src/main/jasper/completedEstimatedHours_Bundle/</directory>
|
||||
</resource>
|
||||
|
||||
<resource>
|
||||
<directory>../libreplan-webapp/src/main/jasper/hoursWorkedPerWorker_Bundle/</directory>
|
||||
</resource>
|
||||
|
||||
<resource>
|
||||
<directory>../libreplan-webapp/src/main/jasper/hoursWorkedPerWorkerInAMonth_Bundle/</directory>
|
||||
</resource>
|
||||
|
||||
<resource>
|
||||
<directory>../libreplan-webapp/src/main/jasper/orderCostsPerResource_Bundle/</directory>
|
||||
</resource>
|
||||
|
||||
<resource>
|
||||
<directory>../libreplan-webapp/src/main/jasper/schedulingProgressPerOrder_Bundle/</directory>
|
||||
</resource>
|
||||
|
||||
<resource>
|
||||
<directory>../libreplan-webapp/src/main/jasper/timeLineRequiredMaterial_Bundle/</directory>
|
||||
</resource>
|
||||
|
||||
<resource>
|
||||
<directory>../libreplan-webapp/src/main/jasper/workingProgressPerTask_Bundle/</directory>
|
||||
</resource>
|
||||
|
||||
<resource>
|
||||
<directory>../libreplan-webapp/src/main/jasper/projectStatus_Bundle/</directory>
|
||||
</resource>
|
||||
|
|
@ -813,7 +833,8 @@
|
|||
<configuration>
|
||||
<jettyEnvXml>target/jetty/jetty-env.xml</jettyEnvXml>
|
||||
<reload>manual</reload>
|
||||
<stopPort>9966</stopPort>
|
||||
|
||||
<stopPort>${jetty-stop-port}</stopPort>
|
||||
<stopKey>stop</stopKey>
|
||||
<!-- Log to the console. -->
|
||||
<requestLog implementation="org.mortbay.jetty.NCSARequestLog">
|
||||
|
|
@ -832,7 +853,7 @@
|
|||
<version>${jdbcDriver.version}</version>
|
||||
</dependency>
|
||||
|
||||
<!-- connection pooling -->
|
||||
<!-- Connection pooling -->
|
||||
<dependency>
|
||||
<groupId>com.jolbox</groupId>
|
||||
<artifactId>bonecp</artifactId>
|
||||
|
|
@ -845,11 +866,13 @@
|
|||
<artifactId>slf4j-api</artifactId>
|
||||
<version>1.7.21</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.slf4j</groupId>
|
||||
<artifactId>slf4j-simple</artifactId>
|
||||
<version>1.7.21</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
|
|
|
|||
|
|
@ -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"));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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]"));
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
|
|
|
|||
|
|
@ -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"));
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue