lams-github / lams_tool_lamc / src

java

Clone Tools

Stats

Commits this week: 0
Total Committers: 21
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
Wednesday 18 Jul 2018
6:52 pm

Andrey Balan

LDEV-4634 Update response in case answer hasn't been changed

Otherwise we end up loosing new values for confidence level and attempt

time.

Options
    • -16
    • +6
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
Sunday 24 Jun 2018
2:41 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/web/RatingServlet.java

lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.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/web/action/McMonitoringAction.java

lams_tool_mindmap/.classpath

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

Options
    • -4
    • +4
    ./org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -2
    • +1
    ./org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  3. … 22 more files in changeset.
Friday 22 Jun 2018
6:42 pm

Marcin Cieslak

LDEV-4607 Remove marks on output change to "none" in monitoring

Options
    • -32
    • +31
    ./org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  2. … 11 more files in changeset.
Tuesday 05 Jun 2018
5:07 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4596 Prefix letters shown on results and in monitoring

Options
    • -0
    • +4
    ./org/lamsfoundation/lams/tool/mc/pojos/McOptsContent.java
    • -4
    • +4
    ./org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
  3. … 2 more files in changeset.
Friday 18 May 2018
12:43 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

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

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java

lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.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_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java

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

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

Options
    • -0
    • +1
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +1
    ./org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -1
    • +22
    ./org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  4. … 20 more files in changeset.
Monday 14 May 2018
2:44 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4577 Can now just show feedback without showing answers.

Options
    • -0
    • +14
    ./org/lamsfoundation/lams/tool/mc/dbupdates/patch20180511.sql
    • -3
    • +13
    ./org/lamsfoundation/lams/tool/mc/dto/McGeneralLearnerFlowDTO.java
    • -0
    • +9
    ./org/lamsfoundation/lams/tool/mc/dto/McGeneralMonitoringDTO.java
    • -3
    • +14
    ./org/lamsfoundation/lams/tool/mc/pojos/McContent.java
    • -0
    • +1
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -7
    • +12
    ./org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java
    • -0
    • +1
    ./org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -0
    • +1
    ./org/lamsfoundation/lams/tool/mc/web/action/McLearningStarterAction.java
    • -1
    • +22
    ./org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
    • -1
    • +2
    ./org/lamsfoundation/lams/tool/mc/web/action/McMonitoringStarterAction.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/web/action/McStarterAction.java
    • -5
    • +5
    ./org/lamsfoundation/lams/tool/mc/web/form/McAuthoringForm.java
  13. … 7 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
    • +18
    ./org/lamsfoundation/lams/tool/mc/dbupdates/patch20180425.sql
    • -18
    • +0
    ./org/lamsfoundation/lams/tool/mc/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
    • +18
    ./org/lamsfoundation/lams/tool/mc/dbupdates/patch20180525.sql
  2. … 28 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
    • -21
    • +30
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +2
    ./org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -1
    • +2
    ./org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
    • -0
    • +128
    ./org/lamsfoundation/lams/tool/mc/web/action/TblMonitoringAction.java
  5. … 80 more files in changeset.
Thursday 08 Mar 2018
4:02 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4525 Fixed Reflection issues

Options
    • -0
    • +2
    ./org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
  2. … 4 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
    • -1
    • +2
    ./org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  2. … 34 more files in changeset.
11:40 am

Marcin Cieslak

LDEV-4523 Tools remove mark rather than clear it on user content delete

Options
    • -31
    • +42
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 4 more files in changeset.
Sunday 04 Mar 2018
2:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 Merge work replacing audit logs with LogEvent entries

Resolved conflicts for lams.jar and the Admin language file.

Options
    • -11
    • +15
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 13 more files in changeset.
Friday 02 Mar 2018
11:14 pm

Andrey Balan

Merge branch 'LDEV-4520'

Options
    • -1
    • +0
    ./org/lamsfoundation/lams/tool/mc/web/action/TblMonitoringAction.java
  2. … 1 more file in changeset.
11:13 pm

Andrey Balan

LDEV-4520 Reimplement student choices page in case of Assessment iRA

It should follow the format of Student choices page in case of MCQ iRA.

Options
    • -1
    • +0
    ./org/lamsfoundation/lams/tool/mc/web/action/TblMonitoringAction.java
  2. … 13 more files in changeset.
Wednesday 28 Feb 2018
12:49 am

Andrey Balan

LDEV-4520 Stop showing n/a column in iRA's student's choices

Instead show percentages as floats with 2 decimal places.

Options
    • -0
    • +13
    ./org/lamsfoundation/lams/tool/mc/dto/McOptionDTO.java
    • -7
    • +2
    ./org/lamsfoundation/lams/tool/mc/web/action/TblMonitoringAction.java
  3. … 1 more file in changeset.
Tuesday 27 Feb 2018
3:56 am

Andrey Balan

LKC-89 Add TBL Monitoring code specific for the tools

Add TblMonitoringAction classes and /tblmonitoring/*.jsps to the

tools projects. They will be consumed solely by lams_monitoring

to generate tool specific content required for TBL Monitoring.

Tools themselves won't use those classes and jsps.

Options
    • -0
    • +2
    ./org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java
    • -0
    • +9
    ./org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
    • -0
    • +10
    ./org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -7
    • +12
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +135
    ./org/lamsfoundation/lams/tool/mc/web/action/TblMonitoringAction.java
  6. … 47 more files in changeset.
Thursday 22 Feb 2018
2:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • -11
    • +15
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 65 more files in changeset.
Tuesday 06 Feb 2018
5:17 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
  2. … 62 more files in changeset.
Friday 02 Feb 2018
10:16 pm

Andrey Balan

LDEV-4407 Other projects stop depending on lams_gradebook

* GradebookService interfaces are redefined now:

- IGradebookService is going to be used by core modules.

- IGradebookFullService is used inside of lams_gradebook only and

nowhere else, as it contains lams_gradebook's internal logic and

classes.

* Introduce CommonContants.java which contains for now common

constants that used to be located in GradebookConstants.java

* Tools stop using gradebookService directly, but rather through

ILamsToolService's method updateGradebookUserActivityMark()

* Move GradebookUserActivityArchive and GradebookUserLessonArchive

to lams_gradebook

Options
    • -1
    • +0
    ./org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
    • -11
    • +3
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
  3. … 55 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
    • -2
    • +1
    ./org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
    • -12
    • +2
    ./org/lamsfoundation/lams/tool/mc/service/McService.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
    • -3
    • +2
    ./org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
  2. … 78 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
    • +1
    ./org/lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java
  2. … 77 more files in changeset.
Tuesday 19 Dec 2017
1: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
    • -83
    • +80
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -5
    • +10
    ./org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -0
    • +1
    ./org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  4. … 43 more files in changeset.
1:03 am

Andrey Balan

LDEV-4490 Fix exceptions caused by NULL ConfidenceLevel columns

Options
    • -0
    • +17
    ./org/lamsfoundation/lams/tool/mc/dbupdates/patch20171218.sql
  2. … 1 more file in changeset.
Thursday 09 Nov 2017
5:57 pm

Marcin Cieslak

LDEV-4453 Mark chosen activity outputs as weightable

Activity outputs without max score are not eligible for weighting as we

can not calculate percent in which the activity is completed. They must

not appear in weighting dialog and they must always have 0% weight.

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/service/MCOutputFactory.java
  2. … 10 more files in changeset.
Tuesday 07 Nov 2017
9:53 pm

Andrey Balan

LDEV-4444 Update properly the score when question/answer is changed

THe problem happens, if you change the question/answer, then the score

for the activity for the user didn't change accordingly.

Options
    • -1
    • +4
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
Thursday 02 Nov 2017
10:32 pm

Andrey Balan

Merge branch 'LDEV-4451'

Options
    • -0
    • +16
    ./org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -0
    • +22
    ./org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -11
    • +8
    ./org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -77
    • +65
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +1
    ./org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  6. … 3 more files in changeset.
10:30 pm

Andrey Balan

LDEV-4451 Ability to save confidence levels in MCQ

And also return them to Scratchie on request.

Options
    • -9
    • +0
    ./org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java
    • -0
    • +2
    ./org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java
    • -0
    • +16
    ./org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -5
    • +0
    ./org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java
    • -0
    • +30
    ./org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
    • -0
    • +22
    ./org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -0
    • +23
    ./org/lamsfoundation/lams/tool/mc/dbupdates/patch20171031.sql
    • -0
    • +10
    ./org/lamsfoundation/lams/tool/mc/dto/AnswerDTO.java
    • -7
    • +23
    ./org/lamsfoundation/lams/tool/mc/pojos/McContent.java
    • -3
    • +19
    ./org/lamsfoundation/lams/tool/mc/pojos/McQueContent.java
    • -1
    • +12
    ./org/lamsfoundation/lams/tool/mc/pojos/McUsrAttempt.java
    • -11
    • +8
    ./org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -77
    • +65
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +3
    ./org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/web/action/McAction.java
  16. … 17 more files in changeset.
1:18 am

Andrey Balan

Merge branch 'LDEV-4451'

Options
    • -0
    • +6
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 3 more files in changeset.