lams-github

lams_tool_vote

Clone Tools

Stats

Commits this week: 0
Total Committers: 24
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 05 Mar 2018
8: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
    • -6
    • +6
    ./src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java
    • -1
    • +1
    ./web/learning/AllNominations.jsp
    • -1
    • +1
    ./web/learning/RevisitedDisplay.jsp
    • -1
    • +1
    ./web/learning/RevisitedNoDisplay.jsp
  5. … 31 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
    • -13
    • +26
    ./src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java
  2. … 65 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
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.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
    • -25
    • +2
    ./src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java
    • -2
    • +1
    ./src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml
  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
    • -5
    • +4
    ./src/java/org/lamsfoundation/lams/tool/vote/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
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/vote/web/form/VotePedagogicalPlannerForm.java
  3. … 76 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.
Tuesday 19 Dec 2017
8:47 pm

Marcin Cieslak

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

Conflicts:

lams_build/conf/domain.xml

lams_build/lib/lams/lams.jar

lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.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/LearningAction.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/service/ChatService.java

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_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.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/service/ResourceServiceImpl.java

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

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

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

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

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

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

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

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

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

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

Options
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java
  2. … 45 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.
Thursday 02 Nov 2017
10:41 pm

Marcin Cieslak

LDEV-4411 Add collections 2nd level cache

Options
    • -0
    • +4
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteQueUsr.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteSession.hbm.xml
  4. … 95 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/vote/service/VoteService.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/vote/pojos/VoteContent.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteQueContent.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteQueUsr.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteSession.hbm.xml
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/pojos/VoteUsrAttempt.hbm.xml
  6. … 233 more files in changeset.
Tuesday 24 Oct 2017
3:52 pm

Marcin Cieslak

LDEV-4440 Fix Vote statistics URL

Struts considered absolute URLs relative to module context, for example

/monitoring/stats.do translates into

http://localhost/lams/tool/lavote11/monitoring/stats.do

Spring considers absolute URLs relative to server context, for example

/monitoring/stats.do translates into

http://localhost/lams/monitoring/stats.do

Because of this URLs (ajax, form actions etc.) need to be rewritten when

migrating to Spring.

Options
    • -1
    • +1
    ./web/monitoring/MonitoringMaincontent.jsp
Monday 23 Oct 2017
11:00 pm

Marcin Cieslak

LDEV-4440 Add missing URLs to Vote tool

Options
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20171023.sql
2:12 pm

Marcin Cieslak

LDEV-4440 Change tool access URLs to reflect migration to Spring MVC

Options
    • -0
    • +21
    ./src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20171023.sql
Friday 20 Oct 2017
4:15 am

Marcin Cieslak

LDEV-4440 Add a test library which does not reference Struts

After full LAMS migration to Spring MVC it will become

3rdParty.userlibraries

Options
    • -30
    • +30
    ./.classpath
    • -33
    • +0
    ./src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java
    • -37
    • +0
    ./src/java/org/lamsfoundation/lams/tool/vote/util/VoteUtils.java
    • -1338
    • +0
    ./src/java/org/lamsfoundation/lams/tool/vote/web/action/AuthoringAction.java
    • -0
    • +1231
    ./src/java/org/lamsfoundation/lams/tool/vote/web/action/AuthoringController.java
    • -51
    • +0
    ./src/java/org/lamsfoundation/lams/tool/vote/web/action/ClearSessionAction.java
    • -0
    • +67
    ./src/java/org/lamsfoundation/lams/tool/vote/web/action/ClearSessionController.java
    • -1086
    • +0
    ./src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java
    • -0
    • +1002
    ./src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningController.java
    • -562
    • +0
    ./src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java
    • -0
    • +514
    ./src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringController.java
    • -121
    • +0
    ./src/java/org/lamsfoundation/lams/tool/vote/web/action/VoteChartGeneratorAction.java
    • -0
    • +111
    ./src/java/org/lamsfoundation/lams/tool/vote/web/action/VoteChartGeneratorController.java
    • -128
    • +0
    ./src/java/org/lamsfoundation/lams/tool/vote/web/action/VotePedagogicalPlannerAction.java
  16. … 53 more files in changeset.
Monday 16 Oct 2017
5:41 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4443: warning when editing activity that has been already used.

Currently when editing an assessment or voting activity in monitor, if an answer is changed, the data associated with that question is removed.

So if students have already completed the activity, their answers/marks will be removed and will shown as not answered.

We currently give no warning to monitors when they do this, so we should.

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +4
    ./web/monitoring/Edit.jsp
  4. … 10 more files in changeset.
5:33 pm

Marcin Cieslak

LDEV-4440 Rewrite configuration of an example tool

Struts servlet gets replaced with Spring one. It has its own

configuration in a separate XML file.

Options
    • -0
    • +17
    ./web/WEB-INF/spring-servlet.xml
    • -25
    • +11
    ./web/WEB-INF/web.xml
Monday 09 Oct 2017
5:08 pm

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
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java
    • -6
    • +13
    ./src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java
  3. … 28 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.
Thursday 14 Sep 2017
8:48 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Scratchie, Spreadsheet, Scribe, Task, Vote

Options
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java
    • -17
    • +39
    ./src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/vote/dto/OpenTextAnswerDTO.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java
    • -6
    • +13
    ./src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java
    • -0
    • +1
    ./web/common/monitorheader.jsp
    • -1
    • +2
    ./web/monitoring/OtherTextNominationViewer.jsp
    • -1
    • +5
    ./web/monitoring/ReflectionViewer.jsp
    • -2
    • +4
    ./web/monitoring/VoteNominationViewer.jsp
  11. … 26 more files in changeset.
8:48 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Scratchie, Spreadsheet, Scribe, Task, Vote

Options
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java
    • -17
    • +39
    ./src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/vote/dto/OpenTextAnswerDTO.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java
    • -6
    • +13
    ./src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java
    • -0
    • +1
    ./web/common/monitorheader.jsp
    • -1
    • +2
    ./web/monitoring/OtherTextNominationViewer.jsp
    • -1
    • +5
    ./web/monitoring/ReflectionViewer.jsp
    • -2
    • +4
    ./web/monitoring/VoteNominationViewer.jsp
  11. … 26 more files in changeset.
Wednesday 30 Aug 2017
7:32 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

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

Options
    • -1
    • +7
    ./web/WEB-INF/tlds/lams/lams.tld
  2. … 73 more files in changeset.
7:32 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

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

Options
    • -1
    • +7
    ./web/WEB-INF/tlds/lams/lams.tld
  2. … 74 more files in changeset.
Saturday 26 Aug 2017
4:04 pm

Marcin Cieslak

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

Multiple conflicts resolved with JSON replace and class move to

packages.

Options
    • -0
    • +2048
    ./src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java
    • -0
    • +1086
    ./src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java
    • -0
    • +555
    ./src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java
    • -0
    • +121
    ./src/java/org/lamsfoundation/lams/tool/vote/web/action/VoteChartGeneratorAction.java
  5. … 30 more files in changeset.
Friday 18 Aug 2017
2:43 am

Andrey Balan

LDEV-4407 Move classes to the proper packages

Action classes were moved to admin.web.action package; forms to

admin.web.form; DTOs to admin.web.dto.

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

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

Options
    • -0
    • +2042
    ./src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java
    • -2042
    • +0
    ./src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml
  4. … 74 more files in changeset.
Thursday 17 Aug 2017
12:33 am

Andrey Balan

LDEV-4407 Move classes to the proper packages

Action classes were moved to tool.vote.web.action package; exception to

tool.vote.web.util.

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

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

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java
    • -78
    • +0
    ./src/java/org/lamsfoundation/lams/tool/vote/service/VoteApplicationException.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java
    • -0
    • +78
    ./src/java/org/lamsfoundation/lams/tool/vote/util/VoteApplicationException.java
    • -1338
    • +0
    ./src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringAction.java
    • -51
    • +0
    ./src/java/org/lamsfoundation/lams/tool/vote/web/ClearSessionAction.java
    • -1084
    • +0
    ./src/java/org/lamsfoundation/lams/tool/vote/web/LearningAction.java
    • -554
    • +0
    ./src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringAction.java
    • -120
    • +0
    ./src/java/org/lamsfoundation/lams/tool/vote/web/VoteChartGeneratorAction.java
    • -128
    • +0
    ./src/java/org/lamsfoundation/lams/tool/vote/web/VotePedagogicalPlannerAction.java
    • -0
    • +1338
    ./src/java/org/lamsfoundation/lams/tool/vote/web/action/AuthoringAction.java
    • -0
    • +51
    ./src/java/org/lamsfoundation/lams/tool/vote/web/action/ClearSessionAction.java
    • -0
    • +1084
    ./src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java
    • -0
    • +554
    ./src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java
    • -0
    • +120
    ./src/java/org/lamsfoundation/lams/tool/vote/web/action/VoteChartGeneratorAction.java
    • -0
    • +128
    ./src/java/org/lamsfoundation/lams/tool/vote/web/action/VotePedagogicalPlannerAction.java
    • -6
    • +6
    ./web/WEB-INF/struts-config.xml
Thursday 10 Aug 2017
12:28 am

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
    • -66
    • +72
    ./src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java
    • -15
    • +17
    ./src/java/org/lamsfoundation/lams/tool/vote/web/LearningAction.java
    • -28
    • +29
    ./src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringAction.java
    • -6
    • +7
    ./src/java/org/lamsfoundation/lams/tool/vote/web/VoteChartGeneratorAction.java
  6. … 131 more files in changeset.