Skip to content

Commit 2e9816c

Browse files
committed
fix: email not appearing in analytics now use fullName
1 parent ea16978 commit 2e9816c

File tree

1 file changed

+39
-128
lines changed

1 file changed

+39
-128
lines changed

src/components/organisms/UserAnalytics.vue

Lines changed: 39 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<v-col class="ma-0 pa-1 answer-list" cols="9">
2626
<v-data-table :headers="dataHeaders" :items="taskAnswers">
2727
<template v-slot:item.userDocId="{ item }">
28-
<span>{{ getCooperatorEmail(item.userDocId) }}</span>
28+
<span>{{ item.fullName }}</span>
2929
</template>
3030
<template v-slot:item.actions="{ item }">
3131
<v-btn color="orange" text @click="viewAnswers(item)">
@@ -39,12 +39,7 @@
3939
</div>
4040
</ShowInfo>
4141
<template>
42-
<v-dialog
43-
v-model="showDialog"
44-
max-width="600"
45-
fullscreen
46-
transition="dialog-bottom-transition"
47-
>
42+
<v-dialog v-model="showDialog" max-width="600" fullscreen transition="dialog-bottom-transition">
4843
<v-card>
4944
<v-toolbar color="orange" dark>
5045
<span class="headline">Answer and Observation</span>
@@ -54,40 +49,21 @@
5449
</v-toolbar>
5550
<v-card-text style="background-color: #E8EAF2;">
5651
<v-row v-if="dialogItem">
57-
<v-col
58-
v-if="dialogItem.preTestAnswer.length > 0"
59-
:cols="
60-
dialogItem.tasks[taskSelect].taskTime != '' ? '10' : '12'
61-
"
62-
class="pt-8"
63-
>
64-
<span class="cardsTitle ma-3" style="color: #252525"
65-
>Variables</span
66-
>
52+
<v-col v-if="dialogItem.preTestAnswer.length > 0" :cols="dialogItem.tasks[taskSelect].taskTime != '' ? '10' : '12'
53+
" class="pt-8">
54+
<span class="cardsTitle ma-3" style="color: #252525">Variables</span>
6755
<v-card outlined rounded="xxl">
6856
<div class="ma-6">
69-
<span
70-
v-for="(question, index) in testStructure.preTest"
71-
:key="index"
72-
class="ma-1 text-subtitle-1"
73-
style="color: #252525"
74-
>
57+
<span v-for="(question, index) in testStructure.preTest" :key="index" class="ma-1 text-subtitle-1"
58+
style="color: #252525">
7559
<strong>{{ question.title }}</strong> :
7660
{{ dialogItem.preTestAnswer[index].answer }}
7761
</span>
7862
</div>
7963
</v-card>
8064
</v-col>
81-
<v-col
82-
v-if="dialogItem.tasks[taskSelect].taskTime != null"
83-
cols="2"
84-
class="pt-8"
85-
>
86-
<span
87-
class="t-5 font-weight-bold text-h6"
88-
style="color: #252525"
89-
>Task Time</span
90-
>
65+
<v-col v-if="dialogItem.tasks[taskSelect].taskTime != null" cols="2" class="pt-8">
66+
<span class="t-5 font-weight-bold text-h6" style="color: #252525">Task Time</span>
9167
<v-card outlined rounded="xxl">
9268
<div class="ma-6">
9369
<p class="text-h6">
@@ -96,40 +72,23 @@
9672
</div>
9773
</v-card>
9874
</v-col>
99-
<v-col
100-
v-if="dialogItem.postTestAnswer.length > 0"
101-
cols="12"
102-
class="pt-8"
103-
>
104-
<span class="cardsTitle ma-3" style="color: #252525"
105-
>Post-Test Answer</span
106-
>
75+
<v-col v-if="dialogItem.postTestAnswer.length > 0" cols="12" class="pt-8">
76+
<span class="cardsTitle ma-3" style="color: #252525">Post-Test Answer</span>
10777
<v-card outlined rounded="xxl">
10878
<div class="ma-6">
109-
<span
110-
v-for="(question, index) in testStructure.postTest"
111-
:key="index"
112-
class="ma-1 text-subtitle-1"
113-
style="color: #252525"
114-
>
79+
<span v-for="(question, index) in testStructure.postTest" :key="index" class="ma-1 text-subtitle-1"
80+
style="color: #252525">
11581
<strong>{{ question.title }}</strong> :
11682
{{ dialogItem.postTestAnswer[index].answer }}
11783
</span>
11884
</div>
11985
</v-card>
12086
</v-col>
121-
<v-col
122-
v-if="dialogItem.tasks[taskSelect].taskAnswer != ''"
123-
:cols="
124-
dialogItem.tasks[taskSelect].taskObservations != ''
125-
? '6'
126-
: '12'
127-
"
128-
class="mt-4"
129-
>
130-
<span class="cardsTitle ma-3" style="color: #252525"
131-
>Answer</span
132-
>
87+
<v-col v-if="dialogItem.tasks[taskSelect].taskAnswer != ''" :cols="dialogItem.tasks[taskSelect].taskObservations != ''
88+
? '6'
89+
: '12'
90+
" class="mt-4">
91+
<span class="cardsTitle ma-3" style="color: #252525">Answer</span>
13392
<v-card outlined rounded="xxl">
13493
<div class="ma-6">
13594
<span>
@@ -138,14 +97,8 @@
13897
</div>
13998
</v-card>
14099
</v-col>
141-
<v-col
142-
v-if="dialogItem.tasks[taskSelect].postAnswer != ''"
143-
cols="12"
144-
class="mt-4"
145-
>
146-
<span class="cardsTitle ma-3" style="color: #252525"
147-
>Post Question</span
148-
>
100+
<v-col v-if="dialogItem.tasks[taskSelect].postAnswer != ''" cols="12" class="mt-4">
101+
<span class="cardsTitle ma-3" style="color: #252525">Post Question</span>
149102
<v-card outlined rounded="xxl">
150103
<div class="ma-6">
151104
<strong>{{
@@ -158,16 +111,9 @@
158111
</div>
159112
</v-card>
160113
</v-col>
161-
<v-col
162-
v-if="dialogItem.tasks[taskSelect].taskObservations != ''"
163-
:cols="
164-
dialogItem.tasks[taskSelect].taskAnswer != '' ? '6' : '12'
165-
"
166-
class="mt-4"
167-
>
168-
<span class="cardsTitle ma-3" style="color: #252525"
169-
>Observation</span
170-
>
114+
<v-col v-if="dialogItem.tasks[taskSelect].taskObservations != ''" :cols="dialogItem.tasks[taskSelect].taskAnswer != '' ? '6' : '12'
115+
" class="mt-4">
116+
<span class="cardsTitle ma-3" style="color: #252525">Observation</span>
171117
<v-card outlined rounded="xxl">
172118
<div class="ma-6">
173119
<span>
@@ -177,54 +123,27 @@
177123
</v-card>
178124
</v-col>
179125
<div v-if="dialogItem">
180-
<v-col
181-
v-if="dialogItem.tasks[taskSelect].webcamRecordURL"
182-
cols="12"
183-
class="d-flex align-center justify-center flex-column"
184-
>
185-
<span class="cardsTitle ma-3" style="color: #252525"
186-
>Web Cam Record</span
187-
>
188-
<video
189-
v-if="dialogItem"
190-
class="my-3"
191-
:src="dialogItem.tasks[taskSelect].webcamRecordURL"
192-
controls
193-
height="260"
194-
/>
126+
<v-col v-if="dialogItem.tasks[taskSelect].webcamRecordURL" cols="12"
127+
class="d-flex align-center justify-center flex-column">
128+
<span class="cardsTitle ma-3" style="color: #252525">Web Cam Record</span>
129+
<video v-if="dialogItem" class="my-3" :src="dialogItem.tasks[taskSelect].webcamRecordURL" controls
130+
height="260" />
195131
</v-col>
196132
</div>
197133
<div v-if="dialogItem">
198-
<v-col
199-
v-if="dialogItem.tasks[taskSelect].screenRecordURL"
200-
cols="12"
201-
class="d-flex align-center justify-center flex-column"
202-
>
203-
<span class="cardsTitle ma-3" style="color: #252525"
204-
>Screen Record</span
205-
>
206-
<video
207-
class="my-3"
208-
:src="dialogItem.tasks[taskSelect].screenRecordURL"
209-
controls
210-
height="260"
211-
/>
134+
<v-col v-if="dialogItem.tasks[taskSelect].screenRecordURL" cols="12"
135+
class="d-flex align-center justify-center flex-column">
136+
<span class="cardsTitle ma-3" style="color: #252525">Screen Record</span>
137+
<video class="my-3" :src="dialogItem.tasks[taskSelect].screenRecordURL" controls height="260" />
212138
</v-col>
213139
</div>
214140
<div v-if="dialogItem">
215-
<v-col
216-
v-if="dialogItem.tasks[taskSelect].audioRecordURL"
217-
cols="12"
218-
class="d-flex align-center justify-center flex-column"
219-
>
141+
<v-col v-if="dialogItem.tasks[taskSelect].audioRecordURL" cols="12"
142+
class="d-flex align-center justify-center flex-column">
220143
<span class="cardsTitle ma-3" style="color: #252525">
221144
Audio Record
222145
</span>
223-
<audio
224-
class="mx-auto my-3"
225-
:src="dialogItem.tasks[taskSelect].audioRecordURL"
226-
controls
227-
></audio>
146+
<audio class="mx-auto my-3" :src="dialogItem.tasks[taskSelect].audioRecordURL" controls></audio>
228147
</v-col>
229148
</div>
230149
</v-row>
@@ -252,7 +171,7 @@ export default {
252171
intro: null,
253172
dataHeaders: [
254173
{
255-
text: 'Email',
174+
text: 'Full Name',
256175
value: 'userDocId',
257176
},
258177
{
@@ -308,19 +227,10 @@ export default {
308227
goToCoops() {
309228
this.$emit('goToCoops')
310229
},
311-
getCooperatorEmail(userDocId) {
312-
let cooperatorEmail = null
313-
if (this.test.cooperators && Array.isArray(this.test.cooperators)) {
314-
for (const element of this.test.cooperators) {
315-
if (element && element.email && element.userDocId === userDocId) {
316-
cooperatorEmail = element.email
317-
}
318-
}
319-
}
320-
return cooperatorEmail
321-
},
322230
viewAnswers(item) {
323231
this.dialogItem = item
232+
console.log(this.dialogItem);
233+
324234
this.showDialog = true
325235
},
326236
},
@@ -335,6 +245,7 @@ export default {
335245
font-weight: 600;
336246
line-height: normal;
337247
}
248+
338249
.list-scroll {
339250
height: 508px;
340251
overflow: auto;

0 commit comments

Comments
 (0)