lams-github

lams_tool_lamc

Clone Tools

Stats

Commits this week: 0
Total Committers: 27
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
Thursday 18 Jul 2019
4:04 pm

Andrey Balan

LDEV-4839 Refine import QB questions feature

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
    • -4
    • +44
    ./web/authoring/BasicContent.jsp
    • -17
    • +8
    ./web/authoring/itemlist.jsp
  5. … 6 more files in changeset.
Saturday 13 Jul 2019
10:00 am

Marcin Cieslak

Merge branch 'LDEV-4834' into LDEV-4745

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java

lams_central/web/qb/collection.jsp

lams_central/web/qb/stats.jsp

lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java

lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java

lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

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

Options
    • -38
    • +44
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 10 more files in changeset.
Friday 12 Jul 2019
11:21 pm

Andrey Balan

LDEV-4836 Change authoring to accommodate importing questions from QB

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 76 more files in changeset.
Thursday 04 Jul 2019
5:48 pm

Marcin Cieslak

LDEV-4834 Initial implementation of Learning Outcomes in Question Bank

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -10
    • +19
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  3. … 49 more files in changeset.
Wednesday 03 Jul 2019
9:25 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4834

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources_en_AU.properties

# lams_central/web/includes/javascript/ckconfig_custom.js

# lams_central/web/main.jsp

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_tool_assessment/conf/language/lams/ApplicationResources.properties

# lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java

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

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

# lams_tool_assessment/web/pages/learning/parts/markhedging.jsp

# lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp

# lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp

# lams_tool_assessment/web/pages/learning/parts/ordering.jsp

# lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# 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/service/McService.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java

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

# lams_tool_lamc/web/authoring/BasicContent.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/authoring/itemlist.jsp

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java

# lams_tool_scratchie/web/pages/learning/learning.jsp

# lams_tool_scratchie/web/pages/learning/scratchies.jsp

# lams_tool_scratchie/web/pages/monitoring/summary.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +10
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -2
    • +6
    ./src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
    • -38
    • +44
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -6
    • +11
    ./src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java
    • -11
    • +14
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
    • -4
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -7
    • +10
    ./web/authoring/BasicContent.jsp
    • -41
    • +42
    ./web/authoring/candidateAnswersList.jsp
    • -3
    • +1
    ./web/authoring/editQuestionBox.jsp
    • -14
    • +20
    ./web/authoring/itemlist.jsp
  16. … 40 more files in changeset.
Tuesday 02 Jul 2019
3:23 pm

Marcin Cieslak

LDEV-4828 Make service methods' names more simple

"Qb" part everywhere does not introduce anything helpful

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
  2. … 14 more files in changeset.
Friday 14 Jun 2019
7:11 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'develop' into LDEV-4759

# Conflicts:

# lams_central/web/authoring/template/tool/mcquestion.jsp

# lams_central/web/authoringConfirm.jsp

# lams_central/web/css/_learner_base.scss

# lams_central/web/profile/editprofile.jsp

# lams_learning/web/optionsActivity.jsp

# lams_monitoring/web/monitor.jsp

# lams_monitoring/web/tblmonitor/sequence.jsp

# lams_monitoring/web/tblmonitor/teams.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/common/monitoringheader.jsp

# lams_tool_preview/web/pages/monitoring/criteria.jsp

# lams_tool_preview/web/pages/monitoring/reflections.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp

# lams_tool_task/web/common/monitorheader.jsp

Options
    • -5
    • +31
    ./web/WEB-INF/tags/OutcomeAuthor.tag
    • -3
    • +1
    ./web/authoring/editQuestionBox.jsp
    • -6
    • +11
    ./web/authoring/itemlist.jsp
    • -2
    • +0
    ./web/common/monitoringheader.jsp
    • -45
    • +28
    ./web/monitoring/SummaryContent.jsp
  6. … 90 more files in changeset.
Thursday 30 May 2019
2:06 am

Andrey Balan

LDEV-4826 Remove import/export QTI questions feature from tools

Options
    • -136
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
    • -29
    • +0
    ./web/authoring/BasicContent.jsp
    • -9
    • +0
    ./web/authoring/itemlist.jsp
  4. … 10 more files in changeset.
Wednesday 29 May 2019
4:20 pm

Marcin Cieslak

LDEV-4825 Show links to activity monitoring on QB stats page

Also fix displaying QB stats in tools' monitoring pages.

Options
    • -4
    • +3
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
    • -3
    • +2
    ./web/monitoring/parts/statsPart.jsp
  3. … 8 more files in changeset.
1:55 pm

Marcin Cieslak

LDEV-4825 Display QB stats in MCQ tool monitoring

Options
    • -241
    • +245
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +14
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
    • -164
    • +229
    ./web/monitoring/parts/statsPart.jsp
  4. … 2 more files in changeset.
Thursday 23 May 2019
1:14 pm

Andrey Balan

LDEV-4745 Fix the way confidence levels is calculated in MCQ

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
Saturday 18 May 2019
1:16 am

Andrey Balan

LDEV-4821 Switch to using qbQuestionUid for competence levels

Options
    • -6
    • +4
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 3 more files in changeset.
Friday 17 May 2019
11:50 pm

Andrey Balan

LDEV-4821 remove obsolete hash field

Options
    • -0
    • +16
    ./src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20190517.sql
    • -21
    • +3
    ./src/java/org/lamsfoundation/lams/tool/mc/model/McQueContent.java
    • -0
    • +7
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
    • -8
    • +4
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
  5. … 4 more files in changeset.
Wednesday 15 May 2019
8:53 pm

Andrey Balan

LDEV-4820 Show user names for confidence levels

Options
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 5 more files in changeset.
1:10 pm

Marcin Cieslak

LDEV-4819 Allow disabling Learning Outcome quick add in sysadmin

Options
    • -3
    • +10
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  2. … 35 more files in changeset.
Tuesday 14 May 2019
11:23 pm

Andrey Balan

LDEV-4818 Add title property to MCQ questions

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
    • -14
    • +3
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -12
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -14
    • +18
    ./src/java/org/lamsfoundation/lams/tool/mc/dto/AnswerDTO.java
    • -9
    • +11
    ./src/java/org/lamsfoundation/lams/tool/mc/dto/McGeneralLearnerFlowDTO.java
    • -8
    • +24
    ./src/java/org/lamsfoundation/lams/tool/mc/dto/McQuestionDTO.java
    • -19
    • +27
    ./src/java/org/lamsfoundation/lams/tool/mc/model/McQueContent.java
    • -4
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/service/MCOutputFactory.java
    • -62
    • +54
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/util/LearningUtil.java
  16. … 21 more files in changeset.
Tuesday 07 May 2019
11:11 pm

Andrey Balan

LDEV-4746 Migrate Assessment to QB

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/model/McQueContent.java
    • -5
    • +5
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
  4. … 78 more files in changeset.
Wednesday 24 Apr 2019
2:14 pm

Marcin Cieslak

LDEV-4746 Fix a duplicate association in MCQ

Options
    • -4
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java
12:24 am

Andrey Balan

LDEV-4805 Finally switch to using free-jqGrid

Options
    • -2
    • +0
    ./web/common/monitoringheader.jsp
    • -45
    • +28
    ./web/monitoring/SummaryContent.jsp
  3. … 26 more files in changeset.
Wednesday 27 Mar 2019
12:18 pm

Marcin Cieslak

LDEV-4786 Adjust outcome CSS in authoring. Confirm outcome removal.

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +7
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  4. … 85 more files in changeset.
Monday 25 Mar 2019
1:07 am

Ernie Ghiglione

LDEV-4739 Updating translations

Options
    • -4
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +4
    ./conf/language/lams/ApplicationResources_es_ES.properties
  5. … 8 more files in changeset.
Tuesday 12 Mar 2019
3:41 pm

Marcin Cieslak

LDEV-4786 Allow creating learning outcomes on the fly

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +18
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  3. … 62 more files in changeset.
Thursday 28 Feb 2019
8:13 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Restyle File Upload widget, cleaned up comments in CSS files

Options
    • -3
    • +2
    ./web/WEB-INF/tags/FileUpload.tag
  2. … 34 more files in changeset.
3:25 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Autocomplete restyling, started Assessment updates

Options
    • -1
    • +0
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  2. … 43 more files in changeset.
Tuesday 26 Feb 2019
8:56 pm

Andrey Balan

LDEV-4777 Search QB interface is now available in MCQ tool

* Further development of QB search feature

Options
    • -14
    • +4
    ./src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java
    • -0
    • +52
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
    • -1
    • +1
    ./web/authoring/AuthoringTabsHolder.jsp
    • -3
    • +3
    ./web/authoring/BasicContent.jsp
    • -1
    • +1
    ./web/authoring/editQuestionBox.jsp
    • -1
    • +15
    ./web/authoring/itemlist.jsp
  7. … 3 more files in changeset.
10:18 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Fixing responsive behaviour on front page and tabs.

Options
    • -5
    • +7
    ./web/WEB-INF/tags/Tabs.tag
  2. … 43 more files in changeset.
Monday 25 Feb 2019
8:22 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Tablesorter, Learner Progress Bar tweaked

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Alert.tag
    • -2
    • +1
    ./web/WEB-INF/tags/Page.tag
    • -1
    • +1
    ./web/WEB-INF/tags/TSTable.tag
  4. … 120 more files in changeset.
Friday 22 Feb 2019
4:17 pm

Marcin Cieslak

LDEV-4746 Set tool content ID also on MCQ clone for lesson

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/model/McQueContent.java
12:51 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Gradebook and jqGrid restyled.

Options
    • -6
    • +19
    ./web/WEB-INF/tags/Page.tag
  2. … 50 more files in changeset.
Monday 18 Feb 2019
11:02 am

Marcin Cieslak

LDEV-4746 Prepare QB model for stats

Tool content ID was added to each tool QB question so we can track which

activity and lesson it belongs to.

Order ID and create date were moved from subclasses to top QB entities.

Options
    • -13
    • +3
    ./src/java/org/lamsfoundation/lams/tool/mc/model/McQueContent.java
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
  4. … 8 more files in changeset.