lams-github / lams_monitoring / src / java

org

Clone Tools

Stats

Commits this week: 0
Total Committers: 25
Last Commit:
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Wednesday 16 Oct 2019
2:39 am

Andrey Balan

LDEV-4881 Remove notebook entries from DB on lesson removal

Options
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
  2. … 4 more files in changeset.
Tuesday 29 Jan 2019
7:58 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4651 Scheduled lesson with rescheduled gate can start now

Options
    • -17
    • +43
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
11:14 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4651 Scheduled gate in scheduled lesson can be viewed/rescheduled.

Options
    • -17
    • +43
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -4
    • +10
    ./lamsfoundation/lams/monitoring/web/GateController.java
  3. … 1 more file in changeset.
Thursday 10 Jan 2019
8:07 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4749 Transitions to be deleted earlier in the preview lesson delete

Options
    • -26
    • +27
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
7:58 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4749 Transitions to be deleted earlier in the preview lesson delete

Options
    • -26
    • +27
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
Friday 21 Dec 2018
2:05 am

Andrey Balan

LDEV-4678 Remove all ServiceProxy classes

Also get rid of LearningWebUtil.putActivityPositionInRequest(Long

activityId, HttpServletRequest request, ServletContext context) and

LearningWebUtil.getActivityMapping(ServletContext context) methods. As

it's better to invoke according service methods directly.

Options
    • -98
    • +0
    ./lamsfoundation/lams/monitoring/service/MonitoringServiceProxy.java
  2. … 51 more files in changeset.
Tuesday 18 Dec 2018
10:45 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4737 Course based lesson delete does not throw exception

Options
    • -0
    • +5
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
  2. … 5 more files in changeset.
Thursday 13 Dec 2018
1:41 pm

Marcin Cieslak

LDEV-4725 Manually delete rating criteria

There is no DB cascade for this.

Also fix transition removal.

Options
    • -0
    • +5
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
Tuesday 11 Dec 2018
4:49 am

Marcin Cieslak

LDEV-4725 Manually delete transitions

Subsequent activity removal does not cascade to transitions

Options
    • -4
    • +8
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
Tuesday 04 Dec 2018
3:51 pm

Marcin Cieslak

LDEV-4705 Remove references to Group Admin role from Java code

Options
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/web/GroupingAJAXController.java
    • -3
    • +2
    ./lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
  3. … 25 more files in changeset.
Sunday 02 Dec 2018
1:22 am

Andrey Balan

LDEV-4720 Fix LAMS issues that prevented TestHarness to work correctly

Options
    • -23
    • +12
    ./lamsfoundation/lams/monitoring/web/MonitoringController.java
  2. … 5 more files in changeset.
Friday 02 Nov 2018
10:32 pm

Marcin Cieslak

LDEV-4696 Rewrite part of Common entities to Hibernate annotations

Options
    • -12
    • +11
    ./lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -1
    • +2
    ./lamsfoundation/lams/monitoring/web/TblMonitoringController.java
  3. … 58 more files in changeset.
Monday 15 Oct 2018
7:23 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4689 Live Edit has a contribution entry and button changes colour.

Also fixed the SVG rendering in monitor (did not return 404 properly

when missing) and fixed the path for the monitor chosen grouping page.

Options
    • -1
    • +14
    ./lamsfoundation/lams/monitoring/web/MonitoringController.java
  2. … 10 more files in changeset.
Thursday 04 Oct 2018
7:35 pm

Andrey Balan

LDEV-4440 Switch controllers to use @Autowired service beans

Also in cases when service bean in Controller has the same name as in

applicationContext, @Qualifier(..) can be removed. Which was done almost

in all cases, except for messageService due to "messageService" name

seems to be more preferable than adminMessageService,

centralMessageService and so on. Thus they were kept as before:

@Autowired

@Qualifier("centralMessageService")

private MessageService messageService;

Options
    • -3
    • +0
    ./lamsfoundation/lams/monitoring/web/ComplexLearnerProgressController.java
    • -9
    • +0
    ./lamsfoundation/lams/monitoring/web/EmailNotificationsController.java
    • -7
    • +2
    ./lamsfoundation/lams/monitoring/web/EmailProgressController.java
    • -8
    • +2
    ./lamsfoundation/lams/monitoring/web/GateController.java
    • -6
    • +1
    ./lamsfoundation/lams/monitoring/web/GroupingAJAXController.java
    • -6
    • +0
    ./lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
    • -17
    • +3
    ./lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -5
    • +0
    ./lamsfoundation/lams/monitoring/web/SequenceController.java
    • -8
    • +2
    ./lamsfoundation/lams/monitoring/web/TblMonitoringController.java
  10. … 174 more files in changeset.
Monday 24 Sep 2018
12:18 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4440 Force Complete URL corrected

Options
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/web/MonitoringController.java
Saturday 22 Sep 2018
4:13 pm

Marcin Cieslak

LDEV-4440 Fix chosen grouping

Options
    • -6
    • +5
    ./lamsfoundation/lams/monitoring/web/FileUploadForm.java
    • -1
    • +0
    ./lamsfoundation/lams/monitoring/web/GroupingAJAXController.java
    • -15
    • +13
    ./lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
  4. … 3 more files in changeset.
Saturday 15 Sep 2018
1:22 pm

Marcin Cieslak

Major merge of LAMS 3.1 into LDEV-4440 branch after Struts migration

Conflicts:

lams_admin/.classpath

lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/CloneLessonsAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ConfigAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgSaveAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ServerSaveAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SignupManagementAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSaveAction.java

lams_admin/web/WEB-INF/struts-config.xml

lams_admin/web/WEB-INF/tiles-defs.xml

lams_admin/web/config/items.jsp

lams_admin/web/css/admin.scss

lams_admin/web/organisation/courseAdminEdit.jsp

lams_admin/web/organisation/createOrEdit.jsp

lams_admin/web/organisation/list.jsp

lams_admin/web/servermaintain.jsp

lams_admin/web/signupmanagement/add.jsp

lams_admin/web/signupmanagement/list.jsp

lams_admin/web/timezoneServerManagement.jsp

lams_admin/web/user.jsp

lams_admin/web/usersearchlist.jsp

lams_build/lib/lams/lams-admin.jar

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams-gradebook.jar

lams_build/lib/lams/lams-learning.jar

lams_build/lib/lams/lams-monitoring.jar

lams_build/lib/lams/lams.jar

lams_central/.classpath

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java

lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java

lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java

lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java

lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java

lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java

lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java

lams_central/src/java/org/lamsfoundation/lams/web/TextSearchActionForm.java

lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java

lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivityForm.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java

lams_central/web/WEB-INF/struts-config.xml

lams_central/web/editprofile.jsp

lams_central/web/includes/javascript/pedagogicalPlanner.js

lams_central/web/lessons.jsp

lams_central/web/main.jsp

lams_central/web/portrait.jsp

lams_central/web/profile.jsp

lams_central/web/signup/singupTab.jsp

lams_central/web/tutorialVideo.jsp

lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180821.sql

lams_common/src/java/org/lamsfoundation/lams/learningdesign/TextSearchCondition.java

lams_gradebook/.classpath

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/BranchingAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ComplexLearnerProgressAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailProgressAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupBasedBranchingAJAXAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/SequenceAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringAction.java

lams_monitoring/web/gate/scheduleGateContent.jsp

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/ClearSessionAction.java

lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/ClearSessionAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/ClearSessionAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatConditionForm.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatPedagogicalPlannerForm.java

lams_tool_daco/.classpath

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/ClearSessionAction.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/LearningAction.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java

lams_tool_dimdim/.classpath

lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/AuthoringAction.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/ClearSessionAction.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java

lams_tool_eadventure/.classpath

lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/LearningAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ClearSessionAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumConditionForm.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumPedagogicalPlannerForm.java

lams_tool_forum/web/jsps/learning/viewtopic.jsp

lams_tool_forum/web/jsps/monitoring/summary.jsp

lams_tool_forum/web/jsps/monitoring/viewmarks.jsp

lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/ClearSessionAction.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/ClearSessionAction.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/ClearSessionAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/form/CommonCartridgePedagogicalPlannerForm.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/ClearSessionAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/forms/KalturaPedagogicalPlannerForm.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/ClearSessionAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java

lams_tool_lamc/web/authoring/AdvancedContent.jsp

lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/ClearSessionAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningStarterAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaConditionForm.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaPedagogicalPlannerForm.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ClearSessionAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/AuthoringAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/ClearSessionAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/LearningAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/ClearSessionAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/forms/MindmapPedagogicalPlannerForm.java

lams_tool_mindmap/web/pages/authoring/authoring.jsp

lams_tool_mindmap/web/pages/learning/mindmap.jsp

lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/ClearSessionAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbAuthoringAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbLearnerAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbLearnerStarterAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbPedagogicalPlannerAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbPedagogicalPlannerForm.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/ClearSessionAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookConditionForm.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookPedagogicalPlannerForm.java

lams_tool_pixlr/.classpath

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/ClearSessionAction.java

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java

lams_tool_preview/.classpath

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/ClearSessionAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/AuthoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/ClearSessionAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/LearnerAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/ReflectAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/SubmitFilesPedagogicalPlannerAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/SubmitFilesPedagogicalPlannerForm.java

lams_tool_sbmt/web/authoring/advance.jsp

lams_tool_sbmt/web/monitoring/mark/mark.jsp

lams_tool_sbmt/web/monitoring/parts/summary.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/ClearSessionAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/TblMonitorAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchiePedagogicalPlannerForm.java

lams_tool_scribe/.classpath

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/ClearSessionAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/forms/ScribePedagogicalPlannerForm.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/ClearSessionAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/ClearSessionAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/SurveyConditionForm.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/ClearSessionAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListPedagogicalPlannerForm.java

lams_tool_videorecorder/.classpath

lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java

lams_tool_vote/.classpath

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/AuthoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/ClearSessionAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VotePedagogicalPlannerForm.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/ClearSessionAction.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiPedagogicalPlannerForm.java

lams_tool_wookie/.classpath

lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java

Options
    • -1
    • +2
    ./lamsfoundation/lams/monitoring/dto/ContributeActivityDTO.java
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/dto/TblUserDTO.java
    • -3
    • +2
    ./lamsfoundation/lams/monitoring/quartz/job/CloseScheduleGateJob.java
    • -2
    • +2
    ./lamsfoundation/lams/monitoring/quartz/job/EmailScheduleMessageJob.java
    • -2
    • +2
    ./lamsfoundation/lams/monitoring/quartz/job/FinishScheduleLessonJob.java
    • -3
    • +3
    ./lamsfoundation/lams/monitoring/quartz/job/MonitoringJob.java
    • -3
    • +2
    ./lamsfoundation/lams/monitoring/quartz/job/OpenScheduleGateJob.java
    • -2
    • +4
    ./lamsfoundation/lams/monitoring/service/ContributeDTOFactory.java
    • -33
    • +51
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -6
    • +6
    ./lamsfoundation/lams/monitoring/service/MonitoringServiceProxy.java
    • -7
    • +3
    ./lamsfoundation/lams/monitoring/web/ComplexLearnerProgressController.java
    • -124
    • +60
    ./lamsfoundation/lams/monitoring/web/EmailNotificationsController.java
    • -51
    • +16
    ./lamsfoundation/lams/monitoring/web/EmailProgressController.java
    • -27
    • +7
    ./lamsfoundation/lams/monitoring/web/GateController.java
    • -35
    • +14
    ./lamsfoundation/lams/monitoring/web/GroupingAJAXController.java
  16. … 634 more files in changeset.
Monday 10 Sep 2018
1:55 am

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_admin/.classpath

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams-gradebook.jar

lams_build/lib/lams/lams.jar

lams_central/.classpath

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java

lams_central/src/java/org/lamsfoundation/lams/rest/RestServlet.java

lams_central/src/java/org/lamsfoundation/lams/rest/ToolRestManager.java

lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java

lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java

lams_central/web/includes/javascript/pedagogicalPlanner.js

lams_common/.classpath

lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java

lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

lams_gradebook/.classpath

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java

lams_learning/.classpath

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java

lams_monitoring/.classpath

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

lams_tool_assessment/.classpath

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_bbb/.classpath

lams_tool_chat/.classpath

lams_tool_doku/.classpath

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java

lams_tool_eadventure/.classpath

lams_tool_forum/.classpath

lams_tool_images/.classpath

lams_tool_kaltura/.classpath

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java

lams_tool_lamc/.classpath

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java

lams_tool_laqa/.classpath

lams_tool_larsrc/.classpath

lams_tool_leader/.classpath

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/LearningAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java

lams_tool_nb/.classpath

lams_tool_notebook/.classpath

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java

lams_tool_sbmt/.classpath

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

lams_tool_scratchie/.classpath

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java

lams_tool_spreadsheet/.classpath

lams_tool_survey/.classpath

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java

lams_tool_task/.classpath

lams_tool_vote/.classpath

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java

lams_tool_wiki/.classpath

Options
    • -20
    • +20
    ./lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -4
    • +4
    ./lamsfoundation/lams/monitoring/web/EmailProgressAction.java
    • -10
    • +9
    ./lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
    • -3
    • +3
    ./lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java
    • -20
    • +52
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
  6. … 99 more files in changeset.
Friday 07 Sep 2018
10:34 pm

Andrey Balan

LDEV-4660 Update LAMS code to support POI 3.17 and 4.0

POI libraries are kept at 3.17 version, until they fix the following

issue: java.lang.IllegalArgumentException: Property

'http://www.oracle.com/xml/jaxp/properties/entityExpansionLimit' is not

recognized.

Options
    • -2
    • +2
    ./lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java
  2. … 13 more files in changeset.
Thursday 30 Aug 2018
6:28 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 trying to solve problems with grouping upload

Options
    • -13
    • +11
    ./lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
  2. … 2 more files in changeset.
1:12 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 updated paths to monitoring and central

Options
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
  2. … 6 more files in changeset.
Wednesday 29 Aug 2018
4:38 pm

Marcin Cieslak

Merge Asia's and Michal's progress in core projects

Options
    • -0
    • +449
    ./lamsfoundation/lams/monitoring/web/GroupingAJAXController.java
  2. … 5 more files in changeset.
Tuesday 28 Aug 2018
8:46 pm

Andrey Balan

Merge branch 'LDEV-4407'

Options
    • -33
    • +41
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -13
    • +4
    ./lamsfoundation/lams/monitoring/web/GateAction.java
  3. … 3 more files in changeset.
5:53 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Monitoring migration - necessary changes at central (changed paths for monitoring), removed controllers connected with branching

Options
    • -190
    • +0
    ./lamsfoundation/lams/monitoring/web/BranchingController.java
    • -310
    • +0
    ./lamsfoundation/lams/monitoring/web/GroupBasedBranchingAJAXController.java
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
    • -41
    • +0
    ./lamsfoundation/lams/monitoring/web/ToolOutputBranchingAction.java
  5. … 12 more files in changeset.
Saturday 25 Aug 2018
7:55 pm

Andrey Balan

LDEV-4407 Remove obsolete methods

Options
    • -36
    • +0
    ./lamsfoundation/lams/monitoring/service/IMonitoringFullService.java
    • -18
    • +10
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
  3. … 2 more files in changeset.
7:26 pm

Andrey Balan

LDEV-4407 Other projects stop depending on lams_central

Options
    • -5
    • +5
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/service/MonitoringServiceProxy.java
    • -9
    • +8
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
    • -11
    • +10
    ./lamsfoundation/lams/monitoring/web/TblMonitoringAction.java
  5. … 106 more files in changeset.
4:16 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Monitoring - noStruts and no tiles

Options
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/web/BranchingController.java
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/web/EmailNotificationsController.java
    • -1
    • +1
    ./lamsfoundation/lams/monitoring/web/EmailProgressController.java
    • -1
    • +0
    ./lamsfoundation/lams/monitoring/web/GateController.java
    • -282
    • +0
    ./lamsfoundation/lams/monitoring/web/GroupBasedBranchingAJAXAction.java
    • -0
    • +310
    ./lamsfoundation/lams/monitoring/web/GroupBasedBranchingAJAXController.java
    • -571
    • +0
    ./lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java
    • -0
    • +577
    ./lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
    • -57
    • +52
    ./lamsfoundation/lams/monitoring/web/MonitoringController.java
  10. … 48 more files in changeset.
Friday 24 Aug 2018
11:18 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Migration of monitoring - changes at jsp files

Options
    • -83
    • +90
    ./lamsfoundation/lams/monitoring/web/GroupingAJAXController.java
    • -34
    • +37
    ./lamsfoundation/lams/monitoring/web/TblMonitoringController.java
  3. … 24 more files in changeset.
3:08 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Started migration of monitoring - controllers

Options
    • -190
    • +0
    ./lamsfoundation/lams/monitoring/web/BranchingAction.java
    • -0
    • +190
    ./lamsfoundation/lams/monitoring/web/BranchingController.java
    • -230
    • +0
    ./lamsfoundation/lams/monitoring/web/ComplexLearnerProgressAction.java
    • -0
    • +219
    ./lamsfoundation/lams/monitoring/web/ComplexLearnerProgressController.java
    • -747
    • +0
    ./lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
    • -0
    • +761
    ./lamsfoundation/lams/monitoring/web/EmailNotificationsController.java
    • -324
    • +0
    ./lamsfoundation/lams/monitoring/web/EmailProgressAction.java
    • -0
    • +330
    ./lamsfoundation/lams/monitoring/web/EmailProgressController.java
    • -18
    • +22
    ./lamsfoundation/lams/monitoring/web/FileUploadForm.java
    • -364
    • +0
    ./lamsfoundation/lams/monitoring/web/GateAction.java
    • -0
    • +295
    ./lamsfoundation/lams/monitoring/web/GateController.java
    • -0
    • +130
    ./lamsfoundation/lams/monitoring/web/GateForm.java
    • -442
    • +0
    ./lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
    • -0
    • +442
    ./lamsfoundation/lams/monitoring/web/GroupingAJAXController.java
    • -1756
    • +0
    ./lamsfoundation/lams/monitoring/web/MonitoringAction.java
  16. … 8 more files in changeset.
Monday 20 Aug 2018
11:51 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4651 Schedule gate monitoring works for a scheduled lesson

Options
    • -0
    • +10
    ./lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -3
    • +17
    ./lamsfoundation/lams/monitoring/web/GateAction.java
  3. … 1 more file in changeset.