lams-github / lams_learning / src / java / org

lamsfoundation

Clone Tools

Stats

Commits this week: 0
Total Committers: 24
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
Saturday 26 Jan 2019
7:35 am

Marcin Cieslak

Merge ordered branching LDEV-4587 into develop

Options
    • -2
    • +6
    ./lams/learning/progress/ProgressBuilder.java
    • -4
    • +5
    ./lams/learning/progress/ProgressEngine.java
    • -3
    • +23
    ./lams/learning/service/LearnerService.java
    • -4
    • +4
    ./lams/learning/web/controller/LearnerController.java
  5. … 20 more files in changeset.
Thursday 10 Jan 2019
7:49 pm

Andrey Balan

LDEV-4678 Push some util methods to the service layer

Certain static util methods (mainly from LearningWebUtil.java) expect

service beans as a parameter. It was changed by pushing those methods to

the appropriate service layer.

Options
    • -2
    • +1
    ./lams/learning/progress/ProgressBuilder.java
    • -6
    • +0
    ./lams/learning/service/ILearnerFullService.java
    • -63
    • +40
    ./lams/learning/service/LearnerService.java
    • -5
    • +7
    ./lams/learning/web/controller/BranchingActivityController.java
    • -2
    • +4
    ./lams/learning/web/controller/ChooseActivityController.java
    • -5
    • +6
    ./lams/learning/web/controller/CompleteActivityController.java
    • -2
    • +1
    ./lams/learning/web/controller/DisplayActivityController.java
    • -3
    • +5
    ./lams/learning/web/controller/DisplayOptionsActivityController.java
    • -1
    • +4
    ./lams/learning/web/controller/DisplayParallelActivityController.java
    • -1
    • +4
    ./lams/learning/web/controller/DisplayToolActivityController.java
    • -17
    • +9
    ./lams/learning/web/controller/GateController.java
    • -6
    • +10
    ./lams/learning/web/controller/GroupingController.java
    • -15
    • +11
    ./lams/learning/web/controller/LearnerController.java
    • -4
    • +5
    ./lams/learning/web/controller/LoadToolActivityController.java
    • -6
    • +8
    ./lams/learning/web/controller/SequenceActivityController.java
  16. … 15 more files in changeset.
Thursday 20 Dec 2018
7:05 pm

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
    • -1
    • +0
    ./lams/learning/service/LearnerService.java
    • -130
    • +0
    ./lams/learning/service/LearnerServiceProxy.java
    • -18
    • +9
    ./lams/learning/web/controller/BranchingActivityController.java
    • -9
    • +2
    ./lams/learning/web/controller/ChooseActivityController.java
    • -7
    • +2
    ./lams/learning/web/controller/CompleteActivityController.java
    • -9
    • +4
    ./lams/learning/web/controller/DisplayActivityController.java
    • -9
    • +8
    ./lams/learning/web/controller/DisplayOptionsActivityController.java
    • -13
    • +6
    ./lams/learning/web/controller/DisplayParallelActivityController.java
    • -7
    • +2
    ./lams/learning/web/controller/DisplayToolActivityController.java
    • -6
    • +3
    ./lams/learning/web/controller/GateController.java
    • -6
    • +10
    ./lams/learning/web/controller/GroupingController.java
    • -15
    • +8
    ./lams/learning/web/controller/LearnerController.java
    • -10
    • +3
    ./lams/learning/web/controller/LoadToolActivityController.java
    • -7
    • +3
    ./lams/learning/web/controller/SequenceActivityController.java
    • -18
    • +10
    ./lams/learning/web/util/ActivityMapping.java
  16. … 37 more files in changeset.
Monday 26 Nov 2018
4:23 pm

Marcin Cieslak

LDEV-4696 Make all @ManyToOne and @OneToOne lazy

Hibernate 3 used lazy loading of single-object relationships by default.

JPA's default setting is eager. When loading entities all references are

loaded immediately using JOINs. A large entity, like Learning Design,

can have a query consisting of 25 JOINs. It makes it very slow.

There is no way to change JPA's default behaviour. In order to make JPA

annotations behave like old Hibernate, each of them got an explicit

attribute saying that loading is lazy.

Options
    • -2
    • +2
    ./lams/learning/kumalive/model/Kumalive.java
    • -9
    • +8
    ./lams/learning/kumalive/model/KumalivePoll.java
    • -10
    • +10
    ./lams/learning/kumalive/model/KumalivePollAnswer.java
    • -6
    • +7
    ./lams/learning/kumalive/model/KumaliveRubric.java
    • -6
    • +7
    ./lams/learning/kumalive/model/KumaliveScore.java
  6. … 166 more files in changeset.
4:23 pm

Marcin Cieslak

LDEV-4696 Make all @ManyToOne and @OneToOne lazy

Hibernate 3 used lazy loading of single-object relationships by default.

JPA's default setting is eager. When loading entities all references are

loaded immediately using JOINs. A large entity, like Learning Design,

can have a query consisting of 25 JOINs. It makes it very slow.

There is no way to change JPA's default behaviour. In order to make JPA

annotations behave like old Hibernate, each of them got an explicit

attribute saying that loading is lazy.

Options
    • -2
    • +2
    ./lams/learning/kumalive/model/Kumalive.java
    • -9
    • +8
    ./lams/learning/kumalive/model/KumalivePoll.java
    • -10
    • +10
    ./lams/learning/kumalive/model/KumalivePollAnswer.java
    • -6
    • +7
    ./lams/learning/kumalive/model/KumaliveRubric.java
    • -6
    • +7
    ./lams/learning/kumalive/model/KumaliveScore.java
  6. … 166 more files in changeset.
Tuesday 13 Nov 2018
7:41 am

Marcin Cieslak

LDEV-4649 Fix a Hibernate mapping to a column

Options
    • -8
    • +7
    ./lams/learning/kumalive/model/Kumalive.java
Sunday 04 Nov 2018
10:41 am

Marcin Cieslak

LDEV-4696 Rewrite part of Common entities to Hibernate annotations

Options
    • -9
    • +9
    ./lams/learning/service/LearnerService.java
    • -3
    • +2
    ./lams/learning/web/controller/LearnerController.java
  3. … 24 more files in changeset.
Wednesday 31 Oct 2018
11:36 pm

Andrey Balan

LDEV-4696 Migrate lams_learning to Hibernate annotations

Options
    • -0
    • +17
    ./lams/learning/command/model/Command.java
    • -3
    • +2
    ./lams/learning/kumalive/dao/hibernate/KumaliveDAO.java
    • -2
    • +34
    ./lams/learning/kumalive/model/Kumalive.java
    • -1
    • +20
    ./lams/learning/kumalive/model/KumaliveLog.java
    • -1
    • +35
    ./lams/learning/kumalive/model/KumalivePoll.java
    • -3
    • +45
    ./lams/learning/kumalive/model/KumalivePollAnswer.java
    • -1
    • +24
    ./lams/learning/kumalive/model/KumaliveRubric.java
    • -0
    • +24
    ./lams/learning/kumalive/model/KumaliveScore.java
    • -22
    • +18
    ./lams/learning/presence/model/PresenceChatMessage.java
    • -14
    • +12
    ./lams/learning/presence/model/PresenceChatUser.java
  11. … 10 more files in changeset.
11:35 pm

Andrey Balan

LDEV-4696 start transactions for update* method names

Options
    • -1
    • +1
    ./lams/learning/learningApplicationContext.xml
11:31 pm

Andrey Balan

LDEV-4440 Fix Kumalive Controller

Options
    • -5
    • +2
    ./lams/learning/kumalive/KumaliveController.java
  2. … 1 more file in changeset.
Wednesday 10 Oct 2018
5:36 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4440 Live Edit saves and the learner message is back

Options
    • -1
    • +1
    ./lams/learning/web/util/ActivityMappingStrategy.java
  2. … 3 more files in changeset.
Thursday 04 Oct 2018
1: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
    • -37
    • +22
    ./lams/learning/kumalive/KumaliveController.java
    • -5
    • +0
    ./lams/learning/web/controller/BranchingActivityController.java
    • -5
    • +1
    ./lams/learning/web/controller/ChooseActivityController.java
    • -16
    • +4
    ./lams/learning/web/controller/CompleteActivityController.java
    • -7
    • +0
    ./lams/learning/web/controller/DisplayActivityController.java
    • -4
    • +0
    ./lams/learning/web/controller/DisplayOptionsActivityController.java
    • -4
    • +0
    ./lams/learning/web/controller/DisplayParallelActivityController.java
    • -4
    • +0
    ./lams/learning/web/controller/DisplayToolActivityController.java
    • -5
    • +0
    ./lams/learning/web/controller/GateController.java
    • -13
    • +3
    ./lams/learning/web/controller/GroupingController.java
    • -30
    • +7
    ./lams/learning/web/controller/LearnerController.java
    • -30
    • +5
    ./lams/learning/web/controller/LessonCompleteActivityController.java
    • -4
    • +0
    ./lams/learning/web/controller/LoadToolActivityController.java
    • -19
    • +11
    ./lams/learning/web/controller/NotebookController.java
    • -7
    • +0
    ./lams/learning/web/controller/SequenceActivityController.java
  16. … 168 more files in changeset.
Monday 01 Oct 2018
10:50 am

Marcin Cieslak

LDEV-4440 Make a path to file absolute

References to requestURL can come from various controllers and contexts,

leading to errors.

Options
    • -1
    • +1
    ./lams/learning/web/util/ActivityMapping.java
Friday 28 Sep 2018
11:00 am

Marcin Cieslak

LDEV-4440 Fix a path for skipping activities in preview

Options
    • -1
    • +1
    ./lams/learning/progress/ProgressBuilder.java
Thursday 27 Sep 2018
1:02 pm

Marcin Cieslak

LDEV-4440 Fix parallel activity completed page redirect

Options
    • -1
    • +1
    ./lams/learning/web/util/ActivityMappingStrategy.java
    • -1
    • +1
    ./lams/learning/web/util/ParallelActivityMappingStrategy.java
Saturday 22 Sep 2018
10:34 am

Marcin Cieslak

LDEV-4440 Get rid of obsolete token processing

Options
    • -8
    • +0
    ./lams/learning/web/controller/ChooseActivityController.java
    • -3
    • +0
    ./lams/learning/web/controller/DisplayOptionsActivityController.java
  3. … 2 more files in changeset.
Friday 21 Sep 2018
6:08 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4440 Fixed TBL template in Authoring. Tweaks to gates, branch

Options
    • -13
    • +13
    ./lams/learning/web/controller/BranchingActivityController.java
    • -1
    • +1
    ./lams/learning/web/controller/GateController.java
    • -13
    • +5
    ./lams/learning/web/controller/GroupingController.java
    • -2
    • +2
    ./lams/learning/web/util/ActivityMapping.java
  5. … 26 more files in changeset.
Tuesday 18 Sep 2018
10:31 pm

Andrey Balan

LDEV-4440 fix path to close.jsp which is shown on finishing already finished activity

Options
    • -1
    • +1
    ./lams/learning/web/util/ActivityMappingStrategy.java
Saturday 15 Sep 2018
7:22 am

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
    • -4
    • +4
    ./lams/learning/command/CommandWebsocketServer.java
    • -6
    • +6
    ./lams/learning/kumalive/KumaliveController.java
    • -17
    • +17
    ./lams/learning/kumalive/service/KumaliveService.java
    • -1
    • +1
    ./lams/learning/learningApplicationContext.xml
    • -1
    • +1
    ./lams/learning/progress/ProgressBuilder.java
    • -39
    • +23
    ./lams/learning/service/LearnerService.java
    • -2
    • +2
    ./lams/learning/service/LearnerServiceProxy.java
    • -10
    • +3
    ./lams/learning/web/controller/BranchingActivityController.java
    • -9
    • +2
    ./lams/learning/web/controller/ChooseActivityController.java
    • -9
    • +2
    ./lams/learning/web/controller/CompleteActivityController.java
    • -17
    • +2
    ./lams/learning/web/controller/DisplayActivityController.java
    • -11
    • +3
    ./lams/learning/web/controller/DisplayOptionsActivityController.java
    • -11
    • +3
    ./lams/learning/web/controller/DisplayParallelActivityController.java
    • -9
    • +3
    ./lams/learning/web/controller/DisplayToolActivityController.java
    • -12
    • +3
    ./lams/learning/web/controller/GateController.java
  16. … 634 more files in changeset.
Sunday 09 Sep 2018
7:55 pm

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
    • -6
    • +6
    ./lams/learning/kumalive/KumaliveAction.java
    • -17
    • +17
    ./lams/learning/kumalive/service/KumaliveService.java
    • -6
    • +6
    ./lams/learning/web/action/LearnerAction.java
  4. … 101 more files in changeset.
Friday 31 Aug 2018
11:13 am

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Portrait fix

Options
    • -2
    • +2
    ./lams/learning/web/controller/GroupingController.java
  2. … 8 more files in changeset.
Thursday 23 Aug 2018
12:49 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Learning noStruts library working

Options
    • -4
    • +0
    ./lams/learning/web/util/ActivityMapping.java
  2. … 2 more files in changeset.
Wednesday 22 Aug 2018
4:17 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Learning noStruts

Options
    • -332
    • +0
    ./lams/learning/kumalive/KumaliveAction.java
    • -0
    • +331
    ./lams/learning/kumalive/KumaliveController.java
    • -1
    • +1
    ./lams/learning/web/controller/ChooseActivityController.java
    • -1
    • +1
    ./lams/learning/web/controller/DisplayOptionsActivityController.java
    • -5
    • +4
    ./lams/learning/web/controller/GroupingController.java
    • -1
    • +1
    ./lams/learning/web/controller/LearnerController.java
    • -4
    • +3
    ./lams/learning/web/controller/NotebookController.java
    • -1
    • +2
    ./lams/learning/web/servlet/LogLessonMarkPushedToIntegrationsServlet.java
    • -2
    • +3
    ./lams/learning/web/servlet/RepopulateProgressMarksServlet.java
    • -10
    • +8
    ./lams/learning/web/util/ActivityMapping.java
    • -3
    • +2
    ./lams/learning/web/util/ActivityMappingStrategy.java
    • -2
    • +1
    ./lams/learning/web/util/ParallelActivityMappingStrategy.java
  13. … 16 more files in changeset.
11:34 am

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Learning notebook

Options
    • -0
    • +5
    ./lams/learning/web/controller/NotebookController.java
  2. … 6 more files in changeset.
Tuesday 21 Aug 2018
3:32 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Learning notebook

Options
    • -2
    • +2
    ./lams/learning/web/controller/NotebookController.java
  2. … 2 more files in changeset.
2:44 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Grouping fixes

Options
    • -6
    • +7
    ./lams/learning/web/controller/GroupingController.java
    • -1
    • +1
    ./lams/learning/web/controller/NotebookController.java
  3. … 10 more files in changeset.
11:35 am

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Gradebook toogleMarks

Options
    • -1
    • +1
    ./lams/learning/web/controller/NotebookController.java
    • -1
    • +1
    ./lams/learning/web/util/ActivityMapping.java
  3. … 16 more files in changeset.
Monday 20 Aug 2018
3:56 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Gradebook noStruts library

Options
    • -7
    • +4
    ./lams/learning/web/controller/LearnerController.java
    • -2
    • +3
    ./lams/learning/web/controller/NotebookController.java
    • -5
    • +1
    ./lams/learning/web/util/ActivityMapping.java
  4. … 23 more files in changeset.
1:31 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Learning minor fixes

Options
    • -1
    • +1
    ./lams/learning/progress/ProgressBuilder.java
    • -3
    • +3
    ./lams/learning/web/util/ActivityMapping.java
  3. … 5 more files in changeset.
11:52 am

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Gradebook

Options
    • -2
    • +1
    ./lams/learning/web/controller/ActivityController.java
    • -1
    • +3
    ./lams/learning/web/controller/ChooseActivityController.java
    • -3
    • +5
    ./lams/learning/web/controller/CompleteActivityController.java
    • -1
    • +3
    ./lams/learning/web/controller/DisplayActivityController.java
    • -1
    • +3
    ./lams/learning/web/controller/DisplayOptionsActivityController.java
    • -1
    • +3
    ./lams/learning/web/controller/DisplayParallelActivityController.java
    • -1
    • +2
    ./lams/learning/web/controller/DisplayToolActivityController.java
    • -2
    • +3
    ./lams/learning/web/controller/LearnerController.java
    • -1
    • +3
    ./lams/learning/web/controller/LessonCompleteActivityController.java
    • -1
    • +2
    ./lams/learning/web/controller/LoadToolActivityController.java
    • -1
    • +2
    ./lams/learning/web/controller/SequenceActivityController.java
  12. … 5 more files in changeset.