loading icon, parse msg in BoardSidebar

Signed-off-by: Jakob <jakob.roehrl@web.de>
This commit is contained in:
Jakob
2019-08-23 13:43:16 +02:00
committed by Julius Härtl
parent 6b8d42f176
commit 9f62a24450
3 changed files with 22 additions and 5 deletions

View File

@@ -1,9 +1,11 @@
<template> <template>
<div> <div>
<div v-for="entry in boardActivity" :key="entry.activity_id"> <div v-if="isLoading" class="icon icon-loading" />
<div v-for="entry in boardActivity" v-else :key="entry.activity_id">
<img :src="entry.icon"> <img :src="entry.icon">
{{ entry.subject }} <span v-html="parseMessage(entry)" />
{{ getTime(entry.datetime) }} <span> {{ getTime(entry.datetime) }} </span>
</div> </div>
<button @click="loadMore">Load More</button> <button @click="loadMore">Load More</button>
</div> </div>
@@ -57,6 +59,15 @@ export default {
this.params.since = aId this.params.since = aId
this.loadBoardActivity() this.loadBoardActivity()
},
parseMessage(activity) {
let subject = activity.subject_rich[0]
let parameters = activity.subject_rich[1]
if (parameters.after && typeof parameters.after.id === 'string' && parameters.after.id.startsWith('dt:')) {
let dateTime = parameters.after.id.substr(3)
parameters.after.name = window.moment(dateTime).format('L LTS')
}
return OCA.Activity.RichObjectStringParser.parseMessage(subject, parameters)
} }
} }
} }

View File

@@ -41,7 +41,7 @@
</multiselect> </multiselect>
</div> </div>
</div> </div>
<div class="section-wrapper"> <div class="section-wrapper">
<div v-tooltip="t('deck', 'Assign to users')" class="section-label icon-group"><span class="hidden-visually">{{ t('deck', 'Assign to users') }}</span></div> <div v-tooltip="t('deck', 'Assign to users')" class="section-label icon-group"><span class="hidden-visually">{{ t('deck', 'Assign to users') }}</span></div>
<div class="section-details"> <div class="section-details">
@@ -77,7 +77,9 @@
</button> </button>
</AppSidebarTab> </AppSidebarTab>
<AppSidebarTab :order="2" name="Timeline" icon="icon-activity"> <AppSidebarTab :order="2" name="Timeline" icon="icon-activity">
<div v-for="entry in cardActivity" :key="entry.activity_id">
<div v-if="isLoading" class="icon icon-loading" />
<div v-for="entry in cardActivity" v-else :key="entry.activity_id">
<img :src="entry.icon"> <img :src="entry.icon">
{{ entry.subject }} {{ entry.subject }}
{{ getTime(entry.datetime) }} {{ getTime(entry.datetime) }}

View File

@@ -23,6 +23,10 @@
use OCP\Util; use OCP\Util;
Util::addScript('activity', 'richObjectStringParser');
Util::addScript('activity', 'templates');
Util::addStyle('activity', 'style');
style('deck', 'globalstyles'); style('deck', 'globalstyles');
script('deck', 'deck'); script('deck', 'deck');