Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== diff -u -r4ad2124069fa259f572a1a7b50aaa275df964fb8 -re3bb7a2952e00fad06d59d7fb977954b76f62aa8 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision 4ad2124069fa259f572a1a7b50aaa275df964fb8) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision e3bb7a2952e00fad06d59d7fb977954b76f62aa8) @@ -867,16 +867,11 @@ { Hashtable table = new Hashtable(); table.put("activityID", activityID); + table.put("activityTypeID", gate.getActivityTypeId()); table.put("gateOpen", gate.getGateOpen()); table.put("activityLevelID", gate.getGateActivityLevelId()); - table.put("waitingLearners", new Integer(gate.getWaitingLearners().size())); - if (gate.isScheduleGate()) - { - ScheduleGateActivity scheduleGate = (ScheduleGateActivity)gate; - table.put("startingTime", scheduleGate.getGateStartDateTime()); - table.put("endingTime", scheduleGate.getGateEndDateTime()); - } - return table; + table.put("learnersWaiting", new Integer(gate.getWaitingLearners().size())); + return table; }