Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: allow to see multiple xblock mindmap in lms #29

Merged
merged 4 commits into from
Oct 2, 2023
Merged

fix: allow to see multiple xblock mindmap in lms #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c46320d
fix: multiple xblock mindmap draggable plugin
johnvente Oct 2, 2023
d5ec179
docs: update changelog
johnvente Oct 2, 2023
a4bbfa2
fix: instructions collapse pr review
johnvente Oct 2, 2023
cf47a6a
fix: open instructions for each xblock
johnvente Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ Change Log
Unreleased
**********

0.8.3 - 2023-10-02
**********************************************

Changed
=======

* Allow to create any number of XBlocks in the lms

0.8.2 - 2023-09-26
**********************************************

Expand Down
2 changes: 1 addition & 1 deletion mindmap/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@

from .mindmap import MindMapXBlock

__version__ = '0.8.2'
__version__ = '0.8.3'
38 changes: 19 additions & 19 deletions mindmap/locale/en/LC_MESSAGES/text.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,78 +192,78 @@ msgstr ""
msgid "Cancel"
msgstr ""

#: public/js/src/mindmap.js:89
#: public/js/src/mindmap.js:84
msgid "Username"
msgstr ""

#: public/js/src/mindmap.js:84
#: public/js/src/mindmap.js:85
msgid "Uploaded"
msgstr ""

#: public/js/src/mindmap.js:85
#: public/js/src/mindmap.js:86
msgid "Submission Status"
msgstr ""

#: public/js/src/mindmap.js:86 public/js/src/mindmap.js:171
#: public/js/src/mindmap.js:87 public/js/src/mindmap.js:171
msgid "Grade"
msgstr ""

#: public/js/src/mindmap.js:87
#: public/js/src/mindmap.js:88
msgid "Actions"
msgstr ""

#: public/js/src/mindmap.js:109
#: public/js/src/mindmap.js:108
msgid "Mindmap submissions"
msgstr ""

#: public/js/src/mindmap.js:110
#: public/js/src/mindmap.js:109
msgid "Review"
msgstr ""

#: public/js/src/mindmap.js:111
#: public/js/src/mindmap.js:110
msgid "Search"
msgstr ""

#: public/js/src/mindmap.js:112
#: public/js/src/mindmap.js:111
msgid "Showing _START_ to _END_ of _TOTAL_ entries"
msgstr ""

#: public/js/src/mindmap.js:113
#: public/js/src/mindmap.js:112
msgid "No data available in table"
msgstr ""

#: public/js/src/mindmap.js:114
#: public/js/src/mindmap.js:113
msgid "Showing 0 to 0 of 0 entries"
msgstr ""

#: public/js/src/mindmap.js:115
#: public/js/src/mindmap.js:114
msgid "No matching records found"
msgstr ""

#: public/js/src/mindmap.js:116
#: public/js/src/mindmap.js:115
msgid "(filtered from _MAX_ total entries)"
msgstr ""

#: public/js/src/mindmap.js:168
#: public/js/src/mindmap.js:167
msgid "Remove grade"
msgstr ""

#: public/js/src/mindmap.js:169
#: public/js/src/mindmap.js:168
msgid "Loading..."
msgstr ""

#: public/js/src/mindmap.js:170
#: public/js/src/mindmap.js:169
msgid "Back"
msgstr ""

#: public/js/src/mindmap.js:192
#: public/js/src/mindmap.js:191
msgid "Reviewing Mindmap for student: "
msgstr ""

#: public/js/src/mindmap.js:236
#: public/js/src/mindmap.js:235
msgid "Invalid grade must be a number"
msgstr ""

#: public/js/src/mindmap.js:237
#: public/js/src/mindmap.js:236
msgid "Please enter a lower grade, maximum grade allowed is:"
msgstr ""
38 changes: 19 additions & 19 deletions mindmap/locale/es_419/LC_MESSAGES/text.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,78 +206,78 @@ msgstr "Mapa mental"
msgid "Cancel"
msgstr "Cancelar"

#: public/js/src/mindmap.js:89
#: public/js/src/mindmap.js:84
msgid "Username"
msgstr "Nombre de usuario"

#: public/js/src/mindmap.js:84
#: public/js/src/mindmap.js:85
msgid "Uploaded"
msgstr "Subido"

#: public/js/src/mindmap.js:85
#: public/js/src/mindmap.js:86
msgid "Submission Status"
msgstr "Estado del Envío"

#: public/js/src/mindmap.js:86 public/js/src/mindmap.js:171
#: public/js/src/mindmap.js:87 public/js/src/mindmap.js:171
msgid "Grade"
msgstr "Calificación"

#: public/js/src/mindmap.js:87
#: public/js/src/mindmap.js:88
msgid "Actions"
msgstr "Acciones"

#: public/js/src/mindmap.js:109
#: public/js/src/mindmap.js:108
msgid "Mindmap submissions"
msgstr "Envíos de mapas mentales"

#: public/js/src/mindmap.js:110
#: public/js/src/mindmap.js:109
msgid "Review"
msgstr "Revisar"

#: public/js/src/mindmap.js:111
#: public/js/src/mindmap.js:110
msgid "Search"
msgstr "Buscar"

#: public/js/src/mindmap.js:112
#: public/js/src/mindmap.js:111
msgid "Showing _START_ to _END_ of _TOTAL_ entries"
msgstr "Mostrando registros del _START_ al _END_ de un total de _TOTAL_ registro(s)"

#: public/js/src/mindmap.js:113
#: public/js/src/mindmap.js:112
msgid "No data available in table"
msgstr "Ningún dato disponible en esta tabla"

#: public/js/src/mindmap.js:114
#: public/js/src/mindmap.js:113
msgid "Showing 0 to 0 of 0 entries"
msgstr "Mostrando registros del 0 al 0 de un total de 0 registro(s)"

#: public/js/src/mindmap.js:115
#: public/js/src/mindmap.js:114
msgid "No matching records found"
msgstr "No se encontraron resultados"

#: public/js/src/mindmap.js:116
#: public/js/src/mindmap.js:115
msgid "(filtered from _MAX_ total entries)"
msgstr "(filtrado de un total de _MAX_ registro(s))"

#: public/js/src/mindmap.js:168
#: public/js/src/mindmap.js:167
msgid "Remove grade"
msgstr "Eliminar calificación"

#: public/js/src/mindmap.js:169
#: public/js/src/mindmap.js:168
msgid "Loading..."
msgstr "Cargando..."

#: public/js/src/mindmap.js:170
#: public/js/src/mindmap.js:169
msgid "Back"
msgstr "Volver"

#: public/js/src/mindmap.js:192
#: public/js/src/mindmap.js:191
msgid "Reviewing Mindmap for student: "
msgstr "Revisando Mapa Mental para el estudiante: "

#: public/js/src/mindmap.js:236
#: public/js/src/mindmap.js:235
msgid "Invalid grade must be a number"
msgstr "Calificación inválida, debe ser un número"

#: public/js/src/mindmap.js:237
#: public/js/src/mindmap.js:236
msgid "Please enter a lower grade, maximum grade allowed is:"
msgstr "Por favor ingresa una calificación menor, la calificación máxima permitida es:"
38 changes: 19 additions & 19 deletions mindmap/locale/es_ES/LC_MESSAGES/text.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,78 +206,78 @@ msgstr "Mapa mental"
msgid "Cancel"
msgstr "Cancelar"

#: public/js/src/mindmap.js:89
#: public/js/src/mindmap.js:84
msgid "Username"
msgstr "Nombre de usuario"

#: public/js/src/mindmap.js:84
#: public/js/src/mindmap.js:85
msgid "Uploaded"
msgstr "Subido"

#: public/js/src/mindmap.js:85
#: public/js/src/mindmap.js:86
msgid "Submission Status"
msgstr "Estado del Envío"

#: public/js/src/mindmap.js:86 public/js/src/mindmap.js:171
#: public/js/src/mindmap.js:87 public/js/src/mindmap.js:171
msgid "Grade"
msgstr "Calificación"

#: public/js/src/mindmap.js:87
#: public/js/src/mindmap.js:88
msgid "Actions"
msgstr "Acciones"

#: public/js/src/mindmap.js:109
#: public/js/src/mindmap.js:108
msgid "Mindmap submissions"
msgstr "Envíos de mapas mentales"

#: public/js/src/mindmap.js:110
#: public/js/src/mindmap.js:109
msgid "Review"
msgstr "Revisar"

#: public/js/src/mindmap.js:111
#: public/js/src/mindmap.js:110
msgid "Search"
msgstr "Buscar"

#: public/js/src/mindmap.js:112
#: public/js/src/mindmap.js:111
msgid "Showing _START_ to _END_ of _TOTAL_ entries"
msgstr "Mostrando registros del _START_ al _END_ de un total de _TOTAL_ registro(s)"

#: public/js/src/mindmap.js:113
#: public/js/src/mindmap.js:112
msgid "No data available in table"
msgstr "Ningún dato disponible en esta tabla"

#: public/js/src/mindmap.js:114
#: public/js/src/mindmap.js:113
msgid "Showing 0 to 0 of 0 entries"
msgstr "Mostrando registros del 0 al 0 de un total de 0 registro(s)"

#: public/js/src/mindmap.js:115
#: public/js/src/mindmap.js:114
msgid "No matching records found"
msgstr "No se encontraron resultados"

#: public/js/src/mindmap.js:116
#: public/js/src/mindmap.js:115
msgid "(filtered from _MAX_ total entries)"
msgstr "(filtrado de un total de _MAX_ registro(s))"

#: public/js/src/mindmap.js:168
#: public/js/src/mindmap.js:167
msgid "Remove grade"
msgstr "Eliminar calificación"

#: public/js/src/mindmap.js:169
#: public/js/src/mindmap.js:168
msgid "Loading..."
msgstr "Cargando..."

#: public/js/src/mindmap.js:170
#: public/js/src/mindmap.js:169
msgid "Back"
msgstr "Volver"

#: public/js/src/mindmap.js:192
#: public/js/src/mindmap.js:191
msgid "Reviewing Mindmap for student: "
msgstr "Revisando Mapa Mental para el estudiante: "

#: public/js/src/mindmap.js:236
#: public/js/src/mindmap.js:235
msgid "Invalid grade must be a number"
msgstr "Calificación inválida, debe ser un número"

#: public/js/src/mindmap.js:237
#: public/js/src/mindmap.js:236
msgid "Please enter a lower grade, maximum grade allowed is:"
msgstr "Por favor ingresa una calificación menor, la calificación máxima permitida es:"
4 changes: 4 additions & 0 deletions mindmap/public/css/mindmap.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@
overflow: hidden;
}

.icon-collapsible {
cursor: pointer;
}

.icon-collapsible:after {
/* Unicode character for "plus" sign (+) */
content: "\02795";
Expand Down
10 changes: 5 additions & 5 deletions mindmap/public/css/submissions.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
.modal-submissions {
opacity: 0;
visibility: hidden;
position: absolute;
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
left: 0;
display: flex;
align-items: center;
justify-content: center;
background: rgba(77, 77, 77, 0.7);
transition: all 0.4s;
width: 100%;
height: 100%;
z-index: 1000;
}

Expand All @@ -33,11 +33,11 @@
max-width: 90%;
background: #fff;
padding: 1em 2em;
max-height: 80%;
max-height: 90%;
overflow-y: auto;
}

#modal_title {
.modal_title {
color: #000 !important;
}

Expand Down
10 changes: 8 additions & 2 deletions mindmap/public/html/mindmap.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,18 @@
{% if is_instructor and in_student_view and not is_static and has_score %}
<button id="get_grade_submissions_button_{{xblock_id}}">{% trans "Grade submissions" %}</button>

<div id="modal-submissions" class="modal-submissions" aria-hidden="true" tabindex="-1">
<div class="modal-submissions" aria-hidden="true" tabindex="-1">
<div class="modal__content">
<h2 id="modal_title"></h2>
<h2 class="modal_title"></h2>
<div class="modal__data"></div>
<div class="modal__footer"></div>
<button type="button" class="modal__close">&times;</button>
</div>
</div>
{% endif %}

{% if in_student_view %}
<script type="text/javascript" src="//cdn.jsdelivr.net/npm/jsmind@0.7.1/es6/jsmind.js"></script>
<script type="text/javascript" src="//cdn.jsdelivr.net/npm/jsmind@0.7.1/es6/jsmind.draggable-node.js"></script>
<script type="text/javascript" src="https://cdn.datatables.net/1.11.5/js/jquery.dataTables.js"></script>
{% endif %}
Loading