lams-github / lams_gradebook

src

Clone Tools

Stats

Commits this week: 0
Total Committers: 15
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
Tuesday 04 Feb 2020
4:10 pm

Marcin Cieslak

LDEV-4962 Introduce complex portrait UUIDs

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java

lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java

Options
    • -5
    • +5
    ./java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
  2. … 38 more files in changeset.
Wednesday 29 Jan 2020
11:00 pm

Andrey Balan

LDEV-4959 Prevent leader and non-leader from creating two GradebookUserLessons at the same time

Options
    • -3
    • +4
    ./java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
  2. … 1 more file in changeset.
Thursday 09 Jan 2020
8:59 am

Andrey Balan

Merge branch 'master' into v4.0

# Conflicts:

# lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_build/build.xml

# lams_build/liblist.txt

# lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

# lams_central/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_central/web/authoringConfirm.jsp

# lams_central/web/common/taglibs.jsp

# lams_central/web/includes/javascript/authoring/authoringGeneral.js

# lams_central/web/includes/javascript/outcome.js

# lams_central/web/outcome/outcomeEdit.jsp

# lams_central/web/outcome/outcomeManage.jsp

# lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

# lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java

# lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java

# lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp

# lams_tool_laqa/web/authoring/newQuestionBox.jsp

# lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp

# lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java

# lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java

# lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/web/pages/authoring/basic.jsp

# lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_www/web/WEB-INF/tags/OutcomeAuthor.tag

Options
    • -2
    • +1
    ./java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java
  2. … 94 more files in changeset.
Monday 30 Dec 2019
11:51 pm

Andrey Balan

LDEV-4932 Secure gradebook calls with CSRF Guard

* Secure the following gradebook calls in particular:

- Release marks

- Any change in marks

- Export

* Add taglibs.jsp to gradebook project

Options
    • -1
    • +0
    ./java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java
    • -75
    • +55
    ./java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java
  3. … 13 more files in changeset.
Monday 23 Dec 2019
1:25 pm

Andrey Balan

Merge branch 'develop' into LDEV-4745

# Conflicts:

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

Options
    • -5
    • +7
    ./java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
  2. … 1 more file in changeset.
Friday 20 Dec 2019
3:27 pm

Andrey Balan

LDEV-4933 Take care about null/100.0 case

Options
    • -6
    • +7
    ./java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
  2. … 2 more files in changeset.
1:45 pm

Andrey Balan

LDEV-4933 Fix exception thrown on exporting lesson Excel from Gradebook

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
Thursday 19 Dec 2019
9:33 pm

Andrey Balan

LDEV-4933 Fix exception thrown on exporting lesson Excel from Gradebook

Options
    • -2
    • +3
    ./java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
Wednesday 18 Dec 2019
11:21 pm

Andrey Balan

LDEV-4929 Add missing service method names to xApplicationContext.xmls

* Alphabetize method names in to xApplicationContext.xmls

Options
    • -4
    • +4
    ./java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml
  2. … 42 more files in changeset.
Monday 25 Nov 2019
11:10 am

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4745

Options
    • -94
    • +86
    ./java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
Friday 22 Nov 2019
5:21 pm

Marcin Cieslak

LDEV-4914 Do not allow NULLs in Lesson settings

Options
    • -94
    • +86
    ./java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java
  3. … 2 more files in changeset.
5:21 pm

Marcin Cieslak

LDEV-4914 Do not allow NULLs in Lesson settings

Options
    • -94
    • +86
    ./java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java
  3. … 2 more files in changeset.
Tuesday 19 Nov 2019
2:43 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/web/pages/learning/learning.jsp

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.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/controller/LearningController.java

lams_tool_scratchie/web/pages/learning/learning.jsp

Options
    • -56
    • +25
    ./java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
  2. … 21 more files in changeset.
Tuesday 12 Nov 2019
8:32 pm

Andrey Balan

LDEV-4900 Update Gradebook marks of non-leaders on leader finish

* Gradebook now pushes updated marks to LTI consumer. It happens only if

user has finished the lesson

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml
    • -56
    • +25
    ./java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -11
    • +0
    ./java/org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java
  4. … 58 more files in changeset.
Friday 08 Nov 2019
4:29 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

lams_central/web/main.jsp

lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

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

lams_tool_lamc/web/authoring/itemlist.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java

lams_tool_scratchie/web/pages/authoring/start.jsp

lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

Options
    • -345
    • +285
    ./java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -318
    • +297
    ./java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
  3. … 26 more files in changeset.
Friday 01 Nov 2019
7:08 pm

Andrey Balan

Merge branch 'master' into develop

Conflicts:

lams_central/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources_el_GR.properties

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

Options
    • -22
    • +1
    ./java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
  2. … 6 more files in changeset.
6:41 pm

Andrey Balan

LDEV-4897 Update Gradebook, Kumalive, and archived emails to use new Excel exporting methods

Options
    • -344
    • +284
    ./java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -4
    • +5
    ./java/org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java
    • -21
    • +0
    ./java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
    • -8
    • +8
    ./java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java
  5. … 7 more files in changeset.
Thursday 31 Oct 2019
3:54 pm

Andrey Balan

LDEV-4897 Update Scratchie and MCQ to use new Excel exporting methods

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
    • -3
    • +0
    ./java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java
  3. … 14 more files in changeset.
Wednesday 30 Oct 2019
5:35 pm

Andrey Balan

LDEV-4897 Introduce ExcelRow and ExcelSheet classes

* Update Daco and Assessment to use new classes

* Move existing ExcelCell and ExcelUtils to .util.excel package

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java
  5. … 29 more files in changeset.
Friday 25 Oct 2019
9:20 pm

Andrey Balan

Merge branch 'master' into develop

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
9:19 pm

Andrey Balan

LDEV-4859 Include time with dates

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
  2. … 4 more files in changeset.
Wednesday 16 Oct 2019
9:30 am

Marcin Cieslak

LDEV-4813 Improve slow queries

Options
    • -11
    • +14
    ./java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
  2. … 1 more file in changeset.
Monday 14 Oct 2019
12:17 pm

Marcin Cieslak

LDEV-4776 Fix a query for fetching Lesson Gradebook data

Options
    • -2
    • +1
    ./java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
Thursday 04 Jul 2019
5:48 pm

Marcin Cieslak

LDEV-4834 Initial implementation of Learning Outcomes in Question Bank

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
  2. … 50 more files in changeset.
Wednesday 03 Jul 2019
9:25 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4834

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources_en_AU.properties

# lams_central/web/includes/javascript/ckconfig_custom.js

# lams_central/web/main.jsp

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_tool_assessment/conf/language/lams/ApplicationResources.properties

# lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.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/controller/LearningController.java

# lams_tool_assessment/web/pages/learning/parts/markhedging.jsp

# lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp

# lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp

# lams_tool_assessment/web/pages/learning/parts/ordering.jsp

# lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# lams_tool_lamc/conf/language/lams/ApplicationResources.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

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

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java

# lams_tool_lamc/web/authoring/BasicContent.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/authoring/itemlist.jsp

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java

# lams_tool_scratchie/web/pages/learning/learning.jsp

# lams_tool_scratchie/web/pages/learning/scratchies.jsp

# lams_tool_scratchie/web/pages/monitoring/summary.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

Options
    • -0
    • +1
    ./java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java
    • -5
    • +7
    ./java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java
  3. … 53 more files in changeset.
Wednesday 05 Jun 2019
8:56 am

Marcin Cieslak

LDEV-4828 Paging and search in QB collections jqGrid

Options
    • -87
    • +83
    ./java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java
    • -341
    • +318
    ./java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
    • -623
    • +623
    ./java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java
  4. … 8 more files in changeset.
Tuesday 23 Apr 2019
2:05 pm

Marcin Cieslak

LDEV-4813 Use tables only if a condition is provided

If tables are used and no condition which uses them is provided, a full

outer join is run. It takes ages to complete on a large instance.

Options
    • -6
    • +9
    ./java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
Wednesday 03 Apr 2019
2:04 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into develop

Options
    • -10
    • +14
    ./java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
Monday 01 Apr 2019
5:55 pm

Marcin Cieslak

LKC-179 Descent into branching when displaying activities in gradebook

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
5:53 pm

Marcin Cieslak

LKC-179 Change activity soring in gradebook to reflect sequence in LD

Options
    • -0
    • +1
    ./java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java
    • -10
    • +14
    ./java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
  3. … 1 more file in changeset.