Merge pull request #298 from harena-lab/development

feat (hradm): new administrative functionalities
harena-lab · Nov 16, 2021 · 85e7faf · 85e7faf
2 parents b1bb4ba + e62ed4e
commit 85e7faf
Show file tree

Hide file tree

Showing 32 changed files with 807 additions and 131 deletions.
diff --git a/src/adonisjs/public/author/drafts/category/cases/index.html b/src/adonisjs/public/author/drafts/category/cases/index.html
@@ -44,7 +44,7 @@
     <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="/dccs/base/end-dcc.js"></script>
+
 
     <script src="/infra/dcc-rest-proxy.js"></script>
     <script src="/infra/dcc-basic.js"></script>
@@ -102,7 +102,7 @@ <h5 class="modal-title">Filter by:</h5>
                     {{@endfor}}
                   </select>
 
-                  <end-dcc></end-dcc>
+
                 </dcc-dhtml>
               </div>
               <div class="pr-3">
@@ -162,7 +162,7 @@ <h5 class="modal-title">Filter by:</h5>
                       <option value="{{institution.id}}">{{institution.title}}</option>
                       {{@endfor}}
                     </select>
-                    <end-dcc></end-dcc>
+
                   </dcc-dhtml>
                 </div>
               </div>
@@ -275,7 +275,7 @@ <h6>Created by {{c.cases.author_grade}}: {{c.cases.username}} ({{c.cases.institu
                 </div>
               </div>
               {{@endfor}}
-              <end-dcc></end-dcc>
+
             </dcc-dhtml>
           </div>
         </div>

diff --git a/src/adonisjs/public/author/drafts/category/index.html b/src/adonisjs/public/author/drafts/category/index.html
@@ -43,7 +43,7 @@
     <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="/dccs/base/end-dcc.js"></script>
+
 
     <script src="/infra/dcc-rest-proxy.js"></script>
     <script src="/infra/dcc-basic.js"></script>
@@ -110,7 +110,6 @@ <h5 class="text-center text-wrap txt-visita-virtual" style="color:#505050 !impor
 
                   </div>
                   {{@endfor}}
-                  <end-dcc></end-dcc>
                 </dcc-dhtml>
 
             </div>

diff --git a/src/adonisjs/public/author/drafts/feedback/index.html b/src/adonisjs/public/author/drafts/feedback/index.html
@@ -44,7 +44,7 @@
     <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="/dccs/base/end-dcc.js"></script>
+
 
     <script src="/infra/dcc-rest-proxy.js"></script>
     <script src="/infra/dcc-basic.js"></script>
@@ -117,7 +117,7 @@
                       <option value="{{institution.id}}">{{institution.title}}</option>
                       {{@endfor}}
                     </select>
-                    <end-dcc></end-dcc>
+
                   </dcc-dhtml>
                 </div>
               </div>
@@ -188,7 +188,7 @@ <h5 class="" id="modal-notice-txt"></h5>
                     {{@endfor}}
                   </select>
 
-                  <end-dcc></end-dcc>
+
                 </dcc-dhtml> -->
               </div>
               <div class="pr-3">
@@ -261,7 +261,7 @@ <h6>Created by: {{c.cases.username}} ({{c.cases.institution_acronym}}) || {{c.ca
                 </div>
               </div>
               {{@endfor}}
-              <end-dcc></end-dcc>
+
             </dcc-dhtml>
           </div>
         </div>

diff --git a/src/adonisjs/public/author/drafts/index.html b/src/adonisjs/public/author/drafts/index.html
@@ -44,7 +44,7 @@
     <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="/dccs/base/end-dcc.js"></script>
+
 
     <script src="/infra/dcc-rest-proxy.js"></script>
     <script src="/infra/dcc-basic.js"></script>
@@ -117,7 +117,7 @@
                       <option value="{{institution.id}}">{{institution.title}}</option>
                       {{@endfor}}
                     </select>
-                    <end-dcc></end-dcc>
+
                   </dcc-dhtml>
                 </div>
               </div>
@@ -161,7 +161,7 @@ <h5 class="modal-title">Filter by:</h5>
                     {{@endfor}}
                   </select>
 
-                  <end-dcc></end-dcc>
+
                 </dcc-dhtml>
               </div>
               <div class="pr-3">
@@ -231,7 +231,7 @@ <h5 class="" id="modal-notice-txt"></h5>
                     {{@endfor}}
                   </select>
 
-                  <end-dcc></end-dcc>
+
                 </dcc-dhtml>
               </div>
               <div class="pr-2">
@@ -302,7 +302,7 @@ <h6>Created by {{c.cases.author_grade}}: {{c.cases.username}} ({{c.cases.institu
                 </div>
               </div>
               {{@endfor}}
-              <end-dcc></end-dcc>
+
             </dcc-dhtml>
           </div>
         </div>

diff --git a/src/adonisjs/public/author/index.html b/src/adonisjs/public/author/index.html
@@ -81,7 +81,7 @@
     <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="/dccs/base/end-dcc.js"></script>
+
 
     <script src="/dccs/components/data/dcc-model.js"></script>
     <script src="/dccs/components/data/dcc-submit.js"></script>
@@ -208,7 +208,7 @@ <h3>Settings</h3>
           </div>
         </div>
       </div>
-      <end-dcc></end-dcc>
+
     </dcc-dhtml>
     <!-- End of settings modal -->
 
@@ -249,7 +249,7 @@ <h3>Settings</h3>
                       <option value="{{institution.id}}">{{institution.title}}</option>
                       {{@endfor}}
                     </select>
-                    <end-dcc></end-dcc>
+
                   </dcc-dhtml>
                 </div>
               </div>
@@ -265,7 +265,7 @@ <h3>Settings</h3>
               </div>
               <dcc-dhtml id="dhtml-case-id" connect="retrieve:harena-case:service/request/get">
                 <input type="hidden" id="table_id" name="table_id" value="{{id}}">
-                <end-dcc></end-dcc>
+
               </dcc-dhtml>
               <dcc-submit label="Share" xstyle="btn btn-success" bind="submit-share" data-dismiss="modal" connect="submit:harena-share-cases:service/request/post"></dcc-submit>
               <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
@@ -318,7 +318,7 @@ <h5 class="" id="modal-notice-txt"></h5>
           <dcc-dhtml subscribe="service/response/get/harena-case:update">
             <h1>Edit case - {{title}}</h1>
             <h6 style="color:#808080;">Created by {{author_grade}}: {{username}} ({{institution_acronym}}). </h6>
-            <end-dcc></end-dcc>
+
           </dcc-dhtml>
         </div>
         <!-- End of page title and description -->

diff --git a/src/adonisjs/public/author/partials/case-list-min.html b/src/adonisjs/public/author/partials/case-list-min.html
@@ -12,7 +12,7 @@
           {{@endfor}}
         </select>
 
-        <end-dcc></end-dcc>
+
       </dcc-dhtml>
     </div>
     <div class="pr-3">
@@ -78,6 +78,6 @@ <h6>Created by {{c.cases.author_grade}}: {{c.cases.username}} ({{c.cases.institu
       </div>
     </div>
     {{@endfor}}
-    <end-dcc></end-dcc>
+
   </dcc-dhtml>
 </div>
diff --git a/src/adonisjs/public/author/partials/template-min.html b/src/adonisjs/public/author/partials/template-min.html
@@ -79,7 +79,7 @@
   <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="/dccs/base/end-dcc.js"></script>
+
 
   <script src="/dccs/components/data/dcc-model.js"></script>
   <script src="/dccs/components/data/dcc-submit.js"></script>

diff --git a/src/adonisjs/public/dccs/base/end-dcc.js b/src/adonisjs/public/dccs/base/end-dcc.js
diff --git a/src/adonisjs/public/dccs/components/data/dcc-table-csv.js b/src/adonisjs/public/dccs/components/data/dcc-table-csv.js
@@ -40,7 +40,7 @@ class DCCTableCSV extends DCCVisual {
   }
 
   static get observedAttributes () {
-    return DCCVisual.observedAttributes.concat(['drop', 'view'])
+    return DCCVisual.observedAttributes.concat(['drop', 'view', 'separator'])
   }
 
   get drop () {
@@ -61,6 +61,14 @@ class DCCTableCSV extends DCCVisual {
     else { this.removeAttribute('view') }
   }
 
+  get separator () {
+    return this.getAttribute('separator')
+  }
+
+  set separator (newValue) {
+    this.setAttribute('separator', newValue)
+  }
+
   _tableDrag (event) {
     this._dropZone.innerHTML = 'Drop your file here'
     event.preventDefault()
@@ -93,10 +101,15 @@ class DCCTableCSV extends DCCVisual {
   }
 
   _processTable (csv) {
+    const sep = (this.hasAttribute('separator')) ? this.separator : ','
+    const lineRE =
+      new RegExp('(?:^|' + sep + ')[ \\t]*(?:(?:"([^"]*)")|([^' + sep + ']*))',
+      'g')
+
     let lines = csv.split(/\r\n|\r|\n/)
     this._table = []
     for (let l of lines) {
-      let cells = l.matchAll(/(?:^|,)[ \t]*(?:(?:"([^"]*)")|([^,]*))/g)
+      let cells = l.matchAll(lineRE)
       let ln = []
       for (const c of cells)
         ln.push((c[1] != null) ? c[1] : c[2])