Updating stuff

app/assets/javascripts/angular/worklogs/client.js.coffee

@@ -16,9 +16,8 @@ app.factory "Client", ["RailsResource", (RailsResource)->
 
     nameOrCompanyName: ->
       if @name.length
-        @name
+        "#{@name} [#{@user.username}]"
       else
-        @companyName
-
+        "#{@companyName} [#{@user.username}]"
   Client
 ]

app/assets/stylesheets/application.css.sass

@@ -19,5 +19,4 @@
 @import "static"
 @import "worklogs"
 @import "tutorial"
-@import kpis
 @import "responsive_fixes"

app/controllers/clients_controller.rb

@@ -14,7 +14,7 @@ def index
           @clients = @clients.updated_since(params[:updated_since])
         end
       end
-      format.json {render json: current_user.clients_and_shared_clients}
+      format.json {render json: current_user.clients_and_shared_clients.to_json(include: :user)}
     end
   end
 
@@ -89,4 +89,5 @@ def activity
     end
     @form.aggregate
   end
+
 end

app/views/layouts/_header.html.slim

@@ -34,8 +34,6 @@ nav.navbar.navbar-default role="navigation"
                 = link_to "Invoices", invoices_path
               li
                 = link_to "Edit defaults", edit_invoice_default_path(current_user.invoice_default)
-          li
-            = link_to "KPI", new_kpi_path
           - if not_on_home?
             li
               = link_to "Tutorial", show_tutorial_path, class: "show-tutorial"

config/routes.rb

@@ -1,7 +1,5 @@
 Timetracker::Application.routes.draw do
 
-  get "kpis/new"
-
   root :to => "static#home"
 
   resources :users, only: [:new, :create, :show, :edit, :update] do
@@ -14,7 +12,6 @@
       get :shared_clients
     end
   end
-  resources :kpis, only: [:new, :create]
   resources :clients do
     member do
       get "activity"
@@ -58,5 +55,4 @@
   get "show_tutorial" => "tutorial#show", as: "show_tutorial"
 
   get "/auth/:provider/callback" => "sessions#auth_provider_callback"
-
 end