lams-github / lams_learning / src

java

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
Monday 22 Jun 2020
4:48 pm

Marcin Cieslak

LDEV-5041 Add lesson service utility method

Options
    • -8
    • +5
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
  2. … 5 more files in changeset.
Monday 11 May 2020
6:14 pm

Marcin Cieslak

LDEV-4997 Renormalize line endings with git

Options
    • -109
    • +109
    ./org/lamsfoundation/lams/learning/kumalive/model/KumaliveLog.java
    • -148
    • +148
    ./org/lamsfoundation/lams/learning/kumalive/model/KumalivePoll.java
    • -128
    • +128
    ./org/lamsfoundation/lams/learning/kumalive/model/KumalivePollAnswer.java
    • -111
    • +111
    ./org/lamsfoundation/lams/learning/kumalive/model/KumaliveRubric.java
    • -111
    • +111
    ./org/lamsfoundation/lams/learning/kumalive/model/KumaliveScore.java
    • -75
    • +75
    ./org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -635
    • +635
    ./org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
  8. … 414 more files in changeset.
Wednesday 06 May 2020
7:21 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.0' into v5.0

Conflicts:

lams_build/3rdParty.userlibraries

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

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

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

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

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

lams_monitoring/web/tblmonitor/teams.jsp

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java

lams_tool_lamc/web/WEB-INF/tags/ImgButtonWrapper.tag

lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/learning/CombinedAnswersContent.jsp

lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp

lams_tool_lamc/web/learning/ViewAnswers.jsp

lams_tool_lamc/web/monitoring/SummaryContent.jsp

lams_tool_lamc/web/monitoring/parts/statsPart.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

Options
    • -62
    • +74
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
  2. … 30 more files in changeset.
Tuesday 21 Apr 2020
6:07 pm

Marcin Cieslak

LDEV-4999 Fix monitor role detection when updating learner mark

Options
    • -109
    • +109
    ./org/lamsfoundation/lams/learning/kumalive/model/KumaliveLog.java
    • -148
    • +148
    ./org/lamsfoundation/lams/learning/kumalive/model/KumalivePoll.java
    • -128
    • +128
    ./org/lamsfoundation/lams/learning/kumalive/model/KumalivePollAnswer.java
    • -111
    • +111
    ./org/lamsfoundation/lams/learning/kumalive/model/KumaliveRubric.java
    • -111
    • +111
    ./org/lamsfoundation/lams/learning/kumalive/model/KumaliveScore.java
    • -75
    • +75
    ./org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -635
    • +635
    ./org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
  8. … 457 more files in changeset.
Friday 20 Mar 2020
1:35 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

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

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java

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

Options
    • -1
    • +3
    ./org/lamsfoundation/lams/learning/service/ILearnerFullService.java
    • -62
    • +74
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
    • -14
    • +11
    ./org/lamsfoundation/lams/learning/web/controller/GateController.java
  4. … 19 more files in changeset.
Wednesday 18 Mar 2020
9:44 pm

Marcin Cieslak

LDEV-4989 Inform user of incorrect gate password

Options
    • -0
    • +4
    ./org/lamsfoundation/lams/learning/web/controller/GateController.java
    • -0
    • +9
    ./org/lamsfoundation/lams/learning/web/form/GateForm.java
  3. … 2 more files in changeset.
Monday 16 Mar 2020
10:44 pm

Marcin Cieslak

LDEV-4989 Password Gate initial implementation

Options
    • -1
    • +3
    ./org/lamsfoundation/lams/learning/service/ILearnerFullService.java
    • -62
    • +74
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
    • -14
    • +7
    ./org/lamsfoundation/lams/learning/web/controller/GateController.java
    • -1
    • +9
    ./org/lamsfoundation/lams/learning/web/form/GateForm.java
  5. … 33 more files in changeset.
Tuesday 18 Feb 2020
10:21 pm

Andrey Balan

LDEV-4951 Remove traces of MCQ tool from other modules

Options
    • -3
    • +1
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
  2. … 192 more files in changeset.
Saturday 28 Dec 2019
10:54 pm

Marcin Cieslak

LDEV-4935 Secure lesson chat (presence) websockets

Nickname is taken from session, not from incoming parameters. User gets

checked if he participates in the given lesson.

Simplified code, clean up.

Options
    • -69
    • +104
    ./org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java
    • -3
    • +3
    ./org/lamsfoundation/lams/learning/presence/dao/IPresenceChatDAO.java
  3. … 2 more files in changeset.
Thursday 19 Dec 2019
6:22 am

Andrey Balan

Merge branch 'master' into develop

Options
    • -3
    • +0
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
6:21 am

Andrey Balan

LDEV-4929 Add missing service method names to xApplicationContext.xmls

* Alphabetize method names in to xApplicationContext.xmls

Options
    • -14
    • +15
    ./org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -3
    • +0
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
  3. … 41 more files in changeset.
Monday 18 Nov 2019
10:30 pm

Marcin Cieslak

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

Conflicts:

lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/CompleteActivityController.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/SequenceActivityController.java

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

Options
    • -5
    • +13
    ./org/lamsfoundation/lams/learning/service/ILearnerFullService.java
    • -42
    • +91
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
    • -4
    • +4
    ./org/lamsfoundation/lams/learning/web/controller/CompleteActivityController.java
    • -1
    • +1
    ./org/lamsfoundation/lams/learning/web/controller/GateController.java
    • -1
    • +1
    ./org/lamsfoundation/lams/learning/web/controller/GroupingController.java
    • -1
    • +1
    ./org/lamsfoundation/lams/learning/web/controller/SequenceActivityController.java
    • -0
    • +13
    ./org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
  8. … 8 more files in changeset.
Friday 15 Nov 2019
5:18 pm

Marcin Cieslak

LDEV-4900 Put websocket commands in a separate transaction

Otherwise command websocket server does not see them until main

transaction finishes.

Options
    • -0
    • +1
    ./org/lamsfoundation/lams/learning/learningApplicationContext.xml
5:17 pm

Marcin Cieslak

LDEV-4900 Fix websocket server run frequency

Options
    • -2
    • +0
    ./org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
4:10 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into LDEV-4900

Options
    • -26
    • +44
    ./org/lamsfoundation/lams/learning/web/controller/GroupingController.java
  2. … 1 more file in changeset.
Thursday 14 Nov 2019
5:30 am

Andrey Balan

Merge branch 'master' into develop

Options
    • -26
    • +44
    ./org/lamsfoundation/lams/learning/web/controller/GroupingController.java
5:28 am

Andrey Balan

LDEV-4894 Fix opening group details from monitor's Learners tab

Options
    • -26
    • +44
    ./org/lamsfoundation/lams/learning/web/controller/GroupingController.java
Wednesday 13 Nov 2019
4:00 am

Marcin Cieslak

LDEV-4900 Run autosave command asynchronously after all

Synchronous approach would work only on LAMS installation with a single

application server. For multi-server environment we need to wait for the

proper server to pick up the command from DB.

Options
    • -58
    • +30
    ./org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
    • -7
    • +1
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
  3. … 2 more files in changeset.
3:32 am

Andrey Balan

LDEV-4900 Update Gradebook marks of non-leaders on leader finish

* Gradebook now pushes updated marks to LTI consumer. It happens only if

user has finished the lesson

Options
    • -5
    • +13
    ./org/lamsfoundation/lams/learning/service/ILearnerFullService.java
    • -50
    • +87
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
    • -5
    • +2
    ./org/lamsfoundation/lams/learning/web/controller/CompleteActivityController.java
    • -2
    • +1
    ./org/lamsfoundation/lams/learning/web/controller/DisplayActivityController.java
    • -3
    • +1
    ./org/lamsfoundation/lams/learning/web/controller/GateController.java
    • -2
    • +1
    ./org/lamsfoundation/lams/learning/web/controller/GroupingController.java
    • -1
    • +1
    ./org/lamsfoundation/lams/learning/web/controller/LessonCompleteActivityController.java
    • -3
    • +1
    ./org/lamsfoundation/lams/learning/web/controller/SequenceActivityController.java
    • -2
    • +2
    ./org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
    • -40
    • +0
    ./org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
  11. … 51 more files in changeset.
Tuesday 12 Nov 2019
12:06 am

Marcin Cieslak

LDEV-4900 Trigger autosave when force completing Assessment activity

Options
    • -27
    • +54
    ./org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
    • -7
    • +13
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
  3. … 4 more files in changeset.
Saturday 02 Nov 2019
1:41 am

Andrey Balan

LDEV-4897 Update Gradebook, Kumalive, and archived emails to use new Excel exporting methods

Options
    • -4
    • +5
    ./org/lamsfoundation/lams/learning/kumalive/KumaliveController.java
    • -2
    • +3
    ./org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -90
    • +78
    ./org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
  4. … 8 more files in changeset.
Thursday 31 Oct 2019
10:54 pm

Andrey Balan

LDEV-4897 Update Scratchie and MCQ to use new Excel exporting methods

Options
    • -1
    • +3
    ./org/lamsfoundation/lams/learning/kumalive/KumaliveController.java
  2. … 15 more files in changeset.
12:35 am

Andrey Balan

LDEV-4897 Introduce ExcelRow and ExcelSheet classes

* Update Daco and Assessment to use new classes

* Move existing ExcelCell and ExcelUtils to .util.excel package

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/learning/kumalive/KumaliveController.java
    • -1
    • +1
    ./org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -1
    • +1
    ./org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
  4. … 30 more files in changeset.
Wednesday 16 Oct 2019
3:05 am

Andrey Balan

LDEV-4882 Check lesson monitor rights correctly

Options
    • -27
    • +5
    ./org/lamsfoundation/lams/learning/web/controller/NotebookController.java
2:39 am

Andrey Balan

LDEV-4881 Remove notebook entries from DB on lesson removal

Options
    • -32
    • +3
    ./org/lamsfoundation/lams/learning/web/controller/NotebookController.java
  2. … 4 more files in changeset.
Saturday 12 Oct 2019
4:46 am

Andrey Balan

Merge branch 'master' into develop

Conflicts:

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java

Options
    • -102
    • +48
    ./org/lamsfoundation/lams/learning/web/controller/GroupingController.java
  2. … 4 more files in changeset.
1:43 am

Andrey Balan

LDEV-4874 Restrict displaying names for students that are not within student's group

Options
    • -101
    • +49
    ./org/lamsfoundation/lams/learning/web/controller/GroupingController.java
  2. … 8 more files in changeset.
Monday 01 Jul 2019
6:43 pm

Marcin Cieslak

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

Options
    • -0
    • +4
    ./org/lamsfoundation/lams/learning/web/controller/LearnerController.java
6:41 pm

Marcin Cieslak

LDEV-3839 Check on back end if a lesson can be restarted by a learner

Options
    • -4
    • +7
    ./org/lamsfoundation/lams/learning/web/controller/LearnerController.java
Sunday 14 Apr 2019
6:35 pm

Marcin Cieslak

LDEV-4801 Revert changes of FileDAO

They did not lead to fixing the problem and were actually unnecessary:

FileDAO does not use DB connections, so no need for transactions.

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
  2. … 9 more files in changeset.