From 3dd7169b8b7619e3add66d37db1866cd1fc3f7db Mon Sep 17 00:00:00 2001
From: Jonathan Bernard <jonathan@jdbernard.com>
Date: Fri, 13 Mar 2020 23:09:01 -0500
Subject: [PATCH] WIP Adding support for Text entry measurements (renamed from
 List).

---
 .../measure-config/MeasureConfigForm.vue      |  4 +-
 .../measure-config/TextMeasureConfigForm.vue  | 10 +++++
 .../measure-config/measure-config-form.ts     |  7 +++-
 .../text-measure-config-form.ts               | 17 ++++++++
 .../measure-summaries/ListSummary.vue         |  6 ---
 .../measure-summaries/MeasureSummary.vue      |  2 +-
 .../measure-summaries/TextSummary.vue         | 13 +++++++
 .../measure-summaries/list-summary.ts         | 16 --------
 .../measure-summaries/measure-summary.ts      |  4 +-
 .../measure-summaries/text-summary.scss       | 39 +++++++++++++++++++
 .../measure-summaries/text-summary.ts         | 33 ++++++++++++++++
 .../measurement-entry/MeasurementEntry.vue    |  2 +
 .../measurement-entry/SimpleEntry.vue         |  4 +-
 .../measurement-entry/TextEntry.vue           | 26 +++++++++++++
 .../measurement-entry/measurement-entry.ts    |  6 ++-
 .../measurement-entry/simple-entry.ts         |  2 -
 .../measurement-entry/text-entry.ts           | 13 +++++++
 web/src/models.d.ts                           |  7 ++--
 web/src/store-modules/measure.ts              |  3 +-
 web/src/views/Measures.vue                    |  5 +--
 web/src/views/new-measurement.ts              |  4 +-
 21 files changed, 179 insertions(+), 44 deletions(-)
 create mode 100644 web/src/components/measure-config/TextMeasureConfigForm.vue
 create mode 100644 web/src/components/measure-config/text-measure-config-form.ts
 delete mode 100644 web/src/components/measure-summaries/ListSummary.vue
 create mode 100644 web/src/components/measure-summaries/TextSummary.vue
 delete mode 100644 web/src/components/measure-summaries/list-summary.ts
 create mode 100644 web/src/components/measure-summaries/text-summary.scss
 create mode 100644 web/src/components/measure-summaries/text-summary.ts
 create mode 100644 web/src/components/measurement-entry/TextEntry.vue
 create mode 100644 web/src/components/measurement-entry/text-entry.ts

diff --git a/web/src/components/measure-config/MeasureConfigForm.vue b/web/src/components/measure-config/MeasureConfigForm.vue
index 8bb5e24..b127e1e 100644
--- a/web/src/components/measure-config/MeasureConfigForm.vue
+++ b/web/src/components/measure-config/MeasureConfigForm.vue
@@ -7,14 +7,14 @@
         name=measureType
         v-model=value.type>
         <option value=simple>Simple</option>
-        <option value=list>List</option>
+        <option value=text>Text</option>
       </select>
     </div>
     <div>
       <label for=measureIsVisible>Show by default.</label>
       <input type=checkbox v-model=value.isVisible :disabled=disabled />
     </div>
-    <!--<ListMeasureConfigForm :config=config v-show="config.type === 'list'"/>-->
+    <TextMeasureConfigForm v-model=value v-show="value.type === 'text'" :disabled=disabled />
   </fieldset>
 </template>
 <script lang=ts src=./measure-config-form.ts></script>
diff --git a/web/src/components/measure-config/TextMeasureConfigForm.vue b/web/src/components/measure-config/TextMeasureConfigForm.vue
new file mode 100644
index 0000000..76a0587
--- /dev/null
+++ b/web/src/components/measure-config/TextMeasureConfigForm.vue
@@ -0,0 +1,10 @@
+<template>
+  <div>
+    <label for=textEntryShowTimestamp>Show Timestamps.</label>
+    <input name=textEntryShowTimestamp
+           :disabled=disabled
+           type=checkbox
+           v-model=value.showTimestamp />
+  </div>
+</template>
+<script lang=ts src=./text-measure-config-form.ts></script>
diff --git a/web/src/components/measure-config/measure-config-form.ts b/web/src/components/measure-config/measure-config-form.ts
index 951ffd4..e8518dd 100644
--- a/web/src/components/measure-config/measure-config-form.ts
+++ b/web/src/components/measure-config/measure-config-form.ts
@@ -1,8 +1,13 @@
 import { Component, Emit, Prop, Vue, Watch } from 'vue-property-decorator';
 import { logService } from '@/services/logging';
 import { Measure, MeasureConfig } from '@/models';
+import TextMeasureConfigForm from './TextMeasureConfigForm.vue';
 
-@Component({})
+@Component({
+  components: {
+    TextMeasureConfigForm
+  }
+})
 export class MeasureConfigForm extends Vue {
   @Prop({}) public value!: MeasureConfig;
   @Prop({}) public disabled: boolean = false;
diff --git a/web/src/components/measure-config/text-measure-config-form.ts b/web/src/components/measure-config/text-measure-config-form.ts
new file mode 100644
index 0000000..22eef21
--- /dev/null
+++ b/web/src/components/measure-config/text-measure-config-form.ts
@@ -0,0 +1,17 @@
+import { Component, Emit, Prop, Vue, Watch } from 'vue-property-decorator';
+import { logService } from '@/services/logging';
+import { Measure, MeasureConfig, TextMeasureConfig } from '@/models';
+
+@Component({})
+export class TextMeasureConfigForm extends Vue {
+  @Prop({}) public value!: MeasureConfig;
+  @Prop({}) public disabled: boolean = false;
+
+  @Watch('value', { immediate: true, deep: true })
+  @Emit('input')
+  private onConfigChanged(newVal: TextMeasureConfig, oldVal: TextMeasureConfig) {
+    return newVal;
+  }
+}
+
+export default TextMeasureConfigForm;
diff --git a/web/src/components/measure-summaries/ListSummary.vue b/web/src/components/measure-summaries/ListSummary.vue
deleted file mode 100644
index 525c279..0000000
--- a/web/src/components/measure-summaries/ListSummary.vue
+++ /dev/null
@@ -1,6 +0,0 @@
-<template>
-  <ul>
-    <li v-for="m in top5">{{m.extData.entry}}</li>
-  </ul>
-</template>
-<script lang="ts" src="./list-summary.ts"></script>
diff --git a/web/src/components/measure-summaries/MeasureSummary.vue b/web/src/components/measure-summaries/MeasureSummary.vue
index f03faaa..74b7876 100644
--- a/web/src/components/measure-summaries/MeasureSummary.vue
+++ b/web/src/components/measure-summaries/MeasureSummary.vue
@@ -5,7 +5,7 @@
         {{measure.name}}</router-link></h2>
     <SimpleSummaryGraph v-if="measure.config.type === 'simple'"
       :measure=measure :measurements=measurements />
-    <ListSummary v-if="measure.config.type === 'list'"
+    <TextSummary v-if="measure.config.type === 'text'"
       :measure=measure :measurements=measurements />
   </div>
 </template>
diff --git a/web/src/components/measure-summaries/TextSummary.vue b/web/src/components/measure-summaries/TextSummary.vue
new file mode 100644
index 0000000..e1784e2
--- /dev/null
+++ b/web/src/components/measure-summaries/TextSummary.vue
@@ -0,0 +1,13 @@
+<template>
+  <ul>
+    <li
+      v-for="m in top5"
+      v-bind:class="{ 'show-timestamp': measure.config.showTimestamp,
+                      'full-timestamp': !withinLastYear }">
+      <span class=timestamp>{{formatDate(m.timestamp)}}</span>
+      <span class=entry>{{m.extData.entry}}</span>
+    </li>
+  </ul>
+</template>
+<script lang="ts" src="./text-summary.ts"></script>
+<style scoped lang="scss" src="./text-summary.scss"></script>
diff --git a/web/src/components/measure-summaries/list-summary.ts b/web/src/components/measure-summaries/list-summary.ts
deleted file mode 100644
index 9b46fbf..0000000
--- a/web/src/components/measure-summaries/list-summary.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Component, Prop, Vue } from 'vue-property-decorator';
-import { Measure, ListMeasureConfig, Measurement, ListMeasurementMeta } from '@/models';
-
-@Component
-export class ListSummary extends Vue {
-  @Prop() private measure!: Measure<ListMeasureConfig>;
-  @Prop() private measurements!: Array<Measurement<ListMeasurementMeta>>;
-
-  private top5(): Array<Measurement<ListMeasurementMeta>>  {
-    return this.measurements
-      .sort((a, b) => b.timestamp.getTime() - a.timestamp.getTime())
-      .slice(0, 5);
-  }
-}
-
-export default ListSummary;
diff --git a/web/src/components/measure-summaries/measure-summary.ts b/web/src/components/measure-summaries/measure-summary.ts
index 85aad98..2f95df5 100644
--- a/web/src/components/measure-summaries/measure-summary.ts
+++ b/web/src/components/measure-summaries/measure-summary.ts
@@ -1,12 +1,12 @@
 import { Component, Prop, Vue } from 'vue-property-decorator';
 import { Measure, MeasureConfig, MeasureType, Measurement, MeasurementMeta } from '@/models';
 import { measurementStore } from '@/store';
-import ListSummary from './ListSummary.vue';
+import TextSummary from './TextSummary.vue';
 import SimpleSummaryGraph from './SimpleSummaryGraph.vue';
 
 @Component({
   components: {
-    ListSummary,
+    TextSummary,
     SimpleSummaryGraph
   }
 })
diff --git a/web/src/components/measure-summaries/text-summary.scss b/web/src/components/measure-summaries/text-summary.scss
new file mode 100644
index 0000000..48f2048
--- /dev/null
+++ b/web/src/components/measure-summaries/text-summary.scss
@@ -0,0 +1,39 @@
+@import '~@/styles/vars';
+
+ul {
+  list-style: none;
+  padding: 0.5rem 0;
+
+  li {
+    span {
+      display: inline-block;
+      vertical-align: bottom;
+
+      &.timestamp {
+        color: $color2;
+        font-weight: bold;
+      }
+
+      &.entry {
+        overflow-x: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+    }
+
+    &:not(.show-timestamp) {
+      span.timestamp { display: none; }
+      span.entry { width: 100%; }
+    }
+
+    &.show-timestamp {
+      span.timestamp { width: 5rem; }
+      span.entry { width: calc(100% - 5rem); }
+    }
+
+    &.show-timestamp.full-timestamp {
+      span.timestamp { width: 6rem; }
+      span.entry { width: calc(100% - 6rem); }
+    }
+  }
+}
diff --git a/web/src/components/measure-summaries/text-summary.ts b/web/src/components/measure-summaries/text-summary.ts
new file mode 100644
index 0000000..166877a
--- /dev/null
+++ b/web/src/components/measure-summaries/text-summary.ts
@@ -0,0 +1,33 @@
+import { Component, Prop, Vue, Watch } from 'vue-property-decorator';
+import moment from 'moment';
+import { Measure, TextMeasureConfig, Measurement, TextMeasurementMeta } from '@/models';
+import { byTimestampComparator } from '@/util';
+
+const YEAR_START = moment().startOf('year');
+
+@Component
+export class TextSummary extends Vue {
+  @Prop() private measure!: Measure<TextMeasureConfig>;
+  @Prop() private measurements!: Array<Measurement<TextMeasurementMeta>>;
+
+  private top5: Array<Measurement<TextMeasurementMeta>> = [];
+  private withinLastYear: boolean = true;
+
+  @Watch('measurements')
+  private onMeasurementsChanged() {
+    this.top5 = this.measurements
+      .slice(0)
+      .sort(byTimestampComparator)
+      .slice(0, 5);
+
+    this.withinLastYear = this.top5.every((entry) => YEAR_START.isBefore(entry.timestamp));
+  }
+
+  private formatDate(ts: Date) {
+    if (this.withinLastYear) { return moment(ts).format('MMM. Do'); }
+    else { return moment(ts).format('YYYY-MM-DD'); }
+  }
+
+}
+
+export default TextSummary;
diff --git a/web/src/components/measurement-entry/MeasurementEntry.vue b/web/src/components/measurement-entry/MeasurementEntry.vue
index c926bd5..d551fb2 100644
--- a/web/src/components/measurement-entry/MeasurementEntry.vue
+++ b/web/src/components/measurement-entry/MeasurementEntry.vue
@@ -2,6 +2,8 @@
   <div>
     <SimpleEntry v-if="measure.config.type === 'simple'"
       :measure=measure v-model=value />
+    <TextEntry v-if="measure.config.type === 'text'"
+      :measure=measure v-model=value />
   </div>
 </template>
 <script lang="ts" src="./measurement-entry.ts"></script>
diff --git a/web/src/components/measurement-entry/SimpleEntry.vue b/web/src/components/measurement-entry/SimpleEntry.vue
index 7fd4f6b..1f2366d 100644
--- a/web/src/components/measurement-entry/SimpleEntry.vue
+++ b/web/src/components/measurement-entry/SimpleEntry.vue
@@ -2,7 +2,9 @@
   <fieldset>
     <div>
       <label for=timestamp>Timestamp</label>
-      <input type=datetime-local
+      <input
+        name=timestamp
+        type=datetime-local
         v-model=value.timestamp
         v-show=editTimestamp
         :disabled=disabled />
diff --git a/web/src/components/measurement-entry/TextEntry.vue b/web/src/components/measurement-entry/TextEntry.vue
new file mode 100644
index 0000000..5b0bc49
--- /dev/null
+++ b/web/src/components/measurement-entry/TextEntry.vue
@@ -0,0 +1,26 @@
+<template>
+  <fieldset>
+    <div>
+      <label for=timestamp>Timestamp</label>
+      <input
+        name=timestamp
+        type=datetime-local
+        v-model=value.timestamp
+        v-show=editTimestamp
+        :disabled=disabled />
+      <span v-show="!editTimestamp">
+        now <a href="#" v-on:click.stop.prevent="editTimestamp = true"> (set a time)</a>
+      </span>
+    </div>
+    <div>
+      <label for=measurementEntry>{{measure.name}}</label>
+      <input
+        name=measurementEntry
+        required
+        type=text
+        v-model=value.extData.entry
+        :disabled=disabled />
+    </div>
+  </fieldset>
+</template>
+<script lang="ts" src="./text-entry.ts"></script>
diff --git a/web/src/components/measurement-entry/measurement-entry.ts b/web/src/components/measurement-entry/measurement-entry.ts
index 09221a8..ca06018 100644
--- a/web/src/components/measurement-entry/measurement-entry.ts
+++ b/web/src/components/measurement-entry/measurement-entry.ts
@@ -1,9 +1,13 @@
 import { Component, Emit, Prop, Vue, Watch } from 'vue-property-decorator';
 import { Measure, MeasureConfig, MeasureType, Measurement, MeasurementMeta } from '@/models';
 import SimpleEntry from './SimpleEntry.vue';
+import TextEntry from './TextEntry.vue';
 
 @Component({
-  components: { SimpleEntry }
+  components: {
+    SimpleEntry,
+    TextEntry
+  }
 })
 export class MeasurementEntry extends Vue {
   @Prop() private measure!: Measure<MeasureConfig>;
diff --git a/web/src/components/measurement-entry/simple-entry.ts b/web/src/components/measurement-entry/simple-entry.ts
index 112d6f1..ba70702 100644
--- a/web/src/components/measurement-entry/simple-entry.ts
+++ b/web/src/components/measurement-entry/simple-entry.ts
@@ -11,8 +11,6 @@ export class SimpleEntry extends Vue {
   @Watch('value', { immediate: true, deep: true })
   @Emit('input')
   private onMeasurementChanged(newVal: Measurement<MeasurementMeta>, oldVal: Measurement<MeasurementMeta>) {
-    newVal.extData.measureType = 'simple' as MeasureType;
-
     if (typeof(newVal.value) === 'string' ) {
       newVal.value = parseInt(newVal.value, 10);
     }
diff --git a/web/src/components/measurement-entry/text-entry.ts b/web/src/components/measurement-entry/text-entry.ts
new file mode 100644
index 0000000..16112f8
--- /dev/null
+++ b/web/src/components/measurement-entry/text-entry.ts
@@ -0,0 +1,13 @@
+import { Component, Emit, Prop, Vue, Watch } from 'vue-property-decorator';
+import { Measure, MeasureConfig, MeasureType, Measurement, MeasurementMeta } from '@/models';
+
+@Component({})
+export class TextEntry extends Vue {
+  @Prop() public measure!: Measure<MeasureConfig>;
+  @Prop() public value!: Measurement<MeasurementMeta>;
+  @Prop() public disabled!: boolean;
+  private editTimestamp: boolean = false;
+
+}
+
+export default TextEntry;
diff --git a/web/src/models.d.ts b/web/src/models.d.ts
index 0e048bd..69dd13a 100644
--- a/web/src/models.d.ts
+++ b/web/src/models.d.ts
@@ -1,4 +1,4 @@
-export enum MeasureType { List = 'list', Simple = 'simple' }
+export enum MeasureType { Text = 'text', Simple = 'simple' }
 
 export interface ApiToken {
   id: string;
@@ -19,7 +19,7 @@ export interface MeasureConfig {
   isVisible: boolean;
 }
 
-export interface ListMeasureConfig extends MeasureConfig {
+export interface TextMeasureConfig extends MeasureConfig {
   showTimestamp: boolean;
 }
 
@@ -33,10 +33,9 @@ export interface Measure<C extends MeasureConfig> {
 }
 
 export interface MeasurementMeta {
-  measureType: MeasureType;
 }
 
-export interface ListMeasurementMeta extends MeasurementMeta {
+export interface TextMeasurementMeta extends MeasurementMeta {
   entry: string;
 }
 
diff --git a/web/src/store-modules/measure.ts b/web/src/store-modules/measure.ts
index a298094..a8b69ee 100644
--- a/web/src/store-modules/measure.ts
+++ b/web/src/store-modules/measure.ts
@@ -6,6 +6,7 @@ import {
   MutationAction,
   VuexModule
 } from 'vuex-module-decorators';
+import assign from 'lodash.assign';
 import keyBy from 'lodash.keyby';
 import { User, Measure, MeasureConfig } from '@/models';
 import api from '@/services/pm-api-client';
@@ -35,6 +36,6 @@ export class MeasureStoreModule extends VuexModule {
   }
 
   @Mutation private SET_MEASURE<T extends MeasureConfig>(measure: Measure<T>) {
-    this.measures[measure.slug] = measure;
+    this.measures = assign({}, this.measures, {[measure.slug]: measure});
   }
 }
diff --git a/web/src/views/Measures.vue b/web/src/views/Measures.vue
index c1f0e5f..14a6405 100644
--- a/web/src/views/Measures.vue
+++ b/web/src/views/Measures.vue
@@ -12,12 +12,9 @@
     <div class=measure-list>
       <MeasureSummary
         v-for="(measure, slug) in measures"
+        v-bind:key="measure.id"
         v-show="measure.slug.startsWith(filter)"
         :measure=measure />
-      <!--<MeasureSummary
-        v-for="(measure, slug) in measures"
-        :key="slug"
-        :measure=measure />-->
     </div>
   </div>
 </template>
diff --git a/web/src/views/new-measurement.ts b/web/src/views/new-measurement.ts
index 64c38f2..c1f99f4 100644
--- a/web/src/views/new-measurement.ts
+++ b/web/src/views/new-measurement.ts
@@ -22,9 +22,7 @@ export class NewMeasurement extends Vue {
     measureId: '',
     value: 0,
     timestamp: new Date(),
-    extData: {
-      measureType: 'simple' as MeasureType
-    }
+    extData: { }
   };
 
   private async mounted() {