lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4782 Add a link to open lesson monitor on QB stats page

LDEV-4828 Fix encoding when sending XML with jqGrid collection data

LDEV-4782 Discar grades with NULL mark before calculating indexes

Merge branch 'master' into develop

LDEV-4837 Removing white line that appears on iPad partway down dialog

    • -1
    • +0
    /lams_central/web/css/_learner_base.scss
LDEV-4834 Fetch outcomes using DAO instead of entity relationship

Various question versions share same outcomes. Hibernate does not like

having same collection bound to two entity instances, though, even if

the collection is read-only. In this case we get rid of the collection

and just fetch it using DAO. It probably is a better solution anyway.

Merge remote-tracking branch 'origin/LDEV-4745' into LDEV-4745

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

    • -526
    • +566
    /lams_central/web/qb/collection.jsp
    • -461
    • +503
    /lams_central/web/qb/stats.jsp
LDEV-4836 Fix autopatch script

Merge branch 'LDEV-4836' into LDEV-4745

LDEV-4836 Properly assign collections

    • -2
    • +3
    /lams_central/web/qb/authoring/addessay.jsp
Merge branch 'LDEV-4745' into LDEV-4836

    • -35
    • +89
    /lams_central/web/qb/collection.jsp
LDEV-4836 Change authoring to accommodate importing questions from QB

    • -0
    • +6
    /lams_central/web/common/taglibs.jsp
    • -0
    • +7
    /lams_central/web/css/bootstrap-toggle.css
    • -0
    • +28
    /lams_central/web/css/bootstrap-toggle.scss
    • -0
    • +1
    /lams_central/web/css/qb-question.css
    • -0
    • +394
    /lams_central/web/css/qb-question.scss
    • -0
    • +135
    /lams_central/web/includes/javascript/qb-option.js
    • -0
    • +80
    /lams_central/web/includes/javascript/qb-question.js
    • -0
    • +29
    /lams_central/web/qb/authoring/addQuestionFooter.jsp
    • -0
    • +28
    /lams_central/web/qb/authoring/addQuestionHeader.jsp
    • -0
    • +231
    /lams_central/web/qb/authoring/addessay.jsp
  1. … 62 more files in changeset.
LDEV-4834 Check if user can manage a QB question

If an user does not have access to a question, i.e. it is not in any

collection he/she sees, then prevent him/her from editing the question's

collections and learning outcomes.

LDEV-4828, LDEV-4834 Move management sections to bottom of stats page

LDEV-4834 Show Learning Outcomes in single QB collection view

    • -526
    • +566
    /lams_central/web/qb/collection.jsp
    • -179
    • +181
    /lams_central/web/qb/collectionList.jsp
LDEV-4834 Initial implementation of Learning Outcomes in Question Bank

    • -10
    • +19
    /lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag
    • -10
    • +19
    /lams_central/web/WEB-INF/tags/OutcomeAuthor.tag
    • -461
    • +463
    /lams_central/web/qb/stats.jsp
  1. … 36 more files in changeset.
LDEV-4829 Supports multiple response app ex, improved font on TRA chart

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

    • -12
    • +16
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
  1. … 40 more files in changeset.
LDEV-4828 Make service methods' names more simple

"Qb" part everywhere does not introduce anything helpful

LDEV-4828 Add subgrid with previous versions in QB collection view

    • -6
    • +55
    /lams_central/web/qb/collection.jsp
LDEV-4828 Rewrite QB collections to use question ID instead of uid

Merge remote-tracking branch 'origin/master' into develop

LDEV-3839 Check on back end if a lesson can be restarted by a learner

Merge branch 'master' into develop

    • -5
    • +15
    /lams_central/web/css/_authoring_base.scss
LDEV-4829 Cosmetic button changes, Assessment questions not numbered

    • -5
    • +15
    /lams_central/web/css/_authoring_base.scss
LDEV-4828 Prevent public collection's name from being changed

    • -28
    • +33
    /lams_central/web/qb/collection.jsp
LDEV-4745 Remove redundant 'local' field

LDEV-4829 Marks for iRA, tRa and AE go to Gradebook

LDEV-4829 Deletion of unwanted RAT and Application Exercises supported.