lams-github / lams_tool_lamc

web

Clone Tools

Stats

Commits this week: 0
Total Committers: 25
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 01 Aug 2018
4:51 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Migration of Chat - controllers, no tiles and no struts

Options
    • -1
    • +1
    ./monitoring/Edit.jsp
  2. … 68 more files in changeset.
Friday 27 Jul 2018
2:55 pm

Marcin Cieslak

Merge Asia's Image Gallery

Options
    • -5
    • +4
    ./WEB-INF/tags/AuthoringButton.tag
    • -1
    • +0
    ./WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -31
    • +30
    ./WEB-INF/tags/AuthoringRatingCriteria.tag
    • -9
    • +6
    ./WEB-INF/tags/CommentsAuthor.tag
    • -3
    • +4
    ./WEB-INF/tags/Page.tag
    • -1
    • +0
    ./WEB-INF/tags/Rating.tag
    • -1
    • +0
    ./WEB-INF/tags/StyledRating.tag
    • -1
    • +0
    ./WEB-INF/tags/TabBody.tag
    • -1
    • +0
    ./WEB-INF/tags/TabBodyArea.tag
    • -52
    • +39
    ./WEB-INF/tags/TextSearch.tag
    • -23
    • +9
    ./WEB-INF/web.xml
    • -17
    • +16
    ./authoring/AdvancedContent.jsp
    • -9
    • +10
    ./authoring/AuthoringTabsHolder.jsp
    • -7
    • +6
    ./authoring/BasicContent.jsp
    • -1
    • +1
    ./authoring/candidateAnswersList.jsp
  16. … 62 more files in changeset.
2:01 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Migration in progress

Options
    • -3
    • +4
    ./authoring/AuthoringTabsHolder.jsp
  2. … 17 more files in changeset.
Wednesday 25 Jul 2018
9:07 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Started migration of Multiple Choices

Options
    • -0
    • +17
    ./WEB-INF/spring-servlet.xml
    • -5
    • +4
    ./WEB-INF/tags/AuthoringButton.tag
    • -1
    • +0
    ./WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -31
    • +30
    ./WEB-INF/tags/AuthoringRatingCriteria.tag
    • -9
    • +6
    ./WEB-INF/tags/CommentsAuthor.tag
    • -3
    • +4
    ./WEB-INF/tags/Page.tag
    • -1
    • +0
    ./WEB-INF/tags/Rating.tag
    • -1
    • +0
    ./WEB-INF/tags/StyledRating.tag
    • -1
    • +0
    ./WEB-INF/tags/TabBody.tag
    • -1
    • +0
    ./WEB-INF/tags/TabBodyArea.tag
    • -52
    • +39
    ./WEB-INF/tags/TextSearch.tag
    • -13
    • +0
    ./WEB-INF/validation.xml
    • -23
    • +9
    ./WEB-INF/web.xml
    • -17
    • +16
    ./authoring/AdvancedContent.jsp
    • -6
    • +6
    ./authoring/AuthoringTabsHolder.jsp
  16. … 38 more files in changeset.
Saturday 21 Jul 2018
5:18 pm

Andrey Balan

LDEV-4493 Fix MCQ ped planner

Options
    • -0
    • +1
    ./authoring/pedagogicalPlannerForm.jsp
  2. … 1 more file in changeset.
Friday 22 Jun 2018
7:28 pm

Marcin Cieslak

LDEV-4607 Confirm delete marks on output change in monitoring

Options
    • -1
    • +8
    ./monitoring/parts/statsPart.jsp
  2. … 3 more files in changeset.
6:42 pm

Marcin Cieslak

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

Options
    • -5
    • +0
    ./monitoring/parts/statsPart.jsp
    • -1
    • +1
    ./monitoring/parts/toolOutput.jsp
  3. … 10 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
    ./learning/ViewAnswers.jsp
5:07 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4596 Prefix letters shown on results and in monitoring

Options
    • -0
    • +19
    ./learning/ViewAnswers.jsp
    • -1
    • +6
    ./monitoring/parts/advanceQuestions.jsp
  3. … 2 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
    ./authoring/AdvancedContent.jsp
2:44 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • -7
    • +24
    ./authoring/AdvancedContent.jsp
    • -1
    • +1
    ./learning/ViewAnswers.jsp
    • -1
    • +5
    ./monitoring/MonitoringMaincontent.jsp
    • -2
    • +32
    ./monitoring/parts/advanceOptions.jsp
  5. … 15 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-INF/tags/Comments.tag
    • -1
    • +22
    ./WEB-INF/tags/CommentsAuthor.tag
  3. … 91 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-INF/tags/Page.tag
  2. … 35 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
    • -0
    • +15
    ./WEB-INF/web.xml
  2. … 83 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
    ./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
    ./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
    ./authoring/editQuestionBox.jsp
  2. … 14 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
    • -19
    • +2
    ./tblmonitoring/mcqStudentChoices.jsp
  2. … 2 more files 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
    • +24
    ./WEB-INF/struts-config.xml
    • -0
    • +15
    ./WEB-INF/web.xml
    • -0
    • +3
    ./common/taglibs.jsp
    • -0
    • +80
    ./tblmonitoring/mcq.jsp
    • -0
    • +156
    ./tblmonitoring/mcqStudentChoices.jsp
    • -0
    • +38
    ./tblmonitoring/teams.jsp
  7. … 46 more files in changeset.
Thursday 15 Feb 2018
4: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-INF/tags/LeaderDisplay.tag
    • -1
    • +1
    ./learning/AnswersContent.jsp
    • -1
    • +1
    ./learning/ViewAnswers.jsp
  4. … 31 more files in changeset.
Friday 05 Jan 2018
3:27 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4421 Comments allowed for authored items in Share Resources

Options
    • -1
    • +27
    ./WEB-INF/tags/Comments.tag
  2. … 65 more files in changeset.
Wednesday 22 Nov 2017
1:55 pm

Andrey Balan

LDEV-4473 Add bootstrap.js when it's not available on page

Options
    • -1
    • +7
    ./WEB-INF/tags/Page.tag
  2. … 30 more files in changeset.
Tuesday 21 Nov 2017
6:11 pm

Andrey Balan

LDEV-4470 Fix conflict between query-ui's slider and bootstrap-slider

Options
    • -0
    • +5
    ./learning/AnswersContent.jsp
    • -1
    • +1
    ./learning/CombinedAnswersContent.jsp
    • -1
    • +1
    ./learning/SingleQuestionAnswersContent.jsp
    • -1
    • +6
    ./learning/ViewAnswers.jsp
  5. … 4 more files in changeset.
Wednesday 15 Nov 2017
9:54 pm

Andrey Balan

LDEV-4436 Ability to change portrait in learner

Options
    • -12
    • +49
    ./WEB-INF/tags/Page.tag
  2. … 33 more files in changeset.
Wednesday 08 Nov 2017
4:45 pm

Andrey Balan

LDEV-4451 Add scss files and fix their names

Options
    • -3
    • +4
    ./monitoring/SummaryContent.jsp
  2. … 9 more files in changeset.
Thursday 02 Nov 2017
10:30 pm

Andrey Balan

LDEV-4451 Ability to save confidence levels in MCQ

And also return them to Scratchie on request.

Options
    • -0
    • +7
    ./authoring/AdvancedContent.jsp
    • -8
    • +7
    ./learning/AnswersContent.jsp
    • -29
    • +41
    ./learning/CombinedAnswersContent.jsp
    • -1
    • +21
    ./learning/SingleQuestionAnswersContent.jsp
    • -9
    • +51
    ./learning/ViewAnswers.jsp
    • -4
    • +5
    ./monitoring/MonitoringMaincontent.jsp
    • -25
    • +32
    ./monitoring/SummaryContent.jsp
    • -0
    • +3
    ./monitoring/masterDetailLoadUp.jsp
  9. … 24 more files in changeset.
Monday 16 Oct 2017
11:41 am

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
    • -0
    • +4
    ./monitoring/Edit.jsp
  2. … 12 more files in changeset.
Monday 18 Sep 2017
2: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-INF/tags/StyledRating.tag
  2. … 44 more files in changeset.
Monday 04 Sep 2017
5:53 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Images, IMSCC, Kalture, MC and QA

Options
    • -1
    • +1
    ./monitoring/MonitoringMaincontent.jsp
    • -2
    • +3
    ./monitoring/Reflections.jsp
    • -7
    • +20
    ./monitoring/SummaryContent.jsp
  4. … 23 more files in changeset.
5:53 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Images, IMSCC, Kalture, MC and QA

Options
    • -1
    • +1
    ./monitoring/MonitoringMaincontent.jsp
    • -2
    • +3
    ./monitoring/Reflections.jsp
    • -7
    • +20
    ./monitoring/SummaryContent.jsp
  4. … 23 more files in changeset.