Don't show duration on scheduled campaigns that are finished. Closes k…

…nadh#701.
runningnoodle · Mar 2, 2022 · b4c7163 · b4c7163
1 parent 8d6e475
commit b4c7163
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/frontend/src/utils.js b/frontend/src/utils.js
@@ -49,6 +49,8 @@ export default class Utils {
     }
   }
 
+  getDate = (d) => dayjs(d);
+
   // Parses an ISO timestamp to a simpler form.
   niceDate = (stamp, showTime) => {
     if (!stamp) {

diff --git a/frontend/src/views/Campaigns.vue b/frontend/src/views/Campaigns.vue
@@ -61,8 +61,11 @@
             <b-tooltip :label="$t('scheduled')" type="is-dark">
               <span class="is-size-7 has-text-grey scheduled">
                 <b-icon icon="alarm" size="is-small" />
-                {{ $utils.duration(Date(), props.row.sendAt, true) }}
-                <br />{{ $utils.niceDate(props.row.sendAt, true) }}
+                <span v-if="!isDone(props.row) && !isRunning(props.row)">
+                  {{ $utils.duration(new Date(), props.row.sendAt, true) }}
+                  <br />
+                </span>
+                {{ $utils.niceDate(props.row.sendAt, true) }}
               </span>
             </b-tooltip>
           </p>