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
Wednesday 05 Jun 2019
8:11 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Activities removable in build, RAT and AE have QTI Import

Options
    • -1
    • +6
    /lams_central/build.properties
    • -0
    • +26
    /lams_central/build.xml
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -1
    • +4
    /lams_central/conf/language/lams/TBLResources.properties
    • -3
    • +85
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -107
    • +240
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -1
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java
    • -4
    • +18
    /lams_central/web/authoring/template/comms.jsp
    • -11
    • +72
    /lams_central/web/authoring/template/tbl/tbl.jsp
    • -5
    • +28
    /lams_central/web/authoring/template/tool/assessmcq.jsp
    • -2
    • +4
    /lams_central/web/authoring/template/tool/assessment.jsp
    • -0
    • +29
    /lams_central/web/authoring/template/tool/assessmentQTI.jsp
    • -8
    • +1
    /lams_central/web/authoring/template/tool/mcoption.jsp
    • -23
    • +43
    /lams_central/web/authoring/template/tool/mcquestion.jsp
    • -0
    • +22
    /lams_central/web/authoring/template/tool/mcquestionQTI.jsp
  16. … 3 more files in changeset.
4:17 pm

Marcin Cieslak

LDEV-4828 Add QB collections link on index page

Options
    • -884
    • +885
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -302
    • +306
    /lams_central/src/java/org/lamsfoundation/lams/web/IndexController.java
    • -0
    • +4
    /lams_central/web/includes/javascript/openUrls.js
    • -331
    • +339
    /lams_central/web/main.jsp
3:55 pm

Marcin Cieslak

LDEV-4828 Multiselect in QB collection jqGrid

Options
    • -3
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -5
    • +98
    /lams_central/web/qb/collection.jsp
3:54 pm

Marcin Cieslak

LDEV-4828 Fix displaying HTML options in chart

Options
    • -3
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
3:52 pm

Marcin Cieslak

LDEV-4828 Fix a CSS link on QB stats page

Options
    • -285
    • +285
    /lams_central/web/qb/stats.jsp
2:56 pm

Marcin Cieslak

LDEV-4828 Paging and search in QB collections jqGrid

Options
    • -26
    • +26
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -4
    • +4
    /lams_central/web/qb/collection.jsp
    • -1
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -9
    • +54
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -1
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -2
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
    • -63
    • +68
    /lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java
    • -512
    • +538
    /lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java
    • -87
    • +83
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java
    • -341
    • +318
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
    • -623
    • +623
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java
1:12 pm

Marcin Cieslak

LDEV-4828 Initial implementation of QB collections front end

Options
    • -0
    • +151
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -0
    • +77
    /lams_central/web/qb/collection.jsp
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbCollection.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -1
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
Tuesday 04 Jun 2019
5:07 am

Andrey Balan

Merge branch 'master' into develop

Options
5:05 am

Andrey Balan

Merge branch 'LDEV-4830'

Options
5:04 am

Andrey Balan

LDEV-4830 LTI requests should proceed with "author" method in order to acquire author and monitor roles as well

Options
    • -8
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
5:03 am

Andrey Balan

LDEV-4830 if integration method is "monitor", assign user monitor role only (no learner, no author)

Options
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/GradebookServlet.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
    • -9
    • +20
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
Monday 03 Jun 2019
5:17 pm

Marcin Cieslak

LDEV-4828 Add QB collections model and service methods

Options
    • -0
    • +43
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190531.sql
    • -0
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -0
    • +32
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +99
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbCollection.java
    • -1
    • +21
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -0
    • +77
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
Thursday 30 May 2019
10:00 pm

Marcin Cieslak

Merge branch 'LDEV-4827' into LDEV-4745

Options
9:52 pm

Marcin Cieslak

LDEV-4827 Use configuration settings for question stats

Options
    • -2
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -2
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
9:50 pm

Marcin Cieslak

LDEV-4827 Add Question Bank settings to sysadmin

Options
    • -641
    • +648
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -16
    • +16
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190119.sql
    • -0
    • +20
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190530.sql
    • -295
    • +301
    /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
8:08 am

Andrey Balan

LDEV-4826 Move import/export QTI questions feature to QB

Options
    • -0
    • +476
    /lams_central/src/java/org/lamsfoundation/lams/web/controller/ImsQtiController.java
    • -0
    • +56
    /lams_central/web/questions/importExport.jsp
8:06 am

Andrey Balan

LDEV-4826 Remove import/export QTI questions feature from tools

Options
    • -0
    • +2
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +0
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -438
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/QTIUtil.java
    • -36
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -29
    • +1
    /lams_tool_assessment/web/pages/authoring/basic.jsp
    • -9
    • +0
    /lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp
    • -136
    • +0
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
    • -29
    • +0
    /lams_tool_lamc/web/authoring/BasicContent.jsp
    • -9
    • +0
    /lams_tool_lamc/web/authoring/itemlist.jsp
    • -2
    • +0
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
    • -122
    • +0
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -30
    • +2
    /lams_tool_scratchie/web/pages/authoring/basic.jsp
    • -18
    • +7
    /lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp
Wednesday 29 May 2019
10:21 pm

Marcin Cieslak

Merge branch 'LDEV-4825' into LDEV-4745

Options
10:20 pm

Marcin Cieslak

LDEV-4825 Show links to activity monitoring on QB stats page

Also fix displaying QB stats in tools' monitoring pages.

Options
    • -2
    • +15
    /lams_central/web/qb/stats.jsp
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -5
    • +24
    /lams_common/src/java/org/lamsfoundation/lams/qb/dto/QbStatsActivityDTO.java
    • -1
    • +18
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
    • -3
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -3
    • +2
    /lams_tool_assessment/web/pages/monitoring/statisticpart.jsp
    • -4
    • +3
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
    • -3
    • +2
    /lams_tool_lamc/web/monitoring/parts/statsPart.jsp
    • -3
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -3
    • +2
    /lams_tool_scratchie/web/pages/monitoring/parts/statisticpart.jsp
9:02 pm

Marcin Cieslak

LDEV-4825 Display QB stats in Assessment tool monitoring

Options
    • -348
    • +352
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -618
    • +632
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -167
    • +231
    /lams_tool_assessment/web/pages/monitoring/statisticpart.jsp
8:36 pm

Marcin Cieslak

LDEV-4825 Display QB stats in Scratchie tool monitoring

Options
    • -237
    • +241
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -0
    • +19
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -69
    • +124
    /lams_tool_scratchie/web/pages/monitoring/parts/statisticpart.jsp
7:55 pm

Marcin Cieslak

LDEV-4825 Display QB stats in MCQ tool monitoring

Options
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -0
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
    • -241
    • +245
    /lams_tool_lamc/conf/language/lams/ApplicationResources.properties
    • -3
    • +14
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
    • -164
    • +229
    /lams_tool_lamc/web/monitoring/parts/statsPart.jsp
7:27 am

Andrey Balan

LDEV-4823 Fix exception on adding and removing questions simultaneously

Options
    • -13
    • +12
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -10
    • +6
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
4:35 am

Marcin Cieslak

LDEV-4825 Fix general stats generation

Take into account Scratchie (multiple learners answer the same as

leader) and Assessment (answers are in a different table) specific

stuff.

Options
    • -4
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -32
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -1
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -8
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
4:34 am

Marcin Cieslak

LDEV-4825 Mark graded options from Assessment as correct in QB

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
Tuesday 28 May 2019
4:02 am

Marcin Cieslak

LDEV-4825 Calculate and display question indexes on stats page

Options
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -9
    • +24
    /lams_central/web/qb/stats.jsp
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -0
    • +27
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +52
    /lams_common/src/java/org/lamsfoundation/lams/qb/dto/QbStatsActivityDTO.java
    • -22
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/qb/dto/QbStatsDTO.java
    • -9
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -22
    • +119
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
Saturday 25 May 2019
4:22 am

Andrey Balan

Merge branch 'master' into develop

Options
4:21 am

Andrey Balan

Merge branch 'LDEV-4820'

Options
4:20 am

Andrey Balan

LDEV-4820 Show user names as tooltips

Options
    • -0
    • +52
    /lams_tool_scratchie/web/includes/css/scratchie-learning.scss
    • -41
    • +24
    /lams_tool_scratchie/web/pages/learning/learning.jsp
    • -10
    • +8
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
Thursday 23 May 2019
8:50 pm

Andrey Balan

LDEV-4745 Remove &nbsp; after closing '>' as it prevents finding identical questions

Also take care about string answer in tl_laasse10_question_result.

Options
    • -17
    • +28
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql