lams-github

lams_tool_assessment

Clone Tools

Stats

Commits this week: 0
Total Committers: 20
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 26 Aug 2017
10:04 am

Marcin Cieslak

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

Multiple conflicts resolved with JSON replace and class move to

packages.

Options
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 33 more files in changeset.
Tuesday 22 Aug 2017
1:09 pm

Marcin Cieslak

LDEV-4410 Add unique key to prevent duplicate results

Options
    • -0
    • +16
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20170822.sql
Monday 21 Aug 2017
5:02 pm

Andrey Balan

LDEV-4409 Clear Short answer' result if it's incorrectly answered

Options
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Thursday 10 Aug 2017
11:04 am

Marcin Cieslak

Merge branch 'LDEV-4402' into lams31

Options
    • -97
    • +117
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
  2. … 1 more file 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
    • -258
    • +299
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -85
    • +103
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -62
    • +64
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
  5. … 132 more files in changeset.
1:46 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4406: Timing count preserved across page switch, Submit All

Also fixed a validation bug with Essay questions that had a

minimum word count but were not required.

Options
    • -0
    • +5
    ./web/WEB-INF/struts-config.xml
1:36 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4406: Timing count preserved across page switch, Submit All

Also fixed a validation bug with Essay questions that had a

minimum word count but were not required.

Options
    • -11
    • +43
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -1
    • +13
    ./web/pages/learning/learning.jsp
Monday 07 Aug 2017
12:23 pm

Marcin Cieslak

LDEV-4402 Remove obsolete XPP3 and XMLPull libraries

The libraries have been used by earlier versions of XStream. They are

not needed for latest XStream and Java 6+.

Deserialized classes must implement a no-arg constructor.

Options
    • -54
    • +50
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
  2. … 12 more files in changeset.
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
    • +28
    ./web/WEB-INF/tags/LeaderDisplay.tag
    • -0
    • +4
    ./web/WEB-INF/tlds/lams/lams.tld
    • -5
    • +1
    ./web/pages/learning/learning.jsp
    • -5
    • +1
    ./web/pages/learning/results.jsp
  5. … 85 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.
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
  2. … 37 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. … 37 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
    • -2
    • +7
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +7
    ./conf/language/lams/ApplicationResources_en_AU.properties
  3. … 2 more files in changeset.
10:13 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4352 & LDEV-4273 updating/adding missing labels

Missed some labels from previous features in i18n. Adding them now

Options
    • -2
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +5
    ./conf/language/lams/ApplicationResources_en_AU.properties
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
    • +2
    ./web/pages/monitoring/monitoring.jsp
  4. … 154 more files in changeset.
Tuesday 18 Jul 2017
10:11 pm

Andrey Balan

LDEV-4386 Prevent showing questions not selected in que. list in monitor

All questions in question bank -even when not selected, show in monitor.

We should show only the ones added to question list or all of them in

case there is at least one random question available

Options
    • -0
    • +44
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/AssessmentResultDTO.java
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -29
    • +63
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +6
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
    • -7
    • +4
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
11:27 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4385: colours for assessment feedback

Depict the tick in green and the cross in red.

Options
    • -2
    • +2
    ./web/pages/learning/results/markhedging.jsp
    • -2
    • +2
    ./web/pages/learning/results/matchingpairs.jsp
    • -8
    • +7
    ./web/pages/learning/results/multiplechoice.jsp
    • -2
    • +2
    ./web/pages/learning/results/numerical.jsp
    • -2
    • +2
    ./web/pages/learning/results/ordering.jsp
    • -2
    • +2
    ./web/pages/learning/results/shortanswer.jsp
    • -4
    • +4
    ./web/pages/learning/results/truefalse.jsp
Thursday 13 Jul 2017
8:37 am

Marcin Cieslak

LDEV-4379 Fix Assessment answers ordering

Assessment questions are numbered from 1, answers from 0. QTI import

method used 1 for both.

Options
    • -2168
    • +2168
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
Tuesday 11 Jul 2017
5:36 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating labels i18n

Mainly Norwegian, Greek and English

Options
    • -15
    • +10
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +7
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +7
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -38
    • +67
    ./conf/language/lams/ApplicationResources_no_NO.properties
  5. … 49 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
    • -30
    • +0
    ./web/includes/css/addQuestion.css
    • -99
    • +0
    ./web/includes/css/assessment.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
    • +15
    ./.externalToolBuilders/SASS_lams_tool_assessment.launch
    • -1
    • +2
    ./.gitignore
    • -0
    • +10
    ./.project
    • -1
    • +4
    ./build.properties
    • -29
    • +19
    ./web/includes/css/addQuestion.css
    • -0
    • +42
    ./web/includes/css/addQuestion.scss
    • -69
    • +72
    ./web/includes/css/assessment.css
    • -0
    • +112
    ./web/includes/css/assessment.scss
    • -32
    • +1
    ./web/pages/learning/learning.jsp
    • -1
    • +1
    ./web/pages/learning/parts/paging.jsp
  11. … 149 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:27 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4352: Adding the Use Leader version of the Mark Charts to Assessment and fixing an update issue with ToolOutput settings.

Options
    • -2
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -2
    • +48
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -0
    • +82
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/LeaderResultsDTO.java
    • -3
    • +22
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +19
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -16
    • +33
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -23
    • +0
    ./web/includes/css/assessment.css
    • -5
    • +1
    ./web/pages/monitoring/monitoring.jsp
    • -29
    • +77
    ./web/pages/monitoring/statisticpart.jsp
Thursday 08 Jun 2017
10:44 pm

Andrey Balan

LDEV-4358 Prevent JS errors on opening summary page when not all questions from the question bank are used in the question list

Options
    • -1
    • +1
    ./web/pages/monitoring/parts/masterDetailLoadUp.jsp
    • -1
    • +1
    ./web/pages/monitoring/parts/usersummary.jsp
10:00 pm

Andrey Balan

LKC-79 Display questions at the “Show students’ choices” page according to their authoring order (just like for the rest of Assessment monitoring pages)

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
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
    • -5
    • +28
    ./web/WEB-INF/tags/Page.tag
  2. … 39 more files in changeset.
Saturday 13 May 2017
8:29 am

Marcin Cieslak

LDEV-4332: Refresh page or reconnect websocket only on abnormal close and not on navigation.

Options
    • -4
    • +7
    ./web/WEB-INF/tags/Page.tag
  2. … 35 more files in changeset.