lams-github / lams_common / src / java

org

Clone Tools

Stats

Commits this week: 0
Total Committers: 32
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 30 Dec 2020
5:05 pm

Marcin Cieslak

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

Conflicts:

lams_build/3rdParty.userlibraries

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/qb/collection.jsp

lams_central/web/questions/questionFile.jsp

lams_common/db/sql/create_lams_11_tables.sql

lams_common/db/sql/insert_lams_config_data.sql

lams_common/db/sql/insert_types_data.sql

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

lams_common/src/java/org/lamsfoundation/lams/questions/QuestionWordParser.java

lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/db/sql/create_lams_tool_assessment.sql

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/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/model/McUsrAttempt.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/WEB-INF/tags/CKEditor.tag

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

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

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

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

lams_tool_scratchie/web/pages/authoring/basic.jsp

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

Options
    • -848
    • +0
    ./lamsfoundation/lams/dbupdates/patch20190722.sql
    • -63
    • +0
    ./lamsfoundation/lams/dbupdates/patch20190724.sql
    • -0
    • +13
    ./lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -15
    • +14
    ./lamsfoundation/lams/tool/service/LamsToolService.java
  5. … 26 more files in changeset.
Wednesday 23 Dec 2020
5:57 pm

Marcin Cieslak

LDEV-4959 Fix comments in the DB patch

Options
    • -3
    • +3
    ./lamsfoundation/lams/dbupdates/patch20200129.sql
Tuesday 01 Dec 2020
8:58 pm

Marcin Cieslak

LDEV-4944 Recalculate Scratchie marks only for given VSA answer

Options
    • -7
    • +2
    ./lamsfoundation/lams/tool/service/ICommonScratchieService.java
    • -4
    • +2
    ./lamsfoundation/lams/tool/service/ILamsToolService.java
    • -16
    • +15
    ./lamsfoundation/lams/tool/service/LamsToolService.java
  4. … 5 more files in changeset.
Monday 30 Nov 2020
9:23 pm

Marcin Cieslak

LDEV-5125 Add support for VSA question for Word import

Options
    • -3
    • +49
    ./lamsfoundation/lams/questions/QuestionWordParser.java
  2. … 1 more file in changeset.
Friday 27 Nov 2020
2:15 pm

Marcin Cieslak

LDEV-5124, LDEV-2169 Put correct time and answer in learner history

Options
    • -0
    • +7
    ./lamsfoundation/lams/logevent/LearnerInteractionEvent.java
  2. … 3 more files in changeset.
Thursday 26 Nov 2020
4:23 pm

Marcin Cieslak

LDEV-5124 Fix result ordering when generating Assessment Excel report

Options
    • -2
    • +21
    ./lamsfoundation/lams/qb/model/QbToolAnswer.java
  2. … 3 more files in changeset.
Tuesday 24 Nov 2020
11:13 pm

Marcin Cieslak

LDEV-5124 Add new format of user summary in Assessment Excel export

Options
    • -1
    • +6
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +35
    ./lamsfoundation/lams/logevent/dao/ILearnerInteractionDAO.java
    • -0
    • +22
    ./lamsfoundation/lams/logevent/dao/hibernate/LearnerInteractionDAO.java
    • -0
    • +4
    ./lamsfoundation/lams/logevent/service/ILearnerInteractionService.java
    • -5
    • +15
    ./lamsfoundation/lams/logevent/service/LearnerInteractionService.java
    • -0
    • +3
    ./lamsfoundation/lams/util/FileUtil.java
  7. … 3 more files in changeset.
11:13 pm

Marcin Cieslak

LDEV-5123 Add ticket information to SQL patch

Options
    • -1
    • +1
    ./lamsfoundation/lams/dbupdates/patch20201122.sql
7:08 pm

Marcin Cieslak

LDEV-5124 Allow cell merging in exported Excel sheet

Options
    • -16
    • +25
    ./lamsfoundation/lams/util/excel/ExcelSheet.java
    • -0
    • +6
    ./lamsfoundation/lams/util/excel/ExcelUtil.java
Monday 23 Nov 2020
4:36 pm

Marcin Cieslak

LDEV-5123 Log learner interaction with questions in Assessment

Options
    • -0
    • +22
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +28
    ./lamsfoundation/lams/dbupdates/patch20201122.sql
    • -0
    • +98
    ./lamsfoundation/lams/logevent/LearnerInteractionEvent.java
    • -0
    • +7
    ./lamsfoundation/lams/logevent/service/ILearnerInteractionService.java
    • -0
    • +18
    ./lamsfoundation/lams/logevent/service/LearnerInteractionService.java
  6. … 4 more files in changeset.
Sunday 22 Nov 2020
5:02 am

Marcin Cieslak

LDEV-5121 Add TBL template imported questions to chosen QB collection

Options
    • -1
    • +1
    ./lamsfoundation/lams/rest/RestTags.java
  2. … 7 more files in changeset.
Friday 20 Nov 2020
4:51 am

Marcin Cieslak

LDEV-5122 Modify DB structure to produce 3.1 version

Till now DB structure was compliant with 3.0 version and patches

upgraded it to 3.1. Now we produce DB compliant with 3.1 and patches in

branch 4.0 upgrade it to version 4.0.

Options
    • -2
    • +111
    ./lamsfoundation/lams/dbupdates/patch20190103_updateTo31.sql
    • -16
    • +0
    ./lamsfoundation/lams/dbupdates/patch20190415.sql
    • -15
    • +0
    ./lamsfoundation/lams/dbupdates/patch20190429.sql
    • -14
    • +0
    ./lamsfoundation/lams/dbupdates/patch20190806.sql
    • -14
    • +0
    ./lamsfoundation/lams/dbupdates/patch20191009.sql
    • -10
    • +0
    ./lamsfoundation/lams/dbupdates/patch20191010.sql
    • -36
    • +0
    ./lamsfoundation/lams/dbupdates/patch20191122.sql
    • -29
    • +0
    ./lamsfoundation/lams/dbupdates/patch20191202.sql
    • -21
    • +0
    ./lamsfoundation/lams/dbupdates/patch20200315.sql
    • -14
    • +0
    ./lamsfoundation/lams/dbupdates/patch20200326.sql
    • -14
    • +0
    ./lamsfoundation/lams/dbupdates/patch20200909.sql
  12. … 30 more files in changeset.
Tuesday 10 Nov 2020
11:23 pm

Marcin Cieslak

LDEV-5101 Prepare a placeholder for QB question versions

Options
    • -0
    • +14
    ./lamsfoundation/lams/qb/model/QbQuestion.java
    • -0
    • +2
    ./lamsfoundation/lams/qb/service/IQbService.java
    • -0
    • +11
    ./lamsfoundation/lams/qb/service/QbService.java
  4. … 2 more files in changeset.
10:50 pm

Marcin Cieslak

LDEV-5110 Add Learning Outcomes processing in TBL template

Options
    • -0
    • +1
    ./lamsfoundation/lams/rest/RestTags.java
  2. … 9 more files in changeset.
2:01 am

Marcin Cieslak

LDEV-5101 Support only Assessment and Scratchie tools

Options
    • -1
    • +2
    ./lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
Sunday 08 Nov 2020
10:36 pm

Marcin Cieslak

LDEV-5106 Allow filtering of question types in Word import.

For iRAT/tRAT allow only single-answer multiple choice questions. For

Application Exercises allow single- and multiple-answer multiple choice

questions and essay questions.

Options
    • -1
    • +1
    ./lamsfoundation/lams/questions/QuestionParser.java
    • -12
    • +14
    ./lamsfoundation/lams/questions/QuestionWordParser.java
  3. … 2 more files in changeset.
10:15 pm

Marcin Cieslak

LDEV-5101 Allow applying new question version to other activities in LD

Options
    • -0
    • +3
    ./lamsfoundation/lams/qb/dao/IQbDAO.java
    • -0
    • +12
    ./lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +5
    ./lamsfoundation/lams/qb/service/IQbService.java
    • -0
    • +24
    ./lamsfoundation/lams/qb/service/QbService.java
    • -0
    • +5
    ./lamsfoundation/lams/tool/service/IQbToolService.java
  6. … 9 more files in changeset.
Thursday 05 Nov 2020
6:56 pm

Marcin Cieslak

LDEV-5094 Add logs to SSO handler

Options
    • -6
    • +59
    ./lamsfoundation/lams/integration/security/SsoHandler.java
5:54 pm

Marcin Cieslak

LDEV-5102 Prevent Scratchie from giving marks to absent learner

Options
    • -4
    • +6
    ./lamsfoundation/lams/learning/service/ILearnerService.java
  2. … 5 more files in changeset.
Tuesday 03 Nov 2020
6:17 pm

Marcin Cieslak

LDEV-4949 Fix question title and feedback extraction

Options
    • -14
    • +27
    ./lamsfoundation/lams/questions/QuestionWordParser.java
1:32 pm

Marcin Cieslak

LDEV-4949 Properly removed "Feedback:" tag

Options
    • -46
    • +2
    ./lamsfoundation/lams/questions/QuestionWordParser.java
12:36 am

Marcin Cieslak

LDEV-4949 Add Learning Outcomes parsing

Options
    • -0
    • +2
    ./lamsfoundation/lams/outcome/service/IOutcomeService.java
    • -12
    • +38
    ./lamsfoundation/lams/outcome/service/OutcomeService.java
    • -0
    • +9
    ./lamsfoundation/lams/questions/Question.java
    • -0
    • +14
    ./lamsfoundation/lams/questions/QuestionParser.java
    • -2
    • +14
    ./lamsfoundation/lams/questions/QuestionWordParser.java
  6. … 3 more files in changeset.
Monday 02 Nov 2020
11:41 pm

Marcin Cieslak

LDEV-4949 Use random temporary image name so it does not get overwritten

Options
    • -4
    • +1
    ./lamsfoundation/lams/questions/QuestionWordParser.java
11:37 pm

Marcin Cieslak

LDEV-4949 Add default value of "alt" attribute to <img> tags

Options
    • -10
    • +19
    ./lamsfoundation/lams/questions/QuestionParser.java
11:32 pm

Marcin Cieslak

LDEV-4949 Always add "img-responsive" class to <img> tags

Options
    • -0
    • +25
    ./lamsfoundation/lams/questions/QuestionParser.java
6:07 pm

Marcin Cieslak

LDEV-4949 Detect question elements correctly. Refactor code.

Options
    • -86
    • +120
    ./lamsfoundation/lams/questions/QuestionWordParser.java
12:36 pm

Ernie Ghiglione

LDEV-4949 remove <p> tags from answers and reduce title to 80 characters

Options
    • -5
    • +7
    ./lamsfoundation/lams/questions/QuestionWordParser.java
Sunday 01 Nov 2020
10:46 pm

Marcin Cieslak

LDEV-4849 Add logging to Question Bank service

Options
    • -0
    • +40
    ./lamsfoundation/lams/qb/service/QbService.java
10:21 pm

Marcin Cieslak

LDEV-4949 Fix correct answer and feedback extraction.

Options
    • -5
    • +5
    ./lamsfoundation/lams/questions/QuestionWordParser.java
Wednesday 28 Oct 2020
11:04 pm

Marcin Cieslak

LDEV-4858 Ensure correct Excel cell text length

Options
    • -22
    • +26
    ./lamsfoundation/lams/util/excel/ExcelUtil.java
  2. … 4 more files in changeset.