lams-github

Clone Tools

Stats

Commits this week: 0
Total Committers: 50
Last Commit:
Commits this week: 0

Lines of code count not available

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
Wednesday 08 Nov 2017
2:03 am

Andrey Balan

Merge branch 'LDEV-4456'

Options
2:02 am

Andrey Balan

LDEV-4456 Warn users when there is no questions in question list

Options
    • -0
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -17
    • +26
    /lams_tool_assessment/web/pages/authoring/authoring.jsp
    • -36
    • +36
    /lams_tool_assessment/web/pages/authoring/basic.jsp
1:24 am

Andrey Balan

LDEV-4462 Calculate max mark properly

Options
    • -0
    • +8
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -11
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieOutputFactory.java
    • -0
    • +15
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -4
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
12:02 am

Marcin Cieslak

LDEV-4453 Rewrite code to follow method single responsibility principle

Options
    • -20
    • +33
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -3
    • +5
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java
    • -8
    • +8
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
Tuesday 07 Nov 2017
11:26 pm

Marcin Cieslak

LDEV-4453 Show raw activity marks, consistent with Gradebook

Options
    • -2
    • +2
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
6:50 pm

Marcin Cieslak

Merge branch 'LDEV-4453'

Options
    • -3
    • +4
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
6:48 pm

Marcin Cieslak

LDEV-4453 Format marks is they are weighted

Options
    • -2
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -1
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java
    • -4
    • +5
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
6:21 pm

Marcin Cieslak

LDEV-4453 Add "Your mark" in lesson complete gradebook

Options
    • -2
    • +4
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -1
    • +5
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java
    • -2
    • +5
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
    • -0
    • +1
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -2
    • +4
    /lams_learning/web/lessonComplete.jsp
4:57 pm

Marcin Cieslak

LDEV-4453 Fix method calls after signature changes

Options
    • binary
    /lams_build/lib/lams/lams-monitoring.jar
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java
    • -2
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
12:29 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4445 Question page in monitor has portraits

Options
    • -0
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
10:45 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4445 Question page in monitor has portraits

Options
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -4
    • +13
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -2
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -4
    • +21
    /lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
8:26 am

Andrey Balan

Merge branch 'LDEV-4458'

Options
8:23 am

Andrey Balan

LDEV-4458 Add option to overwrite default scoring system

Options
    • -0
    • +8
    /lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml
    • -0
    • +4
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -0
    • +15
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20171106.sql
    • -0
    • +17
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -0
    • +9
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -4
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieOutputFactory.java
    • -7
    • +21
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -4
    • +12
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
    • -1
    • +40
    /lams_tool_scratchie/web/pages/authoring/advance.jsp
Monday 06 Nov 2017
9:45 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4449 Course gradebook export contains weighted values

Options
7:05 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4449 Course gradebook exports include weighting

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -1
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/util/ExcelCell.java
    • -3
    • +43
    /lams_common/src/java/org/lamsfoundation/lams/util/ExcelUtil.java
    • -1
    • +1
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -54
    • +62
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -1
    • +21
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
Saturday 04 Nov 2017
8:11 pm

Marcin Cieslak

Merge branch 'LDEV-4453'

Options
8:10 pm

Marcin Cieslak

LDEV-4453 Add gradebook on lesson complete front end

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -62
    • +107
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -2
    • +5
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java
    • -9
    • +48
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
    • -0
    • +7
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -6
    • +6
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LessonCompleteActivityAction.java
    • -0
    • +82
    /lams_learning/web/lessonComplete.jsp
6:25 am

Andrey Balan

Merge branch 'LDEV-4455'

Options
6:24 am

Andrey Balan

LDEV-4455 Move burning question to the learning.jsp

We need a change in the flow for Burning questions in learner, so the

burning question text for each question is entered as the students

answer select the answers.

So each question would have a "burning question?" label that would

expand/collapse on request for students to enter the text as they answer

each question.

Options
    • -3
    • +3
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -10
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -133
    • +45
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
    • -11
    • +2
    /lams_tool_scratchie/web/WEB-INF/struts-config.xml
    • -2
    • +1
    /lams_tool_scratchie/web/includes/css/scratchie-learning.scss
    • -31
    • +74
    /lams_tool_scratchie/web/pages/learning/learning.jsp
    • -4
    • +0
    /lams_tool_scratchie/web/pages/learning/notebook.jsp
    • -9
    • +33
    /lams_tool_scratchie/web/pages/learning/questionlist.jsp
    • -6
    • +6
    /lams_tool_scratchie/web/pages/learning/results.jsp
    • -6
    • +4
    /lams_tool_scratchie/web/pages/learning/submissionDeadline.jsp
Friday 03 Nov 2017
9:41 pm

Marcin Cieslak

LDEV-4411 Make collections and properties lazy

If it is possible, all collections and properties should be lazy. It has

big impact on DB load.

If a collection can not be made lazy because it gets iterated over in a

non-transactional method (Actions), is should probably be moved to a

transactional Service method.

Options
    • -1
    • +0
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/events/Event.hbm.xml
    • -7
    • +8
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml
    • -1
    • +0
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolContent.hbm.xml
    • -2
    • +0
    /lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml
    • -1
    • +0
    /lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml
    • -22
    • +0
    /lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.hbm.xml
    • -31
    • +0
    /lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.java
9:03 pm

Marcin Cieslak

LDEV-4411 Remove obsolete collection from Tool class

Options
    • -14
    • +0
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml
    • -27
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java
    • -17
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java
8:06 pm

Marcin Cieslak

LDEV-4411 Add maps 2nd level cache

Options
    • -0
    • +8
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml
    • -0
    • +8
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgressArchive.hbm.xml
5:32 am

Andrey Balan

Merge branch 'LDEV-4451'

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -2
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -0
    • +3
    /lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +16
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -0
    • +22
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -11
    • +8
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -77
    • +65
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
5:30 am

Andrey Balan

LDEV-4451 Ability to save confidence levels in MCQ

And also return them to Scratchie on request.

Options
    • -1
    • +8
    /lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McContent.hbm.xml
    • -0
    • +9
    /lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McQueContent.hbm.xml
    • -0
    • +8
    /lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McUsrAttempt.hbm.xml
    • -0
    • +3
    /lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
    • -9
    • +0
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java
    • -0
    • +2
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java
    • -0
    • +16
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -5
    • +0
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java
    • -0
    • +30
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
    • -0
    • +22
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -0
    • +23
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20171031.sql
    • -0
    • +10
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/AnswerDTO.java
    • -7
    • +23
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java
    • -3
    • +19
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McQueContent.java
    • -1
    • +12
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McUsrAttempt.java
  16. … 17 more files in changeset.
5:29 am

Andrey Balan

LDEV-4451 Improve question comparison tactics

As long as MCQ doesn't have question titles, exclude title when

calculating question hash.

Another peculiarity of MCQ is that it stores questions and answers with

trailing '/r/n' instead of usual '/n' (as in Assessment and Scratchie),

so remove all '/r' and '/n' before comparing questions and answers.

Options
    • -10
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/confidencelevel/ConfidenceLevelDTO.java
    • -2
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171016.sql
    • -2
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -22
    • +11
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -13
    • +7
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
5:24 am

Andrey Balan

LDEV-4451 Make slider neater (narrower and with lesser text size)

Options
    • -1
    • +10
    /lams_central/web/css/bootstrap-slider.css
    • -9
    • +0
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -9
    • +0
    /lams_tool_assessment/web/pages/learning/results.jsp
Thursday 02 Nov 2017
11:08 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-3164: removing MaxPermSize

Removing MaxPermSize as it's deprecated in Java 8. Increasing the memory allocation

Options
    • -2
    • +1
    /TestHarness4LAMS2/build.xml
10:41 pm

Marcin Cieslak

LDEV-4411 Add collections 2nd level cache

Options
    • -24
    • +8
    /lams_build/conf/slim/standalone.xml
    • -0
    • +4
    /lams_build/conf/standalone.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/events/Event.hbm.xml
    • -0
    • +4
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml
    • -0
    • +16
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -0
    • +6
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Group.hbm.xml
    • -0
    • +4
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml
    • -2
    • +14
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningLibrary.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningLibraryGroup.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Transition.hbm.xml
    • -0
    • +8
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.hbm.xml
    • -0
    • +4
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml
    • -0
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/ToolContent.hbm.xml
  16. … 83 more files in changeset.
4:28 pm

Marcin Cieslak

LDEV-4411 Remove collections caching in the few classes it is present

If we decide to use collections caching after all, we will do it

everywhere, not just in Content Repository.

Options
    • -4
    • +0
    /lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNode.hbm.xml
    • -4
    • +0
    /lams_contentrepository/conf/hibernate/mappings/org/lamsfoundation/lams/contentrepository/CrNodeVersion.hbm.xml
9:11 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4451: modifying labels

Options
    • -2
    • +2
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties