lams-github / lams_gradebook / src

java

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
Wednesday 27 Jan 2021
7:39 pm

Marcin Cieslak

Merge branch 'LDEV-5140' into v4.0

Options
    • -0
    • +1
    ./org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java
7:36 pm

Marcin Cieslak

LDEV-5140 Correctly fetch info if emails will be sent

Options
    • -7
    • +9
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
7:35 pm

Marcin Cieslak

LDEV-5140 Add error information also in logs

Options
    • -0
    • +1
    ./org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java
6:00 pm

Marcin Cieslak

LDEV-5153 Remove obsolete GradebookServlet.

It was introduced for LDEV-2711.

Unnecessary optional layout modification has also been removed.

Options
    • -2
    • +0
    ./org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java
  2. … 4 more files in changeset.
1:17 am

Marcin Cieslak

LDEV-5140 Add learner filtering for sending emails

Options
    • -32
    • +9
    ./org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java
  2. … 4 more files in changeset.
Friday 22 Jan 2021
12:48 am

Marcin Cieslak

LDEV-5140 Use a rich HTML email template

Options
    • -29
    • +122
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -4
    • +0
    ./org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java
  3. … 3 more files in changeset.
Friday 15 Jan 2021
1:51 am

Marcin Cieslak

LDEV-5140 Add i18n labels and better responsiveness.

Options
    • -38
    • +41
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -1
    • +1
    ./org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java
    • -10
    • +28
    ./org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java
  4. … 4 more files in changeset.
12:42 am

Marcin Cieslak

LDEV-5140 Send emails on scheduled marks release. Refresh improvement.

Options
    • -10
    • +24
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -2
    • +3
    ./org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java
    • -7
    • +29
    ./org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java
  4. … 2 more files in changeset.
Thursday 14 Jan 2021
8:07 pm

Marcin Cieslak

LDEV-5140 Improve release marks schedule front-end flow

Options
    • -3
    • +4
    ./org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java
  2. … 1 more file in changeset.
5:46 am

Marcin Cieslak

LDEV-5140 Scheduled release marks basic functionality

Options
    • -0
    • +1
    ./org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml
    • -3
    • +185
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -4
    • +20
    ./org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java
    • -0
    • +43
    ./org/lamsfoundation/lams/gradebook/util/ReleaseMarksJob.java
    • -56
    • +24
    ./org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java
  6. … 2 more files in changeset.
Monday 11 Jan 2021
9:17 pm

Marcin Cieslak

LDEV-5140 Process included/excluded learners to send emails to

Options
    • -10
    • +47
    ./org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java
  2. … 2 more files in changeset.
Friday 08 Jan 2021
2:27 pm

Marcin Cieslak

LDEV-5140 Introduce Release Marks panel for sending emails to learners

Options
    • -3
    • +89
    ./org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java
  2. … 4 more files in changeset.
2:27 pm

Marcin Cieslak

LDEV-5140 Introduce Release Marks panel for sending emails to learners

Options
    • -3
    • +89
    ./org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java
  2. … 4 more files in changeset.
Wednesday 30 Dec 2020
5:05 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.0' into LDEV-5016

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java

lams_central/web/qb/collection.jsp

lams_central/web/questions/questionFile.jsp

lams_common/db/sql/create_lams_11_tables.sql

lams_common/db/sql/insert_lams_config_data.sql

lams_common/db/sql/insert_types_data.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200129.sql

lams_common/src/java/org/lamsfoundation/lams/questions/QuestionWordParser.java

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

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/db/sql/create_lams_tool_assessment.sql

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/model/McContent.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java

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

lams_tool_lamc/web/WEB-INF/tags/Arrow.tag

lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag

lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag

lams_tool_lamc/web/WEB-INF/tags/Rating.tag

lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

lams_tool_scratchie/web/pages/authoring/basic.jsp

lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp

Options
    • -5
    • +6
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
  2. … 29 more files in changeset.
Tuesday 17 Nov 2020
7:21 pm

Marcin Cieslak

LDEV-5113 Introduce manual grading tool output

Options
    • -5
    • +5
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
  2. … 4 more files in changeset.
Thursday 20 Aug 2020
2:46 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.0' into v5.0

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java

lams_central/web/questions/questionFile.jsp

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

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

lams_tool_assessment/web/pages/monitoring/summary.jsp

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_fr_FR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_no_NO.properties

lams_tool_lamc/db/sql/activity_insert.sql

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

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

lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag

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

lams_tool_lamc/web/WEB-INF/tags/Rating.tag

lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/authoring/editQuestionBox.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

Options
    • -22
    • +58
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
  2. … 25 more files in changeset.
1:49 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_gradebook/conf/language/lams/ApplicationResources.properties

Options
    • -12
    • +48
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
  2. … 3 more files in changeset.
Wednesday 19 Aug 2020
2:12 pm

Marcin Cieslak

LDEV-5064 Fix weighted mark calculation in selected lesson gradebook

Options
    • -8
    • +17
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
1:50 pm

Marcin Cieslak

LDEV-4813 Revert to an actually correct query for getting lessons

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
1:27 pm

Marcin Cieslak

LDEV-5063 Add info about activity weight in lesson gradebook export

Options
    • -3
    • +18
    ./org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -14
    • +41
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
  3. … 1 more file in changeset.
Friday 14 Aug 2020
3:32 pm

Marcin Cieslak

LDEV-4813 Fix an invalid query for getting lessons for gradebook

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
Tuesday 28 Jul 2020
3:04 pm

Marcin Cieslak

LDEV-5057 Use UTF-8 as default encoding for message sources

Options
    • -0
    • +1
    ./org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml
  2. … 33 more files in changeset.
Monday 22 Jun 2020
4:48 pm

Marcin Cieslak

LDEV-5041 Add lesson service utility method

Options
    • -10
    • +10
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
  2. … 5 more files in changeset.
Tuesday 21 Apr 2020
6:07 pm

Marcin Cieslak

LDEV-4999 Fix monitor role detection when updating learner mark

Options
    • -84
    • +84
    ./org/lamsfoundation/lams/gradebook/util/GradebookConstants.java
    • -625
    • +625
    ./org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java
  3. … 462 more files in changeset.
Saturday 22 Feb 2020
12:41 am

Andrey Balan

Merge branch 'LDEV-4979' into LDEV-4951

# Conflicts:

# 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

# lams_tool_lamc/build.properties

# lams_tool_lamc/db/sql/create_lams_tool_mc.sql

# lams_tool_lamc/db/sql/tool_insert.sql

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java

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

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

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

# lams_tool_lamc/web/403.jsp

# lams_tool_lamc/web/404.jsp

# lams_tool_lamc/web/WEB-INF/web.xml

# lams_tool_lamc/web/common/taglibs.jsp

# lams_tool_lamc/web/error.jsp

# lams_tool_lamc/web/login.jsp

Options
    • -3
    • +4
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
  2. … 6 more files in changeset.
Tuesday 18 Feb 2020
10:21 pm

Andrey Balan

LDEV-4951 Remove traces of MCQ tool from other modules

Options
    • -2
    • +1
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
  2. … 192 more files in changeset.
Tuesday 04 Feb 2020
11:10 pm

Marcin Cieslak

LDEV-4962 Introduce complex portrait UUIDs

Options
    • -5
    • +5
    ./org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
  2. … 35 more files in changeset.
11: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
    ./org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
  2. … 38 more files in changeset.
Thursday 30 Jan 2020
6:00 am

Andrey Balan

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

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

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
    ./org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java
  2. … 94 more files in changeset.