lams-github

Clone Tools

Stats

Commits this week: 0
Total Committers: 50
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
Monday 16 Apr 2018
2:59 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4553 Template TBL Assessment offers multiple choice

Options
    • -1
    • +8
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -1
    • +3
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +156
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/Assessment.java
    • -52
    • +33
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java
    • -19
    • +61
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java
    • -1
    • +4
    /lams_central/web/WEB-INF/struts-config.xml
    • -8
    • +46
    /lams_central/web/authoring/template/comms.jsp
    • -2
    • +2
    /lams_central/web/authoring/template/grouping.jsp
    • -8
    • +4
    /lams_central/web/authoring/template/tbl/tbl.jsp
    • -0
    • +50
    /lams_central/web/authoring/template/tool/assessgradeselector.jsp
    • -0
    • +66
    /lams_central/web/authoring/template/tool/assessmcq.jsp
    • -5
    • +13
    /lams_central/web/authoring/template/tool/assessment.jsp
    • -0
    • +36
    /lams_central/web/authoring/template/tool/assessoption.jsp
    • -0
    • +14
    /lams_central/web/authoring/template/tool/assessredooption.jsp
    • -2
    • +6
    /lams_central/web/authoring/template/tool/mcquestion.jsp
    • -2
    • +3
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Friday 13 Apr 2018
3:17 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4554 Completed optional activities are now links to revisit.

Options
    • -0
    • +5
    /lams_central/web/css/_learner_base.scss
    • -2
    • +2
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
    • -5
    • +3
    /lams_learning/web/optionsActivity.jsp
12:02 pm

Marcin Cieslak

LDEV-4545 Skip gates in a TBL sequence

Options
    • -6
    • +14
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
6:52 am

Andrey Balan

LDEV-4540 Allow non-leaders see results page together with leader

Previously non-leader could see the results page only when the

leader goes to the next activity. If the leader is still on the

results page, a non-leader still sees the read-only questions page.

This way working with answer disclosing was pretty much

impossible so we allowed non-leaders see results page

simultaneously with leader.

Options
    • -1
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +9
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java
    • -0
    • +15
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -1
    • +6
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +8
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -9
    • +13
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
Thursday 12 Apr 2018
7:41 pm

Marcin Cieslak

Merge branch 'LDEV-4548'

Options
7:41 pm

Marcin Cieslak

LDEV-4548 Disable login button after clicking

Options
    • -0
    • +1
    /lams_central/web/login.jsp
    • -0
    • +1
    /lams_central/web/loginTwoFactorAuth.jsp
7:34 pm

Marcin Cieslak

Merge branch 'LDEV-4545'

Options
7:33 pm

Marcin Cieslak

LDEV-4545 Highlight TBL activities which need grouping

Options
    • -2
    • +5
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
    • -1
    • +5
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -0
    • +4
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
7:21 pm

Marcin Cieslak

LDEV-4545 List activities which should be grouped in TBL sequence

Options
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -24
    • +66
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
6:34 pm

Marcin Cieslak

LDEV-4540 Change layout of other groups' answers for MC questions

Options
    • -0
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -0
    • +9
    /lams_tool_assessment/web/pages/learning/results.jsp
    • -0
    • +1
    /lams_tool_assessment/web/pages/learning/results/essay.jsp
    • -39
    • +27
    /lams_tool_assessment/web/pages/learning/results/multiplechoice.jsp
5:44 pm

Marcin Cieslak

LDEV-4540 Show correct answers and user's answers separately

Options
    • -4
    • +4
    /lams_tool_assessment/web/pages/learning/results/multiplechoice.jsp
3:32 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: fixing Greek quotes in javascript

Options
    • -3
    • +3
    /lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties
Wednesday 11 Apr 2018
9:52 pm

Marcin Cieslak

LDEV-4540 Move groups' answers under each question

Options
    • -1
    • +0
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -6
    • +9
    /lams_tool_assessment/web/pages/learning/results.jsp
    • -1
    • +30
    /lams_tool_assessment/web/pages/learning/results/essay.jsp
    • -5
    • +55
    /lams_tool_assessment/web/pages/learning/results/multiplechoice.jsp
    • -138
    • +0
    /lams_tool_assessment/web/pages/learning/results/tblsummary.jsp
9:06 pm

Marcin Cieslak

LDEV-4540 Do not show correct answers until they are disclosed

Till now other groups' answers were marked as correct no matter if

correct answers were disclosed by a monitor.

Options
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/results/tblsummary.jsp
8:09 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4549 Refreshing learner screen no longer duplicates files.

Options
    • -1
    • +1
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dao/hibernate/SubmitUserDAO.java
    • -1
    • +1
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java
    • -29
    • +86
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
    • -44
    • +75
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/LearnerAction.java
    • -1
    • +1
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java
    • -0
    • +5
    /lams_tool_sbmt/web/WEB-INF/struts-config.xml
    • -0
    • +29
    /lams_tool_sbmt/web/learner/redirectAfterSubmit.jsp
    • -2
    • +3
    /lams_tool_sbmt/web/learner/sbmtlearner.jsp
6:19 pm

Marcin Cieslak

Merge branch 'LDEV-4552'

Options
6:18 pm

Marcin Cieslak

LDEV-4552 Make Edit Class dialog wider and fit its space better

Options
    • -1
    • +1
    /lams_monitoring/web/includes/javascript/monitorLesson.js
    • -2
    • +2
    /lams_monitoring/web/monitor.jsp
6:07 pm

Marcin Cieslak

Merge branch 'LDEV-4551'

Options
6:07 pm

Marcin Cieslak

LDEV-4551 Centre new pop up windows

Options
    • -1
    • +4
    /lams_central/web/includes/javascript/authoring/authoringMenu.js
    • -1
    • +4
    /lams_central/web/includes/javascript/common.js
5:47 pm

Marcin Cieslak

Merge branch 'LDEV-4546'

Options
5:45 pm

Marcin Cieslak

LDEV-4546 Limit coordinates where a dialog can be dragged to

Options
    • -2
    • +2
    /lams_central/web/includes/javascript/dialog.js
Tuesday 10 Apr 2018
2:45 pm

Marcin Cieslak

Merge branch 'LDEV-4550'

Options
2:44 pm

Marcin Cieslak

LDEV-4550 Centre learner and other pop ups

Open the window a bit higher than centre for better readibility.

Also clean up obsolete JS functions.

Options
    • -245
    • +216
    /lams_central/web/includes/javascript/openUrls.js
11:42 am

Marcin Cieslak

LDEV-4540 Add logs

Options
    • -0
    • +10
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
11:41 am

Marcin Cieslak

LDEV-4540 Allow disclosing correct/groups answers in plain monitoring

Options
    • -22
    • +66
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -40
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/TblMonitoringAction.java
    • -0
    • +8
    /lams_tool_assessment/web/WEB-INF/struts-config.xml
    • -1
    • +0
    /lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
    • -14
    • +152
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
    • -2
    • +3
    /lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp
10:27 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4543 Can access resources from monitor with no sessions

Options
    • -0
    • +16
    /lams_tool_larsrc/.externalToolBuilders/SASS_lams_tool_larsrc.launch
    • -0
    • +1
    /lams_tool_larsrc/.gitignore
    • -0
    • +9
    /lams_tool_larsrc/.project
    • -1
    • +1
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java
    • -7
    • +38
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
    • -2
    • +2
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
    • -1
    • +2
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
    • -0
    • +27
    /lams_tool_larsrc/web/css/monitor.scss
    • -22
    • +26
    /lams_tool_larsrc/web/pages/monitoring/summary.jsp
Monday 09 Apr 2018
9:48 pm

Marcin Cieslak

LDEV-4540 Refresh learners' results page when monitor discloses answers

Options
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -0
    • +16
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +7
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -6
    • +16
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/TblMonitoringAction.java
    • -0
    • +11
    /lams_tool_assessment/web/pages/learning/results/tblsummary.jsp
    • -2
    • +3
    /lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp
9: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
    /lams_admin/web/WEB-INF/tags/Page.tag
    • binary
    /lams_build/lib/lams/lams-learning.jar
    • -0
    • +8
    /lams_central/web/WEB-INF/tags/Page.tag
    • -0
    • +8
    /lams_gradebook/web/WEB-INF/tags/Page.tag
    • -0
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -0
    • +17
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -0
    • +8
    /lams_learning/web/WEB-INF/tags/Page.tag
    • -0
    • +8
    /lams_monitoring/web/WEB-INF/tags/Page.tag
    • -0
    • +8
    /lams_tool_assessment/web/WEB-INF/tags/Page.tag
    • -0
    • +8
    /lams_tool_bbb/web/WEB-INF/tags/Page.tag
    • -0
    • +8
    /lams_tool_chat/web/WEB-INF/tags/Page.tag
    • -0
    • +8
    /lams_tool_daco/web/WEB-INF/tags/Page.tag
    • -0
    • +8
    /lams_tool_doku/web/WEB-INF/tags/Page.tag
    • -0
    • +8
    /lams_tool_forum/web/WEB-INF/tags/Page.tag
    • -0
    • +8
    /lams_tool_gmap/web/WEB-INF/tags/Page.tag
  16. … 21 more files in changeset.
7:39 pm

Marcin Cieslak

LDEV-4540 Add "disclose all" buttons to TBL monitor

Options
    • -0
    • +4
    /lams_monitoring/web/css/tblmonitor.scss
    • -0
    • +2
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -13
    • +73
    /lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp
6:14 pm

Marcin Cieslak

LDEV-4540 Redirect to action rather than JSP after submit all

Redirecting to JSP prevents request attributes from being set properly

and they are needed for the new results page.

Options
    • -8
    • +8
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java