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
Monday 09 Apr 2018
9:48 pm

Marcin Cieslak

LDEV-4540 Refresh learners' results page when monitor discloses answers

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -0
    • +16
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +7
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -6
    • +16
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/TblMonitoringAction.java
    • -0
    • +11
    ./web/pages/learning/results/tblsummary.jsp
    • -2
    • +3
    ./web/pages/tblmonitoring/assessment.jsp
9:46 pm

Marcin Cieslak

LDEV-4540 Introduce hooks in command websockets

When a command is added, the JSON can contain "hookTrigger" and

"hookParams" attributes.

hookTrigger is just a string which uniquely identifies a page. If this

page set the same commandWebsocketHookTrigger, then command is consumed

and function defined on this page as commandWebsocketHook is run with

parameters taken from hookParams from JSON.

This way back end can tell exact page on front end to run any code it

defines itself.

Options
    • -0
    • +8
    ./web/WEB-INF/tags/Page.tag
  2. … 35 more files in changeset.
7:39 pm

Marcin Cieslak

LDEV-4540 Add "disclose all" buttons to TBL monitor

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -13
    • +73
    ./web/pages/tblmonitoring/assessment.jsp
  3. … 1 more file in changeset.
6:14 pm

Marcin Cieslak

LDEV-4540 Redirect to action rather than JSP after submit all

Redirecting to JSP prevents request attributes from being set properly

and they are needed for the new results page.

Options
    • -8
    • +8
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
Friday 06 Apr 2018
10:55 pm

Marcin Cieslak

LDEV-4540 Disclose answers in TBL monitor and reflect it in learner

Options
    • -5
    • +15
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.hbm.xml
    • -1
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -1
    • +4
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180330.sql
    • -10
    • +59
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java
    • -5
    • +45
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -16
    • +39
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -18
    • +28
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -30
    • +60
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/TblMonitoringAction.java
    • -2
    • +4
    ./web/pages/learning/results/multiplechoice.jsp
    • -48
    • +53
    ./web/pages/learning/results/tblsummary.jsp
    • -2
    • +36
    ./web/pages/tblmonitoring/assessment.jsp
  13. … 1 more file in changeset.
6:45 pm

Marcin Cieslak

LDEV-4540 Show other teams' answers on results page

Options
    • -75
    • +114
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -64
    • +111
    ./web/pages/learning/results/tblsummary.jsp
5:10 pm

Marcin Cieslak

LDEV-4540 Show answers of current team

Options
    • -1
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +4
    ./web/pages/learning/results.jsp
    • -0
    • +75
    ./web/pages/learning/results/tblsummary.jsp
10:15 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054 Updating labels

Updating Greek

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 5 more files in changeset.
Thursday 05 Apr 2018
9:41 pm

Marcin Cieslak

LDEV-4540 Let author choose whether to disclose answers in monitor

Options
    • -6
    • +8
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +15
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180330.sql
    • -13
    • +24
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java
    • -8
    • +23
    ./web/pages/authoring/advance.jsp
Tuesday 03 Apr 2018
8:21 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054 Updating labels

Updating mainly Norwegian with a dash of Español

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_no_NO.properties
  2. … 8 more files in changeset.
Monday 02 Apr 2018
11:17 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054 updating labels

Updating labels in bulk mainly English, Greek and Norwegian

Options
    • -2
    • +15
    ./conf/language/lams/ApplicationResources.properties
    • -5
    • +18
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -5
    • +5
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +19
    ./conf/language/lams/ApplicationResources_no_NO.properties
  5. … 53 more files in changeset.
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
    • -42
    • +72
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -8
    • +8
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -0
    • +361
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/TblMonitoringAction.java
    • -0
    • +15
    ./web/WEB-INF/web.xml
  7. … 78 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
    ./web/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
    ./web/pages/authoring/parts/addessay.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/addmarkhedging.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/addmatchingpairs.jsp
    • -2
    • +2
    ./web/pages/authoring/parts/addmultiplechoice.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/addnumerical.jsp
    • -2
    • +2
    ./web/pages/authoring/parts/addordering.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/addshortanswer.jsp
    • -2
    • +2
    ./web/pages/authoring/parts/addtruefalse.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/numericaloption.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/option.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/optionhedgingmark.jsp
    • -1
    • +1
    ./web/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
    ./web/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
    ./web/pages/authoring/parts/addessay.jsp
    • -2
    • +2
    ./web/pages/authoring/parts/addmarkhedging.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/addmatchingpairs.jsp
    • -2
    • +2
    ./web/pages/authoring/parts/addmultiplechoice.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/addnumerical.jsp
    • -2
    • +3
    ./web/pages/authoring/parts/addordering.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/addshortanswer.jsp
    • -2
    • +2
    ./web/pages/authoring/parts/addtruefalse.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/numericaloption.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/option.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/optionhedgingmark.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/shortansweroption.jsp
  13. … 3 more files in changeset.
Monday 05 Mar 2018
8:39 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4522 Emojis not displaying correctly in monitoring

Also fixed some general escaping issues found while testing.

Options
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
  2. … 34 more files in changeset.
6:40 pm

Marcin Cieslak

LDEV-4523 Tools remove mark rather than clear it on user content delete

Options
    • -164
    • +191
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 4 more files in changeset.
Sunday 04 Mar 2018
9:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 Merge work replacing audit logs with LogEvent entries

Resolved conflicts for lams.jar and the Admin language file.

Options
    • -6
    • +6
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 13 more files in changeset.
Saturday 03 Mar 2018
6:14 am

Andrey Balan

Merge branch 'LDEV-4520'

Options
    • -20
    • +2
    ./web/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
    • +8
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java
    • -0
    • +17
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionOption.java
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -153
    • +61
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/TblMonitoringAction.java
    • -0
    • +5
    ./web/WEB-INF/struts-config.xml
    • -2
    • +11
    ./web/pages/tblmonitoring/assessment.jsp
    • -20
    • +2
    ./web/pages/tblmonitoring/assessmentStudentChoices.jsp
    • -0
    • +139
    ./web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
  12. … 3 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
    ./web/pages/tblmonitoring/assessmentStudentChoices.jsp
Tuesday 27 Feb 2018
10:59 am

Andrey Balan

LKC-89 add labels

To be able to use them even before they will be added to i18n server

Options
    • -0
    • +9
    ./conf/language/lams/ApplicationResources_en_AU.properties
  2. … 3 more files in changeset.
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
    • +5
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -3
    • +33
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -0
    • +46
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/TblAssessmentDTO.java
    • -0
    • +48
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/TblAssessmentQuestionDTO.java
    • -0
    • +24
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/TblAssessmentQuestionResultDTO.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
    • -10
    • +25
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -2
    • +20
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -5
    • +5
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -0
    • +454
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/TblMonitoringAction.java
    • -1
    • +25
    ./web/WEB-INF/struts-config.xml
    • -0
    • +15
    ./web/WEB-INF/web.xml
    • -1
    • +2
    ./web/common/taglibs.jsp
  16. … 37 more files in changeset.
Thursday 22 Feb 2018
9:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 All Audit Log entries are now Log Event entries

Options
    • -6
    • +6
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 65 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/WEB-INF/tags/LeaderDisplay.tag
  2. … 33 more files in changeset.
Tuesday 06 Feb 2018
12:17 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 Tool context files no longer reference audit service.

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
  2. … 62 more files in changeset.
Saturday 03 Feb 2018
5:16 am

Andrey Balan

LDEV-4407 Other projects stop depending on lams_gradebook

* GradebookService interfaces are redefined now:

- IGradebookService is going to be used by core modules.

- IGradebookFullService is used inside of lams_gradebook only and

nowhere else, as it contains lams_gradebook's internal logic and

classes.

* Introduce CommonContants.java which contains for now common

constants that used to be located in GradebookConstants.java

* Tools stop using gradebookService directly, but rather through

ILamsToolService's method updateGradebookUserActivityMark()

* Move GradebookUserActivityArchive and GradebookUserLessonArchive

to lams_gradebook

Options
    • -1
    • +0
    ./.classpath
    • -3
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -10
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -9
    • +9
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
  5. … 53 more files in changeset.
Friday 02 Feb 2018
5:41 am

Andrey Balan

LDEV-4407 Tools to stop using learnerService

There is no need to have a separate ILearnerService designed

for tools only. As long as they require only one method from it

completeToolSession() which we can simply move to

ILamsToolService. After which we just remove learnerService

from the tools.

Options
    • -3
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -8
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  3. … 57 more files in changeset.
Thursday 01 Feb 2018
5:08 am

Andrey Balan

LDEV-4506 Prevent exception after user resubmits results using two tabs

Options
    • -3
    • +12
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java