Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5338 Properly set chosen groups even for other grouping types

  1. … 6 more files in changeset.
LDEV-5401 Fix timer display on monitoring Dashboard

Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java

  1. … 5 more files in changeset.
LDEV-5383 Allow adding user to all lessons in a course

  1. … 7 more files in changeset.
LDEV-5350 Do not remove groups used for branching on spreadsheet upload

  1. … 1 more file in changeset.
LDEV-3600 Display learner even if current activity is marked as complete

    • -3
    • +4
    ./dao/hibernate/LearnerProgressDAO.java
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

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

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java

lams_tool_assessment/web/pages/monitoring/summary.jsp

  1. … 11 more files in changeset.
LDEV-5350 Add Course Grouping selection to Add Lesson dialog

  1. … 9 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

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

lams_central/web/includes/javascript/orgGroup.js

lams_central/web/orgGroup.jsp

lams_central/web/orgGrouping.jsp

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java

  1. … 6 more files in changeset.
LDEV-4457 Remove empty groups after spreadsheet import

  1. … 1 more file in changeset.
LDEV-5083 Fix absolute time limit check by using UTC time

LDEV-5083 Update time limits on dashboard using Flux

  1. … 6 more files in changeset.
LDEV-5083 Add frontend for displaying running time limits in lesson

  1. … 4 more files in changeset.
LDEV-5083 Add backend for fetching running time limits in lesson

    • -0
    • +27
    ./dto/ActivityTimeLimitDTO.java
  1. … 2 more files in changeset.
LDEV-5083 Update learner progress timeline using Flux

    • -4
    • +29
    ./util/LearnerActivityCompleteFluxItem.java
  1. … 9 more files in changeset.
LDEV-5083 Update LD canvas and chart on learner joining a lesson

    • -0
    • +28
    ./util/LearnerActivityCompleteFluxItem.java
    • -0
    • +22
    ./util/LearnerLessonJoinFluxItem.java
    • -28
    • +0
    ./util/LearnerProgressFluxItem.java
  1. … 4 more files in changeset.
LDEV-5083 Add Sink binding mechanism

    • -0
    • +28
    ./util/LearnerProgressFluxItem.java
  1. … 4 more files in changeset.
LDEV-5083 Add activity mark and time taken to learner timeline

    • -0
    • +41
    ./util/LessonUtil.java
  1. … 18 more files in changeset.
LDEV-4538 At gate display only learners who have not passed it

Till now if a gate was opened, learners passed it and it was closed

again, it would show all those learners as "knocking at gate". It is

because they "attempted or completed" the activity and gate is closed.

Now TBL monitoring shows only learners who attempted the gate activity

but not completed it.

    • -5
    • +9
    ./dao/hibernate/LearnerProgressDAO.java
  1. … 3 more files in changeset.
LDEV-4411 Allow Hibernate to choose fetch type by itself

LDEV-4411 Make relation from Lesson to LessonClass unidirectional

Hibernate can not lazy load properties connected with OneToOne

relationship.

  1. … 1 more file in changeset.
LDEV-4411 Stop using collection cache for now

Cache annotations were commented out so we can come back to them easily

in the future.

Collection cache is not detecting changes made to entities. When a new

entity is added, collection cache does not see the change.

Properly tweaking concurrency strategy does not seem possible at the

moment, so we just turn it off.

  1. … 29 more files in changeset.
LDEV-5248, LDEV-4411 Mark some collections as cacheable

Similar to query cache, the collection cache makes sense if the table

which collection elements map to do not change often. Each modification

to table content invalidates the given collection cache.

  1. … 31 more files in changeset.
LDEV-5248, LDEV-4411 Mark some queries as cacheable

Query cache makes sense if tables which the query reference does not

change often. Each modification to table content invalidates the given

query's cache. Also each set of query parameters is a different cache

entry, so if there are various parameter values the cache overhead can

generate more load than benefit.

    • -4
    • +4
    ./dao/hibernate/LearnerProgressDAO.java
  1. … 94 more files in changeset.
LDEV-5248, LDEV-4411 Add 2nd level cache to selected elements

Displaying Assessment results is too DB-intense for multiple learners.

We can enable a short-lived query cache for some entities which have

most impact on the results page. This way multiple requests can reuse

same objects from cache and there is little danger of inconsistency.

  1. … 19 more files in changeset.
LDEV-5189 Sort class members by last name when UI requires it

  1. … 2 more files in changeset.
LDEV-5170 Add Instructions tab in lesson monitoring

  1. … 6 more files in changeset.
LDEV-5166 Add Learning Design description to monitoring

Lesson description is called "intro" and learning design description is

just "description"

  1. … 5 more files in changeset.
LDEV-5041 Add lesson service utility method

  1. … 4 more files in changeset.
LDEV-4914 Fall back to default settings values when creating a lesson