Merge: Nitrpg work

Improve the dashboard on the player page with `request_for_comment` things, and assigned work

Pull-Request: #1291
Reviewed-by: Alexandre Terrasa <alexandre@moz-code.org>

diff --git a/contrib/nitrpg/src/templates/panels.nit b/contrib/nitrpg/src/templates/panels.nit
index e4e7f8f..97078ab 100644 (file)
--- a/contrib/nitrpg/src/templates/panels.nit
+++ b/contrib/nitrpg/src/templates/panels.nit
@@ -360,16 +360,67 @@ class PlayerReviewsPanel
 
        redef fun render_title do
                add "<span class=\"glyphicon glyphicon-check\"></span>&nbsp;&nbsp;"
-               add "Review pull requests to gain nitcoins!"
+               add "Review pull requests and comment issues to gain nitcoins!"
        end
 
        redef fun render_body do
                var q = "is:open label:need_review sort:updated-asc " +
                        "-involves:{player.name}"
 
-               var issues = game.repo.search_issues(q)
+               var q2 = "is:open label:request_for_comments sort:updated-asc " +
+                       "-involves:{player.name}"
+
+               var issues = new ArraySet[Issue]
+               issues.add_all game.repo.search_issues(q).as(not null)
+               issues.add_all game.repo.search_issues(q2).as(not null)
+               if issues.is_empty then
+                       add "<em>No pull request or issue to review yet...</em>"
+                       return
+               end
+               for issue in issues do
+                       var user = issue.user
+                       var uplay = user.player(game)
+                       add """<div class="media">
+                               <a class="media-left" href="{{{uplay.url}}}">
+                                        <img class=\"img-circle\" style="width:50px"
+                                          src="{{{user.avatar_url}}}" alt="{{{uplay.name}}}">
+                                       </a>
+                                       <div class="media-body">
+                                        <h4 class="media-heading">
+                                               {{{issue.link}}} {{{issue.title}}}
+                                       </h4>
+                                        <span class="text-muted">opened by </span>
+                                        {{{uplay.link}}}
+                                       </div>
+                                  </div>"""
+               end
+       end
+end
+
+# A `Panel` that displays the work assigned or tagged.
+class PlayerWorkPanel
+       super Panel
+
+       # Repo to display.
+       var game: Game
+
+       # Player to display customized list for.
+       var player: Player
+
+       redef fun render_title do
+               add "<span class=\"glyphicon glyphicon-check\"></span>&nbsp;&nbsp;"
+               add "Do your tasks to gain nitcoins!"
+       end
+
+       redef fun render_body do
+               var q = "is:open label:need_work sort:updated-asc author:{player.name}"
+               var q2 = "is:open sort:updated-asc assignee:{player.name}"
+
+               var issues = new ArraySet[Issue]
+               issues.add_all game.repo.search_issues(q).as(not null)
+               issues.add_all game.repo.search_issues(q2).as(not null)
                if issues.is_empty then
-                       add "<em>No pull request to review yet...</em>"
+                       add "<em>No work to do yet...</em>"
                        return
                end
                for issue in issues do

diff --git a/contrib/nitrpg/src/web.nit b/contrib/nitrpg/src/web.nit
index 5f4992e..38ed68e 100644 (file)
--- a/contrib/nitrpg/src/web.nit
+++ b/contrib/nitrpg/src/web.nit
@@ -233,6 +233,7 @@ class PlayerHome
                page.side_panels.clear
                page.side_panels.add new PlayerStatusPanel(game, player)
                page.flow_panels.add new PlayerReviewsPanel(game, player)
+               page.flow_panels.add new PlayerWorkPanel(game, player)
                page.flow_panels.add new AchievementsListPanel(player)
                page.flow_panels.add new EventListPanel(player, list_limit, list_from)
                rsp.body = page.write_to_string