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

Add Liquibase 1.5 changelog to changelogs.

Browse source 
Fix compile errors.
Code refactoring.
This commit is contained in:
Vova Perebykivskiy 2015-12-03 16:49:54 +02:00 • committed by Dgray16
parent aa7f135b0e
commit 6aaae08f42
4 changed files with 10 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libreplan-business/src/test/resources/libreplan-business-spring-config-test.xml
View file

@ -40,6 +40,9 @@
<value>
org/libreplan/business/orders/entities/Orders.hbm.xml
</value>
<value>
org/libreplan/business/templates/entities/Templates.hbm.xml
</value>
<value>
org/libreplan/business/planner/entities/Tasks.hbm.xml
</value>

28
libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardControllerGlobal.java
View file

@ -231,34 +231,12 @@ public class DashboardControllerGlobal extends GenericForwardComposer {
}
}
// Remove time, timezone from full-date string
private String getOrderInitDate(Order order) throws ParseException {
// Remove time, timezone from full-date string
DateFormat inputFormatter = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy");
DateFormat outputFormatter = new SimpleDateFormat("EEE MMM dd yyyy");
String input = "";
String outputInit = "";
String outputDeadline = "";
Date date = null;
input = order.getInitDate().toString();
date = inputFormatter.parse(input);
return outputInit = outputFormatter.format(date);
return new SimpleDateFormat("EEE MMM dd yyyy").format(order.getInitDate());
}
private String getOrderDeadline(Order order) throws ParseException {
// Remove time, timezone from full-date string
DateFormat inputFormatter = new SimpleDateFormat("EEE MMM dd HH:mm:ss zzz yyyy");
DateFormat outputFormatter = new SimpleDateFormat("EEE MMM dd yyyy");
String input = "";
String outputInit = "";
String outputDeadline = "";
Date date = null;
input = order.getDeadline().toString();
date = inputFormatter.parse(input);
return outputDeadline = outputFormatter.format(date);
return new SimpleDateFormat("EEE MMM dd yyyy").format(order.getDeadline());
}
public void showStoredColumn() throws ParseException {

2
libreplan-webapp/src/main/java/org/libreplan/web/planner/taskedition/TaskPropertiesController.java
View file

@ -732,7 +732,7 @@ public class TaskPropertiesController extends GenericForwardComposer {
private void EmailNotificationAddNewWithTaskAssignedToResource(){
if ( allocationResult != null ) {
if ( allocationResult.getSpecificAllocations().size() != 0 ) {
/* Check if resources in allocation are bound by user and are in role ROLE_EMAIL_TASK_ASSIGNED_TO_RESOURCE
* setUser method calling manually because, after initialization user will be null

3
libreplan-webapp/src/test/resources/libreplan-webapp-spring-config-test.xml
View file

@ -41,6 +41,9 @@
<value>
org/libreplan/business/orders/entities/Orders.hbm.xml
</value>
<value>
org/libreplan/business/templates/entities/Templates.hbm.xml
</value>
<value>
org/libreplan/business/planner/entities/Tasks.hbm.xml
</value>