From f3dcf817190da31c137bbc683a1d2bb8ce61cf3e Mon Sep 17 00:00:00 2001
From: Till Breuer <till.breuer@gmx.de>
Date: Thu, 10 Jul 2014 10:54:55 +0200
Subject: [PATCH 1/7] Remove file after its about 10th merge-related
 resurrection

---
 public/templates/tabs/overview.html | 109 ----------------------------
 1 file changed, 109 deletions(-)
 delete mode 100644 public/templates/tabs/overview.html

diff --git a/public/templates/tabs/overview.html b/public/templates/tabs/overview.html
deleted file mode 100644
index ed71f6d127..0000000000
--- a/public/templates/tabs/overview.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<div class="detail-panel-description">
-
-  <h3>Description</h3>
-  <div class="detail-panel-description-content">
-    {{ workPackage.props.description }}
-  </div>
-</div>
-
-<div class="panel-toggler" ng-click="toggleStates.hideFullDescription = !toggleStates.hideFullDescription">
-  <fieldset>
-    <legend align="center">
-      <span ng-if="!toggleStates.hideFullDescription">
-        <i class="icon-arrow-right5-2"></i>
-        Hide full description
-      </span>
-      <span ng-if="toggleStates.hideFullDescription">
-        <i class="icon-arrow-right5-3"></i>
-        Show full description
-      </span>
-    </legend>
-  </fieldset>
-</div>
-
-<div class="detail-panel-attributes" slide-toggle collapsed="toggleStates.hideFullDescription">
-  <ul>
-    <li><label>Status</label>{{ workPackage.props.status }}</li>
-    <li><label>Priortiy</label>{{ workPackage.props.priority }}</li>
-    <li><label>Date</label>{{ workPackage.props.startDate }} - {{ workPackage.props.dueDate }}</li>
-    <li>
-      <label>Responsible</label>
-      <img class="avatar" ng-src="{{ responsible.props.avatar }}" ng-show="{{ !!responsible }}" />
-      <span  class="user" ng-show="{{ !!responsible }}">
-        <a ng-href="{{ userPath(responsible.props.id) }}">
-          {{ responsible.props.firstName }} {{ responsible.props.lastName }}
-          aaa
-        </a>
-      </span>
-      <span class="user" ng-hide="{{ !!responsible }}"> - </span>
-      <!-- <span class="role">{{ responsible.props.role }}</span> -->
-    </li>
-    <li>
-      <label>Assignee</label>
-      <img class="avatar" ng-src="{{ assignee.props.avatar }}" ng-show="{{ !!assignee }}" />
-      <span   class="user" ng-show="{{ !!assignee }}">
-        <a ng-href="{{ userPath(assignee.props.id) }}">
-          {{ assignee.props.firstName }} {{ assignee.props.lastName }}
-        </a>
-      </span>
-      <span class="user" ng-hide="{{ !!assignee }}"> - </span>
-      <!-- <span class="role">{{ assignee.props.roles }}</span> -->
-    </li>
-    <li><label>% Done</label>{{ workPackage.props.percentageDone }} %</li>
-  </ul>
-</div>
-
-<div class="panel-toggler" ng-click="toggleStates.hideAllAttributes = !toggleStates.hideAllAttributes">
-  <fieldset>
-    <legend align="center">
-      <span ng-if="!toggleStates.hideAllAttributes">
-        <i class="icon-arrow-right5-2"></i>
-        Hide all attributes
-      </span>
-      <span ng-if="toggleStates.hideAllAttributes">
-        <i class="icon-arrow-right5-3"></i>
-        Show all attributes
-      </span>
-    </legend>
-  </fieldset>
-</div>
-
-<div class="detail-panel-latest-activity" slide-toggle collapsed="toggleStates.hideAllAttributes">
-  <h3>Latest activity</h3>
-  <ul>
-    <li>
-      <div class="comments-number"><a href="#1">#1</a>
-        <div class="comments-icons"><i class="icon-quote"></i><i class="icon-edit"></i></div>
-      </div>
-      <img class="avatar" src="images/avatar_logout.png" />
-      <span class="user"><a href="#">Christoph Zierz</a></span>
-      <span class="date">commented on 06/05/2014 16:42 Uhr</span>
-      <span class="comment">Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
-      Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis .  ..
-      </span>
-    </li>
-    <li>
-      <div class="comments-number"><a href="#1">#2</a>
-        <div class="comments-icons"><i class="icon-quote"></i><i class="icon-edit"></i></div>
-      </div>
-      <img class="avatar" src="images/avatar_logout.png" />
-      <span class="user"><a href="#">Niels Lindenthal</a></span>
-      <span class="date">commented on 08/05/2014 16:42 Uhr</span>
-      <span class="comment">
-        <ul>
-          <li>Status changed from scheduled to closed</li>
-          <li>Assignee deleted (Michael Frister)</li>
-          <li>% done changed from 0 to 100</li>
-        </ul>
-      </span>
-    </li>
-  </ul>
-</div>
-
-<div class="comments-form">
-  <h3>Add your comments here</h3>
-  <form>
-    <textarea placeholder="Add comments here" rows="4"></textarea>
-  </form>
-  <button class="button">Add comment</button>
-</div>

From 63f14887544a35795644e535b672551d59b2859a Mon Sep 17 00:00:00 2001
From: Till Breuer <till.breuer@gmx.de>
Date: Thu, 10 Jul 2014 11:24:43 +0200
Subject: [PATCH 2/7] =?UTF-8?q?Add=20default=20output=20for=20empty=20work?=
 =?UTF-8?q?=20package=20properties=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

According to the specification there are properties on the embedded overview tab, which are rendered in a fixed order even if empty. For those ‘-‘ should be rendered as a default if empty.
---
 public/templates/work_packages/tabs/overview.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/templates/work_packages/tabs/overview.html b/public/templates/work_packages/tabs/overview.html
index 7bd1b944db..6fbde973ab 100644
--- a/public/templates/work_packages/tabs/overview.html
+++ b/public/templates/work_packages/tabs/overview.html
@@ -24,7 +24,7 @@
       <label ng-bind="propertyData.label"/>
       <span ng-switch="propertyData.format">
         <user-field ng-switch-when="user" user="propertyData.value"></user-field>
-        <span ng-switch-default ng-bind="propertyData.value"/>
+        <span ng-switch-default ng-bind="propertyData.value || '-'"/>
       </span>
     </li>
   </ul>

From fbda18852faf825f09e4a00ab99f78e86ccb859a Mon Sep 17 00:00:00 2001
From: Till Breuer <till.breuer@gmx.de>
Date: Thu, 10 Jul 2014 11:25:51 +0200
Subject: [PATCH 3/7] Update date property output if only a start OR due date
 is given

---
 .../work-package-details-controller.js           | 16 ++++++++++------
 config/locales/js-de.yml                         |  2 ++
 config/locales/js-en.yml                         |  2 ++
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/angular/work_packages/controllers/work-package-details-controller.js b/app/assets/javascripts/angular/work_packages/controllers/work-package-details-controller.js
index 628040782e..896dc0d06a 100644
--- a/app/assets/javascripts/angular/work_packages/controllers/work-package-details-controller.js
+++ b/app/assets/javascripts/angular/work_packages/controllers/work-package-details-controller.js
@@ -94,17 +94,21 @@ angular.module('openproject.workPackages.controllers')
 
     function getFormattedPropertyValue(property) {
       if (property === 'date') {
-        if (workPackage.props.startDate && workPackage.props.dueDate) {
-          return WorkPackagesHelper.formatWorkPackageProperty(workPackage.props['startDate'], 'startDate') +
-                 ' - ' +
-                 WorkPackagesHelper.formatWorkPackageProperty(workPackage.props['dueDate'], 'dueDate');
-
-        }
+        return getDateProperty();
       } else {
         return WorkPackagesHelper.formatWorkPackageProperty(workPackage.props[property], property);
       }
     }
 
+    function getDateProperty() {
+      if (workPackage.props.startDate || workPackage.props.dueDate) {
+        var displayedStartDate = WorkPackagesHelper.formatWorkPackageProperty(workPackage.props.startDate, 'startDate') || I18n.t('js.label_no_start_date'),
+            displayedEndDate   = WorkPackagesHelper.formatWorkPackageProperty(workPackage.props.dueDate, 'dueDate') || I18n.t('js.label_no_due_date');
+
+        return  displayedStartDate + ' - ' + displayedEndDate;
+      }
+    }
+
     function addFormattedValueToPresentProperties(property, label, value, format) {
       var propertyData = {
         property: property,
diff --git a/config/locales/js-de.yml b/config/locales/js-de.yml
index f5382587fa..4cc6d1e6a0 100644
--- a/config/locales/js-de.yml
+++ b/config/locales/js-de.yml
@@ -93,6 +93,8 @@ de:
     label_move_column_right: "Spalte nach rechts verschieben"
     label_next: "Weiter"
     label_no_data: "Nichts anzuzeigen"
+    label_no_due_date: "Kein Abgabedatum"
+    label_no_start_date: "Kein Startdatum"
     label_none: "kein"
     label_not_contains: "enthält nicht"
     label_not_equals: "ist nicht"
diff --git a/config/locales/js-en.yml b/config/locales/js-en.yml
index ed368fad15..9896d45e2c 100644
--- a/config/locales/js-en.yml
+++ b/config/locales/js-en.yml
@@ -93,6 +93,8 @@ en:
     label_move_column_right: "Move column right"
     label_next: "Next"
     label_no_data: "No data to display"
+    label_no_due_date: "No end date"
+    label_no_start_date: "No start date"
     label_none: "none"
     label_not_contains: "doesn't contain"
     label_not_equals: "is not"

From 4663d1a71e49129e785d712d04efd68c26abadf6 Mon Sep 17 00:00:00 2001
From: Till Breuer <till.breuer@gmx.de>
Date: Thu, 10 Jul 2014 13:16:28 +0200
Subject: [PATCH 4/7] Remove redundant work package properties from overview
 tab

---
 .../controllers/work-package-details-controller.js             | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/javascripts/angular/work_packages/controllers/work-package-details-controller.js b/app/assets/javascripts/angular/work_packages/controllers/work-package-details-controller.js
index 896dc0d06a..fea78e235f 100644
--- a/app/assets/javascripts/angular/work_packages/controllers/work-package-details-controller.js
+++ b/app/assets/javascripts/angular/work_packages/controllers/work-package-details-controller.js
@@ -31,8 +31,7 @@ angular.module('openproject.workPackages.controllers')
 .constant('DEFAULT_WORK_PACKAGE_PROPERTIES', [
   'status', 'assignee', 'responsible',
   'date', 'percentageDone', 'priority',
-  'author', 'dueDate', 'estimatedTime',
-  'startDate', 'versionName'
+  'estimatedTime', 'versionName'
 ])
 .constant('USER_TYPE', 'user')
 

From 1f3d28240d4460e9fad00e720bc9eb57fab2f5f0 Mon Sep 17 00:00:00 2001
From: Till Breuer <till.breuer@gmx.de>
Date: Thu, 10 Jul 2014 13:20:33 +0200
Subject: [PATCH 5/7] =?UTF-8?q?Switch=20=E2=80=98date=20missing=E2=80=99-l?=
 =?UTF-8?q?abels=20to=20lower=20case=20(according=20to=20prototype)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/locales/js-de.yml | 4 ++--
 config/locales/js-en.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/locales/js-de.yml b/config/locales/js-de.yml
index 4cc6d1e6a0..4f797e1740 100644
--- a/config/locales/js-de.yml
+++ b/config/locales/js-de.yml
@@ -93,8 +93,8 @@ de:
     label_move_column_right: "Spalte nach rechts verschieben"
     label_next: "Weiter"
     label_no_data: "Nichts anzuzeigen"
-    label_no_due_date: "Kein Abgabedatum"
-    label_no_start_date: "Kein Startdatum"
+    label_no_due_date: "kein Abgabedatum"
+    label_no_start_date: "kein Startdatum"
     label_none: "kein"
     label_not_contains: "enthält nicht"
     label_not_equals: "ist nicht"
diff --git a/config/locales/js-en.yml b/config/locales/js-en.yml
index 9896d45e2c..07f15c5d37 100644
--- a/config/locales/js-en.yml
+++ b/config/locales/js-en.yml
@@ -93,8 +93,8 @@ en:
     label_move_column_right: "Move column right"
     label_next: "Next"
     label_no_data: "No data to display"
-    label_no_due_date: "No end date"
-    label_no_start_date: "No start date"
+    label_no_due_date: "no end date"
+    label_no_start_date: "no start date"
     label_none: "none"
     label_not_contains: "doesn't contain"
     label_not_equals: "is not"

From b101103cb82d0e1471eae6a70be769ecaaf84059 Mon Sep 17 00:00:00 2001
From: Till Breuer <till.breuer@gmx.de>
Date: Thu, 10 Jul 2014 14:44:59 +0200
Subject: [PATCH 6/7] Add some unit tests for property rendering on overview
 tab

---
 .../work-package-details-controller-test.js   | 121 ++++++++++++++++--
 1 file changed, 112 insertions(+), 9 deletions(-)

diff --git a/karma/tests/controllers/work-package-details-controller-test.js b/karma/tests/controllers/work-package-details-controller-test.js
index 5f28fb6ade..4753219a27 100644
--- a/karma/tests/controllers/work-package-details-controller-test.js
+++ b/karma/tests/controllers/work-package-details-controller-test.js
@@ -31,30 +31,40 @@
 describe('WorkPackageDetailsController', function() {
   var scope;
   var buildController;
+  var I18n = { t: angular.noop },
+      workPackage = {
+        props: {
+          status: 'open',
+          versionName: null
+        },
+        embedded: {
+          activities: []
+        },
+      };
+
+  function buildWorkPackageWithId(id) {
+    angular.extend(workPackage.props, {id: id});
+    return workPackage;
+  }
 
   beforeEach(module('openproject.api', 'openproject.services', 'openproject.workPackages.controllers'));
   beforeEach(inject(function($rootScope, $controller, $timeout) {
-    scope = $rootScope.$new();
 
     var workPackageId = 99;
 
     buildController = function() {
+      scope = $rootScope.$new();
+
       ctrl = $controller("WorkPackageDetailsController", {
         $scope:  scope,
         $stateParams: { workPackageId: workPackageId },
+        I18n: I18n,
         ConfigurationService: {
           commentsSortedInDescendingOrder: function() {
             return false;
           }
         },
-        workPackage: {
-          props: {
-            id: workPackageId
-          },
-          embedded: {
-            activities: []
-          }
-        }
+        workPackage: buildWorkPackageWithId(workPackageId),
       });
 
       // $timeout.flush();
@@ -68,4 +78,97 @@ describe('WorkPackageDetailsController', function() {
     });
   });
 
+  describe('work package properties', function() {
+    function fetchPresentPropertiesWithName(propertyName) {
+      return scope.presentWorkPackageProperties.filter(function(propertyData) {
+        return propertyData.property === propertyName;
+      });
+    }
+
+
+
+    describe('when the property has a value', function() {
+      var propertyName = 'status';
+
+      beforeEach(function() {
+        buildController();
+      });
+
+      it('adds properties to present properties', function() {
+        expect(fetchPresentPropertiesWithName(propertyName)).to.have.length(1);
+      });
+    });
+
+    describe('when the property is among the first 3 properties', function() {
+      var propertyName = 'responsible';
+
+      beforeEach(function() {
+        buildController();
+      });
+
+      it('is added to present properties even if it is empty', function() {
+        expect(fetchPresentPropertiesWithName(propertyName)).to.have.length(1);
+      });
+    });
+
+    describe('when the property is among the second group of 3 properties', function() {
+      var propertyName = 'priority',
+          label        = 'Priority';
+
+      beforeEach(function() {
+        sinon.stub(I18n, 't')
+             .withArgs('js.work_packages.properties.' + propertyName)
+             .returns(label);
+
+        buildController();
+      });
+
+      afterEach(function() {
+        I18n.t.restore();
+      });
+
+      describe('and none of these 3 properties is present', function() {
+        beforeEach(function() {
+          buildController();
+        });
+
+        it('is added to the empty properties', function() {
+          expect(scope.emptyWorkPackageProperties.indexOf(label)).to.be.greaterThan(-1);
+        });
+      });
+
+      describe('and at least one of these 3 properties is present', function() {
+        beforeEach(function() {
+          workPackage.props.percentageDone = '20';
+          buildController();
+        });
+
+        it('is added to the present properties', function() {
+          expect(fetchPresentPropertiesWithName(propertyName)).to.have.length(1);
+        });
+      });
+    });
+
+    describe('when the property is not among the first 6 properties', function() {
+      var propertyName = 'versionName',
+          label        = 'Version';
+
+      beforeEach(function() {
+        sinon.stub(I18n, 't')
+             .withArgs('js.work_packages.properties.' + propertyName)
+             .returns(label);
+
+        buildController();
+      });
+
+      afterEach(function() {
+        I18n.t.restore();
+      });
+
+      it('adds properties that without values to empty properties', function() {
+        expect(scope.emptyWorkPackageProperties.indexOf(label)).to.be.greaterThan(-1);
+      });
+    });
+  });
+
 });

From eb98a59a93682ca3e0b351f303125d90eab17944 Mon Sep 17 00:00:00 2001
From: Till Breuer <till.breuer@gmx.de>
Date: Thu, 10 Jul 2014 15:39:14 +0200
Subject: [PATCH 7/7] Add unit tests for date property on overview tab

---
 .../work-package-details-controller-test.js   | 72 +++++++++++++++++--
 1 file changed, 67 insertions(+), 5 deletions(-)

diff --git a/karma/tests/controllers/work-package-details-controller-test.js b/karma/tests/controllers/work-package-details-controller-test.js
index 4753219a27..63c3a5d703 100644
--- a/karma/tests/controllers/work-package-details-controller-test.js
+++ b/karma/tests/controllers/work-package-details-controller-test.js
@@ -31,7 +31,10 @@
 describe('WorkPackageDetailsController', function() {
   var scope;
   var buildController;
-  var I18n = { t: angular.noop },
+  var I18n = { t: angular.identity },
+      WorkPackagesHelper = {
+        formatWorkPackageProperty: angular.identity
+      },
       workPackage = {
         props: {
           status: 'open',
@@ -49,7 +52,6 @@ describe('WorkPackageDetailsController', function() {
 
   beforeEach(module('openproject.api', 'openproject.services', 'openproject.workPackages.controllers'));
   beforeEach(inject(function($rootScope, $controller, $timeout) {
-
     var workPackageId = 99;
 
     buildController = function() {
@@ -67,7 +69,7 @@ describe('WorkPackageDetailsController', function() {
         workPackage: buildWorkPackageWithId(workPackageId),
       });
 
-      // $timeout.flush();
+      $timeout.flush();
     };
 
   }));
@@ -85,8 +87,6 @@ describe('WorkPackageDetailsController', function() {
       });
     }
 
-
-
     describe('when the property has a value', function() {
       var propertyName = 'status';
 
@@ -169,6 +169,68 @@ describe('WorkPackageDetailsController', function() {
         expect(scope.emptyWorkPackageProperties.indexOf(label)).to.be.greaterThan(-1);
       });
     });
+
+    describe('date property', function() {
+      var startDate = '2014-07-09',
+          dueDate   = '2014-07-10',
+          placeholder = 'placeholder';
+
+
+      describe('when only the due date is present', function() {
+        beforeEach(function() {
+          sinon.stub(I18n, 't')
+               .withArgs('js.label_no_start_date')
+               .returns(placeholder);
+
+          workPackage.props.startDate = null;
+          workPackage.props.dueDate = dueDate;
+
+          buildController();
+        });
+
+        afterEach(function() {
+          I18n.t.restore();
+        });
+
+        it('renders the due date and a placeholder for the start date as date property', function() {
+          expect(fetchPresentPropertiesWithName('date')[0].value).to.equal(placeholder + ' - Jul 10, 2014');
+        });
+      });
+
+      describe('when only the start date is present', function() {
+        beforeEach(function() {
+          sinon.stub(I18n, 't')
+               .withArgs('js.label_no_due_date')
+               .returns(placeholder);
+
+          workPackage.props.startDate = startDate;
+          workPackage.props.dueDate = null;
+
+          buildController();
+        });
+
+        afterEach(function() {
+          I18n.t.restore();
+        });
+
+        it('renders the start date and a placeholder for the due date as date property', function() {
+          expect(fetchPresentPropertiesWithName('date')[0].value).to.equal('Jul 9, 2014 - ' + placeholder);
+        });
+      });
+
+      describe('when both - start and due date are present', function() {
+        beforeEach(function() {
+          workPackage.props.startDate = startDate;
+          workPackage.props.dueDate = dueDate;
+
+          buildController();
+        });
+
+        it('combines them and renders them as date property', function() {
+          expect(fetchPresentPropertiesWithName('date')[0].value).to.equal('Jul 9, 2014 - Jul 10, 2014');
+        });
+      });
+    });
   });
 
 });