Merge pull request #480 from harena-lab/development

Development

src/adonisjs/public/player/env/index-jacinto.html

@@ -88,7 +88,7 @@
 					<div class="col-12" style="font-size:28px;font-weight:400;background-color:#111111">Seções</div>
 				  <br>
 					<ul style="color:white">
-						<li><a href="/player/case/index-oid.html?id=b728ce52-11cf-4a6c-9971-237b9cb6fd40&room=91375717-eeba-4144-a597-6f803d86ccef" target="_blank" style="color:white">Perfil de Aprendizagem</a></li>
+						<li><a href="/player/case/index-oid.html?id=b728ce52-11cf-4a6c-9971-237b9cb6fd40&room=91375717-eeba-4144-a597-6f803d86ccef" target="_blank" style="color:white">Perfil Demográfico e de Aprendizagem</a></li>
 						<li><a href="/player/case/index-oid.html?id=011a4fc4-fc95-4292-8368-0d417d64efd1&room=91375717-eeba-4144-a597-6f803d86ccef" target="_blank" style="color:white">Seção 1: <span style="color:#aaaaaa">Bases anatômicas e fisiológicas da estrutura cardíaca</span></a></li>
 						<li>Seção 2: <span style="color:#aaaaaa">Princípios da instalação da Monitorização cardíaca</span></li>
 						<li>Seção 3: <span style="color:#aaaaaa">Ajustes do Monitor</span></li>

src/adonisjs/public/report/category/cases/play/schemas/experiment-specialists.csv

@@ -0,0 +1 @@
+Perfil.idade,Perfil.sexo,Perfil.especialidade,Perfil.formado,Perfil.dispositivo,Atendimentos.dpoc_semana,Atendimentos.dpoc_meses,Atendimentos.iam_semana,Atendimentos.iam_meses,Local.ambulatorio,Local.ambulatorio_carga,Local.enfermaria,Local.enfermaria_carga,Local.pronto_socorro,Local.pronto_socorro_carga,Local.uti,Local.uti_carga,Pergunta_01.tudo_iam,Pergunta_02.tudo_dpoc,Perguntas_Finais.motivado,Perguntas_Finais.empenho,Perguntas_Finais.checou_fonte

src/adonisjs/public/report/category/cases/play/schemas/heart-robot-notes.csv

@@ -0,0 +1 @@
+notes

src/adonisjs/public/report/js/report.js

@@ -37,8 +37,12 @@ class ReportManager {
       for (const s of schema)
         table += ',"' + s + '","time","miliseconds"'
       table += '\n'
-      for (const l of logger.message.logs) {
-        const answers = JSON.parse(l.log)
+
+      const logSet = this._preprocess(logger.message.logs,
+        (new URL(document.location).searchParams.get('aggregate')) == 'true')
+
+      for (const l of logSet) {
+        const answers = l.log
         const track = this._prepareTrack(answers.knotTrack, answers.varTrack)
         let lastTime = new Date(track.timeStart)
         table += '"' + l.user_id + '","' + l.username + '","' +
@@ -81,6 +85,67 @@ class ReportManager {
     }
   }
 
+  _preprocess (logs, aggregate) {
+    const toAdd = ['knotTrack', 'varTrack']
+    const toUpdate = ['variables', 'varUpdated', 'mandatoryFilled']
+    const toReplace = ['groupInput', 'caseCompleted']
+    const pp = (aggregate) ? [] : logs[l]
+    let agg = null
+    let l = 0
+    let prev = null
+    while (l < logs.length) {
+      const parsed = JSON.parse(logs[l].log)
+      if (!aggregate)
+        pp[l].log = parsed
+      else {
+        if (prev == null || prev != logs[l].instance_id) {
+          if (agg != null) {
+            console.log('=== agg')
+            console.log(agg)
+            pp.push(agg)
+          }
+          agg = logs[l]
+          agg.log = {variables: {}}
+          prev = logs[l].instance_id
+        }
+        for (const ta of toAdd) {
+          if (parsed[ta] != null) {
+            if (agg.log[ta] == null)
+              agg.log[ta] = [parsed[ta]]
+            else
+              agg.log[ta] = agg.log[ta].concat(parsed[ta])
+          }
+        }
+        for (const tu of toUpdate)
+          if (parsed[tu] != null) {
+            if (agg.log[tu] == null)
+              agg.log[tu] = parsed[tu]
+            else
+              for (const t in parsed[tu])
+                agg.log[tu][t] = parsed[tu][t]
+          }
+        for (const tr of toReplace)
+          if (parsed[tr] != null)
+            agg.log[tr] = parsed[tr]
+        if (parsed['varTrack'] != null) {
+          const vt = (Array.isArray(parsed['varTrack'])) ? parsed['varTrack'] : [parsed['varTrack']]
+          for (const v of vt) {
+            for (const f in Object.keys(v)) {
+              if (v[f] != 'changed')
+                agg.log.variables[f] = v[f]
+            }
+          }
+        }
+      }
+      l++
+    }
+    if (agg != null)
+      pp.push(agg)
+    console.log('=== pp')
+    console.log(pp)
+    return pp
+  }
+
   async _report () {
     const reportArea = document.querySelector('#report-area')
     const logger = await this._requestLogger()

src/adonisjs/public/themes/sections/atividade.html

@@ -1,13 +1,17 @@
 <div style="color:white;background-color:#009be5">
   <br>
-  <div class="d-flex"><div class="col-6" style="font-size:32px;font-weight:400">Seção 1</div></div>
+  <div class="d-flex">
+    <div class="col-9" style="font-size:32px;font-weight:400">Seção 1</div>
+    <div class="col-3"><img src="/themes/sections/images/florence.png"></div>
+  </div>
   <br>
   <div class="d-flex">
     <div class="col-1" style="font-weight:200">Resumo</div>
     <div class="col-1" style="font-weight:200">Pré-teste</div>
     <div class="col-1" style="font-weight:200">Vídeos</div>
     <div class="col-1" style="font-weight:900;text-decoration:underline">Atividade</div>
     <div class="col-1" style="font-weight:200">Pós-teste</div>
+    <div class="col-1" style="font-weight:200">Plataforma</div>
     <div class="col-1" style="font-weight:200">Conclusão</div>
   </div>
   <br>

src/adonisjs/public/themes/sections/conclusao.html

@@ -1,13 +1,17 @@
 <div style="color:white;background-color:#009be5">
   <br>
-  <div class="d-flex"><div class="col-6" style="font-size:32px;font-weight:400">Seção 1</div></div>
+  <div class="d-flex">
+    <div class="col-9" style="font-size:32px;font-weight:400">Seção 1</div>
+    <div class="col-3"><img src="/themes/sections/images/florence.png"></div>
+  </div>
   <br>
   <div class="d-flex">
     <div class="col-1" style="font-weight:200">Resumo</div>
     <div class="col-1" style="font-weight:200">Pré-teste</div>
     <div class="col-1" style="font-weight:200">Vídeos</div>
     <div class="col-1" style="font-weight:200">Atividade</div>
     <div class="col-1" style="font-weight:200">Pós-teste</div>
+    <div class="col-1" style="font-weight:200">Plataforma</div>
     <div class="col-1" style="font-weight:900;text-decoration:underline">Conclusão</div>
   </div>
   <br>

src/adonisjs/public/themes/sections/demografico.html

@@ -0,0 +1,32 @@
+<div style="color:white;background-color:#009be5">
+  <br>
+  <div class="d-flex">
+    <div class="col-9" style="font-size:32px;font-weight:400">Perfil</div>
+    <div class="col-3"><img src="/themes/sections/images/florence.png"></div>
+  </div>
+  <br>
+  <div class="d-flex">
+    <div class="col-1" style="font-weight:900;text-decoration:underline">Demográfico</div>
+    <div class="col-1" style="font-weight:200">Aprendizagem</div>
+  </div>
+  <br>
+</div>
+<div class="styt-main-frame">
+  <br>
+  <div class="styt-main">
+     <div class="styt-main-text">
+        <dcc-styler xstyle="out" targeted="action">
+           {knot}
+        </dcc-styler>
+     </div>
+  </div>
+  <br>
+</div>
+<div class="d-flex">
+  <span id="action-1-wrapper" class="styt-button-frame">
+    <span id="action-1" class="styt-button"></span>
+  </span>
+  <span id="action-2-wrapper" class="styt-button-frame" style="display:none">
+    <span id="action-2" class="styt-button"></span>
+  </span>
+</div>

src/adonisjs/public/themes/sections/kolb.html

@@ -1,9 +1,13 @@
 <div style="color:white;background-color:#009be5">
   <br>
-  <div class="d-flex"><div class="col-6" style="font-size:32px;font-weight:400">Perfil de Aprendizagem</div></div>
+  <div class="d-flex">
+    <div class="col-9" style="font-size:32px;font-weight:400">Perfil</div>
+    <div class="col-3"><img src="/themes/sections/images/florence.png"></div>
+  </div>
   <br>
   <div class="d-flex">
-    <div class="col-1" style="font-weight:900;text-decoration:underline">Kolb</div>
+    <div class="col-1" style="font-weight:200">Demográfico</div>
+    <div class="col-1" style="font-weight:900;text-decoration:underline">Aprendizagem</div>
   </div>
   <br>
 </div>

src/adonisjs/public/themes/sections/plataforma.html

@@ -0,0 +1,37 @@
+<div style="color:white;background-color:#009be5">
+  <br>
+  <div class="d-flex">
+    <div class="col-9" style="font-size:32px;font-weight:400">Seção 1</div>
+    <div class="col-3"><img src="/themes/sections/images/florence.png"></div>
+  </div>
+  <br>
+  <div class="d-flex">
+    <div class="col-1" style="font-weight:200">Resumo</div>
+    <div class="col-1" style="font-weight:200">Pré-teste</div>
+    <div class="col-1" style="font-weight:200">Vídeos</div>
+    <div class="col-1" style="font-weight:200">Atividade</div>
+    <div class="col-1" style="font-weight:200">Pós-teste</div>
+    <div class="col-1" style="font-weight:900;text-decoration:underline">Plataforma</div>
+    <div class="col-1" style="font-weight:200">Conclusão</div>
+  </div>
+  <br>
+</div>
+<div class="styt-main-frame">
+  <br>
+  <div class="styt-main">
+     <div class="styt-main-text">
+        <dcc-styler xstyle="out" targeted="action">
+           {knot}
+        </dcc-styler>
+     </div>
+  </div>
+  <br>
+</div>
+<div class="d-flex">
+  <span id="action-1-wrapper" class="styt-button-frame">
+    <span id="action-1" class="styt-button"></span>
+  </span>
+  <span id="action-2-wrapper" class="styt-button-frame" style="display:none">
+    <span id="action-2" class="styt-button"></span>
+  </span>
+</div>

src/adonisjs/public/themes/sections/pos.html

@@ -1,13 +1,17 @@
 <div style="color:white;background-color:#009be5">
   <br>
-  <div class="d-flex"><div class="col-6" style="font-size:32px;font-weight:400">Seção 1</div></div>
+  <div class="d-flex">
+    <div class="col-9" style="font-size:32px;font-weight:400">Seção 1</div>
+    <div class="col-3"><img src="/themes/sections/images/florence.png"></div>
+  </div>
   <br>
   <div class="d-flex">
     <div class="col-1" style="font-weight:200">Resumo</div>
     <div class="col-1" style="font-weight:200">Pré-teste</div>
     <div class="col-1" style="font-weight:200">Vídeos</div>
     <div class="col-1" style="font-weight:200">Atividade</div>
     <div class="col-1" style="font-weight:900;text-decoration:underline">Pós-teste</div>
+    <div class="col-1" style="font-weight:200">Plataforma</div>
     <div class="col-1" style="font-weight:200">Conclusão</div>
   </div>
   <br>

src/adonisjs/public/themes/sections/pre.html

@@ -1,13 +1,17 @@
 <div style="color:white;background-color:#009be5">
   <br>
-  <div class="d-flex"><div class="col-6" style="font-size:32px;font-weight:400">Seção 1</div></div>
+  <div class="d-flex">
+    <div class="col-9" style="font-size:32px;font-weight:400">Seção 1</div>
+    <div class="col-3"><img src="/themes/sections/images/florence.png"></div>
+  </div>
   <br>
   <div class="d-flex">
     <div class="col-1" style="font-weight:200">Resumo</div>
     <div class="col-1" style="font-weight:900;text-decoration:underline">Pré-teste</div>
     <div class="col-1" style="font-weight:200">Vídeos</div>
     <div class="col-1" style="font-weight:200">Atividade</div>
     <div class="col-1" style="font-weight:200">Pós-teste</div>
+    <div class="col-1" style="font-weight:200">Plataforma</div>
     <div class="col-1" style="font-weight:200">Conclusão</div>
   </div>
   <br>

src/adonisjs/public/themes/sections/summary.html

@@ -1,13 +1,17 @@
 <div style="color:white;background-color:#009be5">
   <br>
-  <div class="d-flex"><div class="col-6" style="font-size:32px;font-weight:400">Seção 1</div></div>
+  <div class="d-flex">
+    <div class="col-9" style="font-size:32px;font-weight:400">Seção 1</div>
+    <div class="col-3"><img src="/themes/sections/images/florence.png"></div>
+  </div>
   <br>
   <div class="d-flex">
     <div class="col-1" style="font-weight:900;text-decoration:underline">Resumo</div>
     <div class="col-1" style="font-weight:200">Pré-teste</div>
     <div class="col-1" style="font-weight:200">Vídeos</div>
     <div class="col-1" style="font-weight:200">Atividade</div>
     <div class="col-1" style="font-weight:200">Pós-teste</div>
+    <div class="col-1" style="font-weight:200">Plataforma</div>
     <div class="col-1" style="font-weight:200">Conclusão</div>
   </div>
   <br>

src/adonisjs/public/themes/sections/video.html

@@ -1,13 +1,17 @@
 <div style="color:white;background-color:#009be5">
   <br>
-  <div class="d-flex"><div class="col-6" style="font-size:32px;font-weight:400">Seção 1</div></div>
+  <div class="d-flex">
+    <div class="col-9" style="font-size:32px;font-weight:400">Seção 1</div>
+    <div class="col-3"><img src="/themes/sections/images/florence.png"></div>
+  </div>
   <br>
   <div class="d-flex">
     <div class="col-1" style="font-weight:200">Resumo</div>
     <div class="col-1" style="font-weight:200">Pré-teste</div>
     <div class="col-1" style="font-weight:900;text-decoration:underline">Vídeos</div>
     <div class="col-1" style="font-weight:200">Atividade</div>
     <div class="col-1" style="font-weight:200">Pós-teste</div>
+    <div class="col-1" style="font-weight:200">Plataforma</div>
     <div class="col-1" style="font-weight:200">Conclusão</div>
   </div>
   <br>