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

Add Purchase heatmap #352

Merged
merged 68 commits into from
Sep 30, 2023
Merged

Add Purchase heatmap #352

Show file tree
Hide file tree
Changes from 61 commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
c1d8f32
Added mockup heatmap to user-page.
krestenlaust Sep 2, 2023
d1f700a
Merge branch 'f-klubben:next' into purchase-heatmap
krestenlaust Sep 3, 2023
908a952
Updated mockup to better reflect target html.
krestenlaust Sep 3, 2023
c3fb197
Merge branch 'purchase-heatmap' of https://github.com/krestenlaust/st…
krestenlaust Sep 3, 2023
f16239b
Added empty functions for acquiring and transforming heatmap data.
krestenlaust Sep 3, 2023
9f3856d
Proper generation of mockup data in method. Partially finished transf…
krestenlaust Sep 3, 2023
da2d722
Finished replacing mockup with HTML generated using django templates.
krestenlaust Sep 3, 2023
bd74eec
Merge branch 'next' into purchase-heatmap
krestenlaust Sep 3, 2023
6198fe6
Removed outer div, and removed commented code.
krestenlaust Sep 3, 2023
485ff25
Finished logic for retrieving latest purchases and transforming it.
krestenlaust Sep 3, 2023
c199651
Reformatted and removed redundant imports
krestenlaust Sep 3, 2023
affab84
Corrected off-by-one error in day rendering. Finished database queryi…
krestenlaust Sep 4, 2023
2df70b8
Reformatted code using black
krestenlaust Sep 4, 2023
2bb08be
Finished implementing database lookup! Basic heatmap functionality is…
krestenlaust Sep 5, 2023
a648732
Merge branch 'next' into purchase-heatmap
krestenlaust Sep 5, 2023
4b4f791
Inverse filtering
krestenlaust Sep 6, 2023
dd73440
Removed mockup function
krestenlaust Sep 6, 2023
baf1399
moved heatmap logic into separate file
krestenlaust Sep 6, 2023
b94e8c3
Moved remaining function to separate file, and added typing
krestenlaust Sep 6, 2023
4eab769
Prepared table to support multiple color modes
krestenlaust Sep 6, 2023
8907d1f
Finished multiview, and added general view, and figure description
krestenlaust Sep 7, 2023
6405026
Temporarily added heatmap testdata
krestenlaust Sep 7, 2023
d8f0576
Made general-view the primary view, and improved template code. Remov…
krestenlaust Sep 9, 2023
d6e9593
Inverted brightness, to make darker colors show more activity. Offset…
krestenlaust Sep 9, 2023
8489956
Swapped figure button text, to display the next mode instead of current.
krestenlaust Sep 9, 2023
9e79226
Partially finished abstracting heatmap color modes
krestenlaust Sep 14, 2023
8328017
Finished abstracting heatmap color modes. Added separate buttons for …
krestenlaust Sep 14, 2023
d59af25
Proposed solution for displaying purchased products
krestenlaust Sep 15, 2023
2c80d85
Removed iter from query loop
krestenlaust Sep 16, 2023
25e3beb
Selects related product field immediately instead of making duplicate…
krestenlaust Sep 16, 2023
2f5221b
Improved appearance
krestenlaust Sep 16, 2023
2b46afe
Made product count appear whenever mouse enters figure. Styled number…
krestenlaust Sep 16, 2023
aee0aed
Finished money-used color mode. Made title show current mode selected…
krestenlaust Sep 17, 2023
2e816a7
Improved interactivity by adding day summaries, every day now shows t…
krestenlaust Sep 17, 2023
b5133df
Fixed crash on rendering other than 10 weeks
krestenlaust Sep 17, 2023
601463e
Resolved crash on empty heatmap. Corrected week numbers on new year w…
krestenlaust Sep 17, 2023
6d593ed
"Vare" vs. "varer"
krestenlaust Sep 17, 2023
155e227
Added RGB interpolation for color values.
krestenlaust Sep 17, 2023
abc1937
test
falkecarlsen Sep 18, 2023
55f6155
test
falkecarlsen Sep 18, 2023
b83c552
Merge remote-tracking branch 'origin/github-actions2' into purchase-h…
falkecarlsen Sep 18, 2023
241ccbd
dummy change to trigger CI
falkecarlsen Sep 18, 2023
993c746
Revert "dummy change to trigger CI"
falkecarlsen Sep 18, 2023
28b8d6e
fixup py versions
falkecarlsen Sep 18, 2023
04e33f0
add caching to build
falkecarlsen Sep 18, 2023
0392aef
nop
falkecarlsen Sep 18, 2023
8906e3e
Merge remote-tracking branch 'origin/github-actions2' into purchase-h…
falkecarlsen Sep 18, 2023
255584f
nop
falkecarlsen Sep 18, 2023
d7f5f5a
try reverting action-version
falkecarlsen Sep 18, 2023
a578fa4
Merge branch 'next' into purchase-heatmap
falkecarlsen Sep 18, 2023
f761c7c
nop
falkecarlsen Sep 18, 2023
b967717
Abstracted heatmap preparation into new method.
krestenlaust Sep 18, 2023
430c1c6
Made a few tests. Need to improve further.
krestenlaust Sep 18, 2023
accee71
Finished tests
krestenlaust Sep 19, 2023
b51e526
Removed color brightness from category heatmap
krestenlaust Sep 19, 2023
3f0b9dd
Displays 12 weeks default, as it corresponds to last 3 months
krestenlaust Sep 21, 2023
ad06c7e
Reorganized code, removed some comments, and added docstring
krestenlaust Sep 21, 2023
c2641e2
Whoops. Should work now.
krestenlaust Sep 21, 2023
b8358a6
Resolved bug for when a purchased product isn't in the table anymore,…
krestenlaust Sep 21, 2023
10db095
Test errors interpret now as well
krestenlaust Sep 21, 2023
188febe
Updated fixture
krestenlaust Sep 21, 2023
d6083be
Changed event listening method
krestenlaust Sep 21, 2023
b31496a
Resolved nested loops
krestenlaust Sep 22, 2023
ca157cf
Resolved issue (my laptop setup is non-optimal)
krestenlaust Sep 22, 2023
2082681
Reduced category/product lookup from 6 queries to 3.
krestenlaust Sep 23, 2023
22ffc40
Refactored function names, and corrected typing
krestenlaust Sep 26, 2023
4feddf5
Changed the colors on the category chart, to (kind of) make it better…
krestenlaust Sep 27, 2023
6c8edc6
Black formatter
krestenlaust Sep 27, 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
2 changes: 1 addition & 1 deletion .github/workflows/django.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
python-version: ["3.6.9", "3.7.17", "3.11.5"] # 3.6.9 is what is running on prod

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
Expand Down
Loading
Loading