Commit Graph

103 Commits

Author SHA1 Message Date
Aarni Koskela
8c69c7a887 Soft-launch 2025 results (#21)
* Upgrade deps, require Python 3.13

Upgrade Bokeh

* Adjust makefile for 2025

* Hook up 2025

* Add 2025 survey data support

The 2025 survey uses a single English-only xlsx (instead of separate
fi/en files) with a restructured schema: compensation is split into
base salary, commission, lomaraha, bonus, and equity components;
working time is h/week instead of percentage; and competitive salary
is categorical instead of boolean. Vuositulot is now synthesized
from the component fields.

Drop COLUMN_MAP_2024, COLUMN_MAP_2024_EN_TO_FI, VALUE_MAP_2024_EN_TO_FI,
read_initial_dfs_2024, read_data_2024, map_sukupuoli, map_vuositulot,
split_boolean_column_to_other, apply_fixups, and the associated gender
value lists and boolean text maps. All of this exists in version history.

- KKPALKKA now includes base salary + commission (median 5500 → 5800)
- Apply map_numberlike to tuntilaskutus and vuosilaskutus columns to
  handle string values like "60 000" and "100 000"
- Filter out zeros when computing tunnusluvut on the index page so
  stats reflect actual reported values

* Add new charts
2026-03-12 16:02:29 +02:00
Aarni Koskela
ac79c18b09 Add new charts 2026-03-12 15:55:11 +02:00
Aarni Koskela
663cd3d349 Add 2025 survey data support
The 2025 survey uses a single English-only xlsx (instead of separate
fi/en files) with a restructured schema: compensation is split into
base salary, commission, lomaraha, bonus, and equity components;
working time is h/week instead of percentage; and competitive salary
is categorical instead of boolean. Vuositulot is now synthesized
from the component fields.

Drop COLUMN_MAP_2024, COLUMN_MAP_2024_EN_TO_FI, VALUE_MAP_2024_EN_TO_FI,
read_initial_dfs_2024, read_data_2024, map_sukupuoli, map_vuositulot,
split_boolean_column_to_other, apply_fixups, and the associated gender
value lists and boolean text maps. All of this exists in version history.

- KKPALKKA now includes base salary + commission (median 5500 → 5800)
- Apply map_numberlike to tuntilaskutus and vuosilaskutus columns to
  handle string values like "60 000" and "100 000"
- Filter out zeros when computing tunnusluvut on the index page so
  stats reflect actual reported values

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-12 15:40:13 +02:00
Aarni Koskela
5f720b8928 Hook up 2025 2026-03-12 15:40:13 +02:00
Aarni Koskela
242fc5bcb7 Adjust makefile for 2025 2026-03-12 15:23:03 +02:00
Aarni Koskela
1ee8f0d5de Upgrade deps, require Python 3.13
Upgrade Bokeh
2026-03-12 15:22:36 +02:00
Aarni Koskela
1d14bfe765 Renovate for 2025, uvify CI (#20) 2026-03-11 10:50:21 +02:00
Aarni Koskela
e4fd9ae1a7 Add verification for expected data length (#19) 2024-10-29 12:23:00 +02:00
Aarni Koskela
8784f379eb Merge pull request #18 from koodiklinikka/2024
2024 Edition
2024-10-28 11:54:13 +02:00
Aarni Koskela
81fc15a541 Update CI bits 2024-10-28 11:51:13 +02:00
Aarni Koskela
1a0ae2502b Update for 2024 2024-10-28 11:48:39 +02:00
Aarni Koskela
de20fd9283 Sort imports 2024-10-28 11:48:29 +02:00
Aarni Koskela
741fea1f7b Bump requirements 2024-10-28 11:48:29 +02:00
Aarni Koskela
001610bbc3 Merge pull request #17 from koodiklinikka/ids
Ids, vertical HTML, data fixups
2023-09-28 16:48:32 +03:00
Aarni Koskela
773aad8749 Drop and fixup data based on ID, not timestamp 2023-09-28 16:45:48 +03:00
Aarni Koskela
4a9a4ddbee Add vertical HTML 2023-09-28 16:45:48 +03:00
Aarni Koskela
471a1ee9da Add hashes as "Vastaustunniste" 2023-09-28 16:45:48 +03:00
Aarni Koskela
2195f6621d Modernize analysaattori packages (#16)
See https://github.com/plotly/react-pivottable/issues/150#issuecomment-1327602745
2023-09-28 13:00:44 +00:00
Aarni Koskela
ff8f98fd7a Merge pull request #15 from koodiklinikka/fix-lint
Fix lint issues, run lint in CI
2023-09-28 15:38:08 +03:00
Aarni Koskela
4907cd3792 Run pre-commit in CI 2023-09-28 15:30:30 +03:00
Aarni Koskela
fe06cc38bc Ruffify 2023-09-28 15:30:30 +03:00
Aarni Koskela
767c9a8ed6 Run prettier 2023-09-28 15:28:42 +03:00
Aarni Koskela
2049638e13 Adjust obvious data errors in TYOAIKA (h/t tvainika) 2023-09-25 14:16:59 +03:00
Aarni Koskela
6bb7038cc7 Merge pull request #14 from koodiklinikka/2023-improve
Improvements for 2023
2023-09-25 09:36:21 +03:00
Aarni Koskela
8c10561e86 Ingest new data 2023-09-25 09:29:39 +03:00
Aarni Koskela
1e223e6a26 Improve index page 2023-09-25 09:29:14 +03:00
Aarni Koskela
d71d0a188c Improve column maps, drop duplicate row 2023-09-25 09:23:37 +03:00
Aarni Koskela
d75eedbebb Merge pull request #13 from koodiklinikka/2023-prep
2023
2023-09-24 22:03:10 +03:00
Aarni Koskela
e730ee89fe Tweak everything for 2023 2023-09-24 22:00:19 +03:00
Aarni Koskela
5d40fcbae9 Link to 2023 2023-09-24 21:24:55 +03:00
Aarni Koskela
2437242126 Update makefile for 2023 2023-09-24 21:24:55 +03:00
Aarni Koskela
423ee1c991 Downgrade Bokeh to <3 (#12)
Should fix broken charts.html.
2023-09-24 21:23:26 +03:00
Aarni Koskela
00bd84bd6f Merge pull request #10 from koodiklinikka/dep-upgrades-etc
Dep upgrades, etc.
2023-09-24 15:34:47 +03:00
Aarni Koskela
0cb68e7486 Reorder makefile 2023-09-24 15:34:12 +03:00
Aarni Koskela
9f98b96c68 Switch to ydata-profiling 2023-09-24 15:32:07 +03:00
Aarni Koskela
ba95db768d Upgrade GHA workflow 2023-09-24 15:32:07 +03:00
Aarni Koskela
edc84f4e89 Upgrade dependencies 2023-09-24 15:32:07 +03:00
Aarni Koskela
e5f83801d9 Improve layout a bit v2022 2022-10-19 12:12:09 +03:00
Aarni Koskela
9e1ab195c6 Run black 2022-10-19 12:11:30 +03:00
Aarni Koskela
4e97f5fc3e Improve data normalization 2022-10-17 16:36:10 +03:00
Aarni Koskela
52a5c4bdff Refresh data 2022-10-17 15:37:45 +03:00
Aarni Koskela
5f766518e8 Update data 2022-10-10 12:31:42 +03:00
Aarni Koskela
aa060b10a4 Merge massage scripts (for templating), prettify HTML 2022-10-10 12:31:20 +03:00
Aarni Koskela
335cf15064 Apply some data fixes 2022-10-10 12:07:48 +03:00
Aarni Koskela
938e37c720 Do 2022 2022-10-10 11:54:49 +03:00
Aarni Koskela
36c8c0c65d Link to 2022 2022-10-04 10:13:14 +03:00
Aarni Koskela
aff1533f7f Update ingestion script for 2022 2022-10-04 10:11:03 +03:00
Aarni Koskela
f5b1f83ff6 Update dependencies 2022-10-04 10:11:03 +03:00
Juha-Matti Santala
d3cf581c2b Revert autoformatting 2022-09-27 14:14:00 +03:00
Juha-Matti Santala
b87b488aee Add year to the title and heading of individual yearly pages
Make it clearer to the reader which year's results they are reading
2022-09-27 14:14:00 +03:00