lams-github / lams_tool_assessment

web

Clone Tools

Stats

Commits this week: 0
Total Committers: 15
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 24 Mar 2018
2:12 am

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
    • -0
    • +15
    ./WEB-INF/web.xml
  2. … 83 more files in changeset.
Thursday 22 Mar 2018
1:55 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4533 Exception details are hidden as per system config

Options
    • -7
    • +17
    ./error.jsp
  2. … 34 more files in changeset.
8:24 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4532 Opening collapsable panels no longer makes screen jump

Options
    • -1
    • +1
    ./pages/authoring/parts/addessay.jsp
    • -1
    • +1
    ./pages/authoring/parts/addmarkhedging.jsp
    • -1
    • +1
    ./pages/authoring/parts/addmatchingpairs.jsp
    • -2
    • +2
    ./pages/authoring/parts/addmultiplechoice.jsp
    • -1
    • +1
    ./pages/authoring/parts/addnumerical.jsp
    • -2
    • +2
    ./pages/authoring/parts/addordering.jsp
    • -1
    • +1
    ./pages/authoring/parts/addshortanswer.jsp
    • -2
    • +2
    ./pages/authoring/parts/addtruefalse.jsp
    • -1
    • +1
    ./pages/authoring/parts/numericaloption.jsp
    • -1
    • +1
    ./pages/authoring/parts/option.jsp
    • -1
    • +1
    ./pages/authoring/parts/optionhedgingmark.jsp
    • -1
    • +1
    ./pages/authoring/parts/shortansweroption.jsp
  13. … 4 more files in changeset.
Friday 16 Mar 2018
12:20 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4531 Essay Question displays 8 rows for text entry

Options
    • -2
    • +2
    ./pages/learning/parts/essay.jsp
12:01 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4532 Burning Questions accessible on iPad

Also did the same fix to similar entries in authoring to ensure

they would work on an iPad

Options
    • -1
    • +1
    ./pages/authoring/parts/addessay.jsp
    • -2
    • +2
    ./pages/authoring/parts/addmarkhedging.jsp
    • -1
    • +1
    ./pages/authoring/parts/addmatchingpairs.jsp
    • -2
    • +2
    ./pages/authoring/parts/addmultiplechoice.jsp
    • -1
    • +1
    ./pages/authoring/parts/addnumerical.jsp
    • -2
    • +3
    ./pages/authoring/parts/addordering.jsp
    • -1
    • +1
    ./pages/authoring/parts/addshortanswer.jsp
    • -2
    • +2
    ./pages/authoring/parts/addtruefalse.jsp
    • -1
    • +1
    ./pages/authoring/parts/numericaloption.jsp
    • -1
    • +1
    ./pages/authoring/parts/option.jsp
    • -1
    • +1
    ./pages/authoring/parts/optionhedgingmark.jsp
    • -1
    • +1
    ./pages/authoring/parts/shortansweroption.jsp
  13. … 3 more files in changeset.
Saturday 03 Mar 2018
6:14 am

Andrey Balan

Merge branch 'LDEV-4520'

Options
    • -20
    • +2
    ./pages/tblmonitoring/assessmentStudentChoices.jsp
  2. … 1 more file in changeset.
6:13 am

Andrey Balan

LDEV-4520 Reimplement student choices page in case of Assessment iRA

It should follow the format of Student choices page in case of MCQ iRA.

Options
    • -0
    • +5
    ./WEB-INF/struts-config.xml
    • -2
    • +11
    ./pages/tblmonitoring/assessment.jsp
    • -20
    • +2
    ./pages/tblmonitoring/assessmentStudentChoices.jsp
    • -0
    • +139
    ./pages/tblmonitoring/iraAssessmentStudentChoices.jsp
  5. … 10 more files in changeset.
Friday 02 Mar 2018
6:06 am

Andrey Balan

LDEV-4520 Fix export excel feature for AEs tab

Options
    • -1
    • +1
    ./pages/tblmonitoring/assessmentStudentChoices.jsp
Tuesday 27 Feb 2018
10:56 am

Andrey Balan

LKC-89 Add TBL Monitoring code specific for the tools

Add TblMonitoringAction classes and /tblmonitoring/*.jsps to the

tools projects. They will be consumed solely by lams_monitoring

to generate tool specific content required for TBL Monitoring.

Tools themselves won't use those classes and jsps.

Options
    • -1
    • +25
    ./WEB-INF/struts-config.xml
    • -0
    • +15
    ./WEB-INF/web.xml
    • -1
    • +2
    ./common/taglibs.jsp
    • -0
    • +193
    ./pages/tblmonitoring/assessment.jsp
    • -0
    • +122
    ./pages/tblmonitoring/assessmentStudentChoices.jsp
    • -0
    • +37
    ./pages/tblmonitoring/teams.jsp
    • -0
    • +92
    ./pages/tblmonitoring/userresponse.jsp
  8. … 45 more files in changeset.
Thursday 15 Feb 2018
11:54 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4514 Greek names appear in notification window correctly.

Also added some HTML escaping to the display of the leader's name

in tool messages.

Options
    • -1
    • +1
    ./WEB-INF/tags/LeaderDisplay.tag
  2. … 33 more files in changeset.
Friday 05 Jan 2018
10:27 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4421 Comments allowed for authored items in Share Resources

Options
    • -1
    • +27
    ./WEB-INF/tags/Comments.tag
  2. … 65 more files in changeset.
Wednesday 22 Nov 2017
8:55 pm

Andrey Balan

LDEV-4473 Add bootstrap.js when it's not available on page

Options
    • -1
    • +7
    ./WEB-INF/tags/Page.tag
  2. … 30 more files in changeset.
1:11 am

Andrey Balan

LDEV-4470 Fix conflict between query-ui's slider and bootstrap-slider

Options
    • -1
    • +2
    ./pages/learning/learning.jsp
    • -1
    • +1
    ./pages/learning/parts/confidencelevel.jsp
    • -0
    • +3
    ./pages/learning/results.jsp
    • -1
    • +1
    ./pages/learning/results/confidencelevel.jsp
  5. … 4 more files in changeset.
Thursday 16 Nov 2017
4:54 am

Andrey Balan

LDEV-4436 Ability to change portrait in learner

Options
    • -12
    • +49
    ./WEB-INF/tags/Page.tag
  2. … 33 more files in changeset.
Wednesday 08 Nov 2017
11:45 pm

Andrey Balan

LDEV-4451 Add scss files and fix their names

Options
    • -0
    • +5
    ./includes/css/monitoring.scss
    • -4
    • +5
    ./pages/monitoring/monitoring.jsp
    • -3
    • +4
    ./pages/monitoring/parts/questionsummary.jsp
    • -3
    • +4
    ./pages/monitoring/parts/usersummary.jsp
  5. … 6 more files in changeset.
2:02 am

Andrey Balan

LDEV-4456 Warn users when there is no questions in question list

Options
    • -17
    • +26
    ./pages/authoring/authoring.jsp
    • -36
    • +36
    ./pages/authoring/basic.jsp
  3. … 1 more file in changeset.
Tuesday 07 Nov 2017
10:45 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4445 Question page in monitor has portraits

Options
    • -4
    • +21
    ./pages/monitoring/parts/questionsummary.jsp
  2. … 4 more files in changeset.
Friday 03 Nov 2017
5:24 am

Andrey Balan

LDEV-4451 Make slider neater (narrower and with lesser text size)

Options
    • -9
    • +0
    ./pages/learning/learning.jsp
    • -9
    • +0
    ./pages/learning/results.jsp
  3. … 1 more file in changeset.
Thursday 02 Nov 2017
7:57 am

Andrey Balan

LDEV-4451 Store ConfidenceLevels inside Assessment

ConfidenceLevels should be stored at the tools level as otherwise it's

hard to keep questions hashes updated in lams_central.

Add support for providing them to Scratchie.

Options
    • -33
    • +0
    ./includes/javascript/monitoring.js
    • -1
    • +1
    ./pages/monitoring/monitoring.jsp
    • -6
    • +2
    ./pages/monitoring/parts/questionsummary.jsp
    • -8
    • +4
    ./pages/monitoring/parts/usersummary.jsp
    • -5
    • +1
    ./pages/monitoring/summary.jsp
  6. … 12 more files in changeset.
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
    • +33
    ./includes/javascript/monitoring.js
    • -0
    • +7
    ./pages/authoring/advance.jsp
    • -17
    • +23
    ./pages/learning/learning.jsp
    • -0
    • +4
    ./pages/learning/parts/allquestions.jsp
    • -0
    • +13
    ./pages/learning/parts/confidencelevel.jsp
    • -0
    • +11
    ./pages/learning/results.jsp
    • -0
    • +4
    ./pages/learning/results/allquestions.jsp
    • -0
    • +13
    ./pages/learning/results/confidencelevel.jsp
    • -11
    • +2
    ./pages/monitoring/monitoring.jsp
    • -2
    • +6
    ./pages/monitoring/parts/masterDetailLoadUp.jsp
    • -14
    • +20
    ./pages/monitoring/parts/questionsummary.jsp
    • -14
    • +23
    ./pages/monitoring/parts/usersummary.jsp
    • -23
    • +36
    ./pages/monitoring/summary.jsp
  14. … 17 more files in changeset.
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
    ./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
    • binary
    ./pages/monitoring/.editactivity.jsp.swp
    • -0
    • +4
    ./pages/monitoring/editactivity.jsp
  3. … 11 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-INF/tags/StyledRating.tag
  2. … 44 more files in changeset.
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
    • -1
    • +7
    ./WEB-INF/tlds/lams/lams.tld
    • -2
    • +5
    ./pages/monitoring/monitoring.jsp
    • -1
    • +1
    ./pages/monitoring/parts/reflections.jsp
    • -7
    • +19
    ./pages/monitoring/summary.jsp
  5. … 70 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
    • -1
    • +7
    ./WEB-INF/tlds/lams/lams.tld
    • -2
    • +5
    ./pages/monitoring/monitoring.jsp
    • -1
    • +1
    ./pages/monitoring/parts/reflections.jsp
    • -7
    • +19
    ./pages/monitoring/summary.jsp
  5. … 71 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-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
    • -1
    • +13
    ./pages/learning/learning.jsp
  2. … 1 more file in changeset.
Monday 07 Aug 2017
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-INF/web.xml
  2. … 19 more files in changeset.
Saturday 05 Aug 2017
2:11 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395 Sizing tweaks

Options
    • -1
    • +1
    ./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-INF/tags/LeaderDisplay.tag
    • -0
    • +4
    ./WEB-INF/tlds/lams/lams.tld
    • -5
    • +1
    ./pages/learning/learning.jsp
    • -5
    • +1
    ./pages/learning/results.jsp
  5. … 85 more files in changeset.