Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added incremental id in history items #142

Merged
merged 2 commits into from
Oct 24, 2023
Merged

Added incremental id in history items #142

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0ed7da
Added incremental id in history items
SMorettini Sep 13, 2023
5de53da
Switches to basic counter for incremental_id
LeStarch Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/fprime_gds/flask/static/js/datastore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,9 @@ class HistoryHelper {
let _self = this;
// Break our when no new items returned
if (new_items.length === 0) { return; }
new_items.filter((item) => item.time).forEach((item) => {
item.datetime = timeToDate(item.time)
new_items.filter((item) => item.time).forEach((item, index) => {
item.datetime = timeToDate(item.time);
item.incremental_id = index + this.store.length;
SMorettini marked this conversation as resolved.
Show resolved Hide resolved
});
this.consumers.forEach((consumer) => {
try {
Expand Down
2 changes: 1 addition & 1 deletion src/fprime_gds/flask/static/js/vue-support/event.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ Vue.component("event-list", {
* @return {string} unique key
*/
keyify(item) {
return "evt-" + item.id + "-" + item.time.seconds + "-"+ item.time.microseconds;
return "evt-" + item.id + "-" + item.time.seconds + "-"+ item.time.microseconds + "-" + item.incremental_id;
},
/**
* A function to clear events out of the data store. This is to reset the events entirely.
Expand Down
Loading