RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replaced tabs for 4-spaces in several files.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2011-07-01 09:46:36 +02:00
parent 8ee51a7721
commit 0acc29aadf
31 changed files with 295 additions and 295 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
debian/maven-settings.xml vendored
View file

@ -1,9 +1,9 @@
<settings <settings
xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
http://maven.apache.org/xsd/settings-1.0.0.xsd"> http://maven.apache.org/xsd/settings-1.0.0.xsd">
<!-- Change this to something inside the build directory --> <!-- Change this to something inside the build directory -->
<localRepository>${env.CURDIR}/debian/maven-repo</localRepository> <localRepository>${env.CURDIR}/debian/maven-repo</localRepository>
</settings> </settings>

208
ganttzk/src/main/resources/metainfo/zk/lang-addon.xml
View file

@ -1,38 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<language-addon> <language-addon>
<addon-name>ganttz</addon-name> <addon-name>ganttz</addon-name>
<language-name>xul/html</language-name> <language-name>xul/html</language-name>
<extension>zul</extension> <extension>zul</extension>
<extension>xul</extension> <extension>xul</extension>
<zscript> <zscript>
import org.zkoss.ganttz.*; import org.zkoss.ganttz.*;
</zscript> </zscript>
<component> <component>
<component-name>planner</component-name> <component-name>planner</component-name>
<component-class>org.zkoss.ganttz.Planner</component-class> <component-class>org.zkoss.ganttz.Planner</component-class>
<widget-class>ganttz.Planner</widget-class> <widget-class>ganttz.Planner</widget-class>
<macro-uri>~./ganttz/zul/plannerLayout.zul</macro-uri> <macro-uri>~./ganttz/zul/plannerLayout.zul</macro-uri>
<!-- mold> <!-- mold>
<mold-name>default</mold-name> <mold-name>default</mold-name>
<mold-uri>~./ganttz/planner.dsp</mold-uri> <mold-uri>~./ganttz/planner.dsp</mold-uri>
</mold --> </mold -->
</component> </component>
<component> <component>
<component-name>tabSwitcher</component-name> <component-name>tabSwitcher</component-name>
<component-class>org.zkoss.ganttz.TabSwitcher</component-class> <component-class>org.zkoss.ganttz.TabSwitcher</component-class>
<macro-uri>~./ganttz/zul/tabSwitcher.zul</macro-uri> <macro-uri>~./ganttz/zul/tabSwitcher.zul</macro-uri>
</component> </component>
<component> <component>
<component-name>resourcesLoadPanel</component-name> <component-name>resourcesLoadPanel</component-name>
<component-class>org.zkoss.ganttz.resourceload.ResourcesLoadPanel</component-class> <component-class>org.zkoss.ganttz.resourceload.ResourcesLoadPanel</component-class>
<macro-uri>~./ganttz/zul/resourcesLoadLayout.zul</macro-uri> <macro-uri>~./ganttz/zul/resourcesLoadLayout.zul</macro-uri>
</component> </component>
<component> <component>
<component-name>resourcesLoadList</component-name> <component-name>resourcesLoadList</component-name>
@ -52,43 +52,43 @@
</component> </component>
<component> <component>
<component-name>leftPane</component-name> <component-name>leftPane</component-name>
<component-class>org.zkoss.ganttz.LeftPane</component-class> <component-class>org.zkoss.ganttz.LeftPane</component-class>
<macro-uri>~./ganttz/zul/leftPane.zul</macro-uri> <macro-uri>~./ganttz/zul/leftPane.zul</macro-uri>
</component> </component>
<component> <component>
<component-name>leftTasksTree</component-name> <component-name>leftTasksTree</component-name>
<component-class>org.zkoss.ganttz.LeftTasksTree</component-class> <component-class>org.zkoss.ganttz.LeftTasksTree</component-class>
<macro-uri>~./ganttz/zul/leftTasksTree.zul</macro-uri> <macro-uri>~./ganttz/zul/leftTasksTree.zul</macro-uri>
</component> </component>
<component> <component>
<component-name>ganttpanel</component-name> <component-name>ganttpanel</component-name>
<component-class>org.zkoss.ganttz.GanttPanel</component-class> <component-class>org.zkoss.ganttz.GanttPanel</component-class>
<widget-class>ganttz.GanttPanel</widget-class> <widget-class>ganttz.GanttPanel</widget-class>
<mold> <mold>
<mold-name>default</mold-name> <mold-name>default</mold-name>
<!-- <mold-uri>~./ganttz/ganttpanel.dsp</mold-uri> --> <!-- <mold-uri>~./ganttz/ganttpanel.dsp</mold-uri> -->
<mold-uri>mold/gantt-panel.js</mold-uri> <mold-uri>mold/gantt-panel.js</mold-uri>
</mold> </mold>
</component> </component>
<component> <component>
<component-name>resourceload</component-name> <component-name>resourceload</component-name>
<component-class>org.zkoss.ganttz.resourceload.ResourceLoadComponent <component-class>org.zkoss.ganttz.resourceload.ResourceLoadComponent
</component-class> </component-class>
<widget-class>ganttz.resourceload.ResourceLoadComponent</widget-class> <widget-class>ganttz.resourceload.ResourceLoadComponent</widget-class>
<mold> <mold>
<mold-name>default</mold-name> <mold-name>default</mold-name>
<mold-uri>mold/resource-load-component.js</mold-uri> <mold-uri>mold/resource-load-component.js</mold-uri>
<!-- <mold-uri>~./ganttz/resourceload/resourceload.dsp</mold-uri> --> <!-- <mold-uri>~./ganttz/resourceload/resourceload.dsp</mold-uri> -->
</mold> </mold>
</component> </component>
<component> <component>
<component-name>taskRow</component-name> <component-name>taskRow</component-name>
<component-class>org.zkoss.ganttz.TaskRow</component-class> <component-class>org.zkoss.ganttz.TaskRow</component-class>
<widget-class>ganttz.TaskRow</widget-class> <widget-class>ganttz.TaskRow</widget-class>
@ -99,16 +99,16 @@
</mold> </mold>
</component> </component>
<component> <component>
<component-name>task</component-name> <component-name>task</component-name>
<component-class>org.zkoss.ganttz.TaskComponent</component-class> <component-class>org.zkoss.ganttz.TaskComponent</component-class>
<widget-class>ganttz.TaskComponent</widget-class> <widget-class>ganttz.TaskComponent</widget-class>
<mold> <mold>
<mold-name>default</mold-name> <mold-name>default</mold-name>
<!-- <mold-uri>~./ganttz/task.dsp</mold-uri> --> <!-- <mold-uri>~./ganttz/task.dsp</mold-uri> -->
<mold-uri>mold/task-component.js</mold-uri> <mold-uri>mold/task-component.js</mold-uri>
</mold> </mold>
</component> </component>
<component> <component>
<component-name>milestone</component-name> <component-name>milestone</component-name>
@ -122,64 +122,64 @@
</component> </component>
<component> <component>
<component-name>taskcontainer</component-name> <component-name>taskcontainer</component-name>
<component-class>org.zkoss.ganttz.TaskContainerComponent <component-class>org.zkoss.ganttz.TaskContainerComponent
</component-class> </component-class>
<widget-class>ganttz.TaskContainerComponent</widget-class> <widget-class>ganttz.TaskContainerComponent</widget-class>
<mold> <mold>
<mold-name>default</mold-name> <mold-name>default</mold-name>
<mold-uri>mold/task-container.js</mold-uri> <mold-uri>mold/task-container.js</mold-uri>
<!-- <mold-uri>~./ganttz/taskcontainer.dsp</mold-uri> --> <!-- <mold-uri>~./ganttz/taskcontainer.dsp</mold-uri> -->
</mold> </mold>
</component> </component>
<component> <component>
<component-name>tasklist</component-name> <component-name>tasklist</component-name>
<component-class>org.zkoss.ganttz.TaskList</component-class> <component-class>org.zkoss.ganttz.TaskList</component-class>
<widget-class>ganttz.TaskList</widget-class> <widget-class>ganttz.TaskList</widget-class>
<mold> <mold>
<mold-name>default</mold-name> <mold-name>default</mold-name>
<!-- <mold-uri>~./ganttz/tasklist.dsp</mold-uri> --> <!-- <mold-uri>~./ganttz/tasklist.dsp</mold-uri> -->
<mold-uri>mold/task-list.js</mold-uri> <mold-uri>mold/task-list.js</mold-uri>
</mold> </mold>
</component> </component>
<component> <component>
<component-name>dependencylist</component-name> <component-name>dependencylist</component-name>
<component-class>org.zkoss.ganttz.DependencyList</component-class> <component-class>org.zkoss.ganttz.DependencyList</component-class>
<widget-class>ganttz.DependencyList</widget-class> <widget-class>ganttz.DependencyList</widget-class>
<mold> <mold>
<mold-name>default</mold-name> <mold-name>default</mold-name>
<!-- <mold-uri>~./ganttz/dependencylist.dsp</mold-uri> --> <!-- <mold-uri>~./ganttz/dependencylist.dsp</mold-uri> -->
<mold-uri>mold/dependency-list.js</mold-uri> <mold-uri>mold/dependency-list.js</mold-uri>
</mold> </mold>
</component> </component>
<component> <component>
<component-name>dependency</component-name> <component-name>dependency</component-name>
<component-class>org.zkoss.ganttz.DependencyComponent <component-class>org.zkoss.ganttz.DependencyComponent
</component-class> </component-class>
<widget-class>ganttz.DependencyComponent</widget-class> <widget-class>ganttz.DependencyComponent</widget-class>
<mold> <mold>
<mold-name>default</mold-name> <mold-name>default</mold-name>
<mold-uri>mold/dependency-component.js</mold-uri> <mold-uri>mold/dependency-component.js</mold-uri>
<!-- <mold-uri>~./ganttz/dependency.dsp</mold-uri> --> <!-- <mold-uri>~./ganttz/dependency.dsp</mold-uri> -->
</mold> </mold>
</component> </component>
<component> <component>
<component-name>timetracker</component-name> <component-name>timetracker</component-name>
<component-class>org.zkoss.ganttz.timetracker.TimeTrackerComponent</component-class> <component-class>org.zkoss.ganttz.timetracker.TimeTrackerComponent</component-class>
<widget-class>ganttz.TimeTracker</widget-class> <widget-class>ganttz.TimeTracker</widget-class>
<macro-uri>~./ganttz/zul/timetracker/timetracker.zul</macro-uri> <macro-uri>~./ganttz/zul/timetracker/timetracker.zul</macro-uri>
</component> </component>
<component> <component>
<component-name>timeTrackedTable</component-name> <component-name>timeTrackedTable</component-name>
<component-class>org.zkoss.ganttz.timetracker.TimeTrackedTable</component-class> <component-class>org.zkoss.ganttz.timetracker.TimeTrackedTable</component-class>
<macro-uri>~./ganttz/zul/timetracker/timetrackedtable.zul</macro-uri> <macro-uri>~./ganttz/zul/timetracker/timetrackedtable.zul</macro-uri>
</component> </component>
</language-addon> </language-addon>

48
navalplanner-business/pom.xml
View file

@ -125,15 +125,15 @@
<profiles> <profiles>
<profile> <profile>
<!-- LiquiBase liquibase:update --> <!-- LiquiBase liquibase:update -->
<id>liquibase-update</id> <id>liquibase-update</id>
<activation> <activation>
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
</activation> </activation>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.liquibase</groupId> <groupId>org.liquibase</groupId>
<artifactId>liquibase-maven-plugin</artifactId> <artifactId>liquibase-maven-plugin</artifactId>
<version>2.0-rc7</version> <version>2.0-rc7</version>
<executions> <executions>
<execution> <execution>
@ -147,21 +147,21 @@
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>
<profile> <profile>
<!-- LiquiBase liquibase:updateSQL --> <!-- LiquiBase liquibase:updateSQL -->
<id>liquibase-updatesql</id> <id>liquibase-updatesql</id>
<activation> <activation>
<activeByDefault>false</activeByDefault> <activeByDefault>false</activeByDefault>
</activation> </activation>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.liquibase</groupId> <groupId>org.liquibase</groupId>
<artifactId>liquibase-maven-plugin</artifactId> <artifactId>liquibase-maven-plugin</artifactId>
<version>2.0-rc7</version> <version>2.0-rc7</version>
<executions> <executions>
<execution> <execution>
@ -175,10 +175,10 @@
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>
</profiles> </profiles>
<build> <build>

10
navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java
View file

@ -529,12 +529,12 @@ public class CriterionType extends IntegrationEntity implements
.checkChildrenAssignedToAnyResource(this))); .checkChildrenAssignedToAnyResource(this)));
} }
@NotNull(message = "last criterion sequence code not specified") @NotNull(message = "last criterion sequence code not specified")
public Integer getLastCriterionSequenceCode() { public Integer getLastCriterionSequenceCode() {
return lastCriterionSequenceCode; return lastCriterionSequenceCode;
} }
public void incrementLastCriterionSequenceCode() { public void incrementLastCriterionSequenceCode() {
if (this.lastCriterionSequenceCode == null) { if (this.lastCriterionSequenceCode == null) {
this.lastCriterionSequenceCode = 0; this.lastCriterionSequenceCode = 0;
} }

24
navalplanner-business/src/main/java/org/navalplanner/business/users/entities/User.java
View file

@ -244,20 +244,20 @@ public class User extends BaseEntity {
this.expandCompanyPlanningViewCharts = expandCompanyPlanningViewCharts; this.expandCompanyPlanningViewCharts = expandCompanyPlanningViewCharts;
} }
public String getFirstName() { public String getFirstName() {
return firstName; return firstName;
} }
public void setFirstName(String firstName) { public void setFirstName(String firstName) {
this.firstName = firstName; this.firstName = firstName;
} }
public String getLastName() { public String getLastName() {
return lastName; return lastName;
} }
public void setLastName(String lastName) { public void setLastName(String lastName) {
this.lastName = lastName; this.lastName = lastName;
} }
} }

12
navalplanner-business/src/main/java/org/navalplanner/business/workreports/daos/WorkReportDAO.java
View file

@ -57,12 +57,12 @@ public class WorkReportDAO extends IntegrationEntityDAO<WorkReport>
@Autowired @Autowired
private IOrderDAO orderDAO; private IOrderDAO orderDAO;
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
public List<WorkReport> getAllByWorkReportType(WorkReportType workReportType) { public List<WorkReport> getAllByWorkReportType(WorkReportType workReportType) {
final Criteria criteria = getSession().createCriteria(WorkReport.class); final Criteria criteria = getSession().createCriteria(WorkReport.class);
return criteria.add(Restrictions.eq("workReportType", workReportType)).list(); return criteria.add(Restrictions.eq("workReportType", workReportType)).list();
} }
@Override @Override
public List<WorkReport> getAll() { public List<WorkReport> getAll() {

6
navalplanner-business/src/main/resources/navalplanner-business-spring-config.xml
View file

@ -127,16 +127,16 @@
class="org.navalplanner.business.orders.entities.CriterionRequirementOrderElementHandler" class="org.navalplanner.business.orders.entities.CriterionRequirementOrderElementHandler"
factory-method="getInstance" /> factory-method="getInstance" />
<bean id="versionInformation" <bean id="versionInformation"
class="org.navalplanner.business.common.VersionInformation" class="org.navalplanner.business.common.VersionInformation"
factory-method="getInstance" factory-method="getInstance"
lazy-init="false"> lazy-init="false">
<property name="projectVersion"> <property name="projectVersion">
<value>${project.version}</value> <value>${project.version}</value>
</property> </property>
</bean> </bean>
<bean id="configuration" <bean id="configuration"
class="org.navalplanner.business.common.Configuration" class="org.navalplanner.business.common.Configuration"
factory-method="getInstance" factory-method="getInstance"
lazy-init="false"> lazy-init="false">

2
navalplanner-business/src/main/resources/org/navalplanner/business/calendars/entities/Calendars.hbm.xml
View file

@ -20,7 +20,7 @@
<property name="codeAutogenerated" access="field" <property name="codeAutogenerated" access="field"
column="code_autogenerated" /> column="code_autogenerated" />
<property name="lastSequenceCode" access="field" <property name="lastSequenceCode" access="field"
column="last_sequence_code" /> column="last_sequence_code" />
<!-- Index created in a database-object section --> <!-- Index created in a database-object section -->

2
navalplanner-business/src/main/resources/org/navalplanner/business/costcategories/entities/CostCategories.hbm.xml
View file

@ -13,7 +13,7 @@
<property name="code" access="property" not-null="true" unique="true"/> <property name="code" access="property" not-null="true" unique="true"/>
<property name="name" unique="true"/> <property name="name" unique="true"/>
<property name="codeAutogenerated" not-null="true" access="field" <property name="codeAutogenerated" not-null="true" access="field"
column="code_autogenerated" /> column="code_autogenerated" />
<property name="lastHourCostSequenceCode" not-null="true" access="field" <property name="lastHourCostSequenceCode" not-null="true" access="field"
column="last_hour_cost_sequence_code" /> column="last_hour_cost_sequence_code" />

8
navalplanner-business/src/main/resources/org/navalplanner/business/labels/entities/Labels.hbm.xml
View file

@ -13,13 +13,13 @@
<version name="version" access="property" type="long" /> <version name="version" access="property" type="long" />
<property name="code" access="property" not-null="true" unique="true"/> <property name="code" access="property" not-null="true" unique="true"/>
<properties name="nameAndType" unique="true"> <properties name="nameAndType" unique="true">
<property name="name" /> <property name="name" />
<!-- Indexed --> <!-- Indexed -->
<many-to-one name="type" class="LabelType" <many-to-one name="type" class="LabelType"
column="label_type_id" column="label_type_id"
index="idx_label_on_label_type"/> index="idx_label_on_label_type"/>
</properties> </properties>
<set name="orderElements" table="order_element_label" cascade="none" inverse="true"> <set name="orderElements" table="order_element_label" cascade="none" inverse="true">
<key column="label_id" not-null="false"/> <key column="label_id" not-null="false"/>

8
navalplanner-business/src/main/resources/org/navalplanner/business/materials/entities/Materials.hbm.xml
View file

@ -64,7 +64,7 @@
<property name="codeAutogenerated" not-null="true" <property name="codeAutogenerated" not-null="true"
column="code_autogenerated" /> column="code_autogenerated" />
<property name="lastMaterialSequenceCode" access="field" not-null="true" <property name="lastMaterialSequenceCode" access="field" not-null="true"
column="last_material_sequence_code" /> column="last_material_sequence_code" />
<!-- Indexed the other side --> <!-- Indexed the other side -->
@ -97,9 +97,9 @@
<version name="version" access="property" type="long" /> <version name="version" access="property" type="long" />
<component name="materialInfo"> <component name="materialInfo">
<property name="units" /> <property name="units" />
<property name="unitPrice" column="unit_price" /> <property name="unitPrice" column="unit_price" />
<many-to-one name="material" class="Material" column="material_id" /> <many-to-one name="material" class="Material" column="material_id" />
</component> </component>
<property name="estimatedAvailability" column="estimated_availability" /> <property name="estimatedAvailability" column="estimated_availability" />

6
navalplanner-business/src/main/resources/org/navalplanner/business/orders/entities/Orders.hbm.xml
View file

@ -221,9 +221,9 @@
<class name="TaskSource" table="task_source"> <class name="TaskSource" table="task_source">
<id name="id" access="property" type="long"> <id name="id" access="property" type="long">
<generator class="foreign"> <generator class="foreign">
<param name="property">task</param> <param name="property">task</param>
</generator> </generator>
</id> </id>
<version name="version" access="property" type="long" /> <version name="version" access="property" type="long" />
<many-to-one name="schedulingData" class="SchedulingDataForVersion" <many-to-one name="schedulingData" class="SchedulingDataForVersion"

30
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationCommand.java
View file

@ -52,22 +52,22 @@ public class ResourceAllocationCommand implements IResourceAllocationCommand {
public ResourceAllocationCommand() { public ResourceAllocationCommand() {
} }
@Override @Override
public void doAction(IContextWithPlannerTask<TaskElement> context, public void doAction(IContextWithPlannerTask<TaskElement> context,
TaskElement taskElement) { TaskElement taskElement) {
editTaskUtilities.reattach(taskElement); editTaskUtilities.reattach(taskElement);
if (isApplicableTo(taskElement)) { if (isApplicableTo(taskElement)) {
Task task = (Task) taskElement; Task task = (Task) taskElement;
if (task.isSubcontracted()) { if (task.isSubcontracted()) {
editTaskController.showEditFormSubcontract(context, task, editTaskController.showEditFormSubcontract(context, task,
planningState); planningState);
} else { } else {
editTaskController.showEditFormResourceAllocation(context, editTaskController.showEditFormResourceAllocation(context,
task, planningState); task, planningState);
} }
} }
} }
@Override @Override
public String getName() { public String getName() {

2
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/SubcontractCommand.java
View file

@ -54,7 +54,7 @@ public class SubcontractCommand implements ISubcontractCommand {
@Override @Override
public String getIcon() { public String getIcon() {
return "/common/img/ico_subcontract.png"; return "/common/img/ico_subcontract.png";
} }
@Override @Override

8
navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java
View file

@ -81,7 +81,7 @@ public class CutyPrint {
private static int TASK_HEIGHT = 25; private static int TASK_HEIGHT = 25;
private static int PRINT_VERTICAL_PADDING = 50; private static int PRINT_VERTICAL_PADDING = 50;
private static int PRINT_VERTICAL_SPACING = 160; private static int PRINT_VERTICAL_SPACING = 160;
public static void print(Order order) { public static void print(Order order) {
print("/planner/index.zul", entryPointForShowingOrder(order), print("/planner/index.zul", entryPointForShowingOrder(order),
@ -186,10 +186,10 @@ public class CutyPrint {
minWidthForTaskNameColumn); minWidthForTaskNameColumn);
captureString += " --min-width=" + plannerWidth; captureString += " --min-width=" + plannerWidth;
int plannerHeight = (expanded ? planner.getAllTasksNumber() : planner int plannerHeight = (expanded ? planner.getAllTasksNumber() : planner
.getTaskNumber()) * TASK_HEIGHT + PRINT_VERTICAL_SPACING; .getTaskNumber()) * TASK_HEIGHT + PRINT_VERTICAL_SPACING;
captureString += " --min-height=" + plannerHeight; captureString += " --min-height=" + plannerHeight;
// Static width and time delay parameters (FIX) // Static width and time delay parameters (FIX)

8
navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/ISettingsModel.java
View file

@ -50,12 +50,12 @@ public interface ISettingsModel {
boolean isExpandCompanyPlanningViewCharts(); boolean isExpandCompanyPlanningViewCharts();
void setLastName(String lastName); void setLastName(String lastName);
String getLastName(); String getLastName();
void setFirstName(String firstName); void setFirstName(String firstName);
String getFirstName(); String getFirstName();
} }

24
navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/SettingsController.java
View file

@ -126,20 +126,20 @@ public class SettingsController extends GenericForwardComposer {
return settingsModel.isExpandResourceLoadViewCharts(); return settingsModel.isExpandResourceLoadViewCharts();
} }
public String getFirstName() { public String getFirstName() {
return settingsModel.getFirstName(); return settingsModel.getFirstName();
} }
public void setFirstName(String firstName) { public void setFirstName(String firstName) {
settingsModel.setFirstName(firstName); settingsModel.setFirstName(firstName);
} }
public String getLastName() { public String getLastName() {
return settingsModel.getLastName(); return settingsModel.getLastName();
} }
public void setLastName(String lastName) { public void setLastName(String lastName) {
settingsModel.setLastName(lastName); settingsModel.setLastName(lastName);
} }
} }

40
navalplanner-webapp/src/main/java/org/navalplanner/web/users/settings/SettingsModel.java
View file

@ -145,28 +145,28 @@ public class SettingsModel implements ISettingsModel {
} }
} }
@Override @Override
public String getFirstName() { public String getFirstName() {
return user.getFirstName(); return user.getFirstName();
} }
@Override @Override
public void setFirstName(String firstName) { public void setFirstName(String firstName) {
if (user != null) { if (user != null) {
user.setFirstName(firstName); user.setFirstName(firstName);
} }
} }
@Override @Override
public String getLastName() { public String getLastName() {
return user.getLastName(); return user.getLastName();
} }
@Override @Override
public void setLastName(String lastName) { public void setLastName(String lastName) {
if (user != null) { if (user != null) {
user.setLastName(lastName); user.setLastName(lastName);
} }
} }
} }

2
navalplanner-webapp/src/main/java/org/navalplanner/ws/common/impl/GenericRESTService.java
View file

@ -156,7 +156,7 @@ public abstract class GenericRESTService<E extends IntegrationEntity,
* @throws ValidationException if it is not possible to create the entity * @throws ValidationException if it is not possible to create the entity
* because some very important constraint is violated * because some very important constraint is violated
* @throws RecoverableErrorException if a recoverable * @throws RecoverableErrorException if a recoverable
* error occurs * error occurs
*/ */
protected abstract E toEntity(DTO entityDTO) protected abstract E toEntity(DTO entityDTO)
throws ValidationException, RecoverableErrorException; throws ValidationException, RecoverableErrorException;

16
navalplanner-webapp/src/main/webapp/WEB-INF/zk.xml
View file

@ -22,16 +22,16 @@
<!-- Spring Security --> <!-- Spring Security -->
<listener> <listener>
<description>ThreadLocal Synchronization Listener</description> <description>ThreadLocal Synchronization Listener</description>
<listener-class>org.zkoss.zkplus.util.ThreadLocalListener</listener-class> <listener-class>org.zkoss.zkplus.util.ThreadLocalListener</listener-class>
</listener> </listener>
<preference> <preference>
<name>ThreadLocal</name> <name>ThreadLocal</name>
<value> <value>
org.springframework.security.context.ThreadLocalSecurityContextHolderStrategy=contextHolder org.springframework.security.context.ThreadLocalSecurityContextHolderStrategy=contextHolder
</value> </value>
</preference> </preference>
<system-config> <system-config>

10
navalplanner-webapp/src/main/webapp/common/components/i18n.zul
View file

@ -20,10 +20,10 @@
--> -->
<zk> <zk>
<zscript><![CDATA[ <zscript><![CDATA[
top = self; top = self;
]]> ]]>
</zscript> </zscript>
<label id="i18nlabel" value="@{top.i18n}" /> <label id="i18nlabel" value="@{top.i18n}" />
</zk> </zk>

2
navalplanner-webapp/src/main/webapp/common/components/schedulingStateToggler.zul
View file

@ -27,7 +27,7 @@
<div> <div>
<label class="scheduling-state" value="${top.buttonLabel}" tooltiptext="${top.buttonTextTooltip}" /> <label class="scheduling-state" value="${top.buttonLabel}" tooltiptext="${top.buttonTextTooltip}" />
<button tooltiptext="${i18n:_('Schedule')}" visible="${top.scheduleButtonVisible}" sclass="icono" <button tooltiptext="${i18n:_('Schedule')}" visible="${top.scheduleButtonVisible}" sclass="icono"
image="/common/img/ico_planificador1.png" hoverImage="/common/img/ico_planificador.png" image="/common/img/ico_planificador1.png" hoverImage="/common/img/ico_planificador.png"
onClick="top.schedule();"/> onClick="top.schedule();"/>
<button tooltiptext="${i18n:_('Unschedule')}" visible="${top.unscheduleButtonVisible}" sclass="icono" <button tooltiptext="${i18n:_('Unschedule')}" visible="${top.unscheduleButtonVisible}" sclass="icono"
image="/common/img/ico_unschedule1.png" hoverImage="/common/img/ico_unschedule.png" image="/common/img/ico_unschedule1.png" hoverImage="/common/img/ico_unschedule.png"

2
navalplanner-webapp/src/main/webapp/common/components/templateFinder.zul
View file

@ -27,7 +27,7 @@
<popup id="finderPopup" sclass="finder-popup"> <popup id="finderPopup" sclass="finder-popup">
<groupbox mold="3d" closable="false" width="400px"> <groupbox mold="3d" closable="false" width="400px">
<caption id="finderCaption" /> <caption id="finderCaption" />
<div id="finderPlaceholder" /> <div id="finderPlaceholder" />
<hbox> <hbox>
<button id="acceptButton" /> <button id="acceptButton" />
<button id="cancelButton" /> <button id="cancelButton" />

2
navalplanner-webapp/src/main/webapp/labels/_editLabelType.zul
View file

@ -62,7 +62,7 @@
<panel title="${i18n:_('Label list')}" <panel title="${i18n:_('Label list')}"
border="normal"> border="normal">
<panelchildren> <panelchildren>
<hbox align="center"> <hbox align="center">
<label value="${i18n:_('New label')}" /> <label value="${i18n:_('New label')}" />
<textbox id="newLabelTextbox" value="" width="200px" onOK="controller.createLabel()" /> <textbox id="newLabelTextbox" value="" width="200px" onOK="controller.createLabel()" />
<button label="${i18n:_('Add')}" <button label="${i18n:_('Add')}"

2
navalplanner-webapp/src/main/webapp/reports/completedEstimatedHoursPerTask.zul
View file

@ -175,7 +175,7 @@
<separator spacing="10px" orient="horizontal"/> <separator spacing="10px" orient="horizontal"/>
<hbox style="display: none" id="URItext"> <hbox style="display: none" id="URItext">
<label value="${i18n:_('Click on ')}" /> <label value="${i18n:_('Click on ')}" />
<toolbarbutton id="URIlink" class="z-label" zclass="z-label" <toolbarbutton id="URIlink" class="z-label" zclass="z-label"
label="${i18n:_('direct link')}" /> label="${i18n:_('direct link')}" />

2
navalplanner-webapp/src/main/webapp/reports/workingProgressPerTaskReport.zul
View file

@ -174,7 +174,7 @@
<separator spacing="10px" orient="horizontal"/> <separator spacing="10px" orient="horizontal"/>
<hbox style="display: none" id="URItext"> <hbox style="display: none" id="URItext">
<label value="${i18n:_('Click on ')}" /> <label value="${i18n:_('Click on ')}" />
<toolbarbutton id="URIlink" class="z-label" zclass="z-label" <toolbarbutton id="URIlink" class="z-label" zclass="z-label"
label="${i18n:_('direct link')}" /> label="${i18n:_('direct link')}" />

2
navalplanner-webapp/src/main/webapp/workreports/_editWorkReportType.zul
View file

@ -56,7 +56,7 @@
id="code" value="@{controller.workReportType.code}" width="300px" id="code" value="@{controller.workReportType.code}" width="300px"
constraint = "@{controller.validateWorkReportTypeCode}"/> constraint = "@{controller.validateWorkReportTypeCode}"/>
<checkbox id="generateCode" label="${i18n:_('Generate code')}" <checkbox id="generateCode" label="${i18n:_('Generate code')}"
visible = "@{controller.editable}" visible = "@{controller.editable}"
onCheck="controller.onCheckGenerateCode(event)" onCheck="controller.onCheckGenerateCode(event)"
checked="@{controller.workReportType.codeAutogenerated}" /> checked="@{controller.workReportType.codeAutogenerated}" />
<label visible = "@{controller.readOnly}" <label visible = "@{controller.readOnly}"

2
navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/subcontract/ReportAdvancesServiceTest.java
View file

@ -108,7 +108,7 @@ public class ReportAdvancesServiceTest {
public Void execute() { public Void execute() {
defaultAdvanceTypesBootstrapListener.loadRequiredData(); defaultAdvanceTypesBootstrapListener.loadRequiredData();
configurationBootstrap.loadRequiredData(); configurationBootstrap.loadRequiredData();
scenariosBootstrap.loadRequiredData(); scenariosBootstrap.loadRequiredData();
return null; return null;
} }
}; };

16
pom.xml
View file

@ -155,10 +155,10 @@
<id>gettext-commons-site</id> <id>gettext-commons-site</id>
<url>http://gettext-commons.googlecode.com/svn/maven-repository</url> <url>http://gettext-commons.googlecode.com/svn/maven-repository</url>
</repository> </repository>
<repository> <repository>
<id>thirdparty</id> <id>thirdparty</id>
<url>http://nexus.naval.igalia.com/content/repositories/thirdparty</url> <url>http://nexus.naval.igalia.com/content/repositories/thirdparty</url>
</repository> </repository>
</repositories> </repositories>
<pluginRepositories> <pluginRepositories>
@ -557,7 +557,7 @@
<artifactId>ehcache</artifactId> <artifactId>ehcache</artifactId>
<version>1.6.2</version> <version>1.6.2</version>
</dependency> </dependency>
<!-- LiquiBase --> <!-- LiquiBase -->
<dependency> <dependency>
<groupId>org.liquibase</groupId> <groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId> <artifactId>liquibase-core</artifactId>
@ -784,9 +784,9 @@
<!-- =========================================================== --> <!-- =========================================================== -->
<!-- LiquiBase plugin --> <!-- LiquiBase plugin -->
<plugin> <plugin>
<groupId>org.liquibase</groupId> <groupId>org.liquibase</groupId>
<artifactId>liquibase-maven-plugin</artifactId> <artifactId>liquibase-maven-plugin</artifactId>
<version>2.0-rc7</version> <version>2.0-rc7</version>
</plugin> </plugin>

2
scripts/rest-clients/orders-sample.xml
View file

@ -59,7 +59,7 @@
<advance-measurements /> <advance-measurements />
<criterion-requirements /> <criterion-requirements />
<children> <children>
<order-line name="orderline B1" code="PREFIX-00022-00001" /> <order-line name="orderline B1" code="PREFIX-00022-00001" />
</children> </children>
</order> </order>
</order-list> </order-list>

72
scripts/rest-clients/work-reports-sample.xml
View file

@ -3,10 +3,10 @@
<!-- the type wr1 has got the following structure <!-- the type wr1 has got the following structure
Date: heading Date: heading
Resource: heading Resource: heading
Order Element: heading Order Element: heading
Hours Management: Number of assigned hours.--> Hours Management: Number of assigned hours.-->
<work-report work-order="PREFIX-00001" <work-report work-order="PREFIX-00001"
resource="30303030D" date="2010-03-09" resource="30303030D" date="2010-03-09"
@ -135,10 +135,10 @@ Hours Management: Number of assigned hours.-->
<!-- the work report type has got the following structure: <!-- the work report type has got the following structure:
Date: line Date: line
Resource: line Resource: line
Order Element: line Order Element: line
Hours Management: Number of hours calculated by clock --> Hours Management: Number of hours calculated by clock -->
<!-- missing finish-hour OK --> <!-- missing finish-hour OK -->
<work-report date="2010-03-09" <work-report date="2010-03-09"
@ -224,14 +224,14 @@ Hours Management: Number of hours calculated by clock -->
<!-- the work report type (wrt4) has got the following structure : <!-- the work report type (wrt4) has got the following structure :
Date: heading Date: heading
Resource: heading Resource: heading
Order Element: heading Order Element: heading
Hours Management: Number of assigned hours and the time. Hours Management: Number of assigned hours and the time.
--> -->
<!-- the work report date does not match with the work report line date [OK] --> <!-- the work report date does not match with the work report line date [OK] -->
<!-- the work report resource does not match with the work report line resource [OK] --> <!-- the work report resource does not match with the work report line resource [OK] -->
<!-- the work report order element does not match with the work report order element [OK] --> <!-- the work report order element does not match with the work report order element [OK] -->
<work-report date="2010-03-09" <work-report date="2010-03-09"
work-order="PREFIX-00001" work-order="PREFIX-00001"
@ -244,9 +244,9 @@ Hours Management: Number of assigned hours and the time.
start-hour="2010-07-08T01:00:00.000" hour-type="t1" start-hour="2010-07-08T01:00:00.000" hour-type="t1"
date="2010-03-12" work-order="PREFIX-00022" date="2010-03-12" work-order="PREFIX-00022"
resource="w18-nif" code="wr15-wrl1"> resource="w18-nif" code="wr15-wrl1">
<text-field-list> <text-field-list>
<text-field name="etiqueta1" value="value-etiqueta1" /> <text-field name="etiqueta1" value="value-etiqueta1" />
</text-field-list> </text-field-list>
</work-report-line> </work-report-line>
</work-report-line-list> </work-report-line-list>
</work-report> </work-report>
@ -280,18 +280,18 @@ Hours Management: Number of assigned hours and the time.
start-hour="2010-07-08T01:00:00.000" hour-type="t1" start-hour="2010-07-08T01:00:00.000" hour-type="t1"
date="2010-03-12" work-order="PREFIX-00022" date="2010-03-12" work-order="PREFIX-00022"
resource="w18-nif" code="wr17-wrl1"> resource="w18-nif" code="wr17-wrl1">
<text-field-list> <text-field-list>
<text-field name="etiqueta1" value="value-etiqueta1" /> <text-field name="etiqueta1" value="value-etiqueta1" />
</text-field-list> </text-field-list>
</work-report-line> </work-report-line>
<work-report-line hours="6" <work-report-line hours="6"
finish-hour="2010-07-08T06:00:00.000" finish-hour="2010-07-08T06:00:00.000"
start-hour="2010-07-08T01:00:00.000" hour-type="t1" start-hour="2010-07-08T01:00:00.000" hour-type="t1"
date="2010-03-12" work-order="PREFIX-00022" date="2010-03-12" work-order="PREFIX-00022"
resource="w18-nif" code="wr17-wrl1"> resource="w18-nif" code="wr17-wrl1">
<text-field-list> <text-field-list>
<text-field name="etiqueta1" value="value-etiqueta1" /> <text-field name="etiqueta1" value="value-etiqueta1" />
</text-field-list> </text-field-list>
</work-report-line> </work-report-line>
</work-report-line-list> </work-report-line-list>
</work-report> </work-report>
@ -308,10 +308,10 @@ Hours Management: Number of assigned hours and the time.
start-hour="2010-07-08T01:00:00.000" hour-type="t1" start-hour="2010-07-08T01:00:00.000" hour-type="t1"
date="2010-03-12" work-order="PREFIX-00022" date="2010-03-12" work-order="PREFIX-00022"
resource="w18-nif" code="wr18-wrl1"> resource="w18-nif" code="wr18-wrl1">
<text-field-list> <text-field-list>
<text-field name="etiqueta1" value="value-etiqueta1" /> <text-field name="etiqueta1" value="value-etiqueta1" />
<text-field name="etiqueta1" value="value-etiqueta2" /> <text-field name="etiqueta1" value="value-etiqueta2" />
</text-field-list> </text-field-list>
</work-report-line> </work-report-line>
</work-report-line-list> </work-report-line-list>
</work-report> </work-report>
@ -327,9 +327,9 @@ Hours Management: Number of assigned hours and the time.
start-hour="2010-07-08T01:00:00.000" hour-type="t1" start-hour="2010-07-08T01:00:00.000" hour-type="t1"
date="2010-03-12" work-order="PREFIX-00022" date="2010-03-12" work-order="PREFIX-00022"
resource="w18-nif" code="wr20-wrl1"> resource="w18-nif" code="wr20-wrl1">
<text-field-list> <text-field-list>
<text-field name="etiqueta1" value="value-etiqueta1" /> <text-field name="etiqueta1" value="value-etiqueta1" />
</text-field-list> </text-field-list>
</work-report-line> </work-report-line>
</work-report-line-list> </work-report-line-list>
</work-report> </work-report>
@ -345,9 +345,9 @@ Hours Management: Number of assigned hours and the time.
start-hour="2010-07-08T01:00:00.000" hour-type="t1" start-hour="2010-07-08T01:00:00.000" hour-type="t1"
date="2010-03-12" work-order="PREFIX-00022" date="2010-03-12" work-order="PREFIX-00022"
resource="w18-nif" code="wr21-wrl1"> resource="w18-nif" code="wr21-wrl1">
<text-field-list> <text-field-list>
<text-field name="etiqueta1" value="value-etiqueta1" /> <text-field name="etiqueta1" value="value-etiqueta1" />
</text-field-list> </text-field-list>
</work-report-line> </work-report-line>
</work-report-line-list> </work-report-line-list>
</work-report> </work-report>
@ -359,14 +359,14 @@ Hours Management: Number of assigned hours and the time.
resource="30303030D" resource="30303030D"
work-report-type="wrt4" work-report-type="wrt4"
code="wr22"> code="wr22">
<work-report-line-list> <work-report-line-list>
<work-report-line <work-report-line
start-hour="2010-07-08T01:00:00.000" hour-type="t1" start-hour="2010-07-08T01:00:00.000" hour-type="t1"
date="2010-03-12" work-order="PREFIX-00022" date="2010-03-12" work-order="PREFIX-00022"
resource="w18-nif" code="wr20-wrl1"> resource="w18-nif" code="wr20-wrl1">
<text-field-list> <text-field-list>
<text-field name="etiqueta1" value="value-etiqueta1" /> <text-field name="etiqueta1" value="value-etiqueta1" />
</text-field-list> </text-field-list>
</work-report-line> </work-report-line>
</work-report-line-list> </work-report-line-list>
</work-report> </work-report>