Skip to content

Ojs error hotfix #56

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

Merged
mathjoha merged 2 commits into from
Jan 27, 2025
Merged

Ojs error hotfix #56

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
465dc91
Remove empty box
mathjoha Jan 27, 2025
2ceec5f
Hotfix #49, prevent usage of empty selections
mathjoha Jan 27, 2025
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
21 changes: 11 additions & 10 deletions dashboard.qmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,7 @@ used_names = [ ... new Set(db.map((d) => d.name_sv)) ]

```{ojs}
//| output: false

target_codes = codes.map( (d) => d.code)

years = Object.fromEntries(['min', 'max'].map((k, i) => [k, d3.extent(ranges)[i]]))
Expand All @@ -273,11 +274,11 @@ name_filter = target_inn.length === 0 ? (d) => (true) : (d) => (
new String(d.inn_id).includes(target_inn)
)


db_filtered = db.filter(prod_filter)
.filter(year_filter)
.filter(firm_filter)
.filter(name_filter)
tmpdb = db.filter(prod_filter)
.filter(year_filter)
.filter(firm_filter)
.filter(name_filter)
db_filtered = tmpdb.length == 0 ? db : tmpdb

tl = Array.from(d3.group(db_filtered, d => d.year))

Expand Down Expand Up @@ -315,17 +316,16 @@ timeline_raw = [].concat(
value: undefined,
}]
)
console.log(timeline_raw)


function fill_in_zeros(data, labels){
let result = [];
for (let year = years.min; year <= years.max; year++){
let year_object = data.find((t) => t.year == year)
let year_object = data.find((t) => t.year == year);

labels.forEach((label) => {
let value = data.find((t) => t.label == label && t.year == year, false)
let date = new Date(year, 0, 1)
let date = new Date(year, 0, 1);
if (label == 'Patented' && year > 2015){
// Patents past 2015 are not in the data.
result.push({
Expand Down Expand Up @@ -354,14 +354,15 @@ function fill_in_zeros(data, labels){

timeline_data = fill_in_zeros(timeline_raw, ['Innovations', 'Patented'])

console.log(timeline_data)

```

```{ojs}
//| output: false

title = d3.selectAll('.trendCard')
.selectAll('.card-title')
.text(`Trends of ${ts(db_filtered.length)} SWINNO innovations `)
.text(`Trends of ${ts(tmpdb.length)} SWINNO innovations `)

footer_right = d3.selectAll('.nav-footer-left')
.append('p')
Expand Down