Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4609 Fix archived attempt ordering

LDEV-4407 move gradebook classes to lams_gradebook

  1. … 7 more files in changeset.
Merge branch 'master' into LDEV-4407

Conflicts:

lams_build/lib/lams/lams-gradebook.jar

lams_build/lib/lams/lams-learning.jar

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java

lams_central/web/css/pedagogicalPlanner.css

lams_central/web/includes/javascript/openUrls.js

lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java

lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserLessonArchive.java

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

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

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml

lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java

lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java

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

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

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

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/SubmitFilesPedagogicalPlannerAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml

  1. … 102 more files in changeset.
LDEV-4609 Sort attempts in reverse order

It was implemented from the start, but our Java -> jqGrid XML conversion

method sorts the rows in ascending order by default.

  1. … 2 more files in changeset.
LDEV-4440 Show archived activity attempts in gradebook

  1. … 8 more files in changeset.
LDEV-4481 Add full implementation of min/max time taken.

  1. … 4 more files in changeset.
LDEV-4415 Gradebook calculations and UI support weighting

  1. … 15 more files in changeset.
LDEV-4334: Moving Lesson Gradebook into Monitoring window so that it is always available and adding a Marks chart. This requires a new lookup to get the raw marks for the chart and the enableGradebookForMonitors field has been deprecated as it is now always on.

  1. … 2 more files in changeset.
LDEV-3884 Show median time taken instead of the average one in gradebook

  1. … 13 more files in changeset.
LDEV-3884 Show median time taken instead of the average one in gradebook

  1. … 13 more files in changeset.
LDEV-3884 Show median mark instead of the average one in gradebook

  1. … 10 more files in changeset.
LDEV-3776: Remove $Id CVS keyword.

  1. … 1073 more files in changeset.
LDEV-3776: Remove $Id CVS keyword.

  1. … 781 more files in changeset.
LDEV-3776: Clean up and format all LAMS Java code.

    • -202
    • +189
    ./hibernate/GradebookDAO.java
  1. … 2119 more files in changeset.
LDEV-3776: Clean up and format all LAMS Java code.

    • -213
    • +201
    ./hibernate/GradebookDAO.java
  1. … 1859 more files in changeset.
LDEV-3613 calculate Gradebook lesson mark correctly after changing gradebook activity mark

  1. … 1 more file in changeset.
LDEV-3557 Improve performance of gradebook xls export

  1. … 10 more files in changeset.
LDEV-3554 * return only distinct users * recommitting lams.jar

  1. … 1 more file in changeset.
LDEV-3554 return only distinct users

LDEV-3557 Improve performance of gradebook xls export

  1. … 10 more files in changeset.
LDEV-3554 Improve performance of gradebook pages

    • -30
    • +371
    ./hibernate/GradebookDAO.java
  1. … 16 more files in changeset.
LDEV-3554 Had to switch HQL queries to SQL ones as Hibernate doesn't work well with left joins and when clauses

    • -88
    • +101
    ./hibernate/GradebookDAO.java
LDEV-3554 Improve performance of gradebook pages

LDEV-3554 Improve performance of gradebook pages

    • -29
    • +358
    ./hibernate/GradebookDAO.java
  1. … 16 more files in changeset.
LDEV-3424 Add new feature to integrations to be able to sync all marks in the lesson

  1. … 9 more files in changeset.
LDEV-3424 Add new feature to integrations to be able to sync all marks in the lesson

  1. … 13 more files in changeset.
LDEV-3316: Get rid of HibernateTemplate and HibernateDaoSupport in set of LAMS DAO types from lams_common.

  1. … 14 more files in changeset.
LDEV-3293: Use the new Spring's support for Hibernate 4 instead of Hibernate 3. Switch from using HibernateDaoSupport.getSession() to its getSessionFactory().getSession(). The latter is sure to close the session automatically while a session returned by the first method should be closed manually. Theoritecally we do it in OpenSessionInViewFilter, but it may not be always the case, leading to open Hibernate session being left behind.

  1. … 87 more files in changeset.
LDEV-3094: Fix aggregating query so it produces expected results.

LDEV-2828: fix hibernate queries that were incorrect and were causing LAMS to crash