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
Saturday 08 May 2021
10:02 pm

Marcin Cieslak

LDEV-5208 Add Discussion Sentiment monitor widget

Options
    • -4
    • +73
    ./org/lamsfoundation/lams/learning/discussion/controller/DiscussionSentimentController.java
    • -0
    • +3
    ./org/lamsfoundation/lams/learning/discussion/dao/IDiscussionSentimentDAO.java
    • -0
    • +19
    ./org/lamsfoundation/lams/learning/discussion/dao/hibernate/DiscussionSentimentDAO.java
    • -3
    • +25
    ./org/lamsfoundation/lams/learning/discussion/service/DiscussionSentimentService.java
    • -2
    • +11
    ./org/lamsfoundation/lams/learning/discussion/service/IDiscussionSentimentService.java
  6. … 10 more files in changeset.
1:32 am

Marcin Cieslak

LDEV-5208 Add Discussion Sentiment learner widget

Options
    • -5
    • +0
    ./org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
    • -0
    • +105
    ./org/lamsfoundation/lams/learning/discussion/controller/DiscussionSentimentController.java
    • -2
    • +2
    ./org/lamsfoundation/lams/learning/discussion/dao/IDiscussionSentimentDAO.java
    • -7
    • +4
    ./org/lamsfoundation/lams/learning/discussion/dao/hibernate/DiscussionSentimentDAO.java
    • -8
    • +9
    ./org/lamsfoundation/lams/learning/discussion/model/DiscussionSentimentVote.java
    • -30
    • +93
    ./org/lamsfoundation/lams/learning/discussion/service/DiscussionSentimentService.java
    • -5
    • +6
    ./org/lamsfoundation/lams/learning/discussion/service/IDiscussionSentimentService.java
    • -2
    • +24
    ./org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -8
    • +4
    ./org/lamsfoundation/lams/learning/service/ILearnerFullService.java
    • -0
    • +1
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
  11. … 8 more files in changeset.
Thursday 06 May 2021
7:21 pm

Marcin Cieslak

LDEV-5208 Add Discussion Sentiment service and websocket hooks

Options
    • -1
    • +5
    ./org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
    • -0
    • +2
    ./org/lamsfoundation/lams/learning/discussion/dao/IDiscussionSentimentDAO.java
    • -0
    • +14
    ./org/lamsfoundation/lams/learning/discussion/dao/hibernate/DiscussionSentimentDAO.java
    • -0
    • +120
    ./org/lamsfoundation/lams/learning/discussion/service/DiscussionSentimentService.java
    • -0
    • +17
    ./org/lamsfoundation/lams/learning/discussion/service/IDiscussionSentimentService.java
    • -0
    • +12
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
  7. … 2 more files in changeset.
5:34 pm

Marcin Cieslak

LDEV-5208 Add Discussion Sentiment data model

Options
    • -0
    • +13
    ./org/lamsfoundation/lams/learning/discussion/dao/IDiscussionSentimentDAO.java
    • -0
    • +35
    ./org/lamsfoundation/lams/learning/discussion/dao/hibernate/DiscussionSentimentDAO.java
    • -0
    • +88
    ./org/lamsfoundation/lams/learning/discussion/model/DiscussionSentimentVote.java
  4. … 1 more file in changeset.
Thursday 18 Mar 2021
6:10 pm

Marcin Cieslak

LDEV-4802 Ignore invalid websocket close codes

For unknown reason browsers sometimes close websockets with an invalid

close code, for example 15393. It prevents from running @OnClose methods

in LAMS websocket servers. Since we do not have control over this

situation, it is better to skip CloseReason parameter all together.

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
    • -3
    • +3
    ./org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
    • -9
    • +2
    ./org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java
  4. … 4 more files in changeset.
Friday 05 Feb 2021
1:24 am

Marcin Cieslak

LDEV-3125 Give learner less detailed error about missing grouping

Options
    • -1
    • +0
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
  2. … 3 more files in changeset.
Wednesday 30 Dec 2020
5:05 pm

Marcin Cieslak

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

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

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

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

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

lams_central/web/qb/collection.jsp

lams_central/web/questions/questionFile.jsp

lams_common/db/sql/create_lams_11_tables.sql

lams_common/db/sql/insert_lams_config_data.sql

lams_common/db/sql/insert_types_data.sql

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

lams_common/src/java/org/lamsfoundation/lams/questions/QuestionWordParser.java

lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/db/sql/create_lams_tool_assessment.sql

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

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

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

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

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

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

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

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

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

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

lams_tool_scratchie/web/pages/authoring/basic.jsp

lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp

Options
    • -0
    • +5
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
  2. … 29 more files in changeset.
Thursday 10 Dec 2020
8:33 pm

Marcin Cieslak

LDEV-4075 Re-introduce skipping branching in Preview

Options
    • -4
    • +2
    ./org/lamsfoundation/lams/learning/web/controller/CompleteActivityController.java
    • -10
    • +14
    ./org/lamsfoundation/lams/learning/web/controller/DisplayOptionsActivityController.java
  3. … 2 more files in changeset.
Monday 16 Nov 2020
7:25 pm

Marcin Cieslak

LDEV-4915, LDEV-3971 Silence an unnecessary exception log

If this exception occurs, the user can probably and should carry on

instead of trying to create a session which already exists.

Options
    • -4
    • +18
    ./org/lamsfoundation/lams/learning/web/controller/LoadToolActivityController.java
Thursday 05 Nov 2020
5:54 pm

Marcin Cieslak

LDEV-5102 Prevent Scratchie from giving marks to absent learner

Options
    • -0
    • +5
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
  2. … 5 more files in changeset.
Thursday 20 Aug 2020
2:46 pm

Marcin Cieslak

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

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

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

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

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

lams_central/web/questions/questionFile.jsp

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

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

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

lams_tool_assessment/web/pages/monitoring/summary.jsp

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_fr_FR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_no_NO.properties

lams_tool_lamc/db/sql/activity_insert.sql

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

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

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

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

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

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

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/authoring/editQuestionBox.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

Options
    • -8
    • +5
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
  2. … 25 more files in changeset.
Tuesday 28 Jul 2020
3:04 pm

Marcin Cieslak

LDEV-5057 Use UTF-8 as default encoding for message sources

Options
    • -1
    • +3
    ./org/lamsfoundation/lams/learning/learningApplicationContext.xml
  2. … 33 more files in changeset.
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.