From 5281325b150f86bb50ee094ba5df9b95d3bfd907 Mon Sep 17 00:00:00 2001
From: DreaMinder <dreaminder7@gmail.com>
Date: Sat, 7 Jul 2018 22:23:43 +0300
Subject: [PATCH 1/6] translate statuses

---
 src/Deal.vue | 43 +++++++++++++++++++------------------------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/src/Deal.vue b/src/Deal.vue
index 80100f7..a7bbaad 100644
--- a/src/Deal.vue
+++ b/src/Deal.vue
@@ -1,17 +1,17 @@
 <template>
-<li class="deal">
-  <div class="deal-data">
-    <span class="deal-name">{{ deal.name }}</span>
-    <div class="deal-status">
-      {{ deal.status }}<br>
-      {{ currentStatus }}
+  <li class="deal">
+    <div class="deal-data">
+      <span class="deal-name">{{ deal.name }}</span>
+      <div class="deal-status">
+        {{ deal.status }}<br>
+        {{ currentStatus }}
+      </div>
     </div>
-  </div>
-  <div class="progress-container" :title="dateString">
-    <div class="timeline"></div>
-    <div class="deal-progress" :style="progressStyles"></div>
-  </div>
-</li>
+    <div class="progress-container" :title="dateString">
+      <div class="timeline"></div>
+      <div class="deal-progress" :style="progressStyles"></div>
+    </div>
+  </li>
 </template>
 
 <script>
@@ -36,19 +36,14 @@ export default {
   computed: {
     currentStatus: function currentStatus() {
       const today = DateTime.local().setZone('utc').set({ hour: 0, minute: 0, second: 0, millisecond: 0 })
-      
-      if (this.deal.closingDate) return 'Выполнено'
-      if (this.deal.startDate > today) return 'Планируется'
-      if (this.deal.endDate >= today) return 'В работе'
+
+      if (this.deal.closingDate) return 'Finished'
+      if (this.deal.startDate > today) return 'Scheduled'
+      if (this.deal.endDate >= today) return 'In progress'
       if (this.deal.endDate < today && !this.deal.endDateActual) {
-        return `Просрочено на ${this.calculateDelay(today, this.deal.endDate)} дней`
-      }
-      if (+this.deal.endDateActual === +today && !this.deal.closingDate) {
-        return `Ожидается закрытие актов`
-      }
-      if (this.deal.endDateActual && !this.deal.closingDate) {
-        return `Акты просрочены на ${this.calculateDelay(today, this.deal.endDateActual)} дней`
+        return `${this.calculateDelay(today, this.deal.endDate)} days overdue`
       }
+
       return ''
     },
     emptyBeforeWidth: function emptyBeforeWidth() {
@@ -143,4 +138,4 @@ export default {
   flex-grow: 1;
   text-align: right;
 }
-</style>
\ No newline at end of file
+</style>

From 75cf292b95c768a2d866c367d667145a09edf3a8 Mon Sep 17 00:00:00 2001
From: DreaMinder <dreaminder7@gmail.com>
Date: Sat, 7 Jul 2018 22:27:05 +0300
Subject: [PATCH 2/6] change component methods to shorthand notation

---
 src/Deal.vue         | 10 +++++-----
 src/DealsDiagram.vue | 13 ++++++-------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/Deal.vue b/src/Deal.vue
index a7bbaad..8e24154 100644
--- a/src/Deal.vue
+++ b/src/Deal.vue
@@ -34,7 +34,7 @@ export default {
     },
   },
   computed: {
-    currentStatus: function currentStatus() {
+    currentStatus() {
       const today = DateTime.local().setZone('utc').set({ hour: 0, minute: 0, second: 0, millisecond: 0 })
 
       if (this.deal.closingDate) return 'Finished'
@@ -46,21 +46,21 @@ export default {
 
       return ''
     },
-    emptyBeforeWidth: function emptyBeforeWidth() {
+    emptyBeforeWidth() {
       return this.calculateWidthPercentageFromDates(this.minDate,
       this.deal.startDate, this.duration)
     },
-    progressWidth: function progressWidth() {
+    progressWidth() {
       return this.calculateWidthPercentageFromDates(this.deal.startDate,
         this.deal.endDate, this.duration)
     },
-    progressStyles: function progressStyles() {
+    progressStyles() {
       return {
         left: `${this.emptyBeforeWidth}%`,
         width: `${this.progressWidth}%`,
       }
     },
-    dateString: function dateString() {
+    dateString() {
       return `${this.deal.startDate.setLocale('en-gb').toLocaleString()}–${this.deal.endDate.setLocale('en-gb').toLocaleString()}`
     },
   },
diff --git a/src/DealsDiagram.vue b/src/DealsDiagram.vue
index 4209e31..7c87284 100644
--- a/src/DealsDiagram.vue
+++ b/src/DealsDiagram.vue
@@ -22,7 +22,7 @@ export default {
     Deal,
   },
   computed: {
-    sortedDeals: function sortedDeals() {
+    sortedDeals() {
       return this.deals
       .map(deal => this.transformDealDates(deal))
       .sort(
@@ -30,10 +30,10 @@ export default {
           deal1.startDate.diff(deal2.startDate).milliseconds,
       )
     },
-    dates: function dates() {
+    dates() {
       let maxDate = 0
       let minDate = Infinity
-      
+
       for (let deal of this.sortedDeals) {
         let startDate = deal.startDate.valueOf()
         let endDate = deal.endDate.valueOf()
@@ -52,13 +52,13 @@ export default {
         maxDate: DateTime.fromMillis(maxDate, { zone: 'utc' })
       }
     },
-    minDate: function minDate() {
+    minDate() {
       return this.dates.minDate
     },
-    maxDate: function maxDate() {
+    maxDate() {
       return this.dates.maxDate
     },
-    duration: function duration() {
+    duration() {
       if (this.sortedDeals.length) {
         return this.maxDate.diff(this.minDate)
       }
@@ -86,7 +86,6 @@ export default {
 }
 </script>
 
-<!-- Add "scoped" attribute to limit CSS to this component only -->
 <style scoped>
 .diagram ul {
   list-style-type: none;

From 27ef943116d597d5debbb66e7aa7f357a7cf414b Mon Sep 17 00:00:00 2001
From: DreaMinder <dreaminder7@gmail.com>
Date: Sat, 7 Jul 2018 22:32:29 +0300
Subject: [PATCH 3/6] remove obsolete "closing date" logic

---
 src/Deal.vue         | 2 +-
 src/DealsDiagram.vue | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Deal.vue b/src/Deal.vue
index 8e24154..8e34372 100644
--- a/src/Deal.vue
+++ b/src/Deal.vue
@@ -37,7 +37,7 @@ export default {
     currentStatus() {
       const today = DateTime.local().setZone('utc').set({ hour: 0, minute: 0, second: 0, millisecond: 0 })
 
-      if (this.deal.closingDate) return 'Finished'
+      if (this.deal.endDateActual) return 'Finished'
       if (this.deal.startDate > today) return 'Scheduled'
       if (this.deal.endDate >= today) return 'In progress'
       if (this.deal.endDate < today && !this.deal.endDateActual) {
diff --git a/src/DealsDiagram.vue b/src/DealsDiagram.vue
index 7c87284..dfa6ead 100644
--- a/src/DealsDiagram.vue
+++ b/src/DealsDiagram.vue
@@ -76,10 +76,6 @@ export default {
         newDeal.endDateActual = DateTime.fromISO(newDeal.endDateActual, { zone: 'utc' })
       }
 
-      if (newDeal.closingDate) {
-        newDeal.closingDate = DateTime.fromISO(newDeal.closingDate, { zone: 'utc' })
-      }
-
       return newDeal
     },
   },

From e03bc24c431b0787975fe352995867890123764f Mon Sep 17 00:00:00 2001
From: DreaMinder <dreaminder7@gmail.com>
Date: Sat, 7 Jul 2018 22:54:05 +0300
Subject: [PATCH 4/6] update readme

---
 README.md      |   6 ++++--
 screenshot.png | Bin 0 -> 17943 bytes
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 screenshot.png

diff --git a/README.md b/README.md
index 3b84cb0..ee88c12 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,10 @@
 [![Build Status](https://travis-ci.org/bluebirrrrd/deals-diagram.svg?branch=master)](https://travis-ci.org/bluebirrrrd/deals-diagram)
 
-# deals-diagram
+# Deals diagram
 
-> Deals chart
+Vue.js component for task duration visualisation.
+
+![screenshot](/screenshot.png)
 
 ## Build Setup
 
diff --git a/screenshot.png b/screenshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..12cbf7d480081b9a30f1bca199e1206eb3516558
GIT binary patch
literal 17943
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
WiscG1`6=)r$llJyw&ujSpZ^!5I3ywf

literal 0
HcmV?d00001


From cc4ba7094d7cbe9c6e0c66319930afbff3f16dfb Mon Sep 17 00:00:00 2001
From: DreaMinder <dreaminder7@gmail.com>
Date: Sat, 7 Jul 2018 22:54:44 +0300
Subject: [PATCH 5/6] increment package version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a806106..95982f8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "deals-diagram",
-  "version": "1.0.4",
+  "version": "1.1.4",
   "description": "Deals chart",
   "author": "Anna Kurylo <anna.kurilo21@gmail.com>",
   "repository": {

From 5ab2ba42eab5317275350a253f81971afa005012 Mon Sep 17 00:00:00 2001
From: DreaMinder <dreaminder7@gmail.com>
Date: Sat, 7 Jul 2018 23:10:04 +0300
Subject: [PATCH 6/6] fix tests

---
 test/unit/specs/Deal.spec.js | 43 ++++++++----------------------------
 1 file changed, 9 insertions(+), 34 deletions(-)

diff --git a/test/unit/specs/Deal.spec.js b/test/unit/specs/Deal.spec.js
index 6d9fb55..e9a1309 100644
--- a/test/unit/specs/Deal.spec.js
+++ b/test/unit/specs/Deal.spec.js
@@ -11,9 +11,7 @@ function transformDealDates(deal) {
   if (resultingDeal.endDateActual) {
     resultingDeal.endDateActual = DateTime.fromISO(resultingDeal.endDateActual, { zone: 'utc' })
   }
-  if (resultingDeal.closingDate) {
-    resultingDeal.closingDate = DateTime.fromISO(resultingDeal.closingDate, { zone: 'utc' })
-  }
+
   return resultingDeal
 }
 
@@ -41,73 +39,50 @@ describe('Deal.vue', () => {
   })
 
   describe('should set the status to ', () => {
-    it('Выполнено', (done) => {
+    it('Finished', (done) => {
       testDeal.endDate = yesterday
       testDeal.endDateActual = yesterday
       testDeal.closingDate = yesterday
       vm.deal = testDeal
       Vue.nextTick(() => {
-        expect(vm.currentStatus).to.equal('Выполнено')
+        expect(vm.currentStatus).to.equal('Finished')
         done()
       })
     })
 
-    it('Просрочено на 1 день', (done) => {
+    it('1 days overdue', (done) => {
       testDeal.endDate = yesterday
       testDeal.endDateActual = null
       testDeal.closingDate = null
       vm.deal = testDeal
       Vue.nextTick(() => {
-        expect(vm.currentStatus).to.equal('Просрочено на 1 дней')
+        expect(vm.currentStatus).to.equal('1 days overdue')
         done()
       })
     })
 
-    it('В работе', (done) => {
+    it('In progress', (done) => {
       testDeal.endDate = today
       testDeal.endDateActual = null
       testDeal.closingDate = null
       vm.deal = testDeal
       Vue.nextTick(() => {
-        expect(vm.currentStatus).to.equal('В работе')
+        expect(vm.currentStatus).to.equal('In progress')
         done()
       })
     })
 
-    it('Планируется', (done) => {
+    it('Scheduled', (done) => {
       testDeal.startDate = tomorrow
       testDeal.endDate = tomorrow.plus({ days: 1 })
       testDeal.endDateActual = null
       testDeal.closingDate = null
       vm.deal = testDeal
       Vue.nextTick(() => {
-        expect(vm.currentStatus).to.equal('Планируется')
-        done()
-      })
-    })
-
-    it('Ожидается закрытие актов', (done) => {
-      testDeal.startDate = yesterday.minus({ days: 1 })
-      testDeal.endDate = yesterday
-      testDeal.endDateActual = today
-      testDeal.closingDate = null
-      vm.deal = testDeal
-      Vue.nextTick(() => {
-        expect(vm.currentStatus).to.equal('Ожидается закрытие актов')
+        expect(vm.currentStatus).to.equal('Scheduled')
         done()
       })
     })
 
-    it('Акты просрочены на 1 день', (done) => {
-      testDeal.startDate = yesterday.minus({ days: 1 })
-      testDeal.endDate = yesterday
-      testDeal.endDateActual = yesterday
-      testDeal.closingDate = null
-      vm.deal = testDeal
-      Vue.nextTick(() => {
-        expect(vm.currentStatus).to.equal('Акты просрочены на 1 дней')
-        done()
-      })
-    })
   })
 })