Skip to content

Commit d0d3682

Browse files
committed
fix: fixed Score visualization on Android
1 parent 0282eec commit d0d3682

File tree

3 files changed

+10
-20
lines changed

3 files changed

+10
-20
lines changed

src/components/SelectableVisualization.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ div
7979
div(v-if="type == 'vis_timeline' && isSingleDay")
8080
vis-timeline(:buckets="timeline_buckets", :showRowLabels='true', :queriedInterval="timeline_daterange")
8181
div(v-if="type == 'score'")
82-
aw-score(:date="date")
82+
aw-score()
8383
</template>
8484

8585
<style lang="scss">

src/stores/activity.ts

+9-16
Original file line numberDiff line numberDiff line change
@@ -340,13 +340,7 @@ export const useActivityStore = defineStore('activity', {
340340
always_active_pattern,
341341
});
342342
const data = await getClient().query(periods, q, { name: 'multidevice', verbose: true });
343-
const data_window = data[0].window;
344-
345-
// Set $color and $score for categories
346-
data_window.cat_events = colorCategories(data_window.cat_events);
347-
data_window.cat_events = scoreCategories(data_window.cat_events);
348-
349-
this.query_window_completed(data_window);
343+
this.query_window_completed(data[0].window);
350344
},
351345

352346
async query_desktop_full({
@@ -378,15 +372,8 @@ export const useActivityStore = defineStore('activity', {
378372
name: 'fullDesktopQuery',
379373
verbose: true,
380374
});
381-
const data_window = data[0].window;
382-
const data_browser = data[0].browser;
383-
384-
// Set $color and $score for categories
385-
data_window.cat_events = colorCategories(data_window.cat_events);
386-
data_window.cat_events = scoreCategories(data_window.cat_events);
387-
388-
this.query_window_completed(data_window);
389-
this.query_browser_completed(data_browser);
375+
this.query_window_completed(data[0].window);
376+
this.query_browser_completed(data[0].browser);
390377
},
391378

392379
async query_editor({ timeperiod }) {
@@ -701,6 +688,12 @@ export const useActivityStore = defineStore('activity', {
701688
this: State,
702689
data = { app_events: [], title_events: [], cat_events: [], active_events: [], duration: 0 }
703690
) {
691+
// Set $color and $score for categories
692+
if (data.cat_events) {
693+
data.cat_events = colorCategories(data.cat_events);
694+
data.cat_events = scoreCategories(data.cat_events);
695+
}
696+
704697
this.window.top_apps = data.app_events;
705698
this.window.top_titles = data.title_events;
706699
this.category.top = data.cat_events;

src/visualizations/Score.vue

-3
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ import { useActivityStore } from '~/stores/activity';
4242
4343
export default {
4444
name: 'aw-score',
45-
props: {
46-
fields: Array,
47-
},
4845
computed: {
4946
categories_with_score: function () {
5047
// FIXME: Does this get all category time? Or just top ones?

0 commit comments

Comments
 (0)