lams-github / lams_tool_assessment / src / java

org

Clone Tools

Stats

Commits this week: 0
Total Committers: 16
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 27 Apr 2020
6:13 pm

Marcin Cieslak

LDEV-5009 Add student's choices table to Assessment regular monitor

Options
    • -3
    • +35
    ./lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  2. … 4 more files in changeset.
Wednesday 22 Apr 2020
2:59 pm

Marcin Cieslak

LDEV-5002 Show Etherpads in Assessment monitoring user summary page

Conflicts:

lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

Options
    • -1
    • +11
    ./lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  2. … 1 more file in changeset.
2:59 pm

Marcin Cieslak

LDEV-5002 Show Etherpads in Assessment monitoring user summary page

Options
    • -1
    • +11
    ./lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  2. … 1 more file in changeset.
Monday 20 Apr 2020
9:57 pm

Marcin Cieslak

LDEV-5002 Add advanced authoring option to control Etherpads display

Options
    • -0
    • +15
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20200420.sql
    • -1
    • +12
    ./lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -0
    • +2
    ./lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
  4. … 1 more file in changeset.
9:57 pm

Marcin Cieslak

LDEV-5002 Add advanced authoring option to control Etherpads display

Conflicts:

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java

Options
    • -0
    • +15
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20200420.sql
    • -0
    • +11
    ./lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -0
    • +2
    ./lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
  4. … 1 more file in changeset.
9:28 pm

Marcin Cieslak

LDEV-5002 Add Etherpads after each question in Assessment

Options
    • -18
    • +22
    ./lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +5
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -2
    • +7
    ./lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -16
    • +28
    ./lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
  5. … 3 more files in changeset.
9:28 pm

Marcin Cieslak

LDEV-5002 Add Etherpads after each question in Assessment

Conflicts:

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.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

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

lams_tool_assessment/web/pages/learning/learning.jsp

Options
    • -0
    • +4
    ./lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -44
    • +47
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -5
    • +6
    ./lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -9
    • +25
    ./lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
  5. … 3 more files in changeset.
Friday 20 Mar 2020
2:03 pm

Marcin Cieslak

LDEV-4961 Export Assessment confidence levels

Options
    • -9
    • +34
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 1 more file in changeset.
Saturday 07 Mar 2020
11:03 am

Ernie Ghiglione

LDEV-4945 Fix mysql comments on patch files

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql
    • -1
    • +1
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql
Saturday 22 Feb 2020
9:01 pm

Marcin Cieslak

LDEV-4976 Add DB cascades to reflect Hibernate inheritance

Options
    • -0
    • +16
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20200222.sql
  2. … 3 more files in changeset.
1:00 am

Andrey Balan

LDEV-4951 Squash Assessment autopatch scripts for 4.1 release

This is done in order to skip creating MCQ tool tables and then deleting

them in Assessment autopatch script.

Options
    • -159
    • +0
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20200120.sql
    • -0
    • +159
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20200220_updateTo41.sql
  3. … 1 more file in changeset.
12:41 am

Andrey Balan

Merge branch 'LDEV-4979' into LDEV-4951

# Conflicts:

# 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

# lams_tool_lamc/build.properties

# lams_tool_lamc/db/sql/create_lams_tool_mc.sql

# lams_tool_lamc/db/sql/tool_insert.sql

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java

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

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

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

# lams_tool_lamc/web/403.jsp

# lams_tool_lamc/web/404.jsp

# lams_tool_lamc/web/WEB-INF/web.xml

# lams_tool_lamc/web/common/taglibs.jsp

# lams_tool_lamc/web/error.jsp

# lams_tool_lamc/web/login.jsp

Options
    • -136
    • +114
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -5
    • +4
    ./lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -5
    • +2
    ./lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  4. … 4 more files in changeset.
12:32 am

Andrey Balan

LDEV-4979 Update SQL scripts for LAMS 4.0 release

1. Update SQL scripts (create_lams_tool_*.sql), to avoid running 3.1 to

4.0 autopatch scripts on every build.

2. Update module version to 20200219 in build.properties.

3. Squash patches that upgrade from 3.1 to 4.0 into a single one.

Options
    • -22
    • +0
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20190423.sql
    • -16
    • +0
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql
    • -24
    • +0
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20190704.sql
    • -15
    • +0
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql
    • -14
    • +0
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20190913.sql
    • -16
    • +0
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20191016.sql
    • -15
    • +0
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20191120.sql
    • -23
    • +0
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20191205.sql
    • -0
    • +66
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20200219_updateTo40.sql
  10. … 50 more files in changeset.
Tuesday 18 Feb 2020
10:45 pm

Andrey Balan

Merge branch 'master' into v4.0

# Conflicts:

# lams_central/conf/security/Owasp.CsrfGuard.properties

# 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
    • -127
    • +99
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -2
    • +1
    ./lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -4
    • +1
    ./lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
10:30 pm

Andrey Balan

LDEV-4974 Always display user's login and name

Options
    • -157
    • +117
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -3
    • +1
    ./lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -4
    • +1
    ./lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
10:21 pm

Andrey Balan

LDEV-4951 Remove traces of MCQ tool from other modules

Options
    • -9
    • +10
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20200120.sql
  2. … 192 more files in changeset.
Saturday 15 Feb 2020
3:20 am

Andrey Balan

LDEV-4970 Skip renaming questionReference's defaultGrade to maxMark

Options
    • -14
    • +3
    ./lamsfoundation/lams/tool/assessment/service/AssessmentImportContentVersionFilter.java
Thursday 06 Feb 2020
4:33 pm

Marcin Cieslak

LDEV-4962 Fix portraits with complex UUIDs

Options
    • -2
    • +2
    ./lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -4
    • +4
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  3. … 3 more files in changeset.
Wednesday 05 Feb 2020
2:10 pm

Marcin Cieslak

LDEV-4962 Use complex portrait UUID in tools

Options
    • -5
    • +4
    ./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
    ./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
    ./lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -4
    • +3
    ./lamsfoundation/lams/tool/assessment/dto/AssessmentUserDTO.java
    • -79
    • +64
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -8
    • +5
    ./lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -1
    • +1
    ./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
    ./lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -44
    • +40
    ./lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -4
    • +3
    ./lamsfoundation/lams/tool/assessment/dto/AssessmentUserDTO.java
    • -7
    • +5
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -1
    • +1
    ./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
    ./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
    ./lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
4:55 pm

Andrey Balan

LDEV-4951 Migrate MCQ tool to Assessment

Options
    • -2
    • +8
    ./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
    • +1
    ./lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +152
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20200120.sql
    • -8
    • +17
    ./lamsfoundation/lams/tool/assessment/dto/SessionDTO.java
    • -0
    • +170
    ./lamsfoundation/lams/tool/assessment/dto/UserMarkDTO.java
    • -0
    • +35
    ./lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
    • -3
    • +388
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +6
    ./lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -0
    • +52
    ./lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  9. … 3 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
    ./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
    ./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
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20190704.sql
4:12 am

Ernie Ghiglione

LDEV-4945 Fix mysql comments on patch files

Options
    • -2
    • +2
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20110413_updateTo236.sql
    • -2
    • +2
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20170101_updateTo30.sql
    • -2
    • +2
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20190423.sql
    • -2
    • +2
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20191016.sql
  5. … 73 more files in changeset.