• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-79: Added a new DISABLED state for a lesson - when disabled the lesson shouldn't be returned to users. Changed getLessonsForUser() to not return DISABLED lessons, but left getAllLessons() getting all (including disabled) lessons. But added a comment to indicate that getAllLessons includes disabled lessons.

  1. … 1 more file in changeset.
Fixed javadoc comments. Previous CVS comment should have referred to getLessonsForUser() rather than getActiveLessonsForLearner()

    • -1
    • +9
    ./lams/lesson/dao/hibernate/LessonDAO.java
LDEV-79: Added a new DISABLED state for a lesson - when disabled the lesson shouldn't be returned to users. Changed getActiveLessonsForLearner() to not return DISABLED lessons, but left getAllLessons() getting all (including disabled) lessons. But added a comment to indicate that getAllLessons includes disabled lessons.

    • -3
    • +5
    ./lams/lesson/dao/hibernate/LessonDAO.java
Add DISABLED_STATE status

new utility to grab the list of stylesheets used by the user.

used by css tag and export portfolio

    • -0
    • +64
    ./lams/util/CSSThemeUtil.java
the argument for creating the UserDTO object refers to a CSSThemeBriefDTO object instead of the actual CSSThemeVisualElement object

    • -7
    • +32
    ./lams/usermanagement/dto/UserDTO.java
modified the call to getUserDTO

the argument for creating the UserDTO object refers to a CSSThemeBriefDTO object instead of the actual CSSThemeVisualElement object

added a new constructor containing id, name and description

    • -0
    • +7
    ./lams/themes/dto/CSSThemeBriefDTO.java
added this.getHibernateTemplate().flush(); to the save, update, delete calls.

changed theme so it isnt lazily loaded. problem occurred when trying the get the users theme. the CSSThemeVisualElement did not seem tob e loading

    • -3
    • +3
    ./lams/themes/CSSThemeVisualElement.java
  1. … 2 more files in changeset.
LDEV-61 Fixing tool sessions - all users were getting separate tool sessions. Made changes to suit changes in ToolActivity.createToolSession

    • -17
    • +37
    ./lams/tool/service/LamsCoreToolService.java
LDEV-61 Fixing tool sessions - all users were getting separate tool sessions. Modified ToolSessionDAO to look up either a grouped tool session or an individual tool session using the learner rather than the group (in the group cases). The "get group" code only worked for explicit groups defined in the activity object, it didn't work for a "class wide" group, so the call to the get group in the tool session lookup was replaced by an extented HQL query which look at the actual group data in the database (looking via the session table, rather than via activity).

    • -44
    • +29
    ./lams/tool/dao/hibernate/ToolSessionDAO.java
  1. … 1 more file in changeset.
LDEV-61 Fixing tool sessions - all users were getting separate tool sessions. Added proper support for the three grouping support types GROUPING_SUPPORT_NONE, GROUPING_SUPPORT_OPTIONAL, GROUPING_SUPPORT_REQUIRED.

    • -4
    • +20
    ./lams/learningdesign/Activity.java
    • -15
    • +75
    ./lams/learningdesign/ToolActivity.java
LDEV-61 Fixing tool sessions - all users were getting separate tool sessions.

    • -0
    • +1
    ./lams/tool/toolApplicationContext.xml
  1. … 3 more files in changeset.
LDEV-61 Fixing tool sessions - all users were getting separate tool sessions.

Changed the unique key column to be "uq_blah_blah" rather than "uqblahblah" as the latter has the potential for overlaps. e.g. uq_123 could be uq_<12><3> or uq_<1><23>; also changed group -> sessionGroup so that HQL wouldn't complain about group being a reserved word.

    • -8
    • +10
    ./lams/tool/GroupedToolSession.java
LDEV-61 Fixing tool sessions - all users were getting separate tool sessions.

Changed the unique key column to be "uq_blah_blah" rather than "uqblahblah" as the latter has the potential for overlaps. e.g. uq_123 could be uq_<12><3> or uq_<1><23>

    • -0
    • +6
    ./lams/tool/NonGroupedToolSession.java
Add new method to write URL to OutputStream.

    • -16
    • +77
    ./lams/util/HttpUrlConnectionUtil.java
LDEV-67: Run sequences were not going in the correct workspace folder. Added a default runtime sequence folder to the workspace object.

    • -4
    • +20
    ./lams/usermanagement/Workspace.java
  1. … 3 more files in changeset.
update XML read file.

Added method to get the default runtime sequences folder. No implementation yet.

Moved the hibernate properties to the applicationContext and localApplicationContext files, and removed the cache entries from the local version. This way, it won't try to load the jboss cache when doing junit tests. This was causing most of our junit tests to fail.

  1. … 1 more file in changeset.
changed populateActivities method in order to accommodate for change in the getAuthoringActivityDTO method.

added new method getAuthoringActivityDTOSet , which adds the DTO for the parents and DTO for all child activities

    • -0
    • +16
    ./lams/learningdesign/ComplexActivity.java
changed the method getAuthoringActivityDTO to private

and added new method getAuthoringActivityDTOSet

    • -1
    • +10
    ./lams/learningdesign/Activity.java
Made toString() more informative.

The getActivityByUUID now gets the real activity, rather than the hibernate CGLIB version, to avoid classcast errors when updating an activity in authoring.

    • -0
    • +6
    ./lams/learningdesign/dao/IActivityDAO.java
  1. … 1 more file in changeset.
Added mc to our temporary list of tools on the classpath.

  1. … 1 more file in changeset.
Added three new fields to complete the activity on the client - was missing some of the tool details.

  1. … 1 more file in changeset.
just added some comments

instead of throwing exceptions, it will just create a main page sayin gthat the tool activity does not support portfolio export