Merge branch 'master' of https://github.com/LibrePlan/libreplan
Pulling in later changes...
This commit is contained in:
lmann99
commit
e274cf8a1e
13 changed files with 41 additions and 14 deletions
|
|
@ -216,6 +216,12 @@ Microsoft Windows
|
|||
|
||||
# http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html
|
||||
|
||||
* Download and install latest Gettext runtime::
|
||||
|
||||
# https://mlocati.github.io/articles/gettext-iconv-windows.html
|
||||
|
||||
* Add Gettext_installed_directory\bin (for example ``C:\Program Files\gettext-iconv\bin``) to ``Path`` variable
|
||||
|
||||
* Download and install latest PostgreSQL database::
|
||||
|
||||
# http://www.enterprisedb.com/products-services-training/pgdownload#windows
|
||||
|
|
|
|||
|
|
@ -384,6 +384,16 @@ public class LeftTasksTree extends HtmlMacroComponent {
|
|||
fillModel(this.tasksTreeModel.getRoot(), 0, tasks, firstTime);
|
||||
}
|
||||
|
||||
/**
|
||||
* This method is used to fill {@link LeftTasksTree} model.
|
||||
* It is using recursive go-round to go over all tasks.
|
||||
* For top-level tasks parent is null, for child tasks the parent is parent task.
|
||||
*
|
||||
* @param parent parent for current {@link Task}
|
||||
* @param insertionPosition
|
||||
* @param children child elements of a current {@link Task}
|
||||
* @param firstTime
|
||||
*/
|
||||
private void fillModel(Task parent,
|
||||
Integer insertionPosition,
|
||||
Collection<? extends Task> children,
|
||||
|
|
|
|||
|
|
@ -32,7 +32,10 @@ import org.zkoss.zk.ui.util.Clients;
|
|||
|
||||
/**
|
||||
* This class contains the information of a task container. It can be modified
|
||||
* and notifies of the changes to the interested parties. <br/>
|
||||
* and notifies of the changes to the interested parties.
|
||||
* This class is used in {@link org.zkoss.ganttz.LeftTasksTree} as a container for tasks and is put
|
||||
* as {@link org.zkoss.ganttz.util.MutableTreeModel} node.
|
||||
*
|
||||
* @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
|
||||
*/
|
||||
public class TaskContainer extends Task {
|
||||
|
|
|
|||
|
|
@ -43,6 +43,10 @@ import org.libreplan.business.planner.entities.DayAssignment.FilterType;
|
|||
import org.libreplan.business.requirements.entities.CriterionRequirement;
|
||||
import org.libreplan.business.templates.entities.OrderLineTemplate;
|
||||
|
||||
/**
|
||||
* Used in WBS (Work Breakdown Structure).
|
||||
* Represents every task without children.
|
||||
*/
|
||||
public class OrderLine extends OrderElement {
|
||||
|
||||
private HoursGroupOrderLineHandler hoursGroupOrderLineHandler = HoursGroupOrderLineHandler.getInstance();
|
||||
|
|
|
|||
|
|
@ -60,8 +60,8 @@ import org.libreplan.business.trees.ITreeParentNode;
|
|||
|
||||
|
||||
/**
|
||||
* Represents every container in the WBS view. A task of the WBS that has some children.
|
||||
* <br />
|
||||
* Represents every container in the WBS (Work Breakdown Structure) view.
|
||||
* A task of the WBS that has some children.
|
||||
* The project itself is also an {@link OrderLineGroup}.
|
||||
*
|
||||
* @author Manuel Rego Casasnovas <rego@igalia.com>
|
||||
|
|
|
|||
|
|
@ -41,6 +41,8 @@ import org.libreplan.business.util.deepcopy.OnCopy;
|
|||
import org.libreplan.business.util.deepcopy.Strategy;
|
||||
|
||||
/**
|
||||
* This class is kind of data source for {@link TaskElement}
|
||||
*
|
||||
* @author Óscar González Fernández <ogonzalez@igalia.com>
|
||||
*/
|
||||
public class TaskSource extends BaseEntity {
|
||||
|
|
|
|||
|
|
@ -30,8 +30,7 @@ import org.libreplan.business.util.deepcopy.Strategy;
|
|||
import org.libreplan.business.util.deepcopy.OnCopy;
|
||||
|
||||
/**
|
||||
* Entity which represents an associated with properties
|
||||
* between two @{link Task}
|
||||
* Entity which represents an association with properties between two {@link Task}
|
||||
*
|
||||
* @author Óscar González Fernández <ogonzalez@igalia.com>
|
||||
* @author Javier Moran Rua <jmoran@igalia.com>
|
||||
|
|
|
|||
|
|
@ -33,13 +33,10 @@ import org.libreplan.business.planner.entities.DayAssignment.FilterType;
|
|||
import org.libreplan.business.workingday.EffortDuration;
|
||||
|
||||
/**
|
||||
* This is a class, directly associated with a {@link TaskGroup} with no parent element,
|
||||
* which is used to store data about the whole scheduling.
|
||||
*
|
||||
* @author Diego Pino García <dpino@igalia.com>
|
||||
*
|
||||
* This is a class, directly associated with a TaskGroup with no parent
|
||||
* (TaskRoot element), which is used to store data about the whole
|
||||
* scheduling
|
||||
*
|
||||
*/
|
||||
public class PlanningData extends BaseEntity {
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ package org.libreplan.business.planner.entities;
|
|||
import static org.libreplan.business.i18n.I18nHelper._;
|
||||
|
||||
/**
|
||||
* Enumerate of {@Link Task} deadline violation statuses.
|
||||
* Enumerate of {@link Task} deadline violation statuses.
|
||||
*
|
||||
* NO_DEADLINE: Task has no deadline set.
|
||||
* DEADLINE_VIOLATED: Task didn't finish on time.
|
||||
|
|
|
|||
|
|
@ -43,6 +43,9 @@ import org.libreplan.business.workingday.EffortDuration;
|
|||
import org.libreplan.business.workingday.IntraDayDate;
|
||||
|
||||
/**
|
||||
* Represents a parent task which can hold child tasks.
|
||||
* The project itself is also an {@link TaskGroup}.
|
||||
*
|
||||
* @author Óscar González Fernández <ogonzalez@igalia.com>
|
||||
* @author Javier Moran Rua <jmoran@igalia.com>
|
||||
* @author Manuel Rego Casasnovas <rego@igalia.com>
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@ import org.libreplan.business.scenarios.daos.IScenarioDAO;
|
|||
|
||||
/**
|
||||
* Represents a scenario in the application.
|
||||
* Scenario is like a context for each user that holds all his projects.
|
||||
*
|
||||
* @author Manuel Rego Casasnovas <mrego@igalia.com>
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -217,8 +217,10 @@ public class DashboardModel implements IDashboardModel {
|
|||
|
||||
BigDecimal outcome = new BigDecimal(deadlineOffset.getDays(), MathContext.DECIMAL32);
|
||||
|
||||
this.marginWithDeadLine =
|
||||
outcome.divide(new BigDecimal(orderDuration.getDays()), 8, BigDecimal.ROUND_HALF_EVEN);
|
||||
this.marginWithDeadLine = orderDuration.getDays()!= 0
|
||||
? outcome.divide(new BigDecimal(orderDuration.getDays()), 8, BigDecimal.ROUND_HALF_EVEN)
|
||||
: new BigDecimal(
|
||||
Days.daysBetween(rootTask.getStartAsLocalDate(), deadLineAsLocalDate.plusDays(1)).getDays());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ import org.zkoss.zul.Tabpanel;
|
|||
import org.zkoss.zul.Window;
|
||||
|
||||
/**
|
||||
* Controller for edit a {@link Task}.
|
||||
* Controller for editing a {@link Task} on a project scheduling view.
|
||||
*
|
||||
* @author Manuel Rego Casasnovas <mrego@igalia.com>
|
||||
*/
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue