Add work plan (#4864)

* add workplan to activity * fix identation
gitcoinco · Jul 31, 2019 · 97e4662 · 97e4662
1 parent 3e10e6b
commit 97e4662
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/app/assets/v2/js/pages/bounty_details.js b/app/assets/v2/js/pages/bounty_details.js
@@ -1450,6 +1450,13 @@ const process_activities = function(result, bounty_activities) {
     const fulfillment = meta.fulfillment || {};
     const new_bounty = meta.new_bounty || {};
     const old_bounty = meta.old_bounty || {};
+    const issue_message = result.interested.length ?
+      result.interested.find(interest => {
+        if (interest.profile.handle === _activity.profile.handle && interest.issue_message) {
+          return interest.issue_message;
+        }
+        return false;
+      }) : false;
     const has_signed_nda = result.interested.length ?
       result.interested.find(interest => {
         if (interest.profile.handle === _activity.profile.handle && interest.signed_nda) {
@@ -1491,6 +1498,7 @@ const process_activities = function(result, bounty_activities) {
       activity_type: _activity.activity_type,
       status: _activity.activity_type === 'work_started' ? 'started' : 'stopped',
       signed_nda: has_signed_nda,
+      issue_message: issue_message,
       uninterest_possible: uninterest_possible,
       slash_possible: slash_possible,
       approve_worker_url: meta.approve_worker_url,

diff --git a/app/dashboard/router.py b/app/dashboard/router.py
@@ -103,7 +103,7 @@ class InterestSerializer(serializers.ModelSerializer):
     class Meta:
         """Define the Interest serializer metadata."""
         model = Interest
-        fields = ('profile', 'created', 'pending', 'signed_nda')
+        fields = ('profile', 'created', 'pending', 'signed_nda', 'issue_message')
 
 
 # Serializers define the API representation.

diff --git a/app/dashboard/templates/bounty/details.html b/app/dashboard/templates/bounty/details.html
@@ -241,7 +241,7 @@ <h5 class="bounty-heading">{% trans "Funder" %}</h5>
           </div>
           <div class="col-12 col-md-2">
             <div class="activity-name">
-              <a href="https://gitcoin.co/profile/[[:name]]" target="_blank">
+              <a href="/profile/[[:name]]" target="_blank">
                 [[:name]]
               </a>
             </div>
@@ -321,7 +321,7 @@ <h5 class="bounty-heading">{% trans "Funder" %}</h5>
             <div class="col-12 col-md-7 started-status-column">
               <div class="activity-status">
                 Worker
-                <a href="https://gitcoin.co/profile/[[:worker_handle]]" target="_blank">
+                <a href="/profile/[[:worker_handle]]" target="_blank">
                   [[:worker_handle]]
                 </a>
                 Approved
@@ -331,7 +331,7 @@ <h5 class="bounty-heading">{% trans "Funder" %}</h5>
             <div class="col-12 col-md-7 started-status-column">
               <div class="activity-status">
                 Worker
-                <a href="https://gitcoin.co/profile/[[:worker_handle]]" target="_blank">
+                <a href="/profile/[[:worker_handle]]" target="_blank">
                   [[:worker_handle]]
                 </a>
                 Rejected
@@ -399,6 +399,9 @@ <h5 class="bounty-heading">{% trans "Funder" %}</h5>
           <div class="col-12 col-md-2">
             <div class="activity-time">[[:age]]</div>
           </div>
+          [[if issue_message]]
+            <p class="bg-lightblue p-2 rounded mt-3 mb-0 w-100 overflow-auto" style="resize: vertical;height: 50px;word-break: break-word;white-space: pre-wrap;"><b>Work Plan:</b> [[:issue_message.issue_message]]</p>
+          [[/if]]
         </div>
       [[/if]]
     </script>