allow user to mark a doubt as unResolved

coding-blocks · Feb 14, 2019 · 9acd3a8 · 9acd3a8
1 parent 8eda140
commit 9acd3a8
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 52 deletions.
diff --git a/app/pods/components/discourse-topics-view/template.hbs b/app/pods/components/discourse-topics-view/template.hbs
@@ -8,7 +8,7 @@
     </div>
     <a href="{{redirectLink}}" target="_blank">
         <div class="button-solid right-head-button">
-            <button>Ask a Question</button>
+            <button>Discussion Forum</button>
         </div>
     </a>
   </div>

diff --git a/app/pods/components/doubt-view-attempt/component.js b/app/pods/components/doubt-view-attempt/component.js
@@ -44,10 +44,11 @@ export default class DoubtViewAttemptComponent extends Component{
   }
 
   @action
-  markResolved(){
-    this.set('doubt.status', 'RESOLVED')
-    this.set('doubt.resolvedById', this.get('currentUser.user.id'))
-    this.get('doubt').save();
+  markStatus (status) {
+    this.set('doubt.status', status)
+    if (status == 'RESOLVED')
+      this.set('doubt.resolvedById', this.get('currentUser.user.id'))
+      this.get('doubt').save()
   }
 
   @action

diff --git a/app/pods/components/doubt-view-attempt/template.hbs b/app/pods/components/doubt-view-attempt/template.hbs
@@ -23,9 +23,19 @@
     {{/if}}
     <div class="horizontal-half">
       {{#if (eq doubt.status 'PENDING')}}
-      <div class="green">
-        <button {{action 'markResolved'}}><i class="fas fa-check"></i> Mark Resolved</button>
-      </div>
+        <div class="green">
+          <button {{action 'markStatus' 'RESOLVED'}}>
+            <i class="fas fa-check"></i>
+            Mark as Resolved
+          </button>
+        </div>
+      {{else}}
+        <div class="red">
+          <button {{action 'markStatus' 'PENDING'}}>
+            <i class="fas fa-check"></i>
+            Reopen Doubt
+          </button>
+        </div>
       {{/if}}
       {{!-- <div class="button-solid">
         <button>Chat with TA</button>

diff --git a/app/pods/components/doubts-view/template.hbs b/app/pods/components/doubts-view/template.hbs
@@ -1,51 +1,42 @@
-{{!-- <div>
-  {{input type="text" value=title}}
-  {{input type="text" value=body}}
-</div>
-<button class="button-solid" {{action 'askDoubt'}}>Post Doubt</button>
-
-{{#each doubts as |doubt|}}
-  {{doubt-view-attempt doubt=doubt}}
-{{/each}} --}}
-  <div class="top">
-    <div class="new-doubt">
-      <div class="head">
-        <span>Ask a Doubt</span>
-        <div class="button-solid {{if askDoubtTask.isRunning 'disabled'}}">
-          <button {{action 'askDoubt'}} >Post Doubt</button>
-        </div>
+<div class="top">
+  <div class="new-doubt">
+    <div class="head">
+      <span>Ask a Doubt</span>
+      <div class="button-solid {{if askDoubtTask.isRunning 'disabled'}}">
+        <button {{action 'askDoubt'}} >Post Doubt</button>
       </div>
-
-      {{#if err}}
+    </div>
+
+    {{#if err}}
       <div class="red card-md t-align-c pt-3"><i class="fas fa-exclamation-triangle"></i> {{{err}}}</div>
-      {{/if}}
+    {{/if}}
 
-      <div class="input-group">
-        {{input type="text" placeholder="Title" value=title}}
-        {{textarea placeholder="Description" rows="2" value=body}}
-      </div>
-    </div>
-
-    <div class="nav">
-      <div class="tab {{if (eq activeTab 'PENDING') 'active'}}" {{action 'setActiveTab' 'PENDING'}}>Unresolved({{unresolved}})</div>
-      <div class="tab {{if (eq activeTab 'RESOLVED') 'active'}}" {{action 'setActiveTab' 'RESOLVED'}}>Resolved({{sub existingDoubts.length unresolved}})</div>
+    <div class="input-group">
+      {{input type="text" placeholder="Title" value=title}}
+      {{textarea placeholder="Description" rows="2" value=body}}
     </div>
   </div>
 
-  <div class="bottom">
-    {{#if  (eq activeTab 'PENDING')}}
-      {{#if (not unresolved)}}
-      <div class="p-3 t-align-c">You have no unresolved doubts.</div> 
-      {{/if}}
-    {{else}}
-      {{#if (not (sub doubts.length unresolved))}}
-        <div class="p-3 t-align-c">You have no resolved doubts.</div>
-      {{/if}}
+  <div class="nav">
+    <div class="tab {{if (eq activeTab 'PENDING') 'active'}}" {{action 'setActiveTab' 'PENDING'}}>Unresolved({{unresolved}})</div>
+    <div class="tab {{if (eq activeTab 'RESOLVED') 'active'}}" {{action 'setActiveTab' 'RESOLVED'}}>Resolved({{sub existingDoubts.length unresolved}})</div>
+  </div>
+</div>
+
+<div class="bottom">
+  {{#if  (eq activeTab 'PENDING')}}
+    {{#if (not unresolved)}}
+    <div class="p-3 t-align-c">You have no unresolved doubts.</div> 
+    {{/if}}
+  {{else}}
+    {{#if (not (sub doubts.length unresolved))}}
+      <div class="p-3 t-align-c">You have no resolved doubts.</div>
+    {{/if}}
+  {{/if}}
+
+  {{#each existingDoubts as |doubt|}}
+    {{#if (eq activeTab doubt.status)}}
+      {{doubt-view-attempt doubt=doubt comments=doubt.comments}}
     {{/if}}
-
-    {{#each existingDoubts as |doubt|}}
-      {{#if (eq activeTab doubt.status)}}
-        {{doubt-view-attempt doubt=doubt comments=doubt.comments}}
-      {{/if}}
-    {{/each}}
-  </div>
+  {{/each}}
+</div>