lams-github / lams_tool_assessment

src

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 15 Jun 2020
5:58 pm

Marcin Cieslak

LDEV-5041 Rewrite Assessment time limit to Java 8 time classes

Options
    • -17
    • +17
    ./java/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.java
    • -4
    • +7
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Thursday 28 May 2020
3:26 pm

Marcin Cieslak

LDEV-5052 Adjust rating layout in Assessment monitoring

Options
    • -4
    • +3
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  2. … 3 more files in changeset.
Wednesday 27 May 2020
3:43 pm

Marcin Cieslak

LDEV-5052 Adjust rating layout in Assessment monitoring

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  2. … 1 more file in changeset.
1:01 am

Marcin Cieslak

LDEV-5052 Add group name when displaying rating in monitor

Options
    • -0
    • +3
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  2. … 1 more file in changeset.
12:13 am

Marcin Cieslak

LDEV-5025 Show own group ratings only when rated other groups

Options
    • -5
    • +14
    ./java/org/lamsfoundation/lams/tool/assessment/dto/QuestionSummary.java
    • -15
    • +38
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
  3. … 1 more file in changeset.
Tuesday 26 May 2020
11:05 pm

Marcin Cieslak

LDEV-5025 Put own group first in Assessment answer rating table

Options
    • -3
    • +33
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
Monday 25 May 2020
8:09 pm

Marcin Cieslak

LDEV-5025 Show detailed answer ratings in Assessment monitoring

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -7
    • +72
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  3. … 2 more files in changeset.
7:03 pm

Marcin Cieslak

LDEV-5025 Show average answer rating in Assessment monitoring

Options
    • -2
    • +6
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +2
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -3
    • +59
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  4. … 1 more file in changeset.
Thursday 21 May 2020
2:46 pm

Marcin Cieslak

LDEV-5025 Allow Assessment other groups' answer rating and commenting

Options
    • -0
    • +49
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
  2. … 11 more files in changeset.
Tuesday 19 May 2020
11:00 pm

Marcin Cieslak

LDEV-5024 Import QB questions to AE in TBL template

Options
    • -3
    • +16
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 6 more files in changeset.
4:25 pm

Marcin Cieslak

LDEV-5024 Detect and process QB question modification

Options
    • -63
    • +89
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Monday 11 May 2020
6:14 pm

Marcin Cieslak

LDEV-4997 Renormalize line endings with git

Options
    • -1507
    • +1507
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
  2. … 420 more files in changeset.
Wednesday 06 May 2020
7:21 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.0' into v5.0

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190119.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190723.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql

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

lams_monitoring/web/tblmonitor/teams.jsp

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql

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

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java

lams_tool_lamc/web/WEB-INF/tags/ImgButtonWrapper.tag

lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/learning/CombinedAnswersContent.jsp

lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp

lams_tool_lamc/web/learning/ViewAnswers.jsp

lams_tool_lamc/web/monitoring/SummaryContent.jsp

lams_tool_lamc/web/monitoring/parts/statsPart.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

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

Options
    • -18
    • +22
    ./java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -14
    • +67
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -2
    • +7
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -1
    • +51
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  5. … 27 more files in changeset.
Tuesday 05 May 2020
12:06 pm

Marcin Cieslak

LDEV-5015 Set iRA confidence level type on TBL template save

Options
    • -1
    • +4
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
1:05 am

Marcin Cieslak

LDEV-5015 Fix question duplication on TBL template save

Options
    • -0
    • +12
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Monday 04 May 2020
5:35 pm

Marcin Cieslak

LDEV-5015 Replace MCQ with Assessment as iRA in TBL template

Options
    • -2
    • +9
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 2 more files in changeset.
Monday 27 Apr 2020
11:05 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp

Options
    • -0
    • +41
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  2. … 3 more files in changeset.
6:13 pm

Marcin Cieslak

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

Options
    • -3
    • +35
    ./java/org/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
    ./java/org/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
    ./java/org/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
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20200420.sql
    • -1
    • +12
    ./java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -0
    • +2
    ./java/org/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
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20200420.sql
    • -0
    • +11
    ./java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -0
    • +2
    ./java/org/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
    ./java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +5
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -2
    • +7
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -16
    • +28
    ./java/org/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
    ./java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -44
    • +47
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -5
    • +6
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -9
    • +25
    ./java/org/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
    ./java/org/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
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql
    • -1
    • +1
    ./java/org/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
    ./java/org/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
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20200120.sql
    • -0
    • +159
    ./java/org/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
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -5
    • +4
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -5
    • +2
    ./java/org/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
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190423.sql
    • -16
    • +0
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql
    • -24
    • +0
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190704.sql
    • -15
    • +0
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql
    • -14
    • +0
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190913.sql
    • -16
    • +0
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20191016.sql
    • -15
    • +0
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20191120.sql
    • -23
    • +0
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20191205.sql
    • -0
    • +66
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20200219_updateTo40.sql
  10. … 50 more files in changeset.