lams-github / lams_tool_vote

src

Clone Tools

Stats

Commits this week: 0
Total Committers: 20
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
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
    • -33
    • +0
    ./java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/vote/service/VoteService.java
    • -37
    • +0
    ./java/org/lamsfoundation/lams/tool/vote/util/VoteUtils.java
    • -1338
    • +0
    ./java/org/lamsfoundation/lams/tool/vote/web/action/AuthoringAction.java
    • -0
    • +1231
    ./java/org/lamsfoundation/lams/tool/vote/web/action/AuthoringController.java
    • -51
    • +0
    ./java/org/lamsfoundation/lams/tool/vote/web/action/ClearSessionAction.java
    • -0
    • +67
    ./java/org/lamsfoundation/lams/tool/vote/web/action/ClearSessionController.java
    • -1086
    • +0
    ./java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java
    • -0
    • +1002
    ./java/org/lamsfoundation/lams/tool/vote/web/action/LearningController.java
    • -562
    • +0
    ./java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java
    • -0
    • +514
    ./java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringController.java
    • -121
    • +0
    ./java/org/lamsfoundation/lams/tool/vote/web/action/VoteChartGeneratorAction.java
    • -0
    • +111
    ./java/org/lamsfoundation/lams/tool/vote/web/action/VoteChartGeneratorController.java
    • -128
    • +0
    ./java/org/lamsfoundation/lams/tool/vote/web/action/VotePedagogicalPlannerAction.java
    • -0
    • +110
    ./java/org/lamsfoundation/lams/tool/vote/web/action/VotePedagogicalPlannerController.java
  16. … 53 more files in changeset.
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
    ./java/org/lamsfoundation/lams/tool/vote/service/VoteService.java
    • -6
    • +13
    ./java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java
  3. … 28 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
    ./java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java
    • -3
    • +4
    ./java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java
    • -17
    • +39
    ./java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java
    • -0
    • +9
    ./java/org/lamsfoundation/lams/tool/vote/dto/OpenTextAnswerDTO.java
    • -3
    • +3
    ./java/org/lamsfoundation/lams/tool/vote/service/VoteService.java
    • -6
    • +13
    ./java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java
  7. … 30 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
    ./java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java
    • -3
    • +4
    ./java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java
    • -17
    • +39
    ./java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java
    • -0
    • +9
    ./java/org/lamsfoundation/lams/tool/vote/dto/OpenTextAnswerDTO.java
    • -3
    • +3
    ./java/org/lamsfoundation/lams/tool/vote/service/VoteService.java
    • -6
    • +13
    ./java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java
  7. … 30 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
    ./java/org/lamsfoundation/lams/tool/vote/service/VoteService.java
    • -0
    • +1086
    ./java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java
    • -0
    • +555
    ./java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java
    • -0
    • +121
    ./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
    ./java/org/lamsfoundation/lams/tool/vote/service/VoteService.java
    • -2042
    • +0
    ./java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java
    • -1
    • +1
    ./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
    ./java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java
    • -78
    • +0
    ./java/org/lamsfoundation/lams/tool/vote/service/VoteApplicationException.java
    • -1
    • +2
    ./java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java
    • -0
    • +78
    ./java/org/lamsfoundation/lams/tool/vote/util/VoteApplicationException.java
    • -1338
    • +0
    ./java/org/lamsfoundation/lams/tool/vote/web/AuthoringAction.java
    • -51
    • +0
    ./java/org/lamsfoundation/lams/tool/vote/web/ClearSessionAction.java
    • -1084
    • +0
    ./java/org/lamsfoundation/lams/tool/vote/web/LearningAction.java
    • -554
    • +0
    ./java/org/lamsfoundation/lams/tool/vote/web/MonitoringAction.java
    • -120
    • +0
    ./java/org/lamsfoundation/lams/tool/vote/web/VoteChartGeneratorAction.java
    • -128
    • +0
    ./java/org/lamsfoundation/lams/tool/vote/web/VotePedagogicalPlannerAction.java
    • -0
    • +1338
    ./java/org/lamsfoundation/lams/tool/vote/web/action/AuthoringAction.java
    • -0
    • +51
    ./java/org/lamsfoundation/lams/tool/vote/web/action/ClearSessionAction.java
    • -0
    • +1084
    ./java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java
    • -0
    • +554
    ./java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java
    • -0
    • +120
    ./java/org/lamsfoundation/lams/tool/vote/web/action/VoteChartGeneratorAction.java
    • -0
    • +128
    ./java/org/lamsfoundation/lams/tool/vote/web/action/VotePedagogicalPlannerAction.java
  17. … 1 more file in changeset.
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
    • -66
    • +72
    ./java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java
    • -15
    • +17
    ./java/org/lamsfoundation/lams/tool/vote/web/LearningAction.java
    • -28
    • +29
    ./java/org/lamsfoundation/lams/tool/vote/web/MonitoringAction.java
    • -6
    • +7
    ./java/org/lamsfoundation/lams/tool/vote/web/VoteChartGeneratorAction.java
  5. … 132 more files in changeset.
Saturday 05 Aug 2017
1:04 pm

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
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java
    • -0
    • +4
    ./java/org/lamsfoundation/lams/tool/vote/web/LearningAction.java
    • -0
    • +9
    ./java/org/lamsfoundation/lams/tool/vote/web/form/VoteLearningForm.java
  4. … 86 more files in changeset.
Wednesday 07 Jun 2017
9:46 pm

Andrey Balan

LDEV-4356 Avoid modifying Hibernate's FlushMode inside of the tools

Options
    • -5
    • +0
    ./java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteContentDAO.java
    • -2
    • +0
    ./java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteQueContentDAO.java
    • -4
    • +0
    ./java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteSessionDAO.java
    • -2
    • +0
    ./java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUserDAO.java
    • -4
    • +0
    ./java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java
  6. … 7 more files in changeset.
Tuesday 04 Apr 2017
8:27 pm

Andrey Balan

LDEV-4300 Audit logs when activity is modified in monitor

Options
    • -0
    • +7
    ./java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java
    • -0
    • +5
    ./java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java
    • -0
    • +3
    ./java/org/lamsfoundation/lams/tool/vote/web/AuthoringAction.java
  4. … 86 more files in changeset.
Friday 31 Mar 2017
2:31 am

Andrey Balan

LDEV-4291 Move getAccessMode method to WebUtil

Options
    • -20
    • +3
    ./java/org/lamsfoundation/lams/tool/vote/web/AuthoringAction.java
  2. … 30 more files in changeset.
Thursday 02 Mar 2017
10:02 pm

Marcin Cieslak

LDEV-4180: Fix the type of a numerical column.

Options
    • -0
    • +3
    ./java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20170101.sql
  2. … 1 more file in changeset.
Tuesday 28 Feb 2017
6:36 am

erniegx <ernieg@gmail.com>

LDEV-4180 DB fixes for vote (as per Marcin's request)

Options
    • -0
    • +14
    ./java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20170101.sql
  2. … 6 more files in changeset.
Wednesday 11 Jan 2017
4:57 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4187: Get an learner's status from the tool for a particular tool session, which can be used to regenerate learner progress.

Options
    • -0
    • +29
    ./java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java
  2. … 37 more files in changeset.
Wednesday 21 Dec 2016
1:34 pm

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-3992 : Rewrite business logic

Options
    • -43
    • +320
    ./java/org/lamsfoundation/lams/tool/vote/web/AuthoringAction.java
    • -316
    • +0
    ./java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java
    • -45
    • +44
    ./java/org/lamsfoundation/lams/tool/vote/web/LearningAction.java
    • -13
    • +49
    ./java/org/lamsfoundation/lams/tool/vote/web/MonitoringAction.java
    • -75
    • +0
    ./java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java
1:29 pm

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-3989 : Fix Java warnings

Options
    • -21
    • +23
    ./java/org/lamsfoundation/lams/tool/vote/service/VoteOutputFactory.java
    • -148
    • +66
    ./java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java
    • -3
    • +7
    ./java/org/lamsfoundation/lams/tool/vote/web/form/VoteLearningForm.java
    • -0
    • +5
    ./java/org/lamsfoundation/lams/tool/vote/web/form/VoteMonitoringForm.java
1:25 pm

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-3989 :Fix Java warnings

Options
    • -7
    • +7
    ./java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java
1:24 pm

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-3988:Remove unnecessary attributes from constants file

Options
    • -117
    • +0
    ./java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java
Friday 16 Dec 2016
5:26 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4092: Date passed back by server was reconverting time for Daylight Saving, making it an hour out, as the convertToStringForJSON takes the timezone into account. Therefore convert the already timezone converted time (which gets converted back again) rather than the original time.

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/vote/web/MonitoringAction.java
  2. … 13 more files in changeset.
Wednesday 14 Dec 2016
6:59 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4092: Support the server supplying a localised date string for the submission deadline (datetimepicker does not have localisation of the format, just the language).

Options
    • -0
    • +1
    ./java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java
    • -1
    • +2
    ./java/org/lamsfoundation/lams/tool/vote/web/LearningAction.java
    • -1
    • +8
    ./java/org/lamsfoundation/lams/tool/vote/web/MonitoringAction.java
  4. … 36 more files in changeset.
Tuesday 13 Dec 2016
10:34 pm

Marcin Cieslak

LDEV-4127: Remove default tool conditions. Fix conditions refresh in Authoring.

Options
    • -5
    • +5
    ./java/org/lamsfoundation/lams/tool/vote/service/VoteOutputFactory.java
  2. … 28 more files in changeset.
Wednesday 19 Oct 2016
10:34 am

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-3989:Fix Java warnings.

Options
    • -113
    • +113
    ./java/org/lamsfoundation/lams/tool/vote/dto/VoteGeneralMonitoringDTO.java
    • -17
    • +20
    ./java/org/lamsfoundation/lams/tool/vote/dto/VoteMonitoredAnswersDTO.java
    • -17
    • +17
    ./java/org/lamsfoundation/lams/tool/vote/dto/VoteMonitoredUserDTO.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/vote/dto/VoteQuestionDTO.java
    • -2
    • +1
    ./java/org/lamsfoundation/lams/tool/vote/dto/VoteStatsDTO.java
    • -16
    • +21
    ./java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java
    • -0
    • +5
    ./java/org/lamsfoundation/lams/tool/vote/pojos/VoteQueContent.java
    • -7
    • +8
    ./java/org/lamsfoundation/lams/tool/vote/pojos/VoteQueUsr.java
    • -4
    • +9
    ./java/org/lamsfoundation/lams/tool/vote/pojos/VoteSession.java
    • -0
    • +5
    ./java/org/lamsfoundation/lams/tool/vote/pojos/VoteUsrAttempt.java
    • -4
    • +10
    ./java/org/lamsfoundation/lams/tool/vote/service/VoteApplicationException.java
    • -1
    • +6
    ./java/org/lamsfoundation/lams/tool/vote/util/VoteComparator.java
    • -1
    • +6
    ./java/org/lamsfoundation/lams/tool/vote/util/VoteStringComparator.java
    • -2
    • +1
    ./java/org/lamsfoundation/lams/tool/vote/web/VoteChartGeneratorAction.java
    • -0
    • +4
    ./java/org/lamsfoundation/lams/tool/vote/web/form/VoteAuthoringForm.java
    • -5
    • +8
    ./java/org/lamsfoundation/lams/tool/vote/web/form/VotePedagogicalPlannerForm.java
10:12 am

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-3989:Fix Java warnings.

Options
    • -8
    • +7
    ./java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteContentDAO.java
    • -10
    • +10
    ./java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteQueContentDAO.java
    • -4
    • +4
    ./java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteSessionDAO.java
    • -6
    • +8
    ./java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUserDAO.java
    • -6
    • +7
    ./java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/vote/dto/VoteGeneralAuthoringDTO.java
    • -4
    • +7
    ./java/org/lamsfoundation/lams/tool/vote/dto/VoteGeneralLearnerFlowDTO.java
10:05 am

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-3989:Fix Java warnings.

Options
    • -5
    • +8
    ./java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteQueContentDAO.java
    • -4
    • +6
    ./java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteSessionDAO.java
    • -5
    • +10
    ./java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUserDAO.java
    • -2
    • +15
    ./java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java
    • -3
    • +2
    ./java/org/lamsfoundation/lams/tool/vote/dto/ReflectionDTO.java
    • -13
    • +13
    ./java/org/lamsfoundation/lams/tool/vote/dto/SessionDTO.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/vote/dto/SessionNominationDTO.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/vote/dto/SummarySessionDTO.java
    • -32
    • +32
    ./java/org/lamsfoundation/lams/tool/vote/dto/VoteGeneralAuthoringDTO.java
9:53 am

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-3983:Fix Java warnings

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/vote/dao/IVoteQueContentDAO.java
    • -2
    • +4
    ./java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteContentDAO.java
9:46 am

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-3983:Clean up Spring configuration file

Options
    • -12
    • +17
    ./java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml
Monday 17 Oct 2016
9:14 am

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-3983:Rewrite/remove ClearSessionAction.

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/vote/web/ClearSessionAction.java
Thursday 06 Oct 2016
4:47 pm

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-3983: Removed unnecessary code from ClearSessionAction.

Options
    • -14
    • +4
    ./java/org/lamsfoundation/lams/tool/vote/web/ClearSessionAction.java
3:31 pm

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-3983: Added logs.

Options
    • -6
    • +20
    ./java/org/lamsfoundation/lams/tool/vote/web/AuthoringAction.java
    • -0
    • +10
    ./java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java
    • -12
    • +30
    ./java/org/lamsfoundation/lams/tool/vote/web/LearningAction.java
    • -1
    • +9
    ./java/org/lamsfoundation/lams/tool/vote/web/MonitoringAction.java
    • -3
    • +5
    ./java/org/lamsfoundation/lams/tool/vote/web/VoteChartGeneratorAction.java