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
Tuesday 27 Oct 2020
5:18 pm

Marcin Cieslak

Merge branch 'v4.0' into LDEV-5095

Conflicts:

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

Options
    • -143
    • +148
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 3 more files in changeset.
12:37 am

Marcin Cieslak

LDEV-5097 Embed teacher's view of Assessment result in TBL monitoring

Options
    • -1
    • +2
    ./lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
  2. … 4 more files in changeset.
Sunday 25 Oct 2020
12:22 am

Marcin Cieslak

LKC-221 Move TBL template Assessment methods to Authoring service

Workflow Automation needs to have access to them to create Application

Exercise activities.

Options
    • -143
    • +148
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 4 more files in changeset.
Wednesday 21 Oct 2020
8:20 pm

Marcin Cieslak

LDEV-5097 Add buttons to open results view in Assessment monitoring

Options
    • -2
    • +2
    ./lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
  2. … 5 more files in changeset.
6:10 pm

Marcin Cieslak

LDEV-5097 Prepare a teacher's view of Assessment result

Options
    • -100
    • +182
    ./lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
  2. … 9 more files in changeset.
Monday 19 Oct 2020
10:15 pm

Marcin Cieslak

LDEV-5095 Initial implementation of learner complection chart

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

Marcin Cieslak

LDEV-5095 Prepare data for activity completion chart

Options
    • -12
    • +13
    ./lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java
    • -36
    • +42
    ./lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -0
    • +18
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +4
    ./lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -1
    • +5
    ./lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
Friday 09 Oct 2020
7: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
7: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
11: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
7: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
10: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
9: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
1:13 pm

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
10: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.
9: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
11: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.
10: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
5:19 pm

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
2:46 pm

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.
1:49 pm

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
11: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
3:09 pm

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.
3:04 pm

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
2:11 pm

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
2:20 pm

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
11: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.
10: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.
5:16 pm

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.
4:52 pm

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.