Merge pull request #284 from harena-lab/development

Feats: Case list filter by title, desc and keyword
harena-lab · Jul 21, 2021 · f062a13 · f062a13
2 parents 1088fab + f4f6d3f
commit f062a13
Show file tree

Hide file tree

Showing 101 changed files with 13,433 additions and 643 deletions.
diff --git a/src/adonisjs/public/author/drafts/category/cases/index.html b/src/adonisjs/public/author/drafts/category/cases/index.html
@@ -71,6 +71,50 @@
     <div id="alert-feedback" class="alert alert-success ml-2 mt-5" role="alert" style="position:absolute; display:none;">
     </div>
 
+    <!-- Filter options advanced -->
+    <div class="modal fade" id="filter-modal" tabindex="-1" role="dialog" aria-labelledby="filter-modal" aria-hidden="true">
+      <div class="modal-dialog modal-dialog-centered" role="document">
+        <div class="modal-content">
+          <div class="modal-header">
+            <h5 class="modal-title">Filter by:</h5>
+          </div>
+          <div class="modal-body">
+            <form class="pl-2 align-items-center row" id="filter-form">
+              <div class="pr-3">
+                <dcc-rest id="harena-institutions" bind="harena-institutions"></dcc-rest>
+                <dcc-dhtml id="harena-dhtml-institutions" connect="retrieve:harena-institutions:service/request/get">
+
+                  <select id="fInstitution" name="fInstitution" class="custom-select custom-select-sm">
+                    <option selected value="">Institution</option>
+                    {{@foreach . institution}}
+                    <option value={{institution.id}}>{{institution.acronym}}</option>
+                    {{@endfor}}
+                  </select>
+
+                  <end-dcc></end-dcc>
+                </dcc-dhtml>
+              </div>
+              <div class="pr-3">
+                <select id="fUserType" name="fUserType" class="custom-select custom-select-sm">
+                  <option selected value="">User type</option>
+                  <option value="professor">Professor</option>
+                  <option value="student">Student</option>
+                </select>
+              </div>
+              <div class="pr-3" style="width: 120px;">
+                <input type="text" class="form-control custom-select-sm" id="fSpecialty" placeholder="Specialty">
+              </div>
+              <input type="text" class="mr-2 my-2 form-control custom-select-sm" id="fSearchStr"
+               placeholder="Search similar title, keywords or description...">
+
+              <dcc-submit id="filter-submit" bind="submit-filter" label="Filter" xstyle="btn btn-secondary" topic="cases/request/get"></dcc-submit>
+            </form>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- End filter options advanced -->
+
     <!-- Share casel modal -->
     <dcc-rest id="harena-share-cases" bind="harena-share-cases"></dcc-rest>
     <div class="modal fade" id="share-modal" tabindex="-1" role="dialog" aria-labelledby="share-modal" aria-hidden="true">
@@ -164,35 +208,8 @@ <h5 class="" id="modal-notice-txt"></h5>
             <p>Continue editing your drafted cases.</p>
           </div>
           <div class="home-author-padding align-items-center rounded row sticky-top" style="z-index:3;">
-            <form class="pl-2 align-items-center row" id="filter-form">
-              <div class="p-2 ml-4">Filter by: </div>
-              <div class="pr-3">
-                <dcc-rest id="harena-institutions" bind="harena-institutions"></dcc-rest>
-                <dcc-dhtml id="harena-dhtml-institutions" connect="retrieve:harena-institutions:service/request/get">
-
-                  <select id="fInstitution" name="fInstitution" class="custom-select custom-select-sm">
-                    <option selected value="">Institution</option>
-                    {{@foreach . institution}}
-                    <option value={{institution.id}}>{{institution.acronym}}</option>
-                    {{@endfor}}
-                  </select>
-
-                  <end-dcc></end-dcc>
-                </dcc-dhtml>
-              </div>
-              <div class="pr-3">
-                <select id="fUserType" name="fUserType" class="custom-select custom-select-sm">
-                  <option selected value="">User type</option>
-                  <option value="professor">Professor</option>
-                  <option value="student">Student</option>
-                </select>
-              </div>
-              <div class="pr-3" style="width: 120px;">
-                <input type="text" class="form-control custom-select-sm" id="fSpecialty" placeholder="Specialty">
-              </div>
-              <dcc-submit id="filter-submit" bind="submit-filter" label="Filter" xstyle="btn btn-secondary" topic="cases/request/get"></dcc-submit>
-            </form>
-            <dcc-rest id="harena-cases-filter" bind="harena-cases" subscribe="cases/request/get:retrieve"></dcc-rest>
+            <button type="button" class="btn btn-secondary mx-2" data-toggle="modal" data-target="#filter-modal"><i class="fas fa-filter"></i> Filter</button>
+            <dcc-rest id="harena-cases-filter" bind="harena-cases" subscribe="cases/request/get"></dcc-rest>
 
             <!-- Containers to selectAll/share cases -->
             <div class="share-cases-element form-check mt-2 ml-auto" id="share-checkbox" hidden>

diff --git a/src/adonisjs/public/author/drafts/feedback/index.html b/src/adonisjs/public/author/drafts/feedback/index.html
@@ -202,7 +202,7 @@ <h5 class="" id="modal-notice-txt"></h5>
               </div>
               <dcc-submit id="filter-submit" bind="submit-filter" label="Filter" xstyle="btn btn-secondary" topic="cases/request/get"></dcc-submit>
             </form>
-            <dcc-rest id="harena-cases-filter" bind="harena-cases" subscribe="cases/request/get:retrieve"></dcc-rest>
+            <dcc-rest id="harena-cases-filter" bind="harena-cases" subscribe="cases/request/get"></dcc-rest>
             <!-- Containers to selectAll/share cases -->
             <div class="share-cases-element form-check mt-2 ml-auto" id="share-checkbox" hidden>
               <input class="form-check-input" type="checkbox" id="select-all-checkbox">

diff --git a/src/adonisjs/public/author/drafts/index.html b/src/adonisjs/public/author/drafts/index.html
@@ -136,6 +136,50 @@
     </div>
     <!-- End Share case modal -->
 
+    <!-- Filter options advanced -->
+    <div class="modal fade" id="filter-modal" tabindex="-1" role="dialog" aria-labelledby="filter-modal" aria-hidden="true">
+      <div class="modal-dialog modal-dialog-centered" role="document">
+        <div class="modal-content">
+          <div class="modal-header">
+            <h5 class="modal-title">Filter by:</h5>
+          </div>
+          <div class="modal-body">
+            <form class="pl-2 align-items-center row" id="filter-form">
+              <div class="pr-3">
+                <dcc-rest id="harena-institutions" bind="harena-institutions"></dcc-rest>
+                <dcc-dhtml id="harena-dhtml-institutions" connect="retrieve:harena-institutions:service/request/get">
+
+                  <select id="fInstitution" name="fInstitution" class="custom-select custom-select-sm">
+                    <option selected value="">Institution</option>
+                    {{@foreach . institution}}
+                    <option value={{institution.id}}>{{institution.acronym}}</option>
+                    {{@endfor}}
+                  </select>
+
+                  <end-dcc></end-dcc>
+                </dcc-dhtml>
+              </div>
+              <div class="pr-3">
+                <select id="fUserType" name="fUserType" class="custom-select custom-select-sm">
+                  <option selected value="">User type</option>
+                  <option value="professor">Professor</option>
+                  <option value="student">Student</option>
+                </select>
+              </div>
+              <div class="pr-3" style="width: 120px;">
+                <input type="text" class="form-control custom-select-sm" id="fSpecialty" placeholder="Specialty">
+              </div>
+              <input type="text" class="mr-2 my-2 form-control custom-select-sm" id="fSearchStr"
+               placeholder="Search similar title, keywords or description...">
+
+              <dcc-submit id="filter-submit" bind="submit-filter" label="Filter" xstyle="btn btn-secondary" topic="cases/request/get"></dcc-submit>
+            </form>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- End filter options advanced -->
+
     <!-- Notice modal (For share case feedback) -->
     <div class="modal fade" id="notice-modal" tabindex="-1" role="dialog" aria-labelledby="notice-modal" aria-hidden="true">
       <div class="modal-dialog modal-dialog-centered" role="document">
@@ -169,9 +213,9 @@ <h5 class="" id="modal-notice-txt"></h5>
           </div>
 
           <div class="home-author-padding align-items-center rounded row sticky-top" style="z-index:3;">
-            <form class="pl-2 align-items-center row" id="filter-form">
+            <!-- <form class="pl-2 align-items-center row" id="filter-form">
               <div class="p-2 ml-4">Filter by: </div>
-              <div class="pr-3">
+              <div class="pr-2">
                 <dcc-rest id="harena-institutions" bind="harena-institutions"></dcc-rest>
                 <dcc-dhtml id="harena-dhtml-institutions" connect="retrieve:harena-institutions:service/request/get">
 
@@ -185,19 +229,22 @@ <h5 class="" id="modal-notice-txt"></h5>
                   <end-dcc></end-dcc>
                 </dcc-dhtml>
               </div>
-              <div class="pr-3">
+              <div class="pr-2">
                 <select id="fUserType" name="fUserType" class="custom-select custom-select-sm">
                   <option selected value="">User type</option>
                   <option value="professor">Professor</option>
                   <option value="student">Student</option>
                 </select>
               </div>
-              <div class="pr-3" style="width: 120px;">
+              <div class="pr-2" style="width: 120px;">
                 <input type="text" class="form-control custom-select-sm" id="fSpecialty" placeholder="Specialty">
               </div>
-              <dcc-submit id="filter-submit" bind="submit-filter" label="Filter" xstyle="btn btn-secondary" topic="cases/request/get"></dcc-submit>
-            </form>
-            <dcc-rest id="harena-cases-filter" bind="harena-cases" subscribe="cases/request/get:retrieve"></dcc-rest>
+
+<button type="button" class="btn btn-secondary mr-2" data-toggle="modal" data-target="#filter-modal"><i class="fas fa-filter"></i> Filter</button>
+               <dcc-submit id="filter-submit" bind="submit-filter" label="Filter" xstyle="btn btn-secondary" topic="cases/request/get"></dcc-submit>
+            </form> -->
+            <button type="button" class="btn btn-secondary mx-2" data-toggle="modal" data-target="#filter-modal"><i class="fas fa-filter"></i> Filter</button>
+            <dcc-rest id="harena-cases-filter" bind="harena-cases" subscribe="cases/request/get"></dcc-rest>
             <!-- Containers to selectAll/share cases -->
             <div class="share-cases-element form-check mt-2 ml-auto" id="share-checkbox" hidden>
               <input class="form-check-input" type="checkbox" id="select-all-checkbox">

diff --git a/src/adonisjs/public/author/index.html b/src/adonisjs/public/author/index.html
@@ -38,34 +38,34 @@
     <script src="/lib/quill-1-3-7/quill.min.js"></script>
     <script src="/lib/d3.min.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="../dccs/components/visual/dcc-markdown.js"></script>
-    <script src="../dccs/components/visual/dcc-annotation.js"></script>
-    <script src="../dccs/components/visual/dcc-image.js"></script>
-    <script src="../dccs/components/visual/dcc-expression.js"></script>
-    <script src="../dccs/base/dcc-block.js"></script>
-    <script src="../dccs/components/visual/dcc-button.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-notice-input.js"></script>
-    <script src="../dccs/components/visual/dcc-context-menu.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-slider.js"></script>
-    <script src="../dccs/components/visual/dcc-report.js"></script>
-    <script src="../dccs/components/visual/dcc-graph.js"></script>
-
-    <script src="../dccs/components/control/dcc-timer.js"></script>
-    <script src="../dccs/components/control/dcc-message.js"></script>
-    <script src="../dccs/components/control/dcc-compute.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="/dccs/components/visual/dcc-markdown.js"></script>
+    <script src="/dccs/components/visual/dcc-annotation.js"></script>
+    <script src="/dccs/components/visual/dcc-image.js"></script>
+    <script src="/dccs/components/visual/dcc-expression.js"></script>
+    <script src="/dccs/base/dcc-block.js"></script>
+    <script src="/dccs/components/visual/dcc-button.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-notice-input.js"></script>
+    <script src="/dccs/components/visual/dcc-context-menu.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-slider.js"></script>
+    <script src="/dccs/components/visual/dcc-report.js"></script>
+    <script src="/dccs/components/visual/dcc-graph.js"></script>
+
+    <script src="/dccs/components/control/dcc-timer.js"></script>
+    <script src="/dccs/components/control/dcc-message.js"></script>
+    <script src="/dccs/components/control/dcc-compute.js"></script>
 
     <script src="/dccs/base/subscribe-dcc.js"></script>
     <script src="/dccs/base/trigger-dcc.js"></script>
@@ -76,6 +76,7 @@
     <script src="/dccs/components/data/dcc-model.js"></script>
     <script src="/dccs/components/data/dcc-submit.js"></script>
     <script src="/dccs/components/data/dcc-record.js"></script>
+    <script src="/dccs/components/data/dcc-form.js"></script>
 
     <script src="/dccs/components/web/dcc-include.js"></script>
     <script src="/dccs/components/web/dcc-dhtml.js"></script>
@@ -111,7 +112,7 @@
     <!-- Login/logout header -->
     <dcc-include src="/author/partials/header.html"></dcc-include>
     <!-- Start of settings modal -->
-    <dcc-rest id="harena-case" bind="harena-case" subscribe="service/request/get:retrieve"></dcc-rest>
+    <dcc-rest id="harena-case" bind="harena-case" subscribe="service/request/get"></dcc-rest>
     <dcc-dhtml id="dhtml-case" subscribe="service/response/get/harena-case:update">
       <div class="modal fade" id="settings-modal" tabindex="-1" role="dialog" aria-labelledby="settings-modal" aria-hidden="true">
         <div class="modal-dialog" role="document">

diff --git a/src/adonisjs/public/author/js/comments.js b/src/adonisjs/public/author/js/comments.js
@@ -50,7 +50,7 @@ class Comments {
           content[this._template].value.replace(/\//g, '.') + '/get')
         const form = '<form><dcc-dhtml subscribe="data/comments/get:update">' + tmpl.message +
                      '<end-dcc></end-dcc></dcc-dhtml>' +
-                     '<dcc-submit label="COMMENT" xstyle="in" subscribe="control/comments/submit:submit" topic="control/comments/edit/confirm" display="none"></dcc-submit></form>'
+                     '<dcc-submit label="COMMENT" xstyle="in" subscribe="control/comments/submit" topic="control/comments/edit/confirm" display="none"></dcc-submit></form>'
         document.querySelector('#comments-display').innerHTML = form
 
         this._comments = -1

diff --git a/src/adonisjs/public/author/js/draft.js b/src/adonisjs/public/author/js/draft.js
@@ -99,6 +99,7 @@ class DraftManager {
         const listenerFnSelectAll = function () {
           for (let c in cl){
             try {
+
               let editButton = cl[c].children[0]
               const caseContainer = document.querySelector('#b'+editButton.id.substring(1))
               const shareCheckbox = document.querySelector('#c'+editButton.id.substring(1))
@@ -115,6 +116,8 @@ class DraftManager {
                 caseContainer.style.backgroundColor = ''
                 caseContainer.firstElementChild.style.color = '#808080'
               }
+              var changeEv = new Event('change')
+              shareCheckbox.dispatchEvent(changeEv)
             } catch (e) {
               break
             }

diff --git a/src/adonisjs/public/author/partials/case-list-min.html b/src/adonisjs/public/author/partials/case-list-min.html
@@ -27,7 +27,7 @@
     </div>
     <dcc-submit id="filter-submit" bind="submit-filter" label="Filter" xstyle="btn btn-secondary" topic="cases/request/get"></dcc-submit>
   </form>
-  <dcc-rest id="harena-cases-filter" bind="harena-cases" subscribe="cases/request/get:retrieve"></dcc-rest>
+  <dcc-rest id="harena-cases-filter" bind="harena-cases" subscribe="cases/request/get"></dcc-rest>
   <!-- Containers to selectAll/share cases -->
   <!-- <div class="form-check mt-2 ml-auto" id="share-checkbox">
     <input class="form-check-input" type="checkbox" id="select-all-checkbox">

diff --git a/src/adonisjs/public/author/partials/header.html b/src/adonisjs/public/author/partials/header.html
@@ -1,14 +1,11 @@
-<div class="fixed-top">
+<div class="fixed-top up-scroll" style="transition: top 0.3s !important;">
   <dcc-rest id="harena-login" bind="harena-login"></dcc-rest>
   <nav>
       <div class="d-flex overflow-hidden pt-2 mr-4" id="harena-header">
+
       <span class="inline-flex mr-4 rounded-md ml-auto " id="header-login">
         <div id="login-block">
-          <!-- <a href="/login" class="inline-flex items-center px-4 py-2 text-base bg-white">
-            Log in
-          </a> -->
-          <!-- <div class="dropdown"> -->
-            <button id="loginDropdownBtn" class="btn btn-light shadow text-primary pl-4 pt-1 dropdown-toggle " type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            <button id="loginDropdownBtn" class="btn btn-light border-top border-left border-right text-primary pl-4 pt-1 dropdown-toggle " type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
               Login
             </button>
             <form class="needs-validation dropdown-menu p-4 mr-5" novalidate>
@@ -23,16 +20,14 @@
                 <label for="password">Password</label>
                 <input type="password" class="form-control" id="password" name="password" placeholder="Password" required>
               </div>
-              <!-- <button class="btn btn-outline-primary" id="btn-login">Submit form</button> -->
               <dcc-submit id="btn-submit-login" bind="submit-login" label="Login" xstyle="btn btn-outline-primary" connect="submit:harena-login:service/request/post"></dcc-submit>
               <div id="login-message-alert" class="alert mt-3" role="alert">
               </div>
             </form>
-          <!-- </div> -->
         </div>
         <div id="logout-block" style="display: none;">
           <dcc-rest id="harena-logout" bind="harena-logout"></dcc-rest>
-          <button id="logoutDropdownBtn" class="btn btn-light shadow text-primary pl-4 pt-1 dropdown-toggle " type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          <button id="logoutDropdownBtn" class="btn btn-light border-top border-left border-right text-primary pl-4 pt-1 dropdown-toggle " type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             Logout
           </button>
           <div class="dropdown-menu mr-5" aria-labelledby="logoutDropdownBtn">