lams-github

lams_tool_daco

Clone Tools

Stats

Commits this week: 0
Total Committers: 18
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
Monday 21 May 2018
5: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.
1:03 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: updating labels

Mainly Spanish and a little bit of Greek and Norwegian

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

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
1:26 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • -0
    • +17
    ./src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20180425.sql
    • -17
    • +0
    ./src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20180525.sql
  3. … 38 more files in changeset.
Monday 30 Apr 2018
6:40 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • -0
    • +17
    ./src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20180525.sql
  2. … 28 more files in changeset.
Monday 09 Apr 2018
3: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.
Monday 02 Apr 2018
5:17 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054 updating labels

Updating labels in bulk mainly English, Greek and Norwegian

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 56 more files in changeset.
Friday 23 Mar 2018
7:12 pm

Marcin Cieslak

Monthly merge from master to lams31

Multiple conflicts regarding audit service and JSON.

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java

lams_build/conf/domain.xml

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java

lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java

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

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java

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

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

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

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

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

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

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

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

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

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java

Options
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java
  2. … 83 more files in changeset.
Thursday 22 Mar 2018
6:55 am

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.
Monday 05 Mar 2018
1:39 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4522 Emojis not displaying correctly in monitoring

Also fixed some general escaping issues found while testing.

Options
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java
  2. … 34 more files in changeset.
Thursday 15 Feb 2018
4: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.
Thursday 01 Feb 2018
10:41 pm

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/daco/dacoApplicationContext.xml
    • -9
    • +2
    ./src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java
  3. … 57 more files in changeset.
Friday 26 Jan 2018
2: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/daco/web/action/LearningAction.java
  3. … 77 more files in changeset.
12: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/daco/DacoConstants.java
    • -3
    • +0
    ./src/java/org/lamsfoundation/lams/tool/daco/dacoApplicationContext.xml
    • -98
    • +0
    ./src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java
    • -16
    • +0
    ./src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/daco/util/DacoToolContentHandler.java
  7. … 72 more files in changeset.
Friday 05 Jan 2018
3: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
1: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.
Wednesday 15 Nov 2017
9:54 pm

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.
Thursday 02 Nov 2017
3:41 pm

Marcin Cieslak

LDEV-4411 Add collections 2nd level cache

Options
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/Daco.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoQuestion.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoSession.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoUser.hbm.xml
  5. … 94 more files in changeset.
1: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/daco/service/DacoServiceImpl.java
  2. … 28 more files in changeset.
Saturday 28 Oct 2017
7:19 pm

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/daco/model/Daco.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoAnswer.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoAnswerOption.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoQuestion.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoSession.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/daco/model/DacoUser.hbm.xml
  7. … 232 more files in changeset.
Monday 09 Oct 2017
11:08 am

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_build/lib/lams/lams.jar

lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningWebsocketServer.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

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

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

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java

Options
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java
  2. … 29 more files in changeset.
Monday 18 Sep 2017
2: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.
Wednesday 30 Aug 2017
1:32 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implemented in Assessment, Chat, Daco, Forum and Submit.

Options
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/tool/daco/dao/DacoUserDAO.java
    • -8
    • +15
    ./src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoUserDAOHibernate.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java
    • -1
    • +7
    ./web/WEB-INF/tlds/lams/lams.tld
    • -6
    • +11
    ./web/pages/monitoring/summary.jsp
  8. … 67 more files in changeset.
1:32 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implemented in Assessment, Chat, Daco, Forum and Submit.

Options
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/daco/DacoConstants.java
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/tool/daco/dao/DacoUserDAO.java
    • -8
    • +15
    ./src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoUserDAOHibernate.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java
    • -1
    • +7
    ./web/WEB-INF/tlds/lams/lams.tld
    • -6
    • +11
    ./web/pages/monitoring/summary.jsp
  8. … 68 more files in changeset.
Thursday 17 Aug 2017
9:46 pm

Andrey Balan

LDEV-4407 Move lams_contentrepository exceptions to the proper package

lams_contentrepository's exception classes were moved to

contentrepository.exception package.

(To access exceptions' earlier history use Eclipse's Show in History

feature or run 'git log --follow ./path/to/file')

Options
    • -5
    • +5
    ./src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java
  2. … 66 more files in changeset.
Wednesday 09 Aug 2017
6:28 pm

Marcin Cieslak

LDEV-4402 Substitute Gson and Apache JSON with Jackson

Jackson is a top JSON library shipped with WF10.

Apache JSON resides in an ancient library which we do not need for

anything else.

We use GSon only for serializing Java objects to JSON, which Jackson can

do too.

Options
    • -0
    • +2
    ./.classpath
    • -16
    • +16
    ./src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java
  3. … 134 more files in changeset.
Monday 07 Aug 2017
8:53 am

Marcin Cieslak

LDEV-4402 Use Spring support for Hibernate v5 instead of v4

WF10 is shipped with Hibernate 5, so Spring support version should

match.

Options
    • -1
    • +1
    ./web/WEB-INF/web.xml
  2. … 19 more files in changeset.
Saturday 05 Aug 2017
11:36 am

Marcin Cieslak

LDEV-4400 Update dependecies to embedded libraries

WildFly 10 is shipped with newer versions of libraries that LAMS uses.

LAMS now points to proper JAR files. Following libraries were updated:

beanutils 1.8.3 -> 1.9.2

codec 1.9 -> 1.10

collection 3.2.1 -> 3.2.2

xerces 2.11.0.SP3 -> 2.11.0.SP4

httpclient 4.2.1 -> 4.5

httpcore 4.2.1 -> 4.4.1

wildfly-controller-client 8.2.1 -> 2.2.0 (probably naming convention was

changed)

jboss-dmr 1.2.0 -> 1.3.0

Hibernate 4.3.7 -> 5.0.10

log4j-jboss-logmanager 1.1.0 -> 1.1.2

jcl-over-slf4j 1.7.2 -> 1.7.7

undertow-core 1.1.8 -> 1.4.0

undertow-servlet 1.1.8 -> 1.4.0

javax.mail 1.5.0 -> 1.5.5

jboss-jstl 1.1.2 -> 1.1.3

jboss-logging 3.1.4 -> 3.3.0

remoting-jmx 2.0.0 -> 2.0.1

slf4j-api 1.7.2 -> 1.7.7

picketbox 4.0.21 -> 4.9.6

jboss-websocket-api 1.1.0 -> 1.1.1

joda-time 1.6.2 -> 2.7

Options
    • -4
    • +4
    ./.classpath
  2. … 47 more files in changeset.
8:11 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395 Sizing tweaks

Options
    • -1
    • +1
    ./web/WEB-INF/tags/LeaderDisplay.tag
  2. … 33 more files in changeset.
7:04 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395 Leader related tools use Portrait for leader

Created a tag LeaderDisplay to display the leader consistently

across tools.

Options
    • -0
    • +28
    ./web/WEB-INF/tags/LeaderDisplay.tag
    • -0
    • +4
    ./web/WEB-INF/tlds/lams/lams.tld
  3. … 87 more files in changeset.