lams-github

lams_tool_imscc

Clone Tools

Stats

Commits this week: 0
Total Committers: 14
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
Tuesday 21 Aug 2018
5:35 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Gradebook toogleMarks

Options
    • -5
    • +4
    ./web/WEB-INF/tags/Page.tag
  2. … 17 more files in changeset.
Sunday 19 Aug 2018
1:44 am

Andrey Balan

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

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml
    • -7
    • +7
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java
  4. … 101 more files in changeset.
Thursday 16 Aug 2018
10:49 pm

Marcin Cieslak

LDEV-4644 Add outcomes in authoring in all tools

Options
    • -1
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +155
    ./web/WEB-INF/tags/OutcomeAuthor.tag
    • -0
    • +4
    ./web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +2
    ./web/pages/authoring/advance.jsp
  5. … 115 more files in changeset.
Friday 10 Aug 2018
3:34 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Common Cartridge noStruts library

Options
    • -1
    • +1
    ./.classpath
    • -2
    • +0
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/AuthoringController.java
    • -276
    • +0
    ./web/WEB-INF/struts-config.xml
    • -186
    • +0
    ./web/WEB-INF/tlds/lams/lams.tld
    • -212
    • +0
    ./web/WEB-INF/tlds/struts/struts-bean-el.tld
    • -382
    • +0
    ./web/WEB-INF/tlds/struts/struts-bean.tld
    • -3302
    • +0
    ./web/WEB-INF/tlds/struts/struts-html-el.tld
    • -3302
    • +0
    ./web/WEB-INF/tlds/struts/struts-html.tld
    • -382
    • +0
    ./web/WEB-INF/tlds/struts/struts-logic-el.tld
    • -652
    • +0
    ./web/WEB-INF/tlds/struts/struts-logic.tld
    • -3171
    • +0
    ./web/WEB-INF/tlds/struts/struts-nested.tld
    • -343
    • +0
    ./web/WEB-INF/tlds/struts/struts-tiles-el.tld
    • -344
    • +0
    ./web/WEB-INF/tlds/struts/struts-tiles.tld
    • -42
    • +0
    ./web/WEB-INF/validation.xml
    • -36
    • +0
    ./web/WEB-INF/web.xml
    • -1
    • +1
    ./web/pages/authoring/parts/addbasiclti.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/itemattachment.jsp
2:34 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Common Cartridge authoring

Options
    • -1
    • +1
    ./web/pages/authoring/parts/addcommoncartridge.jsp
Thursday 09 Aug 2018
10:53 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Common Cartridge

Options
    • -21
    • +22
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java
    • -149
    • +0
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AdminAction.java
    • -943
    • +0
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java
    • -46
    • +0
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/ClearSessionAction.java
    • -500
    • +0
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java
    • -218
    • +0
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/MonitoringAction.java
    • -344
    • +0
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/ViewItemAction.java
    • -0
    • +127
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/AdminController.java
    • -0
    • +917
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/AuthoringController.java
    • -0
    • +62
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/ClearSessionController.java
    • -0
    • +472
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/LearningController.java
    • -0
    • +181
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/MonitoringController.java
    • -0
    • +314
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/web/controller/ViewItemController.java
    • -17
    • +1
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/web/form/AdminForm.java
  16. … 36 more files in changeset.
Tuesday 22 May 2018
3:04 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating and fixing labels

There's quite a lot of work required with labels and it's not jsut translations but rearringing them according to language, string lenght, etc. Also we shouild be more accurate in naming users. When we are referring to students, we should call them students instead of users. Quite a few of these instances in this commit

Options
    • -5
    • +5
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 48 more files in changeset.
Monday 21 May 2018
11:10 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating labels

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 25 more files in changeset.
7:03 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: updating labels

Mainly Spanish and a little bit of Greek and Norwegian

Options
    • -5
    • +7
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 38 more files in changeset.
Wednesday 09 May 2018
1:59 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4559 Comments can be left anonymously.

Options
    • -1
    • +6
    ./web/WEB-INF/tags/Comments.tag
    • -1
    • +22
    ./web/WEB-INF/tags/CommentsAuthor.tag
  3. … 91 more files in changeset.
Thursday 03 May 2018
7:26 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4558 Rename dbupdate files as name is a month out.

Options
    • -0
    • +15
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20180425.sql
    • -15
    • +0
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20180525.sql
  3. … 38 more files in changeset.
Monday 30 Apr 2018
12:40 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4558 Expand DB Fields to support pictures pasted in CKEditor

Options
    • -0
    • +15
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20180525.sql
  2. … 28 more files in changeset.
Monday 09 Apr 2018
9:46 pm

Marcin Cieslak

LDEV-4540 Introduce hooks in command websockets

When a command is added, the JSON can contain "hookTrigger" and

"hookParams" attributes.

hookTrigger is just a string which uniquely identifies a page. If this

page set the same commandWebsocketHookTrigger, then command is consumed

and function defined on this page as commandWebsocketHook is run with

parameters taken from hookParams from JSON.

This way back end can tell exact page on front end to run any code it

defines itself.

Options
    • -0
    • +8
    ./web/WEB-INF/tags/Page.tag
  2. … 35 more files in changeset.
Thursday 22 Mar 2018
1:55 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4533 Exception details are hidden as per system config

Options
    • -8
    • +17
    ./web/error.jsp
  2. … 34 more files in changeset.
Thursday 22 Feb 2018
9:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 All Audit Log entries are now Log Event entries

Options
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.java
    • -7
    • +7
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java
    • -7
    • +10
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/MonitoringAction.java
  5. … 62 more files in changeset.
Thursday 15 Feb 2018
11:54 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4514 Greek names appear in notification window correctly.

Also added some HTML escaping to the display of the leader's name

in tool messages.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/LeaderDisplay.tag
  2. … 33 more files in changeset.
Tuesday 06 Feb 2018
12:17 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 Tool context files no longer reference audit service.

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml
  2. … 62 more files in changeset.
Friday 02 Feb 2018
5:41 am

Andrey Balan

LDEV-4407 Tools to stop using learnerService

There is no need to have a separate ILearnerService designed

for tools only. As long as they require only one method from it

completeToolSession() which we can simply move to

ILamsToolService. After which we just remove learnerService

from the tools.

Options
    • -3
    • +0
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml
    • -8
    • +1
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java
  3. … 57 more files in changeset.
Friday 26 Jan 2018
9:09 pm

Andrey Balan

LDEV-4407 Tools and core to use learning classes from lams_common

Tools and core start using shared learning classes that were

recently moved from lams_learning to lams_common.

Remove any leftover dependencies on lams_learning.

Options
    • -1
    • +0
    ./.classpath
    • -4
    • +3
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java
  3. … 77 more files in changeset.
7:24 am

Andrey Balan

LDEV-4407 Tools to use contentrepository classes from lams_common

Tools start using shared contentrepository classes that were

recently moved to lams_common from lams_contentrepository.

Remove any leftover dependencies on lams_contentrepository. Which

includes getting rid of getRepositoryLoginTicket() and some other

methods from tools services.

Options
    • -1
    • +0
    ./.classpath
    • -2
    • +0
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/CommonCartridgeConstants.java
    • -3
    • +0
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml
    • -96
    • +4
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java
    • -12
    • +5
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/web/form/CommonCartridgePedagogicalPlannerForm.java
  8. … 71 more files in changeset.
Friday 05 Jan 2018
10:27 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4421 Comments allowed for authored items in Share Resources

Options
    • -1
    • +27
    ./web/WEB-INF/tags/Comments.tag
  2. … 65 more files in changeset.
Wednesday 22 Nov 2017
8:55 pm

Andrey Balan

LDEV-4473 Add bootstrap.js when it's not available on page

Options
    • -1
    • +7
    ./web/WEB-INF/tags/Page.tag
  2. … 30 more files in changeset.
Thursday 16 Nov 2017
4:54 am

Andrey Balan

LDEV-4436 Ability to change portrait in learner

Options
    • -12
    • +49
    ./web/WEB-INF/tags/Page.tag
  2. … 33 more files in changeset.
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
    • -22
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.hbm.xml
    • -31
    • +0
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.java
  3. … 6 more files in changeset.
Thursday 02 Nov 2017
10:41 pm

Marcin Cieslak

LDEV-4411 Add collections 2nd level cache

Options
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.hbm.xml
  3. … 96 more files in changeset.
8:14 am

Andrey Balan

LDEV-4451 Implement ToolSessionManager.getConfidenceLevels() in all tools

This method allows Scratchie to query available confidence levels from

the tools that can provide it. Actually, only Assessment and MCQ will

implement it for real, all other tools will implements it as "return

null;".

Options
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java
  2. … 28 more files in changeset.
Sunday 29 Oct 2017
1:19 am

Marcin Cieslak

LDEV-4411 Mark entities as cacheable

usage="read-only" seems to do nothing at the moment, but it may be a

guidance for future optimisations.

Options
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeConfigItem.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItemInstruction.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItemVisitLog.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeSession.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeUser.hbm.xml
  8. … 231 more files in changeset.
Monday 18 Sep 2017
8:36 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4425 Adding Portraits in Learner

Included in Grouping, Chat, Peer Review and QA

Options
    • -5
    • +7
    ./web/WEB-INF/tags/StyledRating.tag
  2. … 44 more files in changeset.
Monday 04 Sep 2017
11:53 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Images, IMSCC, Kalture, MC and QA

Options
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/dto/ReflectDTO.java
    • -1
    • +8
    ./web/pages/monitoring/summary.jsp
    • -2
    • +9
    ./web/pages/monitoring/userlist.jsp
  4. … 23 more files in changeset.
11:53 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Images, IMSCC, Kalture, MC and QA

Options
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/tool/commonCartridge/dto/ReflectDTO.java
    • -1
    • +8
    ./web/pages/monitoring/summary.jsp
    • -2
    • +9
    ./web/pages/monitoring/userlist.jsp
  4. … 23 more files in changeset.