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
Friday 09 Oct 2020
1:36 pm

Marcin Cieslak

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

Conflicts:

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java

Options
    • -1
    • +3
    ./lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
1:34 pm

Marcin Cieslak

LDEV-5090 Use "-" char when displaying blank Essay answer

Options
    • -6
    • +5
    ./lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
Wednesday 07 Oct 2020
5:59 pm

Marcin Cieslak

LDEV-5087 Do not show question title on Assessment results screen

Options
    • -3
    • +3
    ./lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
  2. … 1 more file in changeset.
Thursday 01 Oct 2020
1:58 pm

Marcin Cieslak

LDEV-5081 Rename file prototypes to real names used in Assessment

Options
    • -8
    • +8
    ./lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
  2. … 23 more files in changeset.
Monday 28 Sep 2020
4:56 pm

Marcin Cieslak

LDEV-5081 Rewrite questions table to bootstrap 4.5

Options
    • -6
    • +6
    ./lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
  2. … 4 more files in changeset.
Friday 25 Sep 2020
3:19 pm

Marcin Cieslak

LDEV-5081 Allow proper saving of redesigned Assessment authoring

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
  2. … 2 more files in changeset.
Wednesday 23 Sep 2020
7:13 am

Marcin Cieslak

LKC-89 Calculate correct answer correctly when max mark is 0

Options
    • -2
    • +25
    ./lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java
Tuesday 22 Sep 2020
4:39 pm

Marcin Cieslak

LDEV-5080 Use redesigned dummy tool authoring template in Assessment

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
  2. … 26 more files in changeset.
3:05 pm

Marcin Cieslak

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

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

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

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

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

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

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

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

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

Options
    • -2
    • +7
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 7 more files in changeset.
Thursday 17 Sep 2020
5:12 pm

Marcin Cieslak

LDEV-4745 Sort QB questions using display order when fetching from DB

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 2 more files in changeset.
4:17 pm

Marcin Cieslak

LKC-236 Return questions replaced in tool for further processing

Options
    • -1
    • +6
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 3 more files in changeset.
Monday 24 Aug 2020
11:19 am

Marcin Cieslak

LDEV-5066 Do not show uncofigured Etherpad option in Assessment

Options
    • -0
    • +4
    ./lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
  2. … 1 more file in changeset.
Thursday 20 Aug 2020
8:46 am

Marcin Cieslak

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

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

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

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

lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java

lams_central/web/questions/questionFile.jsp

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

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

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

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

lams_tool_assessment/web/pages/monitoring/summary.jsp

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_fr_FR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_no_NO.properties

lams_tool_lamc/db/sql/activity_insert.sql

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_lamc/web/WEB-INF/tags/Etherpad.tag

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

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

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

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/authoring/editQuestionBox.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

Options
    • -5
    • +3
    ./lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -95
    • +176
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -12
    • +12
    ./lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -14
    • +332
    ./lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  5. … 22 more files in changeset.
7:49 am

Marcin Cieslak

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

Conflicts:

lams_gradebook/conf/language/lams/ApplicationResources.properties

Options
    • -2
    • +20
    ./lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  2. … 3 more files in changeset.
Friday 14 Aug 2020
5:32 pm

Marcin Cieslak

LDEV-5062 Do not allow multiple disclose answers requests

Options
    • -2
    • +20
    ./lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
Tuesday 28 Jul 2020
9:09 am

Marcin Cieslak

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

Conflicts:

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java

Options
    • -0
    • +1
    ./lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
  2. … 5 more files in changeset.
9:04 am

Marcin Cieslak

LDEV-5057 Use UTF-8 as default encoding for message sources

Options
    • -0
    • +1
    ./lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
  2. … 33 more files in changeset.
Thursday 23 Jul 2020
8:11 am

Marcin Cieslak

LDEV-4921 Hide question titles in Assessment

Options
    • -0
    • +3
    ./lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
  2. … 1 more file in changeset.
Tuesday 14 Jul 2020
8:20 am

Marcin Cieslak

LDEV-5015 Allow answer justification for AE question for TBL template

Options
    • -0
    • +3
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 2 more files in changeset.
Friday 10 Jul 2020
5:12 pm

Marcin Cieslak

LDEV-5050 Control if question is required from Assessment authoring

Options
    • -0
    • +14
    ./lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
  2. … 3 more files in changeset.
4:45 pm

Marcin Cieslak

LDEV-4847 Fix importing QB question with existing UUID

Options
    • -0
    • +2
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 7 more files in changeset.
11:16 am

Marcin Cieslak

LDEV-5050 Transform "is required" attribute when importing a LD

Options
    • -0
    • +15
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20200710.sql
    • -5
    • +26
    ./lamsfoundation/lams/tool/assessment/service/AssessmentImportContentVersionFilter.java
  3. … 2 more files in changeset.
10:52 am

Marcin Cieslak

LDEV-5050 Move "is required" attribute from QB question to tools

Options
    • -4
    • +2
    ./lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  3. … 28 more files in changeset.
Thursday 09 Jul 2020
11:09 am

Marcin Cieslak

LDEV-5015 Hide iRA student choices button if there are no learners

Options
    • -2
    • +4
    ./lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java
  2. … 1 more file in changeset.
Friday 26 Jun 2020
2:39 pm

Marcin Cieslak

LDEV-4745 Use correct JSON attribute name for QB question max mark

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
2:23 pm

Marcin Cieslak

LDEV-5047 Make numeric option more accurate as it performs rounding

Options
    • -15
    • +0
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20200626.sql
  2. … 1 more file in changeset.
11:14 am

Marcin Cieslak

LDEV-5047 Make numeric option more accurate as it performs rounding

Options
    • -0
    • +15
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20200626.sql
Wednesday 24 Jun 2020
2:37 pm

Marcin Cieslak

LDEV-5033 Add answer justification to Assessment

Options
    • -1
    • +3
    ./lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +17
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20200624.sql
    • -13
    • +27
    ./lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java
    • -0
    • +11
    ./lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -0
    • +16
    ./lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java
    • -0
    • +28
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -2
    • +5
    ./lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
    • -1
    • +12
    ./lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -1
    • +12
    ./lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  10. … 5 more files in changeset.
Monday 22 Jun 2020
2:47 pm

Marcin Cieslak

LDEV-5041 Allow adding a whole group to individual time limit table

Options
    • -0
    • +9
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +3
    ./lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -11
    • +86
    ./lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  4. … 1 more file in changeset.
12:57 pm

Marcin Cieslak

LDEV-5041 Allow time limit for learners who did not reach Assessment yet

Options
    • -0
    • +3
    ./lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -4
    • +0
    ./lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -24
    • +1
    ./lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -1
    • +10
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20200617.sql
    • -2
    • +21
    ./lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -11
    • +0
    ./lamsfoundation/lams/tool/assessment/model/AssessmentUser.java
    • -7
    • +11
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -3
    • +1
    ./lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -7
    • +4
    ./lamsfoundation/lams/tool/assessment/web/controller/LearningWebsocketServer.java
    • -20
    • +37
    ./lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  11. … 3 more files in changeset.