lams-github

lams_tool_lamc

Clone Tools

Stats

Commits this week: 0
Total Committers: 27
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
    ./src/java/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
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -2
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  3. … 22 more files in changeset.
Friday 22 Jun 2018
7:28 pm

Marcin Cieslak

LDEV-4607 Confirm delete marks on output change in monitoring

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +8
    ./web/monitoring/parts/statsPart.jsp
  3. … 2 more files in changeset.
6:42 pm

Marcin Cieslak

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

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -32
    • +31
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
    • -5
    • +0
    ./web/monitoring/parts/statsPart.jsp
    • -1
    • +1
    ./web/monitoring/parts/toolOutput.jsp
  5. … 8 more files in changeset.
Tuesday 05 Jun 2018
5:33 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4596: Letters should also display when reviewing questions

Small layout fix

Options
    • -1
    • +1
    ./web/learning/ViewAnswers.jsp
5:07 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4596 Prefix letters shown on results and in monitoring

Options
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/tool/mc/pojos/McOptsContent.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -0
    • +19
    ./web/learning/ViewAnswers.jsp
    • -1
    • +6
    ./web/monitoring/parts/advanceQuestions.jsp
Tuesday 22 May 2018
9:04 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating and fixing labels

There's quite a lot of work required with labels and it's not jsut translations but rearringing them according to language, string lenght, etc. Also we shouild be more accurate in naming users. When we are referring to students, we should call them students instead of users. Quite a few of these instances in this commit

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -15
    • +15
    ./conf/language/lams/ApplicationResources_es_ES.properties
  4. … 46 more files in changeset.
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
    • -8
    • +7
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +8
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +7
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -105
    • +46
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +8
    ./conf/language/lams/ApplicationResources_no_NO.properties
  6. … 34 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
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -1
    • +22
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  4. … 20 more files in changeset.
Monday 14 May 2018
3:28 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4577: minor UI improvement

Adding a heading to feedback options in advanced tab authoring

Options
    • -1
    • +1
    ./web/authoring/AdvancedContent.jsp
2:44 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • -1
    • +9
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McContent.hbm.xml
    • -4
    • +10
    ./conf/language/lams/ApplicationResources.properties
    • -4
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20180511.sql
    • -3
    • +13
    ./src/java/org/lamsfoundation/lams/tool/mc/dto/McGeneralLearnerFlowDTO.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/mc/dto/McGeneralMonitoringDTO.java
    • -3
    • +14
    ./src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -7
    • +12
    ./src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningStarterAction.java
    • -1
    • +22
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringStarterAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McStarterAction.java
    • -5
    • +5
    ./src/java/org/lamsfoundation/lams/tool/mc/web/form/McAuthoringForm.java
  16. … 4 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
    • +18
    ./src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20180425.sql
    • -18
    • +0
    ./src/java/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
    ./src/java/org/lamsfoundation/lams/tool/mc/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
    • +11
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +13
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -7
    • +6
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +15
    ./conf/language/lams/ApplicationResources_no_NO.properties
  5. … 53 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
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
    • -0
    • +128
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/TblMonitoringAction.java
    • -0
    • +15
    ./web/WEB-INF/web.xml
  6. … 79 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
    • -28
    • +16
    ./web/error.jsp
  2. … 34 more files in changeset.
1:24 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4532 Opening collapsable panels no longer makes screen jump

Options
    • -1
    • +1
    ./web/authoring/editQuestionBox.jsp
  2. … 15 more files in changeset.
Friday 16 Mar 2018
5:01 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4532 Burning Questions accessible on iPad

Also did the same fix to similar entries in authoring to ensure

they would work on an iPad

Options
    • -1
    • +1
    ./web/authoring/editQuestionBox.jsp
  2. … 14 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
    ./src/java/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
    ./src/java/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
    ./src/java/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
    ./src/java/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
    ./src/java/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
    ./src/java/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
    ./src/java/org/lamsfoundation/lams/tool/mc/dto/McOptionDTO.java
    • -7
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/TblMonitoringAction.java
    • -19
    • +2
    ./web/tblmonitoring/mcqStudentChoices.jsp
Tuesday 27 Feb 2018
3:59 am

Andrey Balan

LKC-89 add labels

To be able to use them even before they will be added to i18n server

Options
    • -0
    • +7
    ./conf/language/lams/ApplicationResources_en_AU.properties
  2. … 3 more files in changeset.
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
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -7
    • +12
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +135
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/TblMonitoringAction.java
    • -0
    • +24
    ./web/WEB-INF/struts-config.xml
    • -0
    • +15
    ./web/WEB-INF/web.xml
    • -0
    • +3
    ./web/common/taglibs.jsp
    • -0
    • +80
    ./web/tblmonitoring/mcq.jsp
    • -0
    • +156
    ./web/tblmonitoring/mcqStudentChoices.jsp
    • -0
    • +38
    ./web/tblmonitoring/teams.jsp
  12. … 41 more files in changeset.