robustness fix
This commit is contained in:
parent
1d8b26998a
commit
e39f282abf
3 changed files with 5 additions and 4 deletions
3
hal-core/resources/web/js/hal.js
vendored
3
hal-core/resources/web/js/hal.js
vendored
|
|
@ -51,6 +51,9 @@ $.fn.relTimestamp = function() {
|
|||
|
||||
// Converts all timestamps to human readable time and date
|
||||
function getRelTimestamp(timestamp) {
|
||||
if (timestamp == null)
|
||||
return "";
|
||||
|
||||
let timestampNow = Date.now();
|
||||
let timeDiff = timestampNow - timestamp;
|
||||
|
||||
|
|
|
|||
|
|
@ -17,8 +17,6 @@ export default {
|
|||
<input type="hidden" name="action-id" :value="event.id">
|
||||
|
||||
<div class="btn-toolbar pull-right">
|
||||
<template v-if="event.dataType === null">
|
||||
</template>
|
||||
<template v-else-if="event.dataType === 'ColorEventData'">
|
||||
<input type="hidden" name="type" value="color">
|
||||
<input type="color" name="data" onchange="this.form.submit()" :value="event.data?.valueStr">
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ export default {
|
|||
let event = eventStore.getEvent(this.id)
|
||||
return {
|
||||
event: event,
|
||||
timestamp: getRelTimestamp(event.data.timestamp)
|
||||
timestamp: getRelTimestamp(event.data?.timestamp)
|
||||
}
|
||||
},
|
||||
components: {
|
||||
|
|
@ -19,7 +19,7 @@ export default {
|
|||
<tr :data-device-id="event.id">
|
||||
<td><a :href="'?id=' + event.id">{{ event.name }}</a></td>
|
||||
<td>{{ event.configType }}</td>
|
||||
<td>{{ event.data.valueStr }}</td>
|
||||
<td>{{ event.data?.valueStr }}</td>
|
||||
<td class="timestamp">{{ timestamp }}</td>
|
||||
<td>
|
||||
<EventAction :id="event.id"/>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue