lams-github / lams_tool_assessment / web / pages

tblmonitoring

Clone Tools

Stats

Commits this week: 0
Total Committers: 8
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
Thursday 05 Mar 2020
4:45 am

Marcin Cieslak

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

Conflicts:

lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

Options
    • -1
    • +1
    ./assessment.jsp
Tuesday 25 Feb 2020
8:48 am

Ernie Ghiglione

LDEV-4932 adding CSRF to assessment TBL page

Options
    • -1
    • +3
    ./assessment.jsp
8:43 am

Ernie Ghiglione

LDEV-4932 adding CSRF to assessment TBL page

Options
    • -1
    • +3
    ./assessment.jsp
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
    • -1
    • +7
    ./assessmentStudentChoices.jsp
    • -1
    • +7
    ./iraAssessmentStudentChoices.jsp
  3. … 93 more files in changeset.
Tuesday 07 Jan 2020
11:34 pm

Andrey Balan

LDEV-4932 Add CSRF to LD export and Excel export

Options
    • -1
    • +7
    ./assessmentStudentChoices.jsp
    • -1
    • +7
    ./iraAssessmentStudentChoices.jsp
  3. … 11 more files in changeset.
Wednesday 23 Oct 2019
8:27 pm

Andrey Balan

LDEV-4889 Display correct/incorrect icons in TBL monitor's Teams tab

Options
    • -10
    • +127
    ./teams.jsp
    • -92
    • +0
    ./userresponse.jsp
  3. … 1 more file in changeset.
Thursday 10 Oct 2019
9:47 pm

Andrey Balan

LDEV-4875 Fixes for TBL monitoring pages

Options
    • -8
    • +9
    ./assessmentStudentChoices.jsp
    • -2
    • +3
    ./iraAssessmentStudentChoices.jsp
  3. … 2 more files in changeset.
Wednesday 09 Oct 2019
11:32 pm

Andrey Balan

LDEV-4875 Fixes for VSA feature

Options
    • -18
    • +27
    ./assessment.jsp
    • -3
    • +3
    ./iraAssessmentStudentChoices.jsp
  3. … 21 more files in changeset.
Monday 05 Aug 2019
7:43 am

Marcin Cieslak

LDEV-4746, LDEV-4841 Move answer field to QbToolAnswer for inheritance

Fix several issues Q&A migration

Options
    • -5
    • +5
    ./userresponse.jsp
  2. … 23 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
    • -1
    • +6
    ./assessment.jsp
  2. … 54 more files in changeset.
Monday 24 Jun 2019
7:18 pm

Andrey Balan

LKC-202 AEs "Show student’s choices” page to show real question title

Options
    • -1
    • +10
    ./assessmentStudentChoices.jsp
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
    • -1
    • +6
    ./assessment.jsp
  2. … 94 more files in changeset.
Tuesday 07 May 2019
11:11 pm

Andrey Balan

LDEV-4746 Migrate Assessment to QB

Options
    • -5
    • +5
    ./assessment.jsp
    • -3
    • +3
    ./iraAssessmentStudentChoices.jsp
    • -2
    • +2
    ./teams.jsp
    • -10
    • +10
    ./userresponse.jsp
  5. … 77 more files in changeset.
Monday 25 Mar 2019
8:52 pm

Andrey Balan

LDEV-4794 TBLmonitor display question numbering only if setting is ON

Options
    • -1
    • +6
    ./assessment.jsp
Thursday 28 Feb 2019
3:25 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Autocomplete restyling, started Assessment updates

Options
    • -5
    • +5
    ./assessment.jsp
    • -3
    • +3
    ./assessmentStudentChoices.jsp
    • -3
    • +3
    ./iraAssessmentStudentChoices.jsp
  4. … 41 more files in changeset.
Thursday 14 Feb 2019
3:00 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 DateTimePicker and Accordians updated

Options
    • -1
    • +1
    ./assessmentStudentChoices.jsp
    • -1
    • +1
    ./iraAssessmentStudentChoices.jsp
  3. … 390 more files in changeset.
Wednesday 06 Feb 2019
4:04 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Panels are now cards.

Options
    • -7
    • +7
    ./assessment.jsp
    • -2
    • +2
    ./assessmentStudentChoices.jsp
    • -6
    • +6
    ./iraAssessmentStudentChoices.jsp
    • -4
    • +4
    ./teams.jsp
  5. … 503 more files in changeset.
Thursday 06 Dec 2018
7:50 am

Marcin Cieslak

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

Options
    • -2
    • +2
    ./assessment.jsp
    • -1
    • +1
    ./assessmentStudentChoices.jsp
    • -1
    • +1
    ./iraAssessmentStudentChoices.jsp
  4. … 12 more files in changeset.
7:19 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4569: simple TBL UI adjustments

Options
    • -2
    • +2
    ./assessment.jsp
    • -1
    • +1
    ./assessmentStudentChoices.jsp
    • -1
    • +1
    ./iraAssessmentStudentChoices.jsp
  4. … 5 more files in changeset.
Tuesday 08 May 2018
1:28 am

Marcin Cieslak

LDEV-4575 Show disclose buttons only when corresponding option is ON

Options
    • -14
    • +16
    ./assessment.jsp
Monday 30 Apr 2018
9:35 pm

Andrey Balan

LDEV-4569 TBL UI: adjustments

* wrap lesson's name

* revice the LAMS logo at the top left corner

* Make TBL monitor to follow themes

* AEs' tab title is "AEs Questions & Marks" now

Options
    • -1
    • +1
    ./assessmentStudentChoices.jsp
  2. … 5 more files in changeset.
Tuesday 10 Apr 2018
5:41 am

Marcin Cieslak

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

Options
    • -2
    • +3
    ./assessment.jsp
  2. … 5 more files in changeset.
Monday 09 Apr 2018
3:48 pm

Marcin Cieslak

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

Options
    • -2
    • +3
    ./assessment.jsp
  2. … 5 more files in changeset.
1:39 pm

Marcin Cieslak

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

Options
    • -13
    • +73
    ./assessment.jsp
  2. … 2 more files in changeset.
Friday 06 Apr 2018
4:55 pm

Marcin Cieslak

LDEV-4540 Disclose answers in TBL monitor and reflect it in learner

Options
    • -2
    • +36
    ./assessment.jsp
  2. … 12 more files in changeset.
Friday 02 Mar 2018
11:14 pm

Andrey Balan

Merge branch 'LDEV-4520'

Options
    • -20
    • +2
    ./assessmentStudentChoices.jsp
  2. … 1 more file in changeset.
11:13 pm

Andrey Balan

LDEV-4520 Reimplement student choices page in case of Assessment iRA

It should follow the format of Student choices page in case of MCQ iRA.

Options
    • -2
    • +11
    ./assessment.jsp
    • -20
    • +2
    ./assessmentStudentChoices.jsp
    • -0
    • +139
    ./iraAssessmentStudentChoices.jsp
  4. … 11 more files in changeset.
Thursday 01 Mar 2018
11:06 pm

Andrey Balan

LDEV-4520 Fix export excel feature for AEs tab

Options
    • -1
    • +1
    ./assessmentStudentChoices.jsp
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
    • +193
    ./assessment.jsp
    • -0
    • +122
    ./assessmentStudentChoices.jsp
    • -0
    • +37
    ./teams.jsp
    • -0
    • +92
    ./userresponse.jsp
  5. … 48 more files in changeset.