Skip to content
Snippets Groups Projects
Commit 47c7e04e authored by Farbod Zamani's avatar Farbod Zamani Committed by Ron Lucke
Browse files

CW - More accurate unordered blocks checker 

Closes #1852

Merge request studip/studip!1282
parent 0dbc82bb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
resources/vue/components/courseware/CoursewareAccordionContainer.vue
+ 21
− 15
View file @ 47c7e04e
......@@ -191,11 +191,15 @@ export default {
const unallocated = new Set(this.blocks.map(({ id }) => id));
sections.forEach(section => {
for (let section of sections) {
section.locked = false;
section.blocks = section.blocks.map((id) => view.blockById({id})).filter(Boolean);
section.blocks.forEach(({ id }) => unallocated.delete(id));
});
for (let sectionBlock of section.blocks) {
if (sectionBlock?.id && unallocated.has(sectionBlock.id)) {
unallocated.delete(sectionBlock.id);
}
}
}
if (unallocated.size > 0) {
this.unallocatedBlocks = [...unallocated].map((id) => view.blockById({ id }));
......@@ -289,7 +293,7 @@ export default {
this.keyboardSelected = blockId;
const block = this.blockById({id: blockId});
const currentIndex = this.currentSections[sectionIndex].blocks.findIndex(block => block.id === blockId);
this.assistiveLive =
this.assistiveLive =
this.$gettextInterpolate(
this.$gettext('%{blockTitle} Block ausgewählt. Aktuelle Position in der Liste: %{pos} von %{listLength}. Drücken Sie die Aufwärts- und Abwärtspfeiltasten, um die Position zu ändern, die Leertaste zum Ablegen, die Escape-Taste zum Abbrechen.')
, {blockTitle: block.attributes.title, pos: currentIndex + 1, listLength: this.currentSections[sectionIndex].blocks.length}
......@@ -319,7 +323,7 @@ export default {
if (currentIndex !== 0) {
const newPos = currentIndex - 1;
this.currentSections[sectionIndex].blocks.splice(newPos, 0, this.currentSections[sectionIndex].blocks.splice(currentIndex, 1)[0]);
this.assistiveLive =
this.assistiveLive =
this.$gettextInterpolate(
this.$gettext('%{blockTitle} Block. Aktuelle Position in der Liste: %{pos} von %{listLength}.')
, {blockTitle: block.attributes.title, pos: newPos + 1, listLength: this.currentSections[sectionIndex].blocks.length}
......@@ -338,7 +342,7 @@ export default {
if (this.currentSections[sectionIndex].blocks.length - 1 > currentIndex) {
const newPos = currentIndex + 1;
this.currentSections[sectionIndex].blocks.splice(newPos, 0, this.currentSections[sectionIndex].blocks.splice(currentIndex, 1)[0]);
this.assistiveLive =
this.assistiveLive =
this.$gettextInterpolate(
this.$gettext('%{blockTitle} Block. Aktuelle Position in der Liste: %{pos} von %{listLength}.')
, {blockTitle: block.attributes.title, pos: newPos + 1, listLength: this.currentSections[sectionIndex].blocks.length}
......@@ -354,7 +358,7 @@ export default {
abortKeyboardSorting(blockId, sectionIndex) {
const block = this.blockById({id: blockId});
this.keyboardSelected = null;
this.assistiveLive =
this.assistiveLive =
this.$gettextInterpolate(
this.$gettext('%{blockTitle} Block, Neuordnung abgebrochen')
, {blockTitle: block.attributes.title}
......@@ -365,7 +369,7 @@ export default {
const block = this.blockById({id: blockId});
const currentIndex = this.currentSections[sectionIndex].blocks.findIndex(block => block.id === blockId);
this.keyboardSelected = null;
this.assistiveLive =
this.assistiveLive =
this.$gettextInterpolate(
this.$gettext('%{blockTitle} Block, abgelegt. Entgültige Position in der Liste: %{pos} von %{listLength}.')
, {blockTitle: block.attributes.title, pos: currentIndex + 1, listLength: this.currentSections[sectionIndex].blocks.length}
......@@ -374,18 +378,20 @@ export default {
}
},
watch: {
blocks() {
if (!this.showEdit) {
this.initCurrentData();
blocks(newBlocks, oldBlocks) {
if (!this.showEdit && !this.checkSimpleArrayEquality(newBlocks, oldBlocks)) {
this.$nextTick(() => {
setTimeout(() => this.initCurrentData(), 250);
});
}
},
currentSections: {
handler() {
if (this.keyboardSelected) {
this.$nextTick(() => {
this.$refs['sortableHandle' + this.keyboardSelected][0].focus();
});
}
this.$nextTick(() => {
this.$refs['sortableHandle' + this.keyboardSelected][0].focus();
});
}
},
deep: true
}
......
resources/vue/components/courseware/CoursewareTabsContainer.vue
+ 19
− 13
View file @ 47c7e04e
......@@ -198,11 +198,15 @@ export default {
const unallocated = new Set(this.blocks.map(({ id }) => id));
sections.forEach(section => {
for (let section of sections) {
section.locked = false;
section.blocks = section.blocks.map((id) => view.blockById({id})).filter((a) => a);
section.blocks.forEach(({ id }) => unallocated.delete(id));
});
section.blocks = section.blocks.map((id) => view.blockById({id})).filter(Boolean);
for (let sectionBlock of section.blocks) {
if (sectionBlock?.id && unallocated.has(sectionBlock.id)) {
unallocated.delete(sectionBlock.id);
}
}
}
if (unallocated.size > 0) {
this.unallocatedBlocks = [...unallocated].map((id) => view.blockById({ id }));
......@@ -293,7 +297,7 @@ export default {
this.keyboardSelected = blockId;
const block = this.blockById({id: blockId});
const currentIndex = this.currentSections[sectionIndex].blocks.findIndex(block => block.id === blockId);
this.assistiveLive =
this.assistiveLive =
this.$gettextInterpolate(
this.$gettext('%{blockTitle} Block ausgewählt. Aktuelle Position in der Liste: %{pos} von %{listLength}. Drücken Sie die Aufwärts- und Abwärtspfeiltasten, um die Position zu ändern, die Leertaste zum Ablegen, die Escape-Taste zum Abbrechen.')
, {blockTitle: block.attributes.title, pos: currentIndex + 1, listLength: this.currentSections[sectionIndex].blocks.length}
......@@ -323,7 +327,7 @@ export default {
if (currentIndex !== 0) {
const newPos = currentIndex - 1;
this.currentSections[sectionIndex].blocks.splice(newPos, 0, this.currentSections[sectionIndex].blocks.splice(currentIndex, 1)[0]);
this.assistiveLive =
this.assistiveLive =
this.$gettextInterpolate(
this.$gettext('%{blockTitle} Block. Aktuelle Position in der Liste: %{pos} von %{listLength}.')
, {blockTitle: block.attributes.title, pos: newPos + 1, listLength: this.currentSections[sectionIndex].blocks.length}
......@@ -340,7 +344,7 @@ export default {
if (this.currentSections[sectionIndex].blocks.length - 1 > currentIndex) {
const newPos = currentIndex + 1;
this.currentSections[sectionIndex].blocks.splice(newPos, 0, this.currentSections[sectionIndex].blocks.splice(currentIndex, 1)[0]);
this.assistiveLive =
this.assistiveLive =
this.$gettextInterpolate(
this.$gettext('%{blockTitle} Block. Aktuelle Position in der Liste: %{pos} von %{listLength}.')
, {blockTitle: block.attributes.title, pos: newPos + 1, listLength: this.currentSections[sectionIndex].blocks.length}
......@@ -354,7 +358,7 @@ export default {
abortKeyboardSorting(blockId, sectionIndex) {
const block = this.blockById({id: blockId});
this.keyboardSelected = null;
this.assistiveLive =
this.assistiveLive =
this.$gettextInterpolate(
this.$gettext('%{blockTitle} Block, Neuordnung abgebrochen')
, {blockTitle: block.attributes.title}
......@@ -365,7 +369,7 @@ export default {
const block = this.blockById({id: blockId});
const currentIndex = this.currentSections[sectionIndex].blocks.findIndex(block => block.id === blockId);
this.keyboardSelected = null;
this.assistiveLive =
this.assistiveLive =
this.$gettextInterpolate(
this.$gettext('%{blockTitle} Block, abgelegt. Entgültige Position in der Liste: %{pos} von %{listLength}.')
, {blockTitle: block.attributes.title, pos: currentIndex + 1, listLength: this.currentSections[sectionIndex].blocks.length}
......@@ -374,9 +378,11 @@ export default {
}
},
watch: {
blocks() {
if (!this.showEdit) {
this.initCurrentData();
blocks(newBlocks, oldBlocks) {
if (!this.showEdit && !this.checkSimpleArrayEquality(newBlocks, oldBlocks)) {
this.$nextTick(() => {
setTimeout(() => this.initCurrentData(), 250);
});
}
},
currentSections: {
......@@ -385,7 +391,7 @@ export default {
this.$nextTick(() => {
this.$refs['sortableHandle' + this.keyboardSelected][0].focus();
});
}
}
},
deep: true
}
......
resources/vue/mixins/courseware/container.js
+ 5
− 0
View file @ 47c7e04e
......@@ -73,6 +73,11 @@ const containerMixin = {
this.loadContainer({id : data.originContainerId });
this.loadContainer({id : data.targetContainerId });
},
checkSimpleArrayEquality(firstSet, secondSet) {
return Array.isArray(firstSet) && Array.isArray(secondSet) &&
firstSet.length === secondSet.length &&
firstSet.every((val, index) => val === secondSet[index]);
}
}
};
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment