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
Thursday 26 Oct 2017
7:17 am

Andrey Balan

LDEV-4451 Allow learners to choose confidence levels

Add advanced option in Assessment/MCQ - 'Store Confidences'.

If this option is ON, then in learning show sliders which will allow

choosing confidence levels. Display stored levels in learning and

monitoring.

Options
    • -0
    • +8
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml
    • -0
    • +9
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.hbm.xml
    • -0
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -0
    • +20
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171016.sql
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -0
    • +15
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java
    • -8
    • +97
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +19
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -0
    • +24
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -0
    • +24
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -0
    • +33
    ./web/includes/javascript/monitoring.js
  16. … 15 more files in changeset.
Tuesday 24 Oct 2017
5:19 am

Andrey Balan

LDEV-4448 Improve SQL query that is used to change tool outputs

Changing Assessment's tool output to 'First score' was taking too much

time. So the query that returns 'First score' outputs for the entire

activity was rewritten to improve its performance.

Options
    • -6
    • +11
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
Monday 16 Oct 2017
6:58 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4443: Ooops

swap file shouldn't have been committed. Too many terminals open :-)

Options
    • binary
    ./web/pages/monitoring/.editactivity.jsp.swp
5:41 pm

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
    • binary
    ./web/pages/monitoring/.editactivity.jsp.swp
    • -0
    • +4
    ./web/pages/monitoring/editactivity.jsp
  5. … 9 more files in changeset.
Friday 13 Oct 2017
8:01 pm

Marcin Cieslak

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

Conflicts:

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

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

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

Options
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 8 more files in changeset.
Thursday 12 Oct 2017
10:57 pm

Andrey Balan

LDEV-4438 Remove unique constraint added in the previous patch

The new constraint handles all problematic cases including the one with

copying results from leaders. Thus we no longer need

UQ_tl_laasse10_assessment_result_4 (assessment_uid, user_uid,

finish_date) constraint.

Options
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171011.sql
7:39 am

Andrey Balan

LDEV-4438 fix autopatch script typo

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171011.sql
3:27 am

Andrey Balan

LDEV-4438 Add unique constraint (assessment_uid, user_uid, latest)

Add unique constraint (assessment_uid, user_uid, latest) to

tl_laasse10_assessment_result which will apply only in case latest=1. It

was done by making 'latest' field contain only NULL or 1 (as opposite to

the previously used 0 or 1). This way constraint will apply only in

cases when 'latest' is 1.

Options
    • -0
    • +31
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171011.sql
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Wednesday 11 Oct 2017
12:44 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Updating English and Greek

Options
    • -3
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +5
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +5
    ./conf/language/lams/ApplicationResources_en_AU.properties
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
    • +11
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
  3. … 28 more files in changeset.
Monday 18 Sep 2017
8: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.
Friday 15 Sep 2017
8:55 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating Greek and Norwegian

Updating Greek and Norwegian

Options
    • -2
    • +10
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +10
    ./conf/language/lams/ApplicationResources_no_NO.properties
Wednesday 30 Aug 2017
7:32 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

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

Options
    • -0
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -4
    • +14
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/AssessmentUserDTO.java
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/ReflectDTO.java
    • -1
    • +11
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -1
    • +7
    ./web/WEB-INF/tlds/lams/lams.tld
    • -2
    • +5
    ./web/pages/monitoring/monitoring.jsp
    • -1
    • +1
    ./web/pages/monitoring/parts/reflections.jsp
    • -7
    • +19
    ./web/pages/monitoring/summary.jsp
  13. … 62 more files in changeset.
7:32 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

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

Options
    • -0
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -4
    • +14
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/AssessmentUserDTO.java
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/ReflectDTO.java
    • -1
    • +11
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -1
    • +7
    ./web/WEB-INF/tlds/lams/lams.tld
    • -2
    • +5
    ./web/pages/monitoring/monitoring.jsp
    • -1
    • +1
    ./web/pages/monitoring/parts/reflections.jsp
    • -7
    • +19
    ./web/pages/monitoring/summary.jsp
  13. … 63 more files in changeset.
Saturday 26 Aug 2017
4:04 pm

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
7: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
11: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
5:04 pm

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.
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
    • -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.
Wednesday 09 Aug 2017
7: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
7: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
6: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.
2:53 pm

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
5:36 pm

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.
2:11 pm

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.
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
    • +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
11: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
6: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
8: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
4:29 pm

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.