Skip to content

Commit e90c7ea

Browse files
dustinuseydustinusey
authored
Merge pull request #2 from rohald89/main
Update requirements display
2 parents d9818c4 + ad72491 commit e90c7ea

File tree

3 files changed

+38
-21
lines changed

3 files changed

+38
-21
lines changed

‎frontend/dist/scripts/app.js

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@ function loadProjectList(id) {
230230
fetch(PROJECTS_URL)
231231
.then(response => response.json())
232232
.then(data => {
233-
console.log(data.result)
234233
populate(data.result, id)
235234
})
236235

@@ -359,7 +358,6 @@ tdList.addEventListener('click', e => {
359358
fetch(SINGLE_PROJECT_URL)
360359
.then(response => response.json())
361360
.then(data => {
362-
console.log(data.result);
363361
loadProjectRequirements(data.result);
364362
})
365363
}
@@ -814,13 +812,14 @@ function buildReview() {
814812
div.appendChild(icon2);
815813
li.appendChild(div);
816814
let req = document.createElement('span');
817-
req.textContent = item.textContent;
815+
const requirement = item.querySelector('.sub-requirements-title');
816+
req.textContent = requirement.textContent;
818817
li.appendChild(req);
819818
correctItemsList.appendChild(li);
820819
});
821820

822821
// building questionable items
823-
gradedData.questionableItems.forEach(item => {
822+
gradedData.questionableItems.forEach(item => {
824823
let li = document.createElement('li');
825824
li.classList = 'questioned';
826825
const div1 = document.createElement('div');
@@ -832,7 +831,8 @@ function buildReview() {
832831
const div2 = document.createElement('div2');
833832
div2.classList.add('req-content');
834833
let req = document.createElement('span');
835-
req.textContent = item.req.textContent;
834+
const requirement = item.req.querySelector('.sub-requirements-title');
835+
req.textContent = requirement.textContent;
836836
div2.appendChild(req);
837837
if (item.text !== '') {
838838
let customText = document.createElement('p');
@@ -845,6 +845,7 @@ function buildReview() {
845845

846846
// building incorrect items
847847
gradedData.incorrectItems.forEach(item => {
848+
console.log(item)
848849
let li = document.createElement('li');
849850
li.classList = 'incorrect';
850851
const div1 = document.createElement('div');
@@ -856,7 +857,9 @@ function buildReview() {
856857
const div2 = document.createElement('div2');
857858
div2.classList.add('req-content');
858859
let req = document.createElement('span');
859-
req.textContent = item.req.textContent;
860+
console.log(item)
861+
const requirement = item.req.querySelector('.sub-requirements-title');
862+
req.textContent = requirement.textContent;
860863
div2.appendChild(req);
861864
if (item.text !== '') {
862865
let customText = document.createElement('p');
@@ -1020,22 +1023,28 @@ function copySlackMessage() {
10201023

10211024
if (toggle_correct.classList.contains('active')) {
10221025
gradedData.correctItems.meets.forEach(item => {
1023-
secretTextarea.value += `:meets: ${item.textContent}\n`
1026+
const requirement = item.querySelector('.sub-requirements-title');
1027+
secretTextarea.value += `:meets: ${requirement.textContent}\n`
10241028
});
10251029
gradedData.correctItems.exceeds.forEach(item => {
1026-
secretTextarea.value += `:meets: :exceeds: ${item.textContent}\n`
1030+
const requirement = item.querySelector('.sub-requirements-title');
1031+
secretTextarea.value += `:meets: :exceeds: ${requirement.textContent}\n`
10271032
})
10281033
secretTextarea.value += `\n`
10291034
}
10301035
if (toggle_question.classList.contains('active')) {
10311036
gradedData.questionableItems.forEach(item => {
1032-
secretTextarea.value += `:questioned: ${item.req.textContent}\n> ${item.text}\n`
1037+
const requirement = item.req.querySelector('.sub-requirements-title');
1038+
const isExceeds = item.req.classList.contains('exceeds-item');
1039+
secretTextarea.value += `:questioned: ${isExceeds && ":exceeds:"} ${requirement.textContent}\n> ${item.text}\n`
10331040
})
10341041
secretTextarea.value += `\n`
10351042
}
10361043
if (toggle_wrong.classList.contains('active')) {
10371044
gradedData.incorrectItems.forEach(item => {
1038-
secretTextarea.value += `:needs-work: ${item.req.textContent}\n> ${item.text}\n`
1045+
const requirement = item.req.querySelector('.sub-requirements-title');
1046+
const isExceeds = item.req.classList.contains('exceeds-item');
1047+
secretTextarea.value += `:needs-work: ${isExceeds && ":exceeds:"} ${requirement.textContent}\n> ${item.text}\n`
10391048
})
10401049
}
10411050

‎frontend/src/scripts/app.js

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@ function loadProjectList(id) {
230230
fetch(PROJECTS_URL)
231231
.then(response => response.json())
232232
.then(data => {
233-
console.log(data.result)
234233
populate(data.result, id)
235234
})
236235

@@ -359,7 +358,6 @@ tdList.addEventListener('click', e => {
359358
fetch(SINGLE_PROJECT_URL)
360359
.then(response => response.json())
361360
.then(data => {
362-
console.log(data.result);
363361
loadProjectRequirements(data.result);
364362
})
365363
}
@@ -814,13 +812,14 @@ function buildReview() {
814812
div.appendChild(icon2);
815813
li.appendChild(div);
816814
let req = document.createElement('span');
817-
req.textContent = item.textContent;
815+
const requirement = item.querySelector('.sub-requirements-title');
816+
req.textContent = requirement.textContent;
818817
li.appendChild(req);
819818
correctItemsList.appendChild(li);
820819
});
821820

822821
// building questionable items
823-
gradedData.questionableItems.forEach(item => {
822+
gradedData.questionableItems.forEach(item => {
824823
let li = document.createElement('li');
825824
li.classList = 'questioned';
826825
const div1 = document.createElement('div');
@@ -832,7 +831,8 @@ function buildReview() {
832831
const div2 = document.createElement('div2');
833832
div2.classList.add('req-content');
834833
let req = document.createElement('span');
835-
req.textContent = item.req.textContent;
834+
const requirement = item.req.querySelector('.sub-requirements-title');
835+
req.textContent = requirement.textContent;
836836
div2.appendChild(req);
837837
if (item.text !== '') {
838838
let customText = document.createElement('p');
@@ -856,7 +856,8 @@ function buildReview() {
856856
const div2 = document.createElement('div2');
857857
div2.classList.add('req-content');
858858
let req = document.createElement('span');
859-
req.textContent = item.req.textContent;
859+
const requirement = item.req.querySelector('.sub-requirements-title');
860+
req.textContent = requirement.textContent;
860861
div2.appendChild(req);
861862
if (item.text !== '') {
862863
let customText = document.createElement('p');
@@ -1020,22 +1021,28 @@ function copySlackMessage() {
10201021

10211022
if (toggle_correct.classList.contains('active')) {
10221023
gradedData.correctItems.meets.forEach(item => {
1023-
secretTextarea.value += `:meets: ${item.textContent}\n`
1024+
const requirement = item.querySelector('.sub-requirements-title');
1025+
secretTextarea.value += `:meets: ${requirement.textContent}\n`
10241026
});
10251027
gradedData.correctItems.exceeds.forEach(item => {
1026-
secretTextarea.value += `:meets: :exceeds: ${item.textContent}\n`
1028+
const requirement = item.querySelector('.sub-requirements-title');
1029+
secretTextarea.value += `:meets: :exceeds: ${requirement.textContent}\n`
10271030
})
10281031
secretTextarea.value += `\n`
10291032
}
10301033
if (toggle_question.classList.contains('active')) {
10311034
gradedData.questionableItems.forEach(item => {
1032-
secretTextarea.value += `:questioned: ${item.req.textContent}\n> ${item.text}\n`
1035+
const requirement = item.req.querySelector('.sub-requirements-title');
1036+
const isExceeds = item.req.classList.contains('exceeds-item');
1037+
secretTextarea.value += `:questioned: ${isExceeds && ":exceeds:"} ${requirement.textContent}\n> ${item.text}\n`
10331038
})
10341039
secretTextarea.value += `\n`
10351040
}
10361041
if (toggle_wrong.classList.contains('active')) {
10371042
gradedData.incorrectItems.forEach(item => {
1038-
secretTextarea.value += `:needs-work: ${item.req.textContent}\n> ${item.text}\n`
1043+
const requirement = item.req.querySelector('.sub-requirements-title');
1044+
const isExceeds = item.req.classList.contains('exceeds-item');
1045+
secretTextarea.value += `:needs-work: ${isExceeds && ":exceeds:"} ${requirement.textContent}\n> ${item.text}\n`
10391046
})
10401047
}
10411048

‎package-lock.json

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)