Merge pull request #64 from Navinnair/master

list pending tasks in users profile and show priority in task list
foradian · Jun 23, 2019 · c4a13fc · c4a13fc
2 parents 503c7a4 + d80cc6d
commit c4a13fc
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 1 deletion.
diff --git a/app/assets/stylesheets/global.css.scss b/app/assets/stylesheets/global.css.scss
@@ -623,6 +623,10 @@ form.form-horizontal{padding-top: 100px;}
   padding: 1rem 2rem;
 }
 
+.task-index{
+  float: left;
+  margin-right: 7px;
+}
 
 .task-priority{
   margin-left: 10px;

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -14,6 +14,7 @@ def show
     @teams = @user.teams
     @managers = @user.managers
     @users = User.active.by_name
+    @tasks = @user.assigned_and_written_tasks.pending
   end
 
   # GET /users/new

diff --git a/app/views/tasks/_completed_task_page.erb b/app/views/tasks/_completed_task_page.erb
@@ -10,6 +10,7 @@
             <div class="right">
               <%= raw("<div class='icon icon-author'></div>") if task.user_id == current_user.id %>
               <%= raw("<div class='icon icon-assignee'></div>") if task.user_ids.include?(current_user.id) %>
+              <%= raw("<div class='task-priority task-index priority-#{task.priority}'>#{task.priority}</div>") %>
             </div>
           </div>
           <div class="team">

diff --git a/app/views/tasks/_task_listings.erb b/app/views/tasks/_task_listings.erb
@@ -10,6 +10,7 @@
               <div class="right">
                 <%= raw("<div class='icon icon-author'></div>") if task.user_id == current_user.id %>
                 <%= raw("<div class='icon icon-assignee'></div>") if task.user_ids.include?(current_user.id) %>
+                <%= raw("<div class='task-priority task-index priority-#{task.priority}'>#{task.priority}</div>") %> 
               </div>
             </div>
             <div class="team">

diff --git a/app/views/tasks/_task_page.erb b/app/views/tasks/_task_page.erb
@@ -9,6 +9,7 @@
             <div class="right">
               <%= raw("<div class='icon icon-author'></div>") if task.user_id == current_user.id %>
               <%= raw("<div class='icon icon-assignee'></div>") if task.user_ids.include?(current_user.id) %>
+              <%= raw("<div class='task-priority task-index priority-#{task.priority}'>#{task.priority}</div>") %> 
             </div>
           </div>
           <div class="team">

diff --git a/app/views/users/_show.erb b/app/views/users/_show.erb
@@ -68,7 +68,7 @@
         <%= render :partial => 'teams/team_list', :locals => {:teams => @teams.present? ? @teams : @user.teams} %>
       </div>
       <div class="content" id="user-tasks">
-        <%#= render :partial=>'users/user_list',:locals=>{:users=>members.present? ? members : user.members} %>
+       <%= render :partial => 'tasks/task_listings',  :locals => {:task => @task} %>
       </div>
     </div>
   </div>