lams-github / lams_tool_scratchie / web / pages / tblmonitoring

burningQuestions.jsp

Clone Tools

Stats

Commits this week: 0
Total Committers: 7
Last Commit: 09 Apr 24
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 09 Apr 2024
1:16 am

Andrey Balan

Merge branch 'v4.8' into LDEV-5424

# Conflicts:

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

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

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

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

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

# lams_tool_daco/web/pages/monitoring/listRecords.jsp

# lams_tool_forum/web/jsps/monitoring/updatemarks.jsp

# lams_tool_forum/web/jsps/monitoring/viewmarks.jsp

# lams_tool_images/web/pages/monitoring/imagesummary.jsp

# lams_tool_laqa/web/monitoring/PrintAnswers.jsp

# lams_tool_larsrc/web/pages/monitoring/userlist.jsp

# lams_tool_leader/web/pages/monitoring/changeLeaderDialog5.jsp

# lams_tool_leader/web/pages/monitoring/manageLeaders.jsp

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

# lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp

# lams_tool_preview/web/pages/monitoring/rubricspart.jsp

# lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp

Options
    • -0
    • +5
    ./burningQuestions.jsp
  2. … 30 more files in changeset.
Thursday 22 Feb 2024
9:23 pm

Andrey Balan

LDEV-5424 bootstrap5 Scratchie monitoring

Options
    • -0
    • +93
    ./burningQuestions.jsp
  2. … 16 more files in changeset.
Monday 15 Feb 2021
7:53 am

Marcin Cieslak

LDEV-5175 Use TBL burning questions layout in monitoring in Scratchie

Options
    • -164
    • +0
    ./burningQuestions.jsp
  2. … 6 more files in changeset.
Sunday 25 Oct 2020
7:20 am

Marcin Cieslak

LDEV-5020 Prevent "Show options" link from going to top of page

Options
    • -6
    • +13
    ./burningQuestions.jsp
Thursday 14 May 2020
3:33 am

Ernie Ghiglione

LDEV-5020 Adding spacing between question and answers

Options
    • -1
    • +1
    ./burningQuestions.jsp
Tuesday 12 May 2020
12:13 pm

Marcin Cieslak

LDEV-5020 Fix a bug preventing letters from showing in question options

Options
    • -1
    • +1
    ./burningQuestions.jsp
9:59 am

Marcin Cieslak

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

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_build/3rdParty.userlibraries

lams_build/build.xml

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

lams_central/web/includes/javascript/openUrls.js

lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

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

lams_common/src/java/org/lamsfoundation/lams/outcome/Outcome.java

lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeMapping.java

lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeScale.java

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_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.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

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/LearningController.java

lams_tool_assessment/web/pages/learning/learning.jsp

lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20170101_updateTo30.sql

lams_tool_lamc/web/tblmonitoring/mcq.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.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/scratchies.jsp

lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

lams_www/web/news.html

Options
    • -7
    • +6
    ./burningQuestions.jsp
  2. … 8 more files in changeset.
7:21 am

Marcin Cieslak

LDEV-5020 Add letters and highlight to options in burning questions

Options
    • -8
    • +7
    ./burningQuestions.jsp
Monday 11 May 2020
7:35 am

Marcin Cieslak

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

Conflicts:

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

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

lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp

lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

Options
    • -7
    • +34
    ./burningQuestions.jsp
  2. … 3 more files in changeset.
Friday 08 May 2020
7:07 am

Marcin Cieslak

LDEV-5020 Fix a missing character

Options
    • -1
    • +1
    ./burningQuestions.jsp
Thursday 07 May 2020
12:28 pm

Marcin Cieslak

LDEV-5020 Show question options in burning question in TBL monitor

Options
    • -7
    • +34
    ./burningQuestions.jsp
  2. … 1 more file in changeset.
Saturday 21 Mar 2020
2:47 am

Andrey Balan

LDEV-4995 Upgrade to bootstrap 4

* Update LAMS code to use bootstrap 4

* Update and redesign index page

Options
    • -2
    • +2
    ./burningQuestions.jsp
  2. … 198 more files in changeset.
Friday 13 Dec 2019
2:24 pm

Marcin Cieslak

LDEV-4921 Properly detect General Burning Question in TBL monitor

Options
    • -1
    • +1
    ./burningQuestions.jsp
Tuesday 10 Dec 2019
3:24 pm

Marcin Cieslak

LDEV-4921 Hide question titles in TBL monitoring burning questions

Options
    • -1
    • +4
    ./burningQuestions.jsp
  2. … 1 more file in changeset.
Wednesday 09 Oct 2019
11:32 pm

Andrey Balan

LDEV-4875 Fixes for VSA feature

Options
    • -1
    • +1
    ./burningQuestions.jsp
  2. … 22 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
    • -32
    • +87
    ./burningQuestions.jsp
  2. … 54 more files in changeset.
Friday 14 Jun 2019
7:11 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'develop' into LDEV-4759

# Conflicts:

# lams_central/web/authoring/template/tool/mcquestion.jsp

# lams_central/web/authoringConfirm.jsp

# lams_central/web/css/_learner_base.scss

# lams_central/web/profile/editprofile.jsp

# lams_learning/web/optionsActivity.jsp

# lams_monitoring/web/monitor.jsp

# lams_monitoring/web/tblmonitor/sequence.jsp

# lams_monitoring/web/tblmonitor/teams.jsp

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

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/common/monitoringheader.jsp

# lams_tool_preview/web/pages/monitoring/criteria.jsp

# lams_tool_preview/web/pages/monitoring/reflections.jsp

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

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

# lams_tool_task/web/common/monitorheader.jsp

Options
    • -31
    • +86
    ./burningQuestions.jsp
  2. … 94 more files in changeset.
Tuesday 14 May 2019
10:54 pm

Andrey Balan

LDEV-4746 Fix issues that arose after migration to QB questions

Options
    • -3
    • +3
    ./burningQuestions.jsp
  2. … 6 more files in changeset.
Thursday 18 Apr 2019
7:45 pm

Andrey Balan

LDEV-4809 Don't display number prior to general burning question

Options
    • -6
    • +18
    ./burningQuestions.jsp
Monday 25 Mar 2019
9:09 pm

Andrey Balan

LDEV-4796 Fix refresh button issue after clicking "Expand all" one

Options
    • -2
    • +2
    ./burningQuestions.jsp
  2. … 1 more file in changeset.
Friday 15 Feb 2019
9:18 pm

Andrey Balan

LDEV-4766 Add expand all toggle for burning questions in TBL Monitor UI

Options
    • -25
    • +68
    ./burningQuestions.jsp
9:18 pm

Andrey Balan

LDEV-4766 Add expand all toggle for burning questions in TBL Monitor UI

(cherry picked from commit 7a82139f8dd4ce906c0b733f764055197c694898)

Options
    • -25
    • +68
    ./burningQuestions.jsp
Wednesday 06 Feb 2019
4:04 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Panels are now cards.

Options
    • -5
    • +5
    ./burningQuestions.jsp
  2. … 506 more files in changeset.
Friday 07 Dec 2018
7:33 am

Marcin Cieslak

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

Options
    • -3
    • +4
    ./burningQuestions.jsp
  2. … 1 more file in changeset.
4:05 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4569: updating UI for buring questions

Options
    • -3
    • +4
    ./burningQuestions.jsp
Thursday 06 Dec 2018
7:50 am

Marcin Cieslak

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

Options
    • -1
    • +1
    ./burningQuestions.jsp
  2. … 14 more files in changeset.
7:19 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4569: simple TBL UI adjustments

Options
    • -1
    • +1
    ./burningQuestions.jsp
  2. … 7 more files in changeset.
Monday 14 May 2018
7:10 pm

Andrey Balan

LDEV-4569 use jquery toggle instead of bootstrap collapse

By some reason bootstrap collapse doesn't work properly. Involved

links got assigned double amount of click handlers which makes

them appear and then instantaneously disappear again.

Options
    • -1
    • +1
    ./burningQuestions.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
    • +72
    ./burningQuestions.jsp
  2. … 51 more files in changeset.