Merge pull request #465 from harena-lab/development

Development
harena-lab · Dec 7, 2023 · b292cce · b292cce
2 parents 67e5660 + 4cddcbf
commit b292cce
Show file tree

Hide file tree

Showing 24 changed files with 829 additions and 1 deletion.
diff --git a/src/adonisjs/public/author/js/draft.js b/src/adonisjs/public/author/js/draft.js
@@ -52,9 +52,14 @@ class DraftManager {
         function () {
           Basic.service.authorPropertyStore('caseId', this.id.substring(1))
           // window.location.href = "http://0.0.0.0:10010/author/author.html";
+          let params = new URLSearchParams(document.location.search)
+          let mode = params.get("mode")
+
           if(new URL(document.location).pathname.includes('feedback')){
             window.location.href =
                     '/author?id=' + this.id.substring(1)+'&fdbk'
+          }else if(mode == 'advanced'){
+            window.open('/author?id=' + this.id.substring(1),'_blank')
           }else {
             window.location.href =
                     '/author?id=' + this.id.substring(1)
@@ -176,9 +181,13 @@ class DraftManager {
           const listenerFnEdit = function () {
             Basic.service.authorPropertyStore('caseId', editButton.id.substring(1))
             // window.location.href = "http://0.0.0.0:10010/author/author.html";
+            let params = new URLSearchParams(document.location.search)
+            let mode = params.get("mode")
             if(new URL(document.location).pathname.includes('feedback')){
               window.location.href =
               '/author?id=' + this.id.substring(1)+'&fdbk=""'
+            }else if (mode == 'advanced'){
+              window.open('/author?id=' + this.id.substring(1),'_blank').focus()
             }else {
               window.location.href =
               '/author?id=' + this.id.substring(1)

diff --git a/src/adonisjs/public/player/case/tracker.html b/src/adonisjs/public/player/case/tracker.html
@@ -0,0 +1,165 @@
+<!DOCTYPE html>
+<html>
+  <head>
+  <meta charset="utf-8"/>
+  <title>Tracker Download</title>
+
+  <link rel="stylesheet" href="/player/css/player.css">
+
+  <link rel="stylesheet" href="/author/css/author.css">
+
+  <script src="/lib/axios-0.21.0/axios.min.js"></script>
+
+  <script src="/lib/jquery-3-4-1/jquery-3.4.1.slim.min.js"></script>
+  <script src="/lib/popper-1-15-0/popper.min.js"></script>
+  <script src="/lib/bootstrap-4.4.1/js/bootstrap.min.js"></script>
+
+  <script src="/config/config.js"></script>
+  <script src="/dccs/infra/bus.js"></script>
+
+  <script src="/dccs/base/primitive-dcc.js"></script>
+  <script src="/dccs/base/scope-dcc.js"></script>
+  <script src="/dccs/base/dcc.js"></script>
+  <script src="/dccs/base/dcc-base.js "></script>
+  <script src="/dccs/base/dcc-visual.js "></script>
+
+  <script src="/infra/basic.js"></script>
+  <script>
+  Basic.service.rootPath = '../../'
+  </script>
+
+  <script src="/infra/dcc-common-server-proxy.js"></script>
+  <script src="/infra/dcc-common-server-address.js"></script>
+  <script src="/infra/simple-page-tasks.js"></script>
+  <script src="/infra/token-validator.js"></script>
+
+  <script src="/dccs/base/dcc-block.js"></script>
+  <script src="/dccs/base/dcc-light.js "></script>
+
+  <script src="/dccs/components/visual/dcc-button.js"></script>
+  <script src="/dccs/components/visual/dcc-notice-input.js"></script>
+
+  <script src="/dccs/components/web/dcc-rest.js"></script>
+  <script src="/dccs/components/web/dcc-include.js"></script>
+  <script src="/dccs/components/web/dcc-dhtml.js"></script>
+
+  <script src="/dccs/components/data/dcc-table-csv.js"></script>
+  <script src="/dccs/components/data/dcc-submit.js"></script>
+  <script src="/dccs/components/data/dcc-model.js"></script>
+  <script src="/dccs/components/data/dcc-record.js"></script>
+
+  <script src="/dccs/base/subscribe-dcc.js"></script>
+  <script src="/dccs/base/trigger-dcc.js"></script>
+  <script src="/dccs/base/property-dcc.js"></script>
+  <script src="/dccs/base/connect-dcc.js"></script>
+
+  <script src="/infra/dcc-rest-proxy.js"></script>
+  <script src="/infra/proxy/dcc-proxy-case.js"></script>
+  <script src="/infra/dcc-basic.js"></script>
+  <script src="/infra/dcc-logger.js"></script>
+  <script src="/infra/dcc-logger-manager.js"></script>
+
+  <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
+  <link rel="shortcut icon" href="/icons/favicon.ico">
+  <link rel="manifest" href="/site.webmanifest">
+
+  <link rel="stylesheet" href="/lib/fontawesome-5-10-1/css/all.min.css">
+  <link rel="stylesheet" href="/lib/bootstrap-4.4.1/css/bootstrap.min.css">
+
+  <link rel="stylesheet" href="/dccs/css/dccs.css">
+  <link rel="stylesheet" href="/dccs/css/properties.css">
+  <link rel="stylesheet" href="/infra/css/common-player.css">
+  <link rel="stylesheet" href="/infra/css/common-author.css">
+
+  <script src="/author/js/dcc-author-server-proxy.js"></script>
+
+  <script src="/author/js/create.js"></script>
+  <script src="/author/js/template-case.js"></script>
+  <script src="/author/js/draft.js"></script>
+
+  <script src="/context/context.js"></script>
+
+  <script src="/dccs/components/control/dcc-timer.js"></script>
+  <script src="/dccs/components/control/dcc-compute.js"></script>
+  <script src="/dccs/components/control/dcc-message.js"></script>
+
+  <script src="/dccs/components/visual/dcc-markdown.js"></script>
+  <script src="/dccs/components/visual/dcc-annotation.js"></script>
+  <script src="/dccs/components/visual/dcc-expression.js"></script>
+  <script src="/dccs/components/visual/dcc-character.js"></script>
+  <script src="/dccs/components/visual/dcc-lively-dialog.js"></script>
+  <script src="/dccs/components/visual/dcc-state-select.js"></script>
+  <script src="/dccs/components/visual/dcc-image-marker.js"></script>
+  <script src="/dccs/base/dcc-styler.js"></script>
+  <script src="/dccs/components/visual/dcc-entity.js"></script>
+  <script src="/dccs/components/visual/dcc-input.js"></script>
+  <script src="/dccs/components/visual/dcc-input-typed.js"></script>
+  <script src="/dccs/components/visual/dcc-input-choice.js"></script>
+  <script src="/dccs/components/visual/dcc-input-table.js"></script>
+  <script src="/dccs/components/visual/dcc-input-summary.js"></script>
+  <script src="/dccs/components/visual/dcc-chart.js"></script>
+  <script src="/dccs/components/visual/dcc-slider.js"></script>
+  <script src="/dccs/components/visual/dcc-report.js"></script>
+
+  <!-- bundle cellular -->
+  <script src="/dccs/components/cell/dcc-space-cellular.js"></script>
+  <script src="/dccs/components/cell/dcc-cell.js"></script>
+  <script src="/dccs/components/cell/dcc-cell-color.js"></script>
+  <script src="/dccs/components/cell/dcc-cell-image.js"></script>
+  <script src="/dccs/components/cell/dcc-cell-ruler.js"></script>
+  <script src="/dccs/components/cell/rule-dcc-cell.js"></script>
+  <script src="/dccs/components/cell/rule-dcc-cell-transition.js"></script>
+  <script src="/dccs/components/cell/rule-dcc-cell-neighbor.js"></script>
+  <script src="/dccs/components/cell/rule-dcc-cell-expression.js"></script>
+
+  <script src="/lib/showdown/showdown.min.js"></script>
+
+  <script src="/translator/translator.js"></script>
+  <script src="/translator/item-templates.js"></script>
+
+  <script src="/player/js/dcc-player-server-proxy.js"></script>
+  <script src="/player/js/htracker.js"></script>
+  <script src="/player/js/state.js"></script>
+  <script src="/player/js/metaplayer.js"></script>
+  <script src="/player/js/player.js"></script>
+  <script src="/player/js/caselist.js"></script>
+
+  <script>
+    function start () {
+      MessageBus.i.subscribe('download/track', download)
+    }
+
+    function download () {
+      let d = new Date();
+
+      let day = d.getDay().toString();
+      let month = d.getMonth().toString();
+      let h = d.getHours().toString();
+      let m = d.getMinutes().toString();
+      let s = d.getSeconds().toString();
+
+      let chave = Math.floor(Math.random() * (9000 - 1 + 1)) + 1;
+      let strkey = day + month + h + m + s + chave.toString();
+
+      const ui = sessionStorage.getItem('harena-user-id')
+      const trk = localStorage.getItem('harena-track')
+      const st = localStorage.getItem('harena-state')
+
+      const a = document.createElement('a')
+      a.style.display = 'none'
+      document.body.appendChild(a)
+      a.href = window.URL.createObjectURL(
+        new Blob([ui, '\n\n[[TRACK]]\n\n', trk,'\n\n[[STATE]]\n\n',st], {type: 'text/plain'}))
+      a.setAttribute('download', `case${strkey}.track`)
+      a.click()
+      window.URL.revokeObjectURL(a.href)
+      document.body.removeChild(a)
+    }
+  </script>
+</head>
+<body onload="start()">
+    <dcc-button label="Download Track" topic="download/track"></dcc-button>
+</body>
+</html>
diff --git a/src/adonisjs/public/report/category/cases/play/schemas/heart-robot.csv b/src/adonisjs/public/report/category/cases/play/schemas/heart-robot.csv
@@ -0,0 +1 @@
+Kolb1.kb1,Kolb2.kb2,Kolb3.kb3,Kolb4.kb4,Kolb5.kb5,Kolb6.kb6,Kolb7.kb7,Kolb8.kb8,Kolb9.kb9,Kolb10.kb10,Kolb11.kb11,Kolb12.kb12,Teste1.ta1,Teste2.ta2,Teste3.ta3,Teste4.ta4,Teste5.ta5,PosTeste1.tp1,PosTeste2.tp2,PosTeste3.tp3,PosTeste4.tp4,PosTeste5.tp5
diff --git a/src/adonisjs/public/report/js/report-annotations.js b/src/adonisjs/public/report/js/report-annotations.js
@@ -142,7 +142,7 @@ class ReportManager {
     const cases = await this._requestCases()
 
     if (cases != null) {
-      let table = '"user id","annotation id","oranization level","global score","student year",' +
+      let table = '"user id","annotation id","organization level","global score","student year",' +
         '"used categories","right","right (inferred)","total ideas","right encapsulated",' +
         '"right encapsulated (inferred)","wrong","wrong encapsulated","coverage score",' +
         '"accuracy score","accuracy score (inferred)","encapsulated score","self order score",' +

diff --git a/src/adonisjs/public/templates/sections/basic-dynamic.md b/src/adonisjs/public/templates/sections/basic-dynamic.md
@@ -0,0 +1,5 @@
+# Presentation (cell_mutant_sliders) #
+
+___ Template ___
+
+* template: sections/basic
diff --git a/src/adonisjs/public/templates/sections/basic-static.md b/src/adonisjs/public/templates/sections/basic-static.md
@@ -0,0 +1,8 @@
+___ Flow ___
+
+* Sequential:
+  * _sequential_
+
+___ Data ___
+
+* theme: sections(blue)
diff --git a/src/adonisjs/public/themes/sections/atividade.html b/src/adonisjs/public/themes/sections/atividade.html
@@ -0,0 +1,33 @@
+<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>
+  <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">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>
diff --git a/src/adonisjs/public/themes/sections/conclusao.html b/src/adonisjs/public/themes/sections/conclusao.html
@@ -0,0 +1,33 @@
+<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>
+  <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">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>
diff --git a/src/adonisjs/public/themes/sections/css/blue/theme.css b/src/adonisjs/public/themes/sections/css/blue/theme.css
@@ -0,0 +1,9 @@
+@charset "UTF-8";
+
+.styt-button, .styt-button-option {
+   background-color: #234a98;
+}
+
+.dcc-button-theme {
+   background-color: #234a98;
+}
diff --git a/src/adonisjs/public/themes/sections/css/dcc-annotation.css b/src/adonisjs/public/themes/sections/css/dcc-annotation.css
@@ -0,0 +1,7 @@
+@charset "UTF-8";
+
+/* Annotation DCC */
+
+.dcc-text-annotation {
+   background-color: #ffaa0078;
+}
diff --git a/src/adonisjs/public/themes/sections/css/dcc-context-menu.css b/src/adonisjs/public/themes/sections/css/dcc-context-menu.css
@@ -0,0 +1,16 @@
+.dcc-context-menu {
+   position: absolute;
+   background-color: white;
+   border-radius: 1px;
+   box-shadow: 0px 0px 0px 5px rgba(0,0,0,0.5);
+   margin: 5px;
+}
+
+.dcc-context-menu-item {
+   margin: 2px;
+}
+
+.dcc-context-menu-item:hover {
+   cursor: pointer;
+   background-color: gray;
+}
diff --git a/src/adonisjs/public/themes/sections/css/dcc-input-table.css b/src/adonisjs/public/themes/sections/css/dcc-input-table.css
@@ -0,0 +1,17 @@
+@charset "UTF-8";
+
+/* Input Table DCC */
+
+.dcc-input-table-theme table {
+   border: 1px solid darkgray;
+}
+
+.dcc-input-table-theme th {
+   border: 1px solid darkgray;
+   background-color: lightgray;
+   font-weight: bold;
+}
+
+.dcc-input-table-theme td {
+   border: 1px solid darkgray;
+}
diff --git a/src/adonisjs/public/themes/sections/css/dcc-input-typed.css b/src/adonisjs/public/themes/sections/css/dcc-input-typed.css
@@ -0,0 +1,5 @@
+@charset "UTF-8";
+
+.dcc-input-typed-theme {
+   font-size: 30px;
+}