Remove project managers.

It's an unnecessary concept and we're using users for clients
anyway.

Author: Jonathan Geiger

app/controllers/project/edit.js

@@ -3,17 +3,7 @@
 module.exports = App.ProjectEditController = Ember.ObjectController.extend({
   // Load up a list of users that the project can be assigned
   // to, which we'll use for populating the select list.
-  allUsers: function () {
+  clients: function () {
     return this.store.findAll('user');
   }.property(),
-
-  // And then filter down to only clients.
-  clients: function () {
-    return this.get('allUsers').filterBy('role', 'client');
-  }.property('allUsers.isFulfilled'),
-
-  // And also filter down to valid managers
-  managers: function () {
-    return this.get('allUsers').rejectBy('role', 'client');
-  }.property('allUsers.isFulfilled'),
 });

app/controllers/project/index.js

@@ -3,12 +3,9 @@
 var c = Ember.computed;
 
 module.exports = App.ProjectIndexController = Ember.ObjectController.extend({
-  // Display the name of the project manager and client
-  managerName: c.alias('managedBy.name'),
-  clientName: c.alias('client.name'),
-
-  // Track the project budge details
+  // Track the project budget and billing details
   hoursBudgeted: c.alias('hourBudget'),
+  clientName: c.alias('client.name'),
   isInternal: c.not('client'),
 
   // Sum up the hours logged for the project by looping over

app/controllers/projects.js

@@ -2,5 +2,5 @@
 
 module.exports = App.ProjectsController = Ember.ArrayController.extend({
   sortProperties: ['id'],
-  itemController: 'Project',
+  itemController: 'ProjectIndex',
 });

app/models/project.js

@@ -5,7 +5,6 @@ module.exports = App.Project = DS.Model.extend({
   description: DS.attr('string'),
   hourBudget: DS.attr('number'),
   rateAmount: DS.attr('number'),
-  managedBy: DS.belongsTo('user'),
   client: DS.belongsTo('user'),
   users: DS.hasMany('user', { async: true }),
   tasks: DS.hasMany('task', { async: true }),

app/templates/project/edit.hbs

@@ -33,18 +33,6 @@
             classNames="form-control"}}
         </div>
       </div>
-
-      <div class="form-group">
-        <label class="col-sm-2 control-label">Manager</label>
-        <div class="col-sm-10">
-          {{view Ember.Select
-            content=managers
-            optionValuePath="content.id"
-            optionLabelPath="content.name"
-            selection=managedBy
-            classNames="form-control"}}
-        </div>
-      </div>
     </form>
   </div>
 </div>

app/templates/project/index.hbs

@@ -8,11 +8,13 @@
 <div class="row">
   <div class="col-lg-12">
     <p>
-      <span class="fui-user"></span>
-      Managed by <strong>{{managerName}}</strong>
-      {{#unless isInternal}}
-        and billed to <strong>{{clientName}}</strong>
-      {{/unless}}
+      {{#if isInternal}}
+        <span class="fui-heart"></span>
+        Billed <strong>internally</strong>
+      {{else}}
+        <span class="fui-user"></span>
+        Billed to <strong>{{clientName}}</strong>
+      {{/if}}
     </p>
 
     <p>

app/templates/projects.hbs

@@ -4,15 +4,19 @@
   <tr>
     <th>Name</th>
     <th>Description</th>
-    <th>Manager</th>
     <th>Client</th>
   </tr>
     {{#each}}
         <tr>
           <td>{{#link-to 'project' this}}{{name}}{{/link-to}}</td>
           <td>{{description}}</td>
-          <td>{{managerName}}</td>
-          <td>{{clientName}}</td>
+          <td>
+            {{#if isInternal}}
+              <span class="text-muted">Internal</span>
+            {{else}}
+              {{clientName}}
+            {{/if}}
+          </td>
         </tr>
     {{/each}}
 </table>

data/models.js

@@ -55,7 +55,6 @@ module.exports = {
     rate_amount:  String,
     rate_code:    String,
     client:       'user',
-    managed_by:   'user',
     users:        ['user'],
     tasks:        ['task'],
     time_entries: ['time_entry']