lams-github / lams_tool_survey / src

java

Clone Tools

Stats

Commits this week: 0
Total Committers: 19
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
Saturday 24 Mar 2018
2:12 am

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
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java
    • -5
    • +19
    ./org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java
  3. … 82 more files in changeset.
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
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java
    • -5
    • +5
    ./org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java
  3. … 33 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
    • -8
    • +1
    ./org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
    • -3
    • +0
    ./org/lamsfoundation/lams/tool/survey/surveyApplicationContext.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
    • -4
    • +3
    ./org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java
  2. … 78 more files in changeset.
Tuesday 23 Jan 2018
9:40 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4499 Answers are timestamped in the export spreadsheet

Options
    • -0
    • +14
    ./org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java
  2. … 1 more file 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
    ./org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
  2. … 45 more files in changeset.
Thursday 02 Nov 2017
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
    ./org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
  2. … 28 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
    • -2
    • +3
    ./org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
    • -0
    • +9
    ./org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java
  3. … 28 more files in changeset.
Monday 11 Sep 2017
10:16 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Share Resources, Survey, Leader, Mindmap,

Noticeboard, Notebook, Pixlr, Peer Review

Options
    • -0
    • +3
    ./org/lamsfoundation/lams/tool/survey/SurveyConstants.java
    • -2
    • +3
    ./org/lamsfoundation/lams/tool/survey/dao/SurveyUserDAO.java
    • -8
    • +20
    ./org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyUserDAOHibernate.java
    • -2
    • +3
    ./org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
    • -1
    • +10
    ./org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java
  6. … 38 more files in changeset.
10:16 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Share Resources, Survey, Leader, Mindmap,

Noticeboard, Notebook, Pixlr, Peer Review

Options
    • -0
    • +3
    ./org/lamsfoundation/lams/tool/survey/SurveyConstants.java
    • -2
    • +3
    ./org/lamsfoundation/lams/tool/survey/dao/SurveyUserDAO.java
    • -8
    • +20
    ./org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyUserDAOHibernate.java
    • -2
    • +3
    ./org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
    • -1
    • +10
    ./org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java
  6. … 38 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
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/survey/service/SurveyOutputFactory.java
  2. … 76 more files 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
    • -47
    • +47
    ./org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
    • -19
    • +16
    ./org/lamsfoundation/lams/tool/survey/web/action/ChartAction.java
    • -23
    • +23
    ./org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java
    • -24
    • +27
    ./org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java
  5. … 132 more files in changeset.
Wednesday 12 Apr 2017
1:54 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4303: Adding spaces to the Question blah of blah and fixing indexing so we do not start with Question 0 when retaking the survey.

Options
    • -0
    • +1
    ./org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java
  2. … 1 more file in changeset.
Tuesday 04 Apr 2017
8:27 pm

Andrey Balan

LDEV-4300 Audit logs when activity is modified in monitor

Options
    • -0
    • +7
    ./org/lamsfoundation/lams/tool/survey/service/ISurveyService.java
    • -0
    • +5
    ./org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
    • -0
    • +3
    ./org/lamsfoundation/lams/tool/survey/web/action/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
    • -26
    • +4
    ./org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java
  2. … 30 more files in changeset.
Tuesday 28 Mar 2017
1:28 am

Andrey Balan

LDEV-4286 Show authoring advanced tab on re-editing content from monitor

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/survey/SurveyConstants.java
    • -61
    • +27
    ./org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java
  3. … 11 more files in changeset.
Monday 27 Mar 2017
7:55 pm

Andrey Balan

LDEV-4292 Fixed "MySQLSyntaxErrorException: Expression #1 of SELECT list is not in GROUP BY clause and contains nonaggregated column 'lams.session.uid' which is not functionally dependent on columns in GROUP BY clause; this is incompatible with sql_mode=only_full_group_by "

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyUserDAOHibernate.java
Wednesday 08 Mar 2017
9:02 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4258: Protecting the export download from multiple triggers by disabling the button until the file is downloaded. Uses the new generic javascript method based on previous Peer Review download implementation. Uses a cookie to track when the file download is complete.

Options
    • -0
    • +7
    ./org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java
  2. … 3 more files in changeset.
Monday 27 Feb 2017
10:00 pm

Marcin Cieslak

LDEV-4180: Make DB patches produce up-to-date structure during build instead of applying multiple patches. Get rid of unnecessary tables and keys. Modify boolean columns to tinyint(1) Simplify patches where possible.

Options
    • -0
    • +27
    ./org/lamsfoundation/lams/tool/survey/dbupdates/patch20170101.sql
  2. … 223 more files in changeset.
Friday 17 Feb 2017
8:49 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4234: When the retake call does not have a sequence id ( that is, we are retrying all the questions not just one), it now works out the position and sequence number based on the same logic as the inital setup. If a sequence id is supplied, still does the single question page.

Options
    • -1
    • +15
    ./org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java
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
    • +12
    ./org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
  2. … 37 more files in changeset.
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
    ./org/lamsfoundation/lams/tool/survey/web/action/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
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/survey/SurveyConstants.java
    • -2
    • +7
    ./org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java
  3. … 37 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
    • -1
    • +0
    ./org/lamsfoundation/lams/tool/survey/SurveyConstants.java
    • -26
    • +1
    ./org/lamsfoundation/lams/tool/survey/service/SurveyOutputFactory.java
    • -3
    • +0
    ./org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
  4. … 26 more files in changeset.
Thursday 24 Nov 2016
7:26 pm

Marcin Cieslak

LDEV-3316: Remove leftovers (comments, exceptions) of Spring layer.

Options
    • -1
    • +0
    ./org/lamsfoundation/lams/tool/survey/dao/DAO.java
  2. … 19 more files in changeset.
Monday 19 Sep 2016
5:38 pm

Marcin Cieslak

LDEV-3982: Prevent complex outputs from being used as branching conditions. Remove complex outputs from suggestions when creating branching conditions. Fix labels.

Options
    • -10
    • +14
    ./org/lamsfoundation/lams/tool/survey/service/SurveyOutputFactory.java
  2. … 9 more files in changeset.
Monday 15 Aug 2016
3:54 pm

erniegx <ernieg@gmail.com>

LDEV-3952: updating scripts to be compatible with MySQL 5.7

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/survey/dbupdates/patch20150930.sql
    • -9
    • +9
    ./org/lamsfoundation/lams/tool/survey/dbupdates/patch20151217.sql
  3. … 43 more files in changeset.
Wednesday 15 Jun 2016
4:07 pm

Andrey Balan

LDEV-3750 Improve performance of pushing marks to gradebook

Options
    • -0
    • +5
    ./org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
  2. … 36 more files in changeset.
Monday 13 Jun 2016
10:53 pm

Andrey Balan

LDEV-3750 Added ability to request all available tool outputs per toolContentId instead of querying them one by one

Options
    • -0
    • +5
    ./org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
  2. … 36 more files in changeset.
Wednesday 11 May 2016
4:10 pm

Marcin Cieslak

LDEV-3776: Remove $Id CVS keyword.

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/survey/SurveyConstants.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/survey/dao/DAO.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/survey/dao/SurveyDAO.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/survey/dao/SurveyQuestionDAO.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/survey/dao/SurveySessionDAO.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/survey/dao/SurveyUserDAO.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/survey/dao/hibernate/BaseDAOHibernate.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyDAOHibernate.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveySessionDAOHibernate.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyUserDAOHibernate.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/survey/dto/SurveyConditionDTO.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/survey/model/Survey.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/survey/model/SurveyAnswer.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/survey/model/SurveyCondition.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/survey/model/SurveyOption.java
  16. … 990 more files in changeset.