lams-github

lams_tool_scratchie

Clone Tools

Stats

Commits this week: 0
Total Committers: 14
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 16 Oct 2017
11:41 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4443: warning when editing activity that has been already used.

Currently when editing an assessment or voting activity in monitor, if an answer is changed, the data associated with that question is removed.

So if students have already completed the activity, their answers/marks will be removed and will shown as not answered.

We currently give no warning to monitors when they do this, so we should.

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +4
    ./web/pages/monitoring/editactivity.jsp
  4. … 10 more files in changeset.
Wednesday 11 Oct 2017
6:46 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Updating Greek and Norwegian

Options
    • -2
    • +9
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +9
    ./conf/language/lams/ApplicationResources_no_NO.properties
Monday 09 Oct 2017
11:08 am

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
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 29 more files in changeset.
Monday 18 Sep 2017
2:36 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4425 Adding Portraits in Learner

Included in Grouping, Chat, Peer Review and QA

Options
    • -5
    • +7
    ./web/WEB-INF/tags/StyledRating.tag
  2. … 44 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
    • +10
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java
    • -1
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +3
    ./web/pages/monitoring/monitoring.jsp
    • -6
    • +14
    ./web/pages/monitoring/summary.jsp
  5. … 32 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
    • +10
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java
    • -1
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +3
    ./web/pages/monitoring/monitoring.jsp
    • -6
    • +14
    ./web/pages/monitoring/summary.jsp
  5. … 32 more files in changeset.
Wednesday 30 Aug 2017
1:32 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implemented in Assessment, Chat, Daco, Forum and Submit.

Options
    • -1
    • +7
    ./web/WEB-INF/tlds/lams/lams.tld
  2. … 73 more files in changeset.
1:32 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implemented in Assessment, Chat, Daco, Forum and Submit.

Options
    • -1
    • +7
    ./web/WEB-INF/tlds/lams/lams.tld
  2. … 74 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
    • -0
    • +2
    ./.classpath
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -30
    • +28
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -18
    • +21
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -13
    • +14
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
    • -18
    • +21
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
  7. … 130 more files in changeset.
Monday 07 Aug 2017
8:53 am

Marcin Cieslak

LDEV-4402 Use Spring support for Hibernate v5 instead of v4

WF10 is shipped with Hibernate 5, so Spring support version should

match.

Options
    • -1
    • +1
    ./web/WEB-INF/web.xml
  2. … 19 more files in changeset.
Saturday 05 Aug 2017
11:36 am

Marcin Cieslak

LDEV-4400 Update dependecies to embedded libraries

WildFly 10 is shipped with newer versions of libraries that LAMS uses.

LAMS now points to proper JAR files. Following libraries were updated:

beanutils 1.8.3 -> 1.9.2

codec 1.9 -> 1.10

collection 3.2.1 -> 3.2.2

xerces 2.11.0.SP3 -> 2.11.0.SP4

httpclient 4.2.1 -> 4.5

httpcore 4.2.1 -> 4.4.1

wildfly-controller-client 8.2.1 -> 2.2.0 (probably naming convention was

changed)

jboss-dmr 1.2.0 -> 1.3.0

Hibernate 4.3.7 -> 5.0.10

log4j-jboss-logmanager 1.1.0 -> 1.1.2

jcl-over-slf4j 1.7.2 -> 1.7.7

undertow-core 1.1.8 -> 1.4.0

undertow-servlet 1.1.8 -> 1.4.0

javax.mail 1.5.0 -> 1.5.5

jboss-jstl 1.1.2 -> 1.1.3

jboss-logging 3.1.4 -> 3.3.0

remoting-jmx 2.0.0 -> 2.0.1

slf4j-api 1.7.2 -> 1.7.7

picketbox 4.0.21 -> 4.9.6

jboss-websocket-api 1.1.0 -> 1.1.1

joda-time 1.6.2 -> 2.7

Options
    • -5
    • +5
    ./.classpath
  2. … 47 more files in changeset.
8:11 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395 Sizing tweaks

Options
    • -1
    • +1
    ./web/WEB-INF/tags/LeaderDisplay.tag
  2. … 33 more files in changeset.
7:04 am

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
    ./src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -0
    • +28
    ./web/WEB-INF/tags/LeaderDisplay.tag
    • -0
    • +4
    ./web/WEB-INF/tlds/lams/lams.tld
    • -7
    • +1
    ./web/pages/learning/learning.jsp
  6. … 84 more files in changeset.
Monday 31 Jul 2017
5:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395 Portrait tag and javascript to display portraits

A new tag and javascript file shows the user portraits in one of 4 sizes

and either square or round. If no portrait exists a generic coloured

user icon is used. Portraits shown in Forum and Noticeboard Comments.

Options
    • -0
    • +26
    ./web/WEB-INF/tlds/lams/lams.tld
  2. … 53 more files in changeset.
Sunday 30 Jul 2017
6:08 am

Marcin Cieslak

LDEV-4394 Fix refresh and show Finish button flow

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

Marcin Cieslak

LDEV-4394 Rewrite Scratchie time limit

Now it is controlled by websocket server.

Options
    • -72
    • +51
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -62
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/util/FinishScratchingJob.java
    • -22
    • +60
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
    • -1
    • +7
    ./web/pages/learning/questionlist.jsp
Friday 28 Jul 2017
11:30 pm

Andrey Balan

LDEV-4032 Handle hiding of a Finish button for non-leaders properly

Finish button should be hidden from non-leader in case leader hasn't yet

submitted Notebook or burning questions.

Options
    • -1
    • +1
    ./web/pages/learning/questionlist.jsp
11:29 pm

Andrey Balan

LDEV-4032 Handle hiding of a Finish button for non-leaders properly

Finish button should be hidden from non-leader in case leader hasn't yet

submitted Notebook or burning questions

Options
    • -1
    • +1
    ./web/pages/learning/questionlist.jsp
12: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
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
    • -7
    • +0
    ./web/pages/learning/questionlist.jsp
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
    • -12
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/util/FinishScratchingJob.java
    • -17
    • +13
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -10
    • +34
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
    • -0
    • +1
    ./web/pages/learning/questionlist.jsp
  5. … 8 more files in changeset.
Thursday 27 Jul 2017
12:04 pm

Marcin Cieslak

LDEV-4392 Fix websocket close detection

Make sure there is only, well implemented one piece of code that detects

websocket close and optionally reconnects it.

Options
    • -6
    • +5
    ./web/WEB-INF/tags/Page.tag
    • -12
    • +11
    ./web/pages/learning/questionlist.jsp
  3. … 36 more files in changeset.
Tuesday 25 Jul 2017
2:05 pm

Marcin Cieslak

LDEV-4392 Control websocket reconnect

Do not reconnect if close happened immediately after open. Limit command

websocket reconnects.

Options
    • -4
    • +14
    ./web/WEB-INF/tags/Page.tag
    • -2
    • +7
    ./web/pages/learning/questionlist.jsp
  3. … 36 more files in changeset.
Thursday 20 Jul 2017
10:29 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4352: adding missing labels

Alright, these should be all now for this JIRA

Options
    • -8
    • +9
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +9
    ./conf/language/lams/ApplicationResources_en_AU.properties
  3. … 2 more files in changeset.
Wednesday 19 Jul 2017
12:30 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4367 Skins can be created

The SASS files are now configured to allow a new variable file to be

set up with different colours and for users to be able to switch

between skins.

Options
    • -2
    • +2
    ./web/WEB-INF/tags/Page.tag
    • -1
    • +12
    ./web/WEB-INF/tlds/lams/lams.tld
    • -1
    • +1
    ./web/pages/monitoring/monitoring.jsp
  4. … 154 more files in changeset.
Tuesday 11 Jul 2017
5:36 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating labels i18n

Mainly Norwegian, Greek and English

Options
    • -15
    • +29
    ./conf/language/lams/ApplicationResources_no_NO.properties
  2. … 52 more files in changeset.
Monday 10 Jul 2017
4:45 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4367 CSS Files removed if they are now generated files using SASS

Options
    • -0
    • +1
    ./.gitignore
    • -29
    • +0
    ./web/includes/css/scratchie-learning.css
    • -10
    • +0
    ./web/includes/css/scratchie.css
  4. … 40 more files in changeset.
Saturday 01 Jul 2017
5:12 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4367 SASS Used for CSS Development

First pass of converting our .css development to use SASS. Autobuild to

convert .scss to .css files has been set up for all projects where

target .css files were found. The overall ANT build has been modified

so the normal build will generate the .css files from .scss files. The

base variables are defined in lams_build/conf/sccs.

Options
    • -0
    • +16
    ./.externalToolBuilders/SASS_lams_tool_scratchie.launch
    • -1
    • +2
    ./.gitignore
    • -0
    • +9
    ./.project
    • -1
    • +4
    ./build.properties
    • -50
    • +29
    ./web/includes/css/scratchie-learning.css
    • -0
    • +37
    ./web/includes/css/scratchie-learning.scss
    • -39
    • +8
    ./web/includes/css/scratchie.css
    • -0
    • +14
    ./web/includes/css/scratchie.scss
    • -3
    • +0
    ./web/pages/authoring/parts/additem.jsp
  10. … 150 more files in changeset.
Tuesday 13 Jun 2017
7:03 am

Marcin Cieslak

After migration clean up

Options
    • -2
    • +0
    ./.cvsignore
    • -0
    • +2
    ./.gitignore
    • -1
    • +0
    ./web/includes/images/.cvsignore
  4. … 312 more files in changeset.
Friday 09 Jun 2017
5:44 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

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

Options
    • -1
    • +7
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieSessionDAO.java
    • -0
    • +41
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java
    • -0
    • +82
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dto/LeaderResultsDTO.java
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -0
    • +21
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +58
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
    • -0
    • +10
    ./web/WEB-INF/struts-config.xml
    • -2
    • +23
    ./web/pages/monitoring/monitoring.jsp
    • -0
    • +69
    ./web/pages/monitoring/parts/statisticpart.jsp
    • -59
    • +4
    ./web/pages/monitoring/statistic.jsp
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
    • -9
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
    • -5
    • +28
    ./web/WEB-INF/tags/Page.tag
    • -7
    • +30
    ./web/pages/learning/questionlist.jsp
  4. … 37 more files in changeset.