lams-github / lams_tool_scratchie / src

java

Clone Tools

Stats

Commits this week: 0
Total Committers: 12
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 10 Nov 2017
12:27 am

Andrey Balan

LDEV-4466 Prevent exception on opening learning by a teacher

Exception was thrown on opening learning by a teacher when there

is no leader available yet

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
  2. … 1 more file in changeset.
12:27 am

Andrey Balan

LDEV-4466 Prevent exception on opening learning by a teacher

Exception was thrown on opening learning by a teacher when there

is no leader available yet

Options
    • -0
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
Wednesday 08 Nov 2017
1:24 am

Andrey Balan

LDEV-4462 Calculate max mark properly

Options
    • -0
    • +8
    ./org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -11
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieOutputFactory.java
    • -0
    • +15
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -4
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
Tuesday 07 Nov 2017
8:23 am

Andrey Balan

LDEV-4458 Add option to overwrite default scoring system

Options
    • -0
    • +4
    ./org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -0
    • +15
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20171106.sql
    • -0
    • +17
    ./org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -0
    • +9
    ./org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -4
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieOutputFactory.java
    • -7
    • +21
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -4
    • +12
    ./org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
  8. … 3 more files in changeset.
Saturday 04 Nov 2017
6:24 am

Andrey Balan

LDEV-4455 Move burning question to the learning.jsp

We need a change in the flow for Burning questions in learner, so the

burning question text for each question is entered as the students

answer select the answers.

So each question would have a "burning question?" label that would

expand/collapse on request for students to enter the text as they answer

each question.

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -10
    • +4
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -133
    • +45
    ./org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
  5. … 8 more files in changeset.
Friday 03 Nov 2017
5:29 am

Andrey Balan

LDEV-4451 Improve question comparison tactics

As long as MCQ doesn't have question titles, exclude title when

calculating question hash.

Another peculiarity of MCQ is that it stores questions and answers with

trailing '/r/n' instead of usual '/n' (as in Assessment and Scratchie),

so remove all '/r' and '/n' before comparing questions and answers.

Options
    • -13
    • +7
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 5 more files in changeset.
Thursday 02 Nov 2017
8:01 am

Andrey Balan

LDEV-4451 Display confidence levels in Scratchie

Add ability to Scratchie to display what options the individual students

have had in the individual assessment.

Add advanced option to Scratchie - 'Show confidences' and then list

activites from the sequence to choose from (skip branching or use only

the current branch if inside of it).

Options
    • -0
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -0
    • +14
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20171026.sql
    • -0
    • +24
    ./org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -0
    • +14
    ./org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.java
    • -1
    • +0
    ./org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -0
    • +20
    ./org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -13
    • +56
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -0
    • +5
    ./org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
    • -0
    • +5
    ./org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
  10. … 14 more files in changeset.
Monday 09 Oct 2017
5:08 pm

Marcin Cieslak

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

Conflicts:

lams_build/lib/lams/lams.jar

lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.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/web/actions/LearningWebsocketServer.java

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

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

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

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.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/web/action/MonitoringAction.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/MonitoringAction.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
    • -1
    • +8
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 29 more files in changeset.
Thursday 14 Sep 2017
8:48 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Scratchie, Spreadsheet, Scribe, Task, Vote

Options
    • -0
    • +10
    ./org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java
    • -1
    • +8
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  3. … 34 more files in changeset.
8:48 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Scratchie, Spreadsheet, Scribe, Task, Vote

Options
    • -0
    • +10
    ./org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java
    • -1
    • +8
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  3. … 34 more files in changeset.
Thursday 10 Aug 2017
12:28 am

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
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -30
    • +28
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -18
    • +21
    ./org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -13
    • +14
    ./org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
    • -18
    • +21
    ./org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
  6. … 131 more files in changeset.
Saturday 05 Aug 2017
1:04 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395 Leader related tools use Portrait for leader

Created a tag LeaderDisplay to display the leader consistently

across tools.

Options
    • -0
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -0
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
  3. … 87 more files in changeset.
Sunday 30 Jul 2017
12:08 pm

Marcin Cieslak

LDEV-4394 Fix refresh and show Finish button flow

Options
    • -6
    • +19
    ./org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
Saturday 29 Jul 2017
12:55 pm

Marcin Cieslak

LDEV-4394 Rewrite Scratchie time limit

Now it is controlled by websocket server.

Options
    • -72
    • +51
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -62
    • +0
    ./org/lamsfoundation/lams/tool/scratchie/util/FinishScratchingJob.java
    • -22
    • +60
    ./org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
  4. … 1 more file in changeset.
Friday 28 Jul 2017
6:21 pm

Marcin Cieslak

LDEV-4394 Do not show Finish button until Scratchie Leader finished the tool completely

This includes answering to burning questions.

Options
    • -30
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
  2. … 1 more file in changeset.
3:53 pm

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
    • -12
    • +3
    ./org/lamsfoundation/lams/tool/scratchie/util/FinishScratchingJob.java
    • -17
    • +13
    ./org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -10
    • +34
    ./org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
  4. … 9 more files in changeset.
Friday 09 Jun 2017
11:44 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4352: Adding mark charts to Monitoring for Scratchie and MCQ.

Options
    • -0
    • +5
    ./org/lamsfoundation/lams/tool/scratchie/dao/ScratchieSessionDAO.java
    • -0
    • +41
    ./org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java
    • -0
    • +82
    ./org/lamsfoundation/lams/tool/scratchie/dto/LeaderResultsDTO.java
    • -0
    • +8
    ./org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -0
    • +21
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +58
    ./org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
  7. … 5 more files in changeset.
Wednesday 24 May 2017
1:42 pm

Marcin Cieslak

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

Options
    • -9
    • +0
    ./org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
  2. … 39 more files in changeset.
Saturday 20 May 2017
11:03 am

Marcin Cieslak

LDEV-4332: Allow ping message from websocket.

Options
    • -0
    • +9
    ./org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
Thursday 04 May 2017
9:31 pm

Marcin Cieslak

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

Options
    • -33
    • +21
    ./org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
  2. … 3 more files in changeset.
Thursday 20 Apr 2017
5:44 am

Andrey Balan

LDEV-4319 Prevent disappearing of scratchie likes on sorting

Options
    • -0
    • +4
    ./org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
  2. … 1 more file in changeset.
Tuesday 04 Apr 2017
8:27 pm

Andrey Balan

LDEV-4300 Audit logs when activity is modified in monitor

Options
    • -0
    • +7
    ./org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -0
    • +5
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -0
    • +3
    ./org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
  4. … 86 more files in changeset.
Friday 31 Mar 2017
2:31 am

Andrey Balan

LDEV-4291 Move getAccessMode method to WebUtil

Options
    • -26
    • +4
    ./org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
  2. … 30 more files in changeset.
Wednesday 08 Mar 2017
8:49 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4258: Protecting the export download from multiple triggers by disabling the button until the file is downloaded. Uses the new generic javascript method based on previous Peer Review download implementation. Uses a cookie to track when the file download is complete.

Options
    • -0
    • +7
    ./org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
  2. … 3 more files in changeset.
7:00 am

erniegx <ernieg@gmail.com>

LDEV-4180: fixing typos

Options
    • -4
    • +3
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20170101.sql
Monday 27 Feb 2017
10: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
    • +31
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20170101.sql
  2. … 223 more files in changeset.
Thursday 23 Feb 2017
6:19 pm

Andrey Balan

LDEV-4244 Add new advanced option - randomise scratchie Items

Options
    • -0
    • +14
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20170221.sql
    • -0
    • +14
    ./org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -0
    • +9
    ./org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
  4. … 4 more files in changeset.
Monday 30 Jan 2017
12:13 pm

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
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
  2. … 7 more files in changeset.
Wednesday 11 Jan 2017
4:57 pm

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
    • -1
    • +12
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 37 more files in changeset.
Sunday 08 Jan 2017
11: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
    • -9
    • +12
    ./org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
  2. … 5 more files in changeset.