From ddc43e7f810e01b3920039094c4fa851df49dc72 Mon Sep 17 00:00:00 2001
From: Maxime St-Pierre <maxime.st-pierre.3@ens.etsmtl.ca>
Date: Wed, 2 May 2018 23:43:56 -0400
Subject: [PATCH] Change roadmap item display

---
 lib/thirdparty/Asana.class.php    | 15 +++++----------
 view/template/content/roadmap.php | 13 +++++++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/thirdparty/Asana.class.php b/lib/thirdparty/Asana.class.php
index 953d8334..705ca62e 100644
--- a/lib/thirdparty/Asana.class.php
+++ b/lib/thirdparty/Asana.class.php
@@ -14,6 +14,8 @@ class Asana
       161514803479899 => ['Blockchain and Wallets', 'https://github.com/lbryio/lbrycrd'],
       136290697597644 => ['Integration and Building', null],
       158602294500249 => ['Documentation', null],
+      658477315612493 => ['Complete', null],
+      658477315612495 => ['In progress', null]
     ];
 
     $tasks = [];
@@ -21,7 +23,8 @@ class Asana
     $tags = [
       192699565737944 => 'Open Beta',
       542803886522122 => 'Upcoming',
-      542803886522120 => 'Future'
+      658477315612491 => ' 2018 ',
+      659021359433311 => ' 2025 '
     ];
 
     foreach ($tags as $tagId => $tagLabel)
@@ -39,7 +42,7 @@ class Asana
           }
           else
           {
-            $projectName = 'Other';
+            $projectName = 'Planned';
             $projectId = null;
           }
           $tasks[$tagLabel][] = array_intersect_key($fullTask, ['name' => null]) + [
@@ -59,18 +62,10 @@ class Asana
     {
       usort($groupTasks, function ($tA, $tB)
       {
-        if ($tA['group'] != $tB['group'])
-        {
-          return $tA['group'] <= $tB['group'] ? -1 : 1;
-        }
         if ($tA['date'] xor $tB['date'])
         {
           return $tA['date'] ? -1 : 1;
         }
-        if ($tA['project_id'] xor $tB['project_id'])
-        {
-          return $tA['project_id'] ? -1 : 1;
-        }
         return $tA['date'] < $tB['date'] ? -1 : 1;
       });
     }
diff --git a/view/template/content/roadmap.php b/view/template/content/roadmap.php
index 873d817e..6256b939 100644
--- a/view/template/content/roadmap.php
+++ b/view/template/content/roadmap.php
@@ -49,9 +49,14 @@
                     <span class="roadmap-item-assignee"><?php echo $item['assignee'] ?></span>
                   <?php endif ?>
                   <?php if (isset($item['badge'])): ?>
-                    <span class="badge"><?php echo $item['badge'] ?></span><br/>
-                  <?php endif ?>
-
+                    <?php switch($item['badge']): case "Complete": ?>
+                    <span class=" badge badge-primary"><?php echo $item['badge'] ?></span><br/>
+                    <?php break; case "In progress":?>
+                    <span class="badge badge-info"><?php echo $item['badge']?></span><br/>
+                    <?php break; case "Planned": ?>
+                    <span class="badge"><?php echo $item['badge']?></span><br/>
+                    <?php break; endswitch;?>
+                    <?php endif ?>
                 </div>
               <?php endif ?>
               <h3 class="roadmap-item-title">
@@ -72,7 +77,7 @@
                 <?php echo $item['body'] ?: '<em class="no-results">No description</em>' ?>
               </div>
             </div>
-          <?php endforeach ?>
+         <?php endforeach ?>
         </div>
       <?php endforeach ?>
       <div class="text-center"><a href="javascript:;" class="link-primary show-all-roadmap-groups">Show Earlier Releases</a></div>