midsuit
/
core-jgi
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-634 NPE when selecting resource.

This commit is contained in:
Heng Sin Low 2013-02-21 17:30:11 +08:00
parent 5219160e32
commit bca2d0f074
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WSchedule.java
View File

@ -225,9 +225,11 @@ public class WSchedule extends Window implements EventListener<Event>
cal.set(Calendar.SECOND, 0); cal.set(Calendar.SECOND, 0);
cal.set(Calendar.MILLISECOND, 0); cal.set(Calendar.MILLISECOND, 0);
cal.set(Calendar.DAY_OF_MONTH, 1); cal.set(Calendar.DAY_OF_MONTH, 1);
cal.add(Calendar.DAY_OF_MONTH, -7);
Timestamp startDate = new Timestamp(cal.getTimeInMillis()); Timestamp startDate = new Timestamp(cal.getTimeInMillis());
// Calculate End Date // Calculate End Date
cal.add(Calendar.MONTH, 1); cal.add(Calendar.MONTH, 1);
cal.add(Calendar.DAY_OF_MONTH, 14);
Timestamp endDate = new Timestamp (cal.getTimeInMillis()); Timestamp endDate = new Timestamp (cal.getTimeInMillis());
scm = new SimpleCalendarModel(); scm = new SimpleCalendarModel();
@ -236,10 +238,26 @@ public class WSchedule extends Window implements EventListener<Event>
for(MAssignmentSlot mas : list) { for(MAssignmentSlot mas : list) {
SimpleCalendarEvent event = new SimpleCalendarEvent(); SimpleCalendarEvent event = new SimpleCalendarEvent();
event.setBeginDate(mas.getStartTime()); Timestamp startTime = mas.getStartTime();
event.setEndDate(mas.getEndTime()); Timestamp endTime = mas.getEndTime();
Calendar calStart = Calendar.getInstance();
calStart.setTime(startTime);
Calendar calEnd = Calendar.getInstance();
calEnd.setTime(endTime);
calStart.add(Calendar.DAY_OF_MONTH, 1);
if (calStart.get(Calendar.YEAR) == calEnd.get(Calendar.YEAR) && calStart.get(Calendar.MONTH) == calEnd.get(Calendar.MONTH)
&& calStart.get(Calendar.DAY_OF_MONTH) == calEnd.get(Calendar.DAY_OF_MONTH)) {
if (calEnd.get(Calendar.HOUR_OF_DAY) == 0 && calEnd.get(Calendar.MINUTE) == 0) {
calEnd.add(Calendar.DAY_OF_MONTH, -1);
calEnd.set(Calendar.HOUR_OF_DAY, 23);
}
}
event.setBeginDate(startTime);
event.setEndDate(calEnd.getTime());
event.setTitle(mas.getName()); event.setTitle(mas.getName());
event.setContent(mas.getDescription()); event.setContent(mas.getDescription() != null ? mas.getDescription() : mas.getName());
event.setHeaderColor('#'+ZkCssHelper.createHexColorString(mas.getColor(true))); event.setHeaderColor('#'+ZkCssHelper.createHexColorString(mas.getColor(true)));
event.setContentColor('#'+ZkCssHelper.createHexColorString(mas.getColor(true))); event.setContentColor('#'+ZkCssHelper.createHexColorString(mas.getColor(true)));
if (!mas.isAssignment() || mas.getMAssignment().isConfirmed()) if (!mas.isAssignment() || mas.getMAssignment().isConfirmed())
@ -283,6 +301,7 @@ public class WSchedule extends Window implements EventListener<Event>
private void btnCurrentDateClicked() { private void btnCurrentDateClicked() {
calendars.setCurrentDate(Calendar.getInstance(calendars.getDefaultTimeZone()).getTime()); calendars.setCurrentDate(Calendar.getInstance(calendars.getDefaultTimeZone()).getTime());
updateDateLabel(); updateDateLabel();
updateModel();
} }
private void updateDateLabel() { private void updateDateLabel() {
@ -310,6 +329,7 @@ public class WSchedule extends Window implements EventListener<Event>
calendars.setMold("month"); calendars.setMold("month");
} }
updateDateLabel(); updateDateLabel();
updateModel();
} }
public void addNorthPane(Component pane) { public void addNorthPane(Component pane) {

4
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/InfoSchedule.java
View File

@ -562,8 +562,10 @@ public class InfoSchedule extends Window implements EventListener<Event>
dispose(); dispose();
} }
} else { } else {
if (!slot.isAssignment()) if (!slot.isAssignment()) {
FDialog.error(0, this, "No available time slot for the selected day."); FDialog.error(0, this, "No available time slot for the selected day.");
return;
}
MResourceAssignment ma = slot.getMAssignment(); MResourceAssignment ma = slot.getMAssignment();
ma.setAssignDateFrom(start); ma.setAssignDateFrom(start);