lams-github / lams_tool_scribe

src

Clone Tools

Stats

Commits this week: 0
Total Committers: 17
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
Friday 23 Mar 2018
7:12 pm

Marcin Cieslak

Monthly merge from master to lams31

Multiple conflicts regarding audit service and JSON.

Conflicts:

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

lams_build/conf/domain.xml

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

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

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

lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java

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

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

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

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

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

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

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

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

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

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

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

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

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

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

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

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

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

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

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

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

Options
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
  2. … 83 more files in changeset.
Monday 05 Mar 2018
1:39 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4522 Emojis not displaying correctly in monitoring

Also fixed some general escaping issues found while testing.

Options
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
  2. … 34 more files in changeset.
Thursday 01 Feb 2018
10:41 pm

Andrey Balan

LDEV-4407 Tools to stop using learnerService

There is no need to have a separate ILearnerService designed

for tools only. As long as they require only one method from it

completeToolSession() which we can simply move to

ILamsToolService. After which we just remove learnerService

from the tools.

Options
    • -1
    • +0
    ./java/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml
    • -12
    • +1
    ./java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java
  3. … 57 more files in changeset.
Friday 26 Jan 2018
2:09 pm

Andrey Balan

LDEV-4407 Tools and core to use learning classes from lams_common

Tools and core start using shared learning classes that were

recently moved from lams_learning to lams_common.

Remove any leftover dependencies on lams_learning.

Options
    • -6
    • +4
    ./java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java
  2. … 78 more files in changeset.
12:24 am

Andrey Balan

LDEV-4407 Tools to use contentrepository classes from lams_common

Tools start using shared contentrepository classes that were

recently moved to lams_common from lams_contentrepository.

Remove any leftover dependencies on lams_contentrepository. Which

includes getting rid of getRepositoryLoginTicket() and some other

methods from tools services.

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/scribe/web/forms/ScribePedagogicalPlannerForm.java
  2. … 77 more files in changeset.
Tuesday 19 Dec 2017
1:47 pm

Marcin Cieslak

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

Conflicts:

lams_build/conf/domain.xml

lams_build/lib/lams/lams.jar

lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.java

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

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

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

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_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

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

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

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

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

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

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

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

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/service/ScribeService.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

Options
    • -0
    • +6
    ./java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java
  2. … 45 more files in changeset.
Thursday 02 Nov 2017
1:14 am

Andrey Balan

LDEV-4451 Implement ToolSessionManager.getConfidenceLevels() in all tools

This method allows Scratchie to query available confidence levels from

the tools that can provide it. Actually, only Assessment and MCQ will

implement it for real, all other tools will implements it as "return

null;".

Options
    • -0
    • +6
    ./java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java
  2. … 28 more files in changeset.
Thursday 14 Sep 2017
2:48 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Scratchie, Spreadsheet, Scribe, Task, Vote

Options
    • -0
    • +12
    ./java/org/lamsfoundation/lams/tool/scribe/dto/ScribeSessionDTO.java
  2. … 35 more files in changeset.
2:48 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Scratchie, Spreadsheet, Scribe, Task, Vote

Options
    • -0
    • +12
    ./java/org/lamsfoundation/lams/tool/scribe/dto/ScribeSessionDTO.java
  2. … 35 more files in changeset.
Wednesday 09 Aug 2017
6:28 pm

Marcin Cieslak

LDEV-4402 Substitute Gson and Apache JSON with Jackson

Jackson is a top JSON library shipped with WF10.

Apache JSON resides in an ancient library which we do not need for

anything else.

We use GSon only for serializing Java objects to JSON, which Jackson can

do too.

Options
    • -3
    • +5
    ./java/org/lamsfoundation/lams/tool/scribe/service/IScribeService.java
    • -32
    • +29
    ./java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java
    • -17
    • +26
    ./java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java
  6. … 131 more files in changeset.
Saturday 29 Jul 2017
6:53 am

Marcin Cieslak

LDEV-4394 Minor improvements for compiler optimisation

Options
    • -13
    • +8
    ./java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
  2. … 2 more files in changeset.
Friday 28 Jul 2017
9:53 am

Marcin Cieslak

LDEV-4394 Make page reload and websocket close requests cross-node

Some requests have been sent only to websockets on current node. Now

they are detected in DB and run on all nodes.

Options
    • -2
    • +0
    ./java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java
    • -7
    • +17
    ./java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
    • -2
    • +0
    ./java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java
  4. … 9 more files in changeset.
Wednesday 24 May 2017
7:42 am

Marcin Cieslak

LDEV-4332: Send websocket ping after 3 minutes of idleness so the connection does not get cut because of idle timeout.

Options
    • -0
    • +5
    ./java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
  2. … 39 more files in changeset.
Thursday 18 May 2017
2:18 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4336: Running the test harness showed up a case where reportText can be null so that is now catered for in the newline processing

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
Friday 12 May 2017
2:08 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4336: Text coming via websocket is now escaped and the newlines converted to <br> so the pages can use it as html and get the correct visual line breaks.

Options
    • -1
    • +3
    ./java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
  2. … 2 more files in changeset.
Thursday 04 May 2017
3:31 pm

Marcin Cieslak

LDEV-4252: Use another collection type instead of synchronisation.

Options
    • -32
    • +21
    ./java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
  2. … 3 more files in changeset.
Wednesday 05 Apr 2017
6:32 pm

Andrey Balan

LDEV-4286 Show Authoring advanced tab on re-editing content from monitor

Options
    • -10
    • +7
    ./java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java
  2. … 21 more files in changeset.
Tuesday 04 Apr 2017
2:27 pm

Andrey Balan

LDEV-4300 Audit logs when activity is modified in monitor

Options
    • -0
    • +7
    ./java/org/lamsfoundation/lams/tool/scribe/service/IScribeService.java
    • -0
    • +5
    ./java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java
    • -0
    • +3
    ./java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java
  4. … 86 more files in changeset.
Thursday 30 Mar 2017
8:31 pm

Andrey Balan

LDEV-4291 Move getAccessMode method to WebUtil

Options
    • -21
    • +3
    ./java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java
  2. … 30 more files in changeset.
Wednesday 08 Mar 2017
7:26 am

Marcin Cieslak

LDEV-4261: Remove version properties from entities. Remove management of optimistic locking failures as they never happen.

Options
    • -0
    • +14
    ./java/org/lamsfoundation/lams/tool/scribe/dbupdates/patch20170308.sql
    • -15
    • +2
    ./java/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.java
    • -31
    • +2
    ./java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java
  4. … 7 more files in changeset.
Monday 27 Feb 2017
3:00 pm

Marcin Cieslak

LDEV-4180: Make DB patches produce up-to-date structure during build instead of applying multiple patches. Get rid of unnecessary tables and keys. Modify boolean columns to tinyint(1) Simplify patches where possible.

Options
    • -0
    • +14
    ./java/org/lamsfoundation/lams/tool/scribe/dbupdates/patch20170101.sql
  2. … 223 more files in changeset.
Monday 30 Jan 2017
5:13 am

Marcin Cieslak

LDEV-4187: Make sure that even after an exception is thrown, the Hibernate session is closed. Add extra logging to verify completeActivity() failures.

Options
    • -4
    • +5
    ./java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
  2. … 7 more files in changeset.
Wednesday 11 Jan 2017
9:57 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4187: Get an learner's status from the tool for a particular tool session, which can be used to regenerate learner progress.

Options
    • -0
    • +12
    ./java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java
  2. … 37 more files in changeset.
Sunday 08 Jan 2017
4:48 pm

Marcin Cieslak

LDEV-4187: Delegate non-HTTP-request tasks to own threads. Open and close Hibernate session for each of such thread. Bind created session to context and thread. Close session at the end of thread execution.

Options
    • -10
    • +19
    ./java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
  2. … 5 more files in changeset.
Tuesday 03 Jan 2017
9:55 pm

Marcin Cieslak

LDEV-876: As version property seems to be used after all, convert it to a full object instead of a primitive.

Options
    • -0
    • +17
    ./java/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.java
9:07 am

Marcin Cieslak

LDEV-876: Version field does not seem to be used anymore.

Options
    • -18
    • +0
    ./java/org/lamsfoundation/lams/tool/scribe/model/ScribeSession.java
Monday 15 Aug 2016
9:54 am

erniegx <ernieg@gmail.com>

LDEV-3952: updating scripts to be compatible with MySQL 5.7

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/scribe/dbupdates/patch20150930.sql
    • -6
    • +6
    ./java/org/lamsfoundation/lams/tool/scribe/dbupdates/patch20151217.sql
  3. … 43 more files in changeset.
Wednesday 15 Jun 2016
10:07 am

Andrey Balan

LDEV-3750 Improve performance of pushing marks to gradebook

Options
    • -0
    • +6
    ./java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java
  2. … 36 more files in changeset.
Monday 13 Jun 2016
4:53 pm

Andrey Balan

LDEV-3750 Added ability to request all available tool outputs per toolContentId instead of querying them one by one

Options
    • -0
    • +6
    ./java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java
  2. … 36 more files in changeset.
Friday 03 Jun 2016
9:36 am

Marcin Cieslak

LDEV-3736: Check if a websocket is open before requesting close from the browser side.

Options
    • -3
    • +10
    ./java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java