Skip to content

Commit

Permalink
Improve error handling in template
Browse files Browse the repository at this point in the history
  • Loading branch information
Thaddeus McCleary committed Mar 24, 2021
1 parent 96a44a7 commit 5ea623a
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 22 deletions.
2 changes: 1 addition & 1 deletion src/views/Activities.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</div>
<div v-else class="activity-button-area" v-for="(session, index) in activitySessions">
<ButtonCard
:text="`${abbreviatedName(session.activity.name)} (${session.responses.length})`"
:text="`${abbreviatedName(session.activity.name)}`"
:button="true"
:display="true"
:simple="true"
Expand Down
91 changes: 70 additions & 21 deletions src/views/SessionExplorer.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<h5>
{{ makePrettyDate(session.date._d) }}
</h5>
<h6 id="responses" v-if="session.responses.length > 1">
{{ session.responses.length }} responses
<h6 id="responses" v-if="filteredResponses.length > 1">
{{ filteredResponses.length }} responses
</h6>
<button
v-if="loaded && session.chart !== 'anonymous' && !displayRespondents"
Expand Down Expand Up @@ -64,10 +64,10 @@
:words="wordCloudWordArray"
:color="([, weight]) => weight > 6 ? '#FCBB04' : weight > 3 ? '#D2360A' : '#6C6C6C'"
font-family="ArchivoNarrow"
v-if="session.responses.length > 0"
v-if="filteredResponses.length > 0"
/>
<ul v-if="session.responses.length > 0" id="responsePoolList">
<li v-for="(response, index) in session.responses" v-if="response.response.text" :key="`response${index}`">
<ul v-if="filteredResponses.length > 0" id="responsePoolList">
<li v-for="(response, index) in filteredResponses" v-if="response.response.text" :key="`response${index}`">
<h4>{{ response.response.text }}</h4>
<h5 v-if="response.respondent !== 'anonymous' && displayRespondents"><router-link :to="`/student/${response.respondent.id}`">
{{ response.respondent.firstName }}
Expand All @@ -81,8 +81,8 @@
{{ session.activity.content.prompt }}
</h3>
<h2>Responses</h2>
<ul v-if="session.responses.length > 0" id="responsePoolList">
<li v-for="(response, index) in session.responses" v-if="response.response.text" :key="`response${index}`">
<ul v-if="filteredResponses.length > 0" id="responsePoolList">
<li v-for="(response, index) in filteredResponses" v-if="response.response.text" :key="`response${index}`">
<h4>{{ response.response.text }}</h4>
<h5 v-if="response.respondent !== 'anonymous' && displayRespondents"><router-link :to="`/student/${response.respondent.id}`">
{{ response.respondent.firstName }}
Expand All @@ -106,15 +106,15 @@
</div>
</section>
<section v-else-if="loaded && session.activity.activityType == 'survey'">
<div class="survey" v-if="session.responses.length > 0">
<div class="survey" v-if="filteredResponses.length > 0">
<vc-donut
background="black" foreground="black"
:size="250" unit="px" :thickness="20"
has-legend legend-placement="bottom"
:sections="donutSections" :total="session.responses.length"
:sections="donutSections" :total="filteredResponses.length"
>
<h5 v-if="session.responses.length == 1">1 response</h5>
<h5 v-else>{{ session.responses.length }} responses</h5>
<h5 v-if="filteredResponses.length == 1">1 response</h5>
<h5 v-else>{{ filteredResponses.length }} responses</h5>
</vc-donut>
</div>
<div id="responseArea">
Expand All @@ -123,7 +123,7 @@
</h2>
<sequential-entrance fromTop delay="20">
<div
v-for="(response, index) in session.responses"
v-for="(response, index) in filteredResponses"
:key="`response${index}`"
class="response-card"
>
Expand Down Expand Up @@ -162,14 +162,14 @@
</div>
</section>
<section v-else-if="loaded && session.activity.activityType == 'information gap'">
<div class="survey" v-if="session.responses.length > 0">
<div class="survey" v-if="filteredResponses.length > 0">
<vc-donut
background="black" foreground="black"
:size="250" unit="px" :thickness="20"
:sections="assignmentDonutSections" :total="session.responses.length"
:sections="assignmentDonutSections" :total="filteredResponses.length"
>
<h5 v-if="session.responses.length == 1">1 item assigned</h5>
<h5 v-else>{{ session.responses.length }} items assigned</h5>
<h5 v-if="filteredResponses.length == 1">1 item assigned</h5>
<h5 v-else>{{ filteredResponses.length }} items assigned</h5>
</vc-donut>
</div>
<div id="responseArea">
Expand All @@ -178,7 +178,7 @@
</h2>
<sequential-entrance fromTop delay="20">
<div
v-for="(response, index) in session.responses"
v-for="(response, index) in filteredResponses"
:key="`response${index}`"
class="response-card"
>
Expand Down Expand Up @@ -328,8 +328,57 @@ export default {
return false
},
filteredResponses() {
let filtered = []
if (this.session.activity.activityType == 'response pool' || this.session.activity.activityType == 'word cloud') {
filtered = this.session.responses.filter((response) => {
if (response.response.text !== undefined) {
if (this.session.chart !== 'anonymous') {
if (response.respondent.firstName !== undefined && response.respondent.firstName.length !== 0) {
return true
} else {
return false
}
}
} else {
return false
}
})
} else if (this.session.activity.activityType == 'survey') {
filtered = this.session.responses.filter((response) => {
if (response.response.choice !== undefined) {
if (this.session.chart !== 'anonymous') {
if (response.respondent) {
return true
} else {
return false
}
}
} else {
return false
}
})
} else if (this.session.activity.activityType == 'information gap') {
filtered = this.session.responses.filter((response) => {
if (response.response.assignment !== undefined) {
if (this.session.chart !== 'anonymous') {
if (response.respondent) {
return true
} else {
return false
}
}
} else {
return false
}
})
}
return filtered
},
donutSections() {
let responses = this.session.responses
let responses = this.filteredResponses
let sections = []
Expand Down Expand Up @@ -359,7 +408,7 @@ export default {
return sections
},
assignmentDonutSections() {
let responses = this.session.responses
let responses = this.filteredResponses
let sections = []
let spectrumIndex = 0
Expand Down Expand Up @@ -399,11 +448,11 @@ export default {
return sections
},
wordCloudWordArray() {
let responses = this.session.responses
let responses = this.filteredResponses
let wordDictionary = {}
// increment word weights based upon participant responses
for (let i=0; i<this.session.responses.length; i++) {
for (let i=0; i<responses.length; i++) {
let response = responses[i]
if (wordDictionary.hasOwnProperty([response.response.text])) {
wordDictionary[response.response.text]++
Expand Down

0 comments on commit 5ea623a

Please sign in to comment.