lams

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 33
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 4,779,243
Net change in LoC this week: 0

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
Monday 23 Nov 2015
7:49 pm

Marcin Cieslak

LDEV-3614: Improve processing of Gate activities.

Alter lams_activity_learners table so it reflects its real purpose: storing learners who are allowed to pass a gate.

Find out who is waiting in front of a gate using learner progress (activity attempt).

For sync gate take into account all possible lesson learners (lesson class) rather than only ones who started a lesson.

Use an entity in JSP generation rather than a DTO which is just a wrapper for the entity.

Code clean up.

Options
    • binary
    /lams_build/lib/lams/lams-learning.jar
    • binary
    /lams_build/lib/lams/lams.jar
    • -2
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -13
    • +3
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -12
    • +0
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml
    • -41
    • +0
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
    • binary
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040049.sql
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -24
    • +28
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ConditionGateActivity.java
    • -95
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java
    • -200
    • +199
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java
    • -7
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java
    • -13
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java
    • -11
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -5
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java
  16. … 29 more files in changeset.
7:45 pm

Marcin Cieslak

LDEV-3614: Improve processing of Gate activities.

Alter lams_activity_learners table so it reflects its real purpose: storing learners who are allowed to pass a gate.

Find out who is waiting in front of a gate using learner progress (activity attempt).

For sync gate take into account all possible lesson learners (lesson class) rather than only ones who started a lesson.

Use an entity in JSP generation rather than a DTO which is just a wrapper for the entity.

Code clean up.

Options
    • -3
    • +3
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
7:35 pm

fionam

file patch20151123.sql was added on branch lams2_head_wildfly on 2015-11-23 12:01:26 +0000

Options
    • -0
    • +0
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/patch20151123.sql
7:35 pm

fionam

LDEV-3612: Marks should accept decimal

Options
    • -1
    • +3
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java
    • -0
    • +14
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dbupdates/patch20151123.sql
    • -5
    • +6
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetMark.java
    • -4
    • +4
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java
    • -42
    • +36
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java
    • -0
    • +1
    /lams_tool_spreadsheet/web/pages/export/exportportfolio.jsp
    • -1
    • +1
    /lams_tool_spreadsheet/web/pages/export/summarylist.jsp
    • -2
    • +2
    /lams_tool_spreadsheet/web/pages/learning/learning.jsp
    • -1
    • +3
    /lams_tool_spreadsheet/web/pages/monitoring/parts/viewallmarks.jsp
7:34 pm

Marcin Cieslak

file patch2040049.sql was added on branch lams2_head_wildfly on 2015-11-23 11:49:54 +0000

Options
    • binary
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040049.sql
7:34 pm

Marcin Cieslak

LDEV-3614: Improve processing of Gate activities.

Alter lams_activity_learners table so it reflects its real purpose: storing learners who are allowed to pass a gate.

Find out who is waiting in front of a gate using learner progress (activity attempt).

For sync gate take into account all possible lesson learners (lesson class) rather than only ones who started a lesson.

Use an entity in JSP generation rather than a DTO which is just a wrapper for the entity.

Code clean up.

Options
    • binary
    /lams_build/lib/lams/lams-learning.jar
    • binary
    /lams_build/lib/lams/lams.jar
    • -2
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -13
    • +3
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -12
    • +0
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml
    • -41
    • +0
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
    • binary
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040049.sql
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -24
    • +28
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ConditionGateActivity.java
    • -95
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java
    • -200
    • +199
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java
    • -7
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java
    • -13
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java
    • -11
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -5
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java
  16. … 28 more files in changeset.
8:29 am

fionam

LDEV-3590 Renaming sessionMap for consistency to make it easier to debug session issues with Wildfly 8.2

Options
    • -4
    • +4
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java
8:29 am

fionam

LDEV-3590 Removing unneeded code which caused problems with Wildfly 8.2

Options
    • -1
    • +0
    /lams_tool_spreadsheet/web/pages/learning/learning.jsp
8:27 am

fionam

LDEV-3590 Adding paging, sorting, search to Spreadsheet monitoring.

Options
    • -6
    • +5
    /lams_tool_spreadsheet/conf/xdoclet/struts-actions.xml
    • -1
    • +7
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java
    • -1
    • +7
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/SpreadsheetUserDAO.java
    • -1
    • +95
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetUserDAOHibernate.java
    • -1
    • +14
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/ISpreadsheetService.java
    • -22
    • +16
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java
    • -64
    • +74
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java
    • -0
    • +8
    /lams_tool_spreadsheet/web/pages/monitoring/summary.jsp
    • -50
    • +0
    /lams_tool_spreadsheet/web/pages/monitoring/parts/notebook.jsp
    • -133
    • +157
    /lams_tool_spreadsheet/web/pages/monitoring/parts/summarylist.jsp
    • -0
    • +24
    /lams_tool_spreadsheet/web/pages/monitoring/parts/updatemarkaftersave.jsp
Saturday 21 Nov 2015
8:23 pm

fionam

LDEV-3590: Adding code to allow optimised access to the Notebook entries from a Tool that uses paging in monitoring.

Options
    • -0
    • +50
    /lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/notebook/service/ICoreNotebookService.java
8:16 pm

fionam

LDEV-3590 Optimising the calls to get the Notebook entries, so they are returned by the same SQL that gets the Spreadsheet details.

Options
    • -2
    • +4
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/SpreadsheetUserDAO.java
    • -29
    • +50
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetUserDAOHibernate.java
    • -2
    • +2
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/ISpreadsheetService.java
    • -3
    • +3
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java
    • -11
    • +8
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java
7:57 pm

fionam

LDEV-3590 Optimising the calls to get the Notebook entries, so they are returned by the same SQL that gets the Spreadsheet details.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +50
    /lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/notebook/service/ICoreNotebookService.java
8:22 am

Andrey Balan

LDEV-3613 calculate Gradebook lesson mark correctly after changing gradebook activity mark

Options
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
    • -14
    • +11
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
8:21 am

Andrey Balan

LDEV-3613 Introducing new flush() method that will allow to flush the session. It's required in cases when we need to write changes to the database before current transaction is committed

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -1
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/dao/IBaseDAO.java
    • -0
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/LAMSBaseDAO.java
Friday 20 Nov 2015
5:11 am

Andrey Balan

LDEV-3398 fixed the following issue "Producing incorrect tool output on submitting answers second time (after the first one failed)"

Options
    • -10
    • +10
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
Thursday 19 Nov 2015
11:09 pm

Marcin Cieslak

LDEV-3275: Use tokens instead of hardcoded DB details for slimmed configuration.

Options
    • -4
    • +4
    /lams_build/conf/slim/standalone.xml
9:45 am

fionam

LDEV-3609: Ratings on an iPad now work on touch, rather than click, so you don't need to click twice.

Options
    • -1
    • +53
    /lams_central/web/includes/javascript/jquery.jRating.js
9:18 am

fionam

LDEV-3609: Ratings on an iPad now work on touch, rather than click, so you don't need to click twice.

Options
    • -1
    • +53
    /lams_central/web/includes/javascript/jquery.jRating.js
8:35 am

fionam

LDEV-3590 Adding paging, sorting, search to Spreadsheet monitoring.

Options
    • -1
    • +1
    /lams_tool_spreadsheet/conf/xdoclet/struts-actions.xml
7:10 am

fionam

file updatemarkaftersave.jsp was added on branch lams2_head_wildfly on 2015-11-23 00:28:11 +0000

Options
    • -0
    • +0
    /lams_tool_spreadsheet/web/pages/monitoring/parts/updatemarkaftersave.jsp
7:10 am

fionam

LDEV-3590 Adding paging, sorting, search to Spreadsheet monitoring.

Options
    • -0
    • +8
    /lams_tool_spreadsheet/web/pages/monitoring/summary.jsp
    • -50
    • +0
    /lams_tool_spreadsheet/web/pages/monitoring/parts/notebook.jsp
    • -133
    • +157
    /lams_tool_spreadsheet/web/pages/monitoring/parts/summarylist.jsp
    • -0
    • +24
    /lams_tool_spreadsheet/web/pages/monitoring/parts/updatemarkaftersave.jsp
Wednesday 18 Nov 2015
3:26 am

Andrey Balan

LDEV-3611 merged formatting

Options
    • -2
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentSessionComparator.java
3:25 am

Andrey Balan

LDEV-3611 PopulateMarks servlet should not set gradebook marks as markedInGradebook

Options
    • -5
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
3:18 am

Andrey Balan

LDEV-3611 PopulateMarks servlet should not set gradebook marks as markedInGradebook

Options
    • -5
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Tuesday 17 Nov 2015
6:29 pm

Ernie Ghiglione

LDEV-3590: Adding label

Options
    • -2
    • +3
    /lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_tool_spreadsheet/conf/language/lams/ApplicationResources_en_AU.properties
    • -17
    • +3
    /lams_tool_spreadsheet/conf/language/lams/ApplicationResources_es_ES.properties
12:07 pm

fionam

LDEV-3590 Adding paging, sorting, search to Spreadsheet monitoring.

Options
    • -2
    • +2
    /lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    /lams_tool_spreadsheet/conf/language/lams/ApplicationResources_en_AU.properties
    • -5
    • +4
    /lams_tool_spreadsheet/conf/xdoclet/struts-actions.xml
    • -1
    • +7
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java
    • -1
    • +5
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/SpreadsheetUserDAO.java
    • -1
    • +73
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetUserDAOHibernate.java
    • -1
    • +16
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/ISpreadsheetService.java
    • -22
    • +16
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java
    • -64
    • +77
    /lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java
Saturday 14 Nov 2015
12:08 am

Andrey Balan

LDEV-3606 In monitor display the author of each feedback comment

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +8
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/rating/RatingComment.hbm.xml
    • -0
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040048.sql
    • -3
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCommentDAO.java
    • -2
    • +25
    /lams_common/src/java/org/lamsfoundation/lams/rating/dto/RatingCommentDTO.java
    • -1
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/rating/model/RatingComment.java
    • -0
    • +4
    /lams_tool_images/web/pages/monitoring/monitoring.jsp
    • -0
    • +5
    /lams_tool_images/web/pages/monitoring/summary.jsp
    • -4
    • +17
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
    • -1
    • +6
    /lams_tool_laqa/web/includes/qalearning.css
    • -1
    • +1
    /lams_tool_laqa/web/learning/LearnerRep.jsp
    • -1
    • +1
    /lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
    • -1
    • +1
    /lams_tool_laqa/web/learning/mobile/LearnerRep.jsp
    • -1
    • +1
    /lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp
    • -1
    • +10
    /lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp
Friday 13 Nov 2015
10:25 pm

Andrey Balan

LDEV-3580 Modify Assessment monitor UI to support paging, sort and search

Options
    • -0
    • +8
    /lams_tool_assessment/conf/xdoclet/struts-actions.xml
    • -1
    • +10
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -58
    • +57
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java
    • -7
    • +9
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -15
    • +162
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -0
    • +74
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/AssessmentUserDTO.java
    • -0
    • +94
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/SessionDTO.java
    • -88
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/Summary.java
    • -2
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java
    • -3
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
    • -82
    • +66
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -6
    • +39
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -0
    • +343
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
    • -147
    • +231
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -5
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/servlet/ExportServlet.java
  16. … 6 more files in changeset.
10:21 pm

Andrey Balan

LDEV-3580 jqgrid pager to display 10, 20, 30, 40, 50, 100

Options
    • -1
    • +1
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
9:35 pm

Andrey Balan

LDEV-3580 Modify Assessment monitor UI to support paging, sort and search

Options
    • -0
    • +12
    /lams_tool_assessment/web/pages/monitoring/monitoring.jsp
    • -30
    • +18
    /lams_tool_assessment/web/pages/monitoring/summary.jsp