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
Wednesday 05 Feb 2020
2:10 pm

Marcin Cieslak

LDEV-4962 Use complex portrait UUID in tools

Options
    • -5
    • +4
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
  2. … 25 more files in changeset.
2:10 pm

Marcin Cieslak

LDEV-4962 Use complex portrait UUID in tools

Conflicts:

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java

Options
    • -5
    • +4
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
  2. … 25 more files in changeset.
Tuesday 04 Feb 2020
11:10 pm

Marcin Cieslak

LDEV-4962 Introduce complex portrait UUIDs

Options
    • -42
    • +38
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -4
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/AssessmentUserDTO.java
    • -79
    • +64
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -8
    • +5
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  6. … 31 more files in changeset.
11:10 pm

Marcin Cieslak

LDEV-4962 Introduce complex portrait UUIDs

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java

lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -44
    • +40
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -4
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/AssessmentUserDTO.java
    • -7
    • +5
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  7. … 33 more files in changeset.
3:43 am

Andrey Balan

LDEV-4875 Don't allocate answers with different letter case (if question is case-insensitive)

Options
    • -1
    • +9
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Friday 31 Jan 2020
10:41 pm

Marcin Cieslak

LDEV-4802 Use redirect instead of forward to QB interface

Using a cross-module forward for some reason prevents modules from

shutting down in the end.

Options
    • -25
    • +11
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
4:55 pm

Andrey Balan

LDEV-4951 Migrate MCQ tool to Assessment

Options
    • -2
    • +8
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20200120.sql
  2. … 2 more files in changeset.
Wednesday 29 Jan 2020
6:07 am

Andrey Balan

LDEV-4951 Migrate MCQ tool to Assessment

Options
    • -0
    • +12
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +152
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20200120.sql
    • -8
    • +17
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/SessionDTO.java
    • -0
    • +170
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/UserMarkDTO.java
    • -0
    • +35
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
    • -3
    • +388
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -0
    • +52
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -0
    • +11
    ./web/pages/monitoring/summary.jsp
  11. … 1 more file in changeset.
Thursday 23 Jan 2020
6:40 am

Andrey Balan

LDEV-4953 Set pageEncoding and contentType in web.xml instead of jsps

Options
    • -1
    • +0
    ./web/403.jsp
    • -1
    • +0
    ./web/404.jsp
    • -0
    • +6
    ./web/WEB-INF/web.xml
    • -1
    • +1
    ./web/common/taglibs.jsp
    • -1
    • +1
    ./web/error.jsp
    • -1
    • +0
    ./web/login.jsp
  7. … 167 more files in changeset.
Wednesday 22 Jan 2020
9:38 pm

Marcin Cieslak

LDEV-4950 Drag&drop item sorting in Scratchie authoring

Also in Scratchie and Assessment update visible question numbering on

sort.

Options
    • -2
    • +4
    ./web/pages/authoring/parts/questionlist.jsp
  2. … 4 more files in changeset.
9:38 pm

Marcin Cieslak

LDEV-4950 Drag&drop item sorting in Scratchie authoring

Also in Scratchie and Assessment update visible question numbering on

sort.

Conflicts:

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

lams_tool_scratchie/web/pages/authoring/basic.jsp

lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp

Options
    • -2
    • +4
    ./web/pages/authoring/parts/questionlist.jsp
  2. … 4 more files in changeset.
Tuesday 21 Jan 2020
4:23 am

Andrey Balan

LDEV-4948 Prevent adding enctype="multipart/form-data" to forms

Options
    • -4
    • +4
    ./web/pages/learning/learning.jsp
  2. … 4 more files in changeset.
Monday 20 Jan 2020
2:34 pm

Marcin Cieslak

LDEV-4846 Set QB question content folder when creating via TBL template

Options
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 3 more files in changeset.
2:31 pm

Marcin Cieslak

LDEV-4947 Add questions from imported LD to user private QB collection

Options
    • -7
    • +7
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 3 more files in changeset.
6:50 am

Ernie Ghiglione

LDEV-4945 Fix mysql comments on patch files

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190704.sql
4:12 am

Ernie Ghiglione

LDEV-4945 Fix mysql comments on patch files

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20110413_updateTo236.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20170101_updateTo30.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190423.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20191016.sql
  5. … 73 more files in changeset.
Sunday 19 Jan 2020
3:25 pm

Ernie Ghiglione

LDEV-4945 Fix mysql comments on patch files

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20110413_updateTo236.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20170101_updateTo30.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190423.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190704.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190913.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20191016.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20191120.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20191205.sql
  11. … 92 more files in changeset.
Friday 17 Jan 2020
6:04 am

Andrey Balan

LDEV-4932 Add CSRF to Assessment monitoring

Options
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -1
    • +2
    ./web/pages/monitoring/parts/questionsummary.jsp
    • -1
    • +3
    ./web/pages/monitoring/statisticpart.jsp
  4. … 1 more file in changeset.
5:36 am

Andrey Balan

LDEV-4944 Take care about VSAs edited by several teachers simultaneously

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +14
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +12
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -3
    • +11
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -15
    • +18
    ./web/pages/monitoring/parts/questionsummary.jsp
Thursday 16 Jan 2020
4:06 am

Andrey Balan

LDEV-4875 Add "cursor:pointer" to drag-and-drop answers

Options
    • -0
    • +3
    ./web/pages/monitoring/parts/questionsummary.jsp
3:43 am

Andrey Balan

LDEV-4875 Prevent monitors from allocating empty or autosaved answers

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java
    • -1
    • +4
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Friday 10 Jan 2020
6:10 am

Andrey Balan

LDEV-4932 Add CSRF to QB bank calls

Options
    • -2
    • +2
    ./web/pages/authoring/basic.jsp
  2. … 32 more files in changeset.
Thursday 09 Jan 2020
3:59 pm

Andrey Balan

Merge branch 'master' into v4.0

# Conflicts:

# lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_build/build.xml

# lams_build/liblist.txt

# lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

# lams_central/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_central/web/authoringConfirm.jsp

# lams_central/web/common/taglibs.jsp

# lams_central/web/includes/javascript/authoring/authoringGeneral.js

# lams_central/web/includes/javascript/outcome.js

# lams_central/web/outcome/outcomeEdit.jsp

# lams_central/web/outcome/outcomeManage.jsp

# lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

# lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java

# lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java

# lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp

# lams_tool_laqa/web/authoring/newQuestionBox.jsp

# lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp

# lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java

# lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java

# lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/web/pages/authoring/basic.jsp

# lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_www/web/WEB-INF/tags/OutcomeAuthor.tag

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -14
    • +12
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -9
    • +5
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java
    • -2
    • +3
    ./web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +2
    ./web/pages/authoring/authoring.jsp
    • -1
    • +1
    ./web/pages/monitoring/monitoring.jsp
    • -1
    • +1
    ./web/pages/monitoring/parts/questionsummary.jsp
    • -1
    • +1
    ./web/pages/monitoring/parts/usersummary.jsp
    • -9
    • +10
    ./web/pages/monitoring/summary.jsp
    • -1
    • +7
    ./web/pages/tblmonitoring/assessmentStudentChoices.jsp
    • -1
    • +7
    ./web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
  12. … 84 more files in changeset.
5:44 am

Andrey Balan

LDEV-4932 Add CSRF Excel export in tools

Options
    • -4
    • +1
    ./web/pages/monitoring/summary.jsp
  2. … 9 more files in changeset.
Wednesday 08 Jan 2020
6:34 am

Andrey Balan

LDEV-4932 Add CSRF to LD export and Excel export

Options
    • -5
    • +6
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -1
    • +7
    ./web/pages/tblmonitoring/assessmentStudentChoices.jsp
    • -1
    • +7
    ./web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
  4. … 10 more files in changeset.
3:42 am

Andrey Balan

LDEV-4932 Add CSRF to monitor and central

Options
    • -9
    • +5
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java
  2. … 50 more files in changeset.
Friday 03 Jan 2020
6:44 pm

Marcin Cieslak

Merge branch 'LDEV-4745' into v4.0

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources_en_AU.properties

# lams_central/web/includes/javascript/authoring/authoringGeneral.js

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

Options
    • -20
    • +33
    ./src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -399
    • +405
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  3. … 18 more files in changeset.
2:59 pm

Marcin Cieslak

LDEV-4743 Squash tool patches updating to version 3.1

Options
    • -19
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20170315.sql
    • -16
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20170822.sql
    • -34
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171011.sql
    • -23
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171016.sql
    • -17
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171218.sql
    • -18
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180330.sql
    • -26
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180425.sql
    • -14
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180515.sql
    • -14
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190103.sql
    • -0
    • +117
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190103_updateTo31.sql
  11. … 109 more files in changeset.
Thursday 02 Jan 2020
9:12 pm

Ernie Ghiglione

LDEV-4932 Add CSRF to OutcomeAuthor tag

Options
    • -2
    • +3
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  2. … 30 more files in changeset.
9:00 pm

Ernie Ghiglione

LDEV-4932 removing multipart encoding

There are plenty of form we set the multipart encoding for uploading files, but no files are uploaded. This has implications for CSRF tokens. So we remove the enctype="multipart/form-data" for all the authoring forms that aren't needed.

Options
    • -1
    • +1
    ./web/pages/authoring/authoring.jsp
  2. … 14 more files in changeset.