Merge pull request #773 from mathematicalthinking/develop

Enc 3.6.3 - merge develop into main
mathematicalthinking · May 6, 2024 · 56fd79c · 56fd79c
2 parents 994b7eb + 180b481
commit 56fd79c
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 15 deletions.
diff --git a/app/components/home-page.hbs b/app/components/home-page.hbs
@@ -1,4 +1,4 @@
-<div class='home--container{{unless this.isExpanded ' closed'}}'>
+<div class='home--container{{unless this.isExpanded " closed"}}'>
   <EmberTable as |t|>
     <t.head
       @columns={{@tableColumns}}
@@ -25,7 +25,9 @@
               @model={{rowValue.id}}
             >{{format-date cellValue 'MM/DD/YYYY'}}</LinkTo>
           {{else if (is-equal @type 'feedback')}}
-            {{#if (is-equal columnValue.name 'Workspace')}}
+            {{#if (is-equal columnValue.name 'Student Submission')}}
+              <a {{on 'click' (fn this.toResponse rowValue)}}>{{cellValue}}</a>
+            {{else if (is-equal columnValue.name 'Mentor')}}
               <a {{on 'click' (fn this.toResponse rowValue)}}>{{cellValue}}</a>
             {{else if (is-equal columnValue.name 'Status')}}
               <svg height='20' width='20'>

diff --git a/app/components/response-mentor-thread.js b/app/components/response-mentor-thread.js
@@ -1,9 +1,17 @@
+/**
+ * #
+ * @description 
+  Class component file to response-mentor-thread component. Purpose is to show responses for a mentor thread.
+ * @author Yousof Wakili
+ * @since 3.6.2
+ */
+
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
 
 export default class ResponseMentorThreadComponent extends Component {
-  @tracked show = false;
+  @tracked show = true;
 
   get showResponsesText() {
     return this.showResponses

diff --git a/app/controllers/index.js b/app/controllers/index.js
@@ -74,22 +74,24 @@ export default class IndexController extends Controller {
     }
     if (this.dataToShow === 'feedback') {
       return [
-        { name: 'Workspace', valuePath: 'workspaceName' },
-        { name: 'Latest Feedback', valuePath: 'latestReply.createDate' },
-        { name: 'Latest Revision', valuePath: 'latestRevision.createDate' },
         {
-          name: `${this.activeDetailTab === 'Given' ? 'Student' : 'Mentor'}`,
+          name: `${
+            this.activeDetailTab === 'Given' ? 'Student Submission' : 'Mentor'
+          }`,
           valuePath: `${
             this.activeDetailTab === 'Given'
               ? 'studentDisplay'
               : 'mentorDisplay'
           }`,
         },
+
+        { name: 'Latest Feedback', valuePath: 'latestReply.createDate' },
+        { name: 'Latest Revision', valuePath: 'latestRevision.createDate' },
         { name: 'Status', valuePath: 'statusMessage' },
+        { name: 'Workspace', valuePath: 'workspaceName' },
       ];
     }
 
-    //getter must return a value
     return [];
   }
   // updates when user changes tabs and gets sent to table
@@ -178,10 +180,12 @@ export default class IndexController extends Controller {
       const received = responses.filter(
         (response) => response.threadType === 'submitter'
       );
+      // Under "given" tab
       const sent = responses.filter(
         (response) =>
           response.threadType === 'mentor' || response.threadType === 'approver'
       );
+
       const threads = [
         { label: 'Given', details: sent, type: 'response' },
         { label: 'Received', details: received, type: 'response' },

diff --git a/app/models/workspace.js b/app/models/workspace.js
@@ -127,7 +127,6 @@ export default class WorkspaceModel extends Auditable {
     }
     return null;
   }
-
   @attr() permissions;
   get collaborators() {
     const permissions = this.permissions;

diff --git a/app/templates/workspace/submission.hbs b/app/templates/workspace/submission.hbs
@@ -9,10 +9,12 @@
         <LinkTo @route='workspace.info' @model={{this.currentWorkspace.id}}>
           <a>Workspace Stats &amp; Settings</a>
         </LinkTo>
-
-        <LinkTo @route='workspace.summary' @model={{this.model.workspace.id}}>
-          <a>View All Responses</a>
-        </LinkTo>
+        {{#if canSeeResponses}}<LinkTo
+            @route='workspace.summary'
+            @model={{this.model.workspace.id}}
+          >
+            <a>View All Responses</a>
+          </LinkTo>{{/if}}
 
         {{#each this.currentWorkspace.parentWorkspaces as |ws|}}
           <LinkTo @route='workspace.work' @model={{ws.id}}>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "encompass",
-  "version": "3.6.2",
+  "version": "3.6.3",
   "private": true,
   "description": "enCoMPASS",
   "keywords": [