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

CodeWOF Gamification #75

Merged
merged 27 commits into from
Apr 15, 2020
Merged

CodeWOF Gamification #75

merged 27 commits into from
Apr 15, 2020

Conversation

MareePalmer
Copy link
Contributor

Gamification elements of CodeWOF

Main features:

  • Points system: Users earn points from solving questions and earning badges. These are calculated when a question is attempted. Bonus points are earned for correct answers on the user's first try
  • Badges system: Users earn badges for account creation, consecutive days with questions attempted, number of questions attempted and number of questions solved. These are earned when a question is attempted. (Badges could potentially have issues when not loaded through ./dev sampledata)
  • Backdating of current users' points and badges via ./dev backdate (this command still has issues running as a ./dev command, so still figuring out what's wrong with it)
  • Feature files detailing tests for points and badges

MareePalmer and others added 20 commits July 3, 2019 19:13
@MareePalmer
Implemented points system with deductions for incomplete attempts
a204c96
@MareePalmer
Fixed unit tests for profile.
bb50db9
@MareePalmer
Got badges working on CodeWOF website. Moved ProfileView functions to…
d338cb2 
… codewof_utils file.
@MareePalmer
Added badges for consecutive days with attempts. Implementation begun…
ef4c80a 
… on determining number of consecutive days for attempts to award badges.
@MareePalmer
Completed consecutive day badge calculations in async attempt request.
722225f
@MareePalmer
Added test data generator for test classes in codewof system
e031a04
@MareePalmer
Merge branch 'develop' into issue/gamification
dd6ebb1 
# Conflicts:
#	codewof/codewof/admin.py
#	codewof/codewof/views.py
#	codewof/general/management/commands/sampledata.py
#	codewof/programming/models.py
#	codewof/programming/urls.py
#	codewof/templates/users/user_detail.html
#	codewof/users/views.py
@MareePalmer
Ensured points system worked in merged app. Added points in dashbar b…
5225b60 
…y user dashboard link. Implemented backdate of points and badges. Re-engineered point allocation for questions.
@MareePalmer
Added custom backdate command. Fixed points adding per question - now…
2be31d2 
… adds extra point for correct on the first try correctly.
@MareePalmer
Added custom badge card html - not quite functional yet
4011b33
@MareePalmer
Added code for toasts when badges earned (toasts still don't show - b…
1b4bd13 
…ug). Added more attempts to test data generator. User test creation broken - user_type)
@MareePalmer
Attempted to use UserFactory to generate test users, unsuccessful. Ad…
7e093a0 
…ded badge_tier field to Badge model for points calculation.
@MareePalmer
Merge branch 'develop' into issue/gamification
06c93ed
@MareePalmer
Added badge point calculations
1d172bb
@MareePalmer
Toasts now showing. Custom text based on badge earned yet to be imple…
7e83a04 
…mented due to not recognizing toast component IDs.
Added feature files to detail gamification tests.
35a6839
Changed sampledata creation badge to be tier 0 (no points). Added mor…
08d7e8c 
…e points feature tests for attempting and solving questions, and earning a badge.
@MareePalmer
Removed activity graph from dashboard. Fixed toasts to show custom ba…
471e43a 
…dge messages when achieved.
Updated feature files
891aad1
Merge https://github.com/uccser/codewof into develop
3505543
@eAlasdair
Copy link
Contributor

eAlasdair commented Sep 22, 2019 •
edited
Loading

You can view the reasons the build failed by clicking Details and then the job that failed - In your case everything after Running PEP8 style checker... are issues that need addressing

(You can check it locally with ./dev style)

@courtneycb
Copy link
Contributor

You can view the reasons the build failed by clicking Details and then the job that failed - In your case it's everything after Running PEP8 style checker... are issues that need addressing

Also, once you make style fixes you can run ./dev style on your branch to see if you missed any.

@courtneycb courtneycb requested review from caitlind, eAlasdair and courtneycb and removed request for caitlind September 22, 2019 22:52
eAlasdair
eAlasdair reviewed Sep 23, 2019
View reviewed changes
Copy link
Contributor

@eAlasdair eAlasdair left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not used to dealing with forked projects so having some trouble loading it up to test. For now here are a couple of things I noticed just reading though the changed files. Looks like some great work 👍

codewof/codewof/codewof_utils.py Show resolved Hide resolved
codewof/codewof/codewof_utils.py Show resolved Hide resolved
codewof/static/svg/icons8-points.svg
@@ -0,0 +1 @@
<svg id="svg" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="400" height="400" viewBox="0, 0, 400,400"><g id="svgg"><path id="path0" d="M196.314 89.301 C 195.936 90.236,195.437 91.868,195.205 92.930 C 194.687 95.299,193.188 98.328,192.002 99.399 C 190.739 100.541,190.124 101.895,189.375 105.189 C 188.691 108.196,187.015 111.179,185.422 112.222 C 184.270 112.977,183.706 114.242,182.976 117.716 C 182.227 121.277,180.568 124.383,179.153 124.876 C 178.096 125.245,176.800 127.705,176.800 129.343 C 176.800 131.274,174.732 136.245,173.449 137.400 C 171.811 138.873,170.984 140.443,170.605 142.800 C 170.134 145.722,168.815 148.326,167.043 149.831 C 166.139 150.598,164.768 152.346,163.995 153.713 C 161.841 157.526,160.799 157.910,151.800 158.200 C 142.344 158.504,138.793 159.006,135.779 160.462 C 131.647 162.459,122.927 163.693,108.000 164.393 C 95.309 164.988,93.344 165.331,90.679 167.423 C 88.058 169.480,85.961 172.054,86.705 172.302 C 87.533 172.578,90.433 175.131,91.634 176.642 C 92.251 177.420,93.487 178.584,94.378 179.230 C 95.270 179.876,96.000 180.559,96.000 180.747 C 96.000 180.936,97.019 182.060,98.265 183.245 C 99.511 184.430,101.904 186.795,103.584 188.500 C 105.263 190.205,106.759 191.600,106.908 191.600 C 107.056 191.600,110.047 194.435,113.555 197.900 C 117.062 201.365,122.062 206.223,124.666 208.695 C 130.075 213.831,130.089 213.844,132.924 216.800 C 134.085 218.010,135.524 219.325,136.123 219.723 C 139.263 221.809,140.196 225.949,139.625 235.262 C 138.723 249.980,137.818 255.320,135.640 258.766 C 134.188 261.063,133.780 263.563,132.990 275.000 C 132.119 287.613,131.226 292.239,129.058 295.368 C 127.656 297.392,126.783 303.279,127.700 304.529 C 128.263 305.296,135.227 304.118,135.532 303.204 C 136.202 301.195,140.523 298.763,145.464 297.616 C 147.156 297.224,147.616 296.927,148.012 295.972 C 148.774 294.132,152.641 292.240,157.309 291.424 C 158.427 291.229,159.048 290.810,159.703 289.811 C 160.850 288.062,162.041 287.388,166.404 286.020 C 169.495 285.051,170.322 284.588,172.399 282.665 C 174.068 281.120,175.268 280.350,176.304 280.158 C 179.625 279.542,182.221 278.353,183.999 276.632 C 185.417 275.260,186.335 274.757,188.311 274.268 C 191.716 273.427,193.948 272.395,194.221 271.535 C 195.259 268.264,205.141 268.264,206.179 271.535 C 206.457 272.409,208.499 273.320,212.200 274.220 C 215.725 275.078,216.958 275.705,218.068 277.206 C 218.891 278.319,222.351 280.000,223.819 280.000 C 225.009 280.000,228.162 281.788,229.826 283.405 C 231.481 285.013,233.022 285.761,236.800 286.789 C 238.066 287.134,239.168 287.865,240.514 289.252 C 241.747 290.525,242.884 291.308,243.714 291.458 C 248.883 292.391,253.200 294.738,253.200 296.613 C 253.200 296.936,253.458 297.200,253.773 297.200 C 257.157 297.200,264.565 301.021,265.243 303.115 C 265.335 303.399,266.648 303.890,268.161 304.206 C 269.674 304.523,271.236 304.884,271.632 305.010 C 273.460 305.590,273.417 298.242,271.580 296.200 C 269.405 293.782,268.300 288.214,267.413 275.200 C 266.645 263.927,266.254 261.567,264.753 259.171 C 262.624 255.772,261.662 250.016,260.776 235.400 C 260.134 224.790,260.656 223.126,266.114 218.400 C 267.765 216.970,269.307 215.405,269.540 214.921 C 269.773 214.438,270.461 213.718,271.070 213.321 C 271.679 212.925,272.812 211.881,273.588 211.003 C 275.266 209.105,276.457 207.935,278.834 205.850 C 282.267 202.838,291.406 193.789,291.811 193.000 C 292.037 192.560,292.784 191.930,293.471 191.600 C 294.157 191.270,297.392 188.282,300.660 184.961 C 303.927 181.639,307.005 178.708,307.500 178.447 C 307.995 178.186,308.400 177.810,308.400 177.612 C 308.400 176.950,311.598 173.727,313.008 172.968 C 314.753 172.028,314.763 172.100,312.565 169.871 C 308.323 165.568,305.688 164.862,291.400 164.202 C 279.968 163.673,270.838 162.163,267.339 160.221 C 265.216 159.043,260.492 158.508,249.600 158.211 C 239.522 157.935,238.632 157.634,236.405 153.749 C 235.632 152.401,234.314 150.708,233.476 149.987 C 231.626 148.395,230.660 146.574,229.982 143.400 C 229.311 140.264,228.732 139.155,226.690 137.101 C 225.186 135.588,224.920 135.025,224.277 132.000 C 223.181 126.849,222.538 125.326,221.272 124.885 C 219.819 124.378,218.178 121.300,217.407 117.632 C 216.688 114.214,216.290 113.392,214.712 112.065 C 212.880 110.523,211.768 108.458,211.034 105.231 C 210.269 101.866,209.881 101.004,208.499 99.603 C 207.276 98.363,205.787 95.453,205.427 93.600 C 205.277 92.830,204.783 91.165,204.329 89.900 L 203.502 87.600 200.251 87.601 L 197.000 87.603 196.314 89.301 " stroke="none" fill="#fcfcfb" fill-rule="evenodd"></path><path id="path1" d="M196.138 84.103 C 195.664 84.816,194.809 86.717,194.237 88.328 C 192.995 91.825,191.297 95.493,190.769 95.819 C 190.143 96.206,188.943 98.815,187.845 102.179 C 186.846 105.236,185.129 108.400,184.468 108.400 C 183.929 108.400,182.557 111.226,181.436 114.644 C 180.850 116.428,179.793 118.753,179.086 119.810 C 176.309 123.960,175.558 125.353,175.134 127.141 C 174.435 130.084,173.934 131.225,172.541 133.050 C 171.007 135.059,169.897 137.182,169.220 139.400 C 168.416 142.030,167.577 143.670,165.738 146.200 C 164.778 147.520,163.138 149.858,162.094 151.396 C 159.724 154.884,159.329 155.067,152.542 155.809 C 149.494 156.143,143.760 156.785,139.800 157.238 C 135.840 157.690,131.160 158.212,129.400 158.397 C 127.640 158.583,124.130 159.274,121.600 159.932 C 116.616 161.228,110.210 162.091,100.245 162.808 C 93.134 163.320,84.962 164.471,83.722 165.135 C 80.922 166.633,82.641 174.800,85.756 174.800 C 86.046 174.800,87.367 176.015,88.691 177.500 C 92.837 182.149,102.279 191.478,104.123 192.747 C 105.093 193.414,106.407 194.596,107.043 195.373 C 108.817 197.539,115.625 204.421,117.621 206.065 C 122.849 210.372,137.015 225.173,137.582 226.920 C 138.502 229.756,136.564 243.941,134.402 250.200 C 133.286 253.429,132.146 260.063,131.394 267.703 C 130.609 275.677,129.552 281.557,127.994 286.618 C 124.593 297.670,124.775 309.388,128.331 308.266 C 135.490 306.007,137.754 304.998,139.982 303.074 C 141.341 301.901,143.648 300.745,147.200 299.460 C 148.190 299.101,149.944 298.033,151.099 297.085 C 152.253 296.137,153.873 295.124,154.699 294.833 C 157.436 293.868,162.155 291.476,163.804 290.218 C 164.697 289.536,167.036 288.443,169.000 287.789 C 171.656 286.905,172.952 286.223,174.059 285.127 C 176.147 283.059,177.023 282.552,180.205 281.571 C 183.753 280.478,185.359 279.656,187.694 277.737 C 192.000 274.199,200.266 272.571,205.400 274.250 C 210.734 275.994,212.060 276.575,213.473 277.782 C 215.350 279.385,217.374 280.418,220.922 281.585 C 222.630 282.147,224.317 283.062,225.453 284.046 C 227.576 285.883,228.539 286.411,232.673 288.003 C 234.367 288.655,236.400 289.709,237.190 290.344 C 239.024 291.818,241.982 293.310,244.858 294.212 C 246.266 294.653,248.101 295.710,249.735 297.020 C 251.249 298.234,253.251 299.411,254.477 299.808 C 257.852 300.901,259.273 301.622,261.248 303.243 C 263.202 304.847,264.844 305.676,269.410 307.362 C 272.913 308.656,272.592 308.697,273.852 306.794 C 275.799 303.851,274.944 295.567,271.451 283.530 C 270.897 281.622,270.074 276.942,269.622 273.130 C 267.997 259.434,267.505 256.143,266.519 252.400 C 264.319 244.044,263.961 242.446,263.424 238.600 C 261.776 226.796,261.648 227.222,269.142 219.559 C 272.240 216.392,275.197 213.350,275.714 212.800 C 277.093 211.332,283.089 205.945,284.331 205.059 C 284.919 204.639,285.988 203.513,286.707 202.555 C 287.426 201.598,288.804 200.226,289.770 199.507 C 290.735 198.788,291.819 197.710,292.179 197.111 C 292.538 196.511,293.842 195.161,295.076 194.111 C 297.182 192.317,301.820 187.983,304.298 185.492 C 309.309 180.455,311.962 177.644,312.533 176.766 C 312.903 176.198,313.699 175.487,314.303 175.186 C 317.651 173.521,318.000 173.008,318.000 169.753 C 318.000 164.472,317.347 164.229,298.800 162.602 C 290.954 161.914,284.180 160.814,280.358 159.605 C 278.951 159.160,276.180 158.623,274.200 158.410 C 272.220 158.197,269.250 157.848,267.600 157.633 C 265.950 157.418,261.990 157.043,258.800 156.798 C 241.404 155.463,240.928 155.340,238.355 151.501 C 237.434 150.125,235.798 147.797,234.721 146.326 C 233.590 144.781,232.260 142.274,231.571 140.386 C 230.112 136.387,229.525 135.232,227.808 132.983 C 226.454 131.210,224.800 127.389,224.800 126.035 C 224.800 125.212,223.438 122.744,221.418 119.908 C 220.677 118.867,219.580 116.527,218.981 114.708 C 217.596 110.505,217.189 109.718,215.507 107.989 C 214.752 107.213,213.818 105.683,213.433 104.589 C 211.473 99.032,210.633 97.062,209.802 96.075 C 208.777 94.857,208.022 93.222,206.370 88.648 C 204.399 83.190,203.993 82.805,200.200 82.805 C 197.035 82.805,196.991 82.820,196.138 84.103 M204.329 89.900 C 204.783 91.165,205.277 92.830,205.427 93.600 C 205.787 95.453,207.276 98.363,208.499 99.603 C 209.881 101.004,210.269 101.866,211.034 105.231 C 211.768 108.458,212.880 110.523,214.712 112.065 C 216.290 113.392,216.688 114.214,217.407 117.632 C 218.178 121.300,219.819 124.378,221.272 124.885 C 222.538 125.326,223.181 126.849,224.277 132.000 C 224.920 135.025,225.186 135.588,226.690 137.101 C 228.732 139.155,229.311 140.264,229.982 143.400 C 230.660 146.574,231.626 148.395,233.476 149.987 C 234.314 150.708,235.632 152.401,236.405 153.749 C 238.632 157.634,239.522 157.935,249.600 158.211 C 260.492 158.508,265.216 159.043,267.339 160.221 C 270.838 162.163,279.968 163.673,291.400 164.202 C 305.688 164.862,308.323 165.568,312.565 169.871 C 314.763 172.100,314.753 172.028,313.008 172.968 C 311.598 173.727,308.400 176.950,308.400 177.612 C 308.400 177.810,307.995 178.186,307.500 178.447 C 307.005 178.708,303.927 181.639,300.660 184.961 C 297.392 188.282,294.157 191.270,293.471 191.600 C 292.784 191.930,292.037 192.560,291.811 193.000 C 291.406 193.789,282.267 202.838,278.834 205.850 C 276.457 207.935,275.266 209.105,273.588 211.003 C 272.812 211.881,271.679 212.925,271.070 213.321 C 270.461 213.718,269.773 214.438,269.540 214.921 C 269.307 215.405,267.765 216.970,266.114 218.400 C 260.656 223.126,260.134 224.790,260.776 235.400 C 261.662 250.016,262.624 255.772,264.753 259.171 C 266.254 261.567,266.645 263.927,267.413 275.200 C 268.300 288.214,269.405 293.782,271.580 296.200 C 273.417 298.242,273.460 305.590,271.632 305.010 C 271.236 304.884,269.674 304.523,268.161 304.206 C 266.648 303.890,265.335 303.399,265.243 303.115 C 264.565 301.021,257.157 297.200,253.773 297.200 C 253.458 297.200,253.200 296.936,253.200 296.613 C 253.200 294.738,248.883 292.391,243.714 291.458 C 242.884 291.308,241.747 290.525,240.514 289.252 C 239.168 287.865,238.066 287.134,236.800 286.789 C 233.022 285.761,231.481 285.013,229.826 283.405 C 228.162 281.788,225.009 280.000,223.819 280.000 C 222.351 280.000,218.891 278.319,218.068 277.206 C 216.958 275.705,215.725 275.078,212.200 274.220 C 208.499 273.320,206.457 272.409,206.179 271.535 C 205.141 268.264,195.259 268.264,194.221 271.535 C 193.948 272.395,191.716 273.427,188.311 274.268 C 186.335 274.757,185.417 275.260,183.999 276.632 C 182.221 278.353,179.625 279.542,176.304 280.158 C 175.268 280.350,174.068 281.120,172.399 282.665 C 170.322 284.588,169.495 285.051,166.404 286.020 C 162.041 287.388,160.850 288.062,159.703 289.811 C 159.048 290.810,158.427 291.229,157.309 291.424 C 152.641 292.240,148.774 294.132,148.012 295.972 C 147.616 296.927,147.156 297.224,145.464 297.616 C 140.523 298.763,136.202 301.195,135.532 303.204 C 135.227 304.118,128.263 305.296,127.700 304.529 C 126.783 303.279,127.656 297.392,129.058 295.368 C 131.226 292.239,132.119 287.613,132.990 275.000 C 133.780 263.563,134.188 261.063,135.640 258.766 C 137.818 255.320,138.723 249.980,139.625 235.262 C 140.196 225.949,139.263 221.809,136.123 219.723 C 135.524 219.325,134.085 218.010,132.924 216.800 C 130.089 213.844,130.075 213.831,124.666 208.695 C 122.062 206.223,117.062 201.365,113.555 197.900 C 110.047 194.435,107.056 191.600,106.908 191.600 C 106.759 191.600,105.263 190.205,103.584 188.500 C 101.904 186.795,99.511 184.430,98.265 183.245 C 97.019 182.060,96.000 180.936,96.000 180.747 C 96.000 180.559,95.270 179.876,94.378 179.230 C 93.487 178.584,92.251 177.420,91.634 176.642 C 90.433 175.131,87.533 172.578,86.705 172.302 C 85.961 172.054,88.058 169.480,90.679 167.423 C 93.344 165.331,95.309 164.988,108.000 164.393 C 122.927 163.693,131.647 162.459,135.779 160.462 C 138.793 159.006,142.344 158.504,151.800 158.200 C 160.799 157.910,161.841 157.526,163.995 153.713 C 164.768 152.346,166.139 150.598,167.043 149.831 C 168.815 148.326,170.134 145.722,170.605 142.800 C 170.984 140.443,171.811 138.873,173.449 137.400 C 174.732 136.245,176.800 131.274,176.800 129.343 C 176.800 127.705,178.096 125.245,179.153 124.876 C 180.568 124.383,182.227 121.277,182.976 117.716 C 183.706 114.242,184.270 112.977,185.422 112.222 C 187.015 111.179,188.691 108.196,189.375 105.189 C 190.124 101.895,190.739 100.541,192.002 99.399 C 193.188 98.328,194.687 95.299,195.205 92.930 C 195.437 91.868,195.936 90.236,196.314 89.301 L 197.000 87.603 200.251 87.601 L 203.502 87.600 204.329 89.900 " stroke="none" fill="#f4dfa7" fill-rule="evenodd"></path><path id="path2" d="M195.466 81.580 C 194.156 83.030,192.699 86.736,191.843 90.800 C 191.727 91.350,190.845 92.633,189.882 93.650 C 188.161 95.470,187.332 97.406,185.982 102.756 C 185.682 103.945,184.900 105.188,183.561 106.604 C 181.616 108.660,180.812 110.389,179.600 115.118 C 179.318 116.219,178.451 117.618,177.189 119.012 C 176.105 120.209,175.114 121.686,174.987 122.294 C 173.858 127.688,172.891 130.038,171.220 131.444 C 169.916 132.542,168.274 136.090,167.564 139.346 C 167.164 141.178,166.673 142.097,165.322 143.546 C 164.370 144.566,162.676 146.890,161.558 148.711 C 158.400 153.853,156.922 154.280,137.000 155.791 C 125.628 156.654,119.698 157.575,116.000 159.055 C 113.348 160.116,108.427 160.778,98.527 161.406 C 84.497 162.297,82.794 162.594,80.141 164.618 L 78.878 165.581 79.639 168.026 C 80.058 169.371,80.400 170.832,80.400 171.274 C 80.400 172.692,81.754 174.444,83.449 175.219 C 84.356 175.634,85.616 176.625,86.249 177.421 C 87.322 178.771,89.005 180.519,91.735 183.119 C 92.360 183.713,93.304 184.870,93.833 185.689 C 94.362 186.507,95.292 187.434,95.898 187.748 C 97.028 188.333,100.800 191.953,100.800 192.453 C 100.800 192.606,101.669 193.266,102.732 193.920 C 103.794 194.574,105.099 195.699,105.632 196.420 C 106.164 197.141,107.888 199.006,109.463 200.565 C 111.037 202.124,112.625 203.883,112.991 204.473 C 113.357 205.063,114.795 206.300,116.187 207.221 C 117.578 208.143,118.960 209.353,119.258 209.909 C 119.556 210.466,120.754 211.627,121.921 212.489 C 123.088 213.351,124.561 214.899,125.195 215.928 C 125.829 216.958,126.890 218.119,127.552 218.510 C 128.215 218.900,129.873 220.475,131.237 222.010 C 132.601 223.544,133.946 224.800,134.226 224.800 C 136.958 224.800,136.888 236.052,134.115 242.579 C 132.500 246.381,131.658 250.133,131.016 256.400 C 130.690 259.590,130.146 264.900,129.808 268.200 C 129.155 274.574,128.676 276.728,127.034 280.651 C 125.751 283.716,124.963 288.737,124.451 297.112 C 123.929 305.659,124.297 307.907,126.537 309.824 L 128.119 311.178 129.432 310.026 C 130.154 309.392,131.792 308.579,133.072 308.219 C 138.961 306.565,139.777 306.219,141.177 304.778 C 142.853 303.054,145.069 301.862,148.647 300.756 C 150.493 300.186,151.674 299.517,152.723 298.446 C 154.045 297.097,155.909 296.106,161.421 293.821 C 162.313 293.452,163.607 292.622,164.297 291.977 C 165.096 291.231,167.191 290.220,170.055 289.198 C 173.960 287.805,174.774 287.354,176.179 285.804 C 177.609 284.227,178.247 283.883,181.600 282.875 C 186.356 281.445,187.601 280.798,189.048 279.007 C 192.998 274.116,207.401 274.130,211.900 279.029 C 213.332 280.588,215.931 281.869,220.311 283.173 C 222.683 283.880,223.408 284.306,224.454 285.607 C 225.638 287.081,229.454 288.936,233.893 290.196 C 234.384 290.335,235.554 291.147,236.493 291.998 C 237.723 293.114,239.442 294.008,242.641 295.196 C 246.051 296.461,247.287 297.121,247.966 298.039 C 248.889 299.288,250.236 299.996,255.156 301.819 C 257.203 302.578,258.634 303.429,259.811 304.590 C 261.649 306.402,262.273 306.712,266.747 308.035 C 268.473 308.546,270.233 309.380,270.996 310.050 L 272.299 311.194 273.358 310.362 C 275.830 308.417,276.539 305.287,275.999 298.704 C 275.088 287.613,274.390 283.310,272.985 280.131 C 271.775 277.392,270.962 273.301,270.415 267.200 C 269.028 251.720,268.257 247.058,266.443 243.167 C 263.310 236.447,263.415 224.800,266.608 224.800 C 266.920 224.800,267.886 223.837,268.755 222.661 C 269.624 221.484,271.256 219.860,272.381 219.052 C 273.506 218.244,274.583 217.170,274.775 216.667 C 274.966 216.163,276.175 214.815,277.461 213.672 C 278.748 212.528,279.953 211.432,280.140 211.236 C 280.327 211.040,281.176 210.148,282.026 209.254 C 282.877 208.359,284.286 207.177,285.159 206.626 C 286.031 206.076,287.303 204.813,287.986 203.820 C 288.669 202.828,290.043 201.393,291.040 200.632 C 292.037 199.871,293.358 198.549,293.977 197.695 C 294.596 196.841,295.692 195.705,296.412 195.171 C 297.132 194.637,299.098 192.850,300.781 191.200 C 302.464 189.550,304.319 187.883,304.903 187.495 C 305.486 187.107,306.625 185.794,307.433 184.577 C 308.336 183.216,309.484 182.067,310.415 181.592 C 311.363 181.109,312.281 180.181,312.870 179.110 C 313.458 178.042,314.559 176.926,315.805 176.138 C 319.004 174.113,319.861 173.067,320.159 170.825 C 320.304 169.731,320.679 168.110,320.992 167.223 C 321.561 165.611,321.560 165.610,320.253 164.613 C 317.660 162.636,316.559 162.451,299.881 161.192 C 294.132 160.759,288.380 159.832,287.062 159.126 C 284.334 157.666,274.875 156.275,263.200 155.616 C 244.163 154.542,242.082 153.932,238.661 148.428 C 237.427 146.443,235.725 144.105,234.878 143.232 C 233.706 142.025,233.216 141.089,232.831 139.323 C 232.120 136.061,230.478 132.536,229.148 131.417 C 227.830 130.308,227.260 129.097,225.751 124.200 C 224.924 121.516,224.266 120.193,223.167 119.000 C 221.377 117.057,221.051 116.422,220.392 113.600 C 219.590 110.164,218.663 108.352,216.673 106.336 C 215.661 105.310,214.721 103.960,214.584 103.336 C 213.514 98.467,212.215 95.444,210.339 93.457 C 209.085 92.129,208.400 91.049,208.400 90.403 C 208.400 88.377,206.323 83.117,204.902 81.544 L 203.507 80.000 200.200 80.000 L 196.893 80.000 195.466 81.580 M204.316 84.150 C 204.819 84.890,205.744 86.914,206.370 88.648 C 208.022 93.222,208.777 94.857,209.802 96.075 C 210.633 97.062,211.473 99.032,213.433 104.589 C 213.818 105.683,214.752 107.213,215.507 107.989 C 217.189 109.718,217.596 110.505,218.981 114.708 C 219.580 116.527,220.677 118.867,221.418 119.908 C 223.438 122.744,224.800 125.212,224.800 126.035 C 224.800 127.389,226.454 131.210,227.808 132.983 C 229.525 135.232,230.112 136.387,231.571 140.386 C 232.260 142.274,233.590 144.781,234.721 146.326 C 235.798 147.797,237.434 150.125,238.355 151.501 C 240.928 155.340,241.404 155.463,258.800 156.798 C 261.990 157.043,265.950 157.418,267.600 157.633 C 269.250 157.848,272.220 158.197,274.200 158.410 C 276.180 158.623,278.951 159.160,280.358 159.605 C 284.180 160.814,290.954 161.914,298.800 162.602 C 317.347 164.229,318.000 164.472,318.000 169.753 C 318.000 173.008,317.651 173.521,314.303 175.186 C 313.699 175.487,312.903 176.198,312.533 176.766 C 311.962 177.644,309.309 180.455,304.298 185.492 C 301.820 187.983,297.182 192.317,295.076 194.111 C 293.842 195.161,292.538 196.511,292.179 197.111 C 291.819 197.710,290.735 198.788,289.770 199.507 C 288.804 200.226,287.426 201.598,286.707 202.555 C 285.988 203.513,284.919 204.639,284.331 205.059 C 283.089 205.945,277.093 211.332,275.714 212.800 C 275.197 213.350,272.240 216.392,269.142 219.559 C 261.648 227.222,261.776 226.796,263.424 238.600 C 263.961 242.446,264.319 244.044,266.519 252.400 C 267.505 256.143,267.997 259.434,269.622 273.130 C 270.074 276.942,270.897 281.622,271.451 283.530 C 274.944 295.567,275.799 303.851,273.852 306.794 C 272.592 308.697,272.913 308.656,269.410 307.362 C 264.844 305.676,263.202 304.847,261.248 303.243 C 259.273 301.622,257.852 300.901,254.477 299.808 C 253.251 299.411,251.249 298.234,249.735 297.020 C 248.101 295.710,246.266 294.653,244.858 294.212 C 241.982 293.310,239.024 291.818,237.190 290.344 C 236.400 289.709,234.367 288.655,232.673 288.003 C 228.539 286.411,227.576 285.883,225.453 284.046 C 224.317 283.062,222.630 282.147,220.922 281.585 C 217.374 280.418,215.350 279.385,213.473 277.782 C 212.060 276.575,210.734 275.994,205.400 274.250 C 200.266 272.571,192.000 274.199,187.694 277.737 C 185.359 279.656,183.753 280.478,180.205 281.571 C 177.023 282.552,176.147 283.059,174.059 285.127 C 172.952 286.223,171.656 286.905,169.000 287.789 C 167.036 288.443,164.697 289.536,163.804 290.218 C 162.155 291.476,157.436 293.868,154.699 294.833 C 153.873 295.124,152.253 296.137,151.099 297.085 C 149.944 298.033,148.190 299.101,147.200 299.460 C 143.648 300.745,141.341 301.901,139.982 303.074 C 137.754 304.998,135.490 306.007,128.331 308.266 C 124.775 309.388,124.593 297.670,127.994 286.618 C 129.552 281.557,130.609 275.677,131.394 267.703 C 132.146 260.063,133.286 253.429,134.402 250.200 C 136.564 243.941,138.502 229.756,137.582 226.920 C 137.015 225.173,122.849 210.372,117.621 206.065 C 115.625 204.421,108.817 197.539,107.043 195.373 C 106.407 194.596,105.093 193.414,104.123 192.747 C 102.279 191.478,92.837 182.149,88.691 177.500 C 87.367 176.015,86.046 174.800,85.756 174.800 C 82.641 174.800,80.922 166.633,83.722 165.135 C 84.962 164.471,93.134 163.320,100.245 162.808 C 110.210 162.091,116.616 161.228,121.600 159.932 C 124.130 159.274,127.640 158.583,129.400 158.397 C 131.160 158.212,135.840 157.690,139.800 157.238 C 143.760 156.785,149.494 156.143,152.542 155.809 C 159.329 155.067,159.724 154.884,162.094 151.396 C 163.138 149.858,164.778 147.520,165.738 146.200 C 167.577 143.670,168.416 142.030,169.220 139.400 C 169.897 137.182,171.007 135.059,172.541 133.050 C 173.934 131.225,174.435 130.084,175.134 127.141 C 175.558 125.353,176.309 123.960,179.086 119.810 C 179.793 118.753,180.850 116.428,181.436 114.644 C 182.557 111.226,183.929 108.400,184.468 108.400 C 185.129 108.400,186.846 105.236,187.845 102.179 C 188.943 98.815,190.143 96.206,190.769 95.819 C 191.297 95.493,192.995 91.825,194.237 88.328 C 196.080 83.137,196.438 82.805,200.200 82.805 C 203.384 82.805,203.405 82.812,204.316 84.150 " stroke="none" fill="#f0cc6c" fill-rule="evenodd"></path><path id="path3" d="M152.400 4.049 C 152.400 4.335,151.910 4.397,151.000 4.226 C 149.071 3.864,147.408 5.416,147.802 7.211 C 147.966 7.957,147.903 8.400,147.632 8.400 C 147.394 8.400,147.200 8.670,147.200 9.000 C 147.200 9.550,136.823 10.006,131.900 9.672 C 131.295 9.631,130.800 9.797,130.800 10.041 C 130.800 10.286,130.552 10.390,130.249 10.274 C 129.537 10.001,128.801 10.737,129.074 11.449 C 129.190 11.752,129.116 12.000,128.909 12.000 C 128.703 12.000,128.533 12.810,128.533 13.800 C 128.533 16.126,129.066 15.934,122.190 16.076 C 117.663 16.170,116.224 16.322,116.300 16.700 C 116.356 16.981,116.006 17.201,115.500 17.201 C 113.512 17.205,110.800 19.847,110.800 21.780 C 110.800 22.340,106.891 22.742,104.495 22.429 C 104.217 22.392,103.882 22.641,103.752 22.981 C 103.621 23.322,103.256 23.600,102.941 23.600 C 101.007 23.600,98.400 26.022,98.400 27.819 C 98.400 28.356,95.705 28.686,93.100 28.468 C 92.715 28.436,92.400 28.598,92.400 28.828 C 92.400 29.059,92.220 29.136,92.000 29.000 C 91.780 28.864,91.587 28.898,91.572 29.076 C 91.556 29.254,91.451 30.570,91.338 32.000 C 91.092 35.124,91.565 34.722,88.012 34.837 C 85.228 34.927,84.356 35.098,81.481 36.116 C 80.338 36.521,79.205 38.188,79.194 39.480 C 79.183 40.794,78.523 41.279,76.552 41.423 C 73.544 41.643,72.988 41.824,73.118 42.545 C 73.182 42.905,73.075 43.200,72.879 43.200 C 72.683 43.200,72.541 43.995,72.562 44.967 C 72.610 47.172,72.674 47.118,69.795 47.272 C 66.747 47.435,66.235 47.947,66.072 50.995 C 65.918 53.868,66.270 53.517,63.396 53.663 C 60.410 53.816,59.842 54.354,59.659 57.203 C 59.489 59.862,59.785 59.578,57.069 59.699 C 55.576 59.765,54.801 59.971,54.801 60.300 C 54.800 60.575,54.575 60.800,54.300 60.801 C 53.966 60.801,53.764 61.622,53.690 63.277 C 53.559 66.250,53.880 65.917,50.995 66.072 C 47.947 66.235,47.435 66.747,47.272 69.795 C 47.118 72.669,47.231 72.533,45.000 72.533 C 44.010 72.533,43.200 72.691,43.200 72.884 C 43.200 73.077,42.905 73.182,42.545 73.118 C 41.833 72.990,41.664 73.490,41.391 76.524 C 41.170 78.976,41.118 79.047,39.286 79.340 C 37.440 79.635,36.105 80.948,35.750 82.819 C 35.606 83.579,35.357 84.380,35.199 84.600 C 35.040 84.820,34.872 86.348,34.825 87.997 C 34.724 91.567,35.125 91.092,32.000 91.338 C 30.570 91.451,29.254 91.556,29.076 91.572 C 28.898 91.587,28.864 91.780,29.000 92.000 C 29.136 92.220,29.059 92.400,28.828 92.400 C 28.598 92.400,28.436 92.715,28.468 93.100 C 28.804 97.102,28.449 98.305,26.680 99.161 C 25.240 99.858,24.844 100.317,24.244 101.985 C 23.850 103.080,23.319 103.936,23.064 103.888 C 22.534 103.788,22.509 103.951,22.446 107.900 C 22.407 110.377,22.298 110.800,21.700 110.801 C 19.795 110.806,17.200 113.561,17.200 115.580 C 17.200 116.031,16.975 116.355,16.700 116.300 C 16.322 116.224,16.170 117.663,16.076 122.190 C 15.935 129.033,16.086 128.619,13.768 128.530 C 12.795 128.492,12.000 128.622,12.000 128.818 C 12.000 129.014,11.759 129.082,11.464 128.969 C 10.810 128.718,9.831 129.803,10.189 130.382 C 10.331 130.612,10.249 130.800,10.006 130.800 C 9.757 130.800,9.604 131.366,9.655 132.100 C 9.999 137.125,9.563 147.200,9.000 147.200 C 8.670 147.200,8.400 147.394,8.400 147.632 C 8.400 147.903,7.957 147.966,7.211 147.802 C 5.416 147.408,3.864 149.071,4.226 151.000 C 4.397 151.910,4.335 152.400,4.049 152.400 C 3.732 152.400,3.610 165.672,3.610 200.000 C 3.610 228.372,3.757 247.600,3.974 247.600 C 4.175 247.600,4.308 248.404,4.270 249.386 C 4.183 251.634,5.009 252.561,7.094 252.557 C 9.521 252.553,9.554 252.670,9.634 261.552 C 9.676 266.167,9.865 269.600,10.077 269.600 C 10.281 269.600,10.331 269.788,10.189 270.018 C 9.831 270.597,10.810 271.682,11.464 271.431 C 11.759 271.318,12.000 271.386,12.000 271.582 C 12.000 271.778,12.795 271.908,13.768 271.870 C 16.086 271.781,15.935 271.367,16.076 278.210 C 16.170 282.737,16.322 284.176,16.700 284.100 C 16.981 284.044,17.201 284.394,17.201 284.900 C 17.205 286.888,19.847 289.600,21.780 289.600 C 22.279 289.600,22.409 290.167,22.446 292.500 C 22.509 296.449,22.534 296.612,23.064 296.512 C 23.319 296.464,23.850 297.320,24.244 298.415 C 24.844 300.083,25.240 300.542,26.680 301.239 C 28.454 302.097,28.714 302.947,28.497 307.163 C 28.462 307.844,29.406 308.861,29.752 308.514 C 29.889 308.378,30.000 308.438,30.000 308.647 C 30.000 308.857,31.024 309.071,32.276 309.123 C 35.038 309.239,34.724 308.835,34.825 312.403 C 34.872 314.052,35.042 315.580,35.203 315.800 C 35.364 316.020,35.612 316.846,35.754 317.636 C 36.079 319.444,37.379 320.683,39.388 321.101 C 41.036 321.443,41.873 322.893,41.360 324.520 C 41.236 324.915,41.437 325.703,41.808 326.269 C 42.189 326.849,42.263 327.163,41.980 326.987 C 41.643 326.779,41.576 326.838,41.779 327.165 C 41.945 327.434,42.333 327.558,42.640 327.440 C 42.948 327.322,43.200 327.386,43.200 327.582 C 43.200 327.778,43.995 327.908,44.968 327.870 C 47.171 327.785,47.118 327.722,47.272 330.605 C 47.435 333.653,47.947 334.165,50.995 334.328 C 53.868 334.482,53.517 334.130,53.663 337.004 C 53.816 339.990,54.354 340.558,57.203 340.741 C 59.834 340.909,59.491 340.566,59.659 343.197 C 59.842 346.046,60.410 346.584,63.396 346.737 C 66.270 346.883,65.918 346.532,66.072 349.405 C 66.235 352.453,66.747 352.965,69.795 353.128 C 72.678 353.282,72.615 353.229,72.530 355.432 C 72.492 356.405,72.622 357.200,72.818 357.200 C 73.014 357.200,73.060 357.500,72.919 357.866 C 72.748 358.313,72.817 358.436,73.132 358.242 C 73.389 358.083,73.600 358.163,73.600 358.419 C 73.600 358.676,73.870 358.782,74.200 358.655 C 74.530 358.529,74.800 358.619,74.800 358.856 C 74.800 359.106,75.186 359.190,75.719 359.056 C 77.602 358.583,78.947 359.318,79.299 361.012 C 79.717 363.021,80.956 364.321,82.764 364.646 C 83.554 364.788,84.380 365.036,84.600 365.197 C 84.820 365.358,86.348 365.528,87.997 365.575 C 91.563 365.676,91.138 365.345,91.405 368.226 C 91.525 369.532,91.649 370.808,91.679 371.062 C 91.709 371.316,91.973 371.432,92.267 371.319 C 92.560 371.207,92.800 371.303,92.800 371.533 C 92.800 371.762,93.205 371.929,93.700 371.902 C 97.458 371.699,98.311 371.952,99.067 373.495 C 99.597 374.575,100.363 375.268,101.830 375.995 C 102.947 376.548,103.894 377.180,103.935 377.400 C 104.023 377.874,104.164 377.894,107.864 377.954 L 110.729 378.000 111.592 379.784 C 112.293 381.232,112.866 381.762,114.628 382.596 C 115.823 383.161,116.800 383.772,116.800 383.954 C 116.800 384.135,119.361 384.321,122.492 384.367 C 129.004 384.463,128.619 384.318,128.530 386.632 C 128.492 387.605,128.622 388.400,128.818 388.400 C 129.014 388.400,129.082 388.641,128.969 388.936 C 128.718 389.590,129.803 390.569,130.382 390.211 C 130.612 390.069,130.800 390.119,130.800 390.323 C 130.800 390.535,134.221 390.724,138.816 390.765 C 147.903 390.847,148.164 390.892,147.807 392.316 C 147.211 394.689,149.265 396.649,151.842 396.166 C 152.714 396.002,153.200 396.068,153.200 396.349 C 153.200 396.910,244.700 396.975,245.589 396.414 C 245.977 396.169,246.285 396.206,246.489 396.521 C 246.724 396.883,246.887 396.865,247.157 396.446 C 247.400 396.068,247.866 395.980,248.619 396.169 C 250.985 396.763,253.176 394.639,252.593 392.316 C 252.236 390.892,252.497 390.847,261.584 390.765 C 266.179 390.724,269.600 390.535,269.600 390.323 C 269.600 390.119,269.788 390.069,270.018 390.211 C 270.597 390.569,271.682 389.590,271.431 388.936 C 271.318 388.641,271.386 388.400,271.582 388.400 C 271.778 388.400,271.908 387.605,271.870 386.632 C 271.781 384.318,271.396 384.463,277.908 384.367 C 281.039 384.321,283.600 384.135,283.600 383.954 C 283.600 383.772,284.577 383.161,285.772 382.596 C 287.534 381.762,288.107 381.232,288.808 379.784 L 289.671 378.000 292.536 377.953 C 294.111 377.927,295.535 377.927,295.700 377.953 C 295.865 377.979,296.000 377.809,296.000 377.576 C 296.000 377.343,296.208 377.281,296.462 377.438 C 296.716 377.595,296.818 377.552,296.688 377.343 C 296.321 376.749,296.861 376.178,298.643 375.275 C 299.671 374.753,300.475 373.986,300.791 373.221 C 301.295 372.005,302.860 371.681,307.163 371.903 C 307.844 371.938,308.861 370.994,308.514 370.648 C 308.378 370.511,308.475 370.400,308.729 370.400 C 308.983 370.400,309.164 370.085,309.132 369.700 C 309.100 369.315,309.102 368.235,309.137 367.300 L 309.200 365.600 311.858 365.600 C 314.013 365.600,314.675 365.443,315.358 364.768 C 315.821 364.311,316.827 363.540,317.594 363.056 C 318.361 362.572,319.393 361.462,319.887 360.588 C 320.883 358.830,321.187 359.692,320.226 361.549 C 319.495 362.963,318.775 363.552,316.904 364.264 L 315.400 364.837 316.800 364.614 C 318.861 364.286,320.124 363.175,320.800 361.097 C 321.422 359.182,322.864 358.389,324.546 359.035 C 324.923 359.179,325.200 359.086,325.200 358.816 C 325.200 358.528,325.510 358.444,326.000 358.600 C 326.477 358.751,326.800 358.672,326.800 358.403 C 326.800 358.156,326.999 358.076,327.243 358.226 C 327.541 358.411,327.597 358.222,327.416 357.650 C 327.251 357.131,327.319 356.800,327.591 356.800 C 327.873 356.800,327.953 356.324,327.810 355.500 C 327.485 353.635,327.945 353.231,330.518 353.124 C 331.773 353.071,332.800 352.887,332.800 352.714 C 332.800 352.541,333.025 352.445,333.300 352.500 C 333.575 352.555,333.755 352.375,333.700 352.100 C 333.645 351.825,333.741 351.600,333.914 351.600 C 334.087 351.600,334.271 350.576,334.323 349.324 C 334.439 346.562,334.107 346.846,337.317 346.758 C 340.495 346.670,340.659 346.511,340.766 343.409 C 340.864 340.559,340.544 340.910,343.197 340.741 C 346.046 340.558,346.584 339.990,346.737 337.004 C 346.883 334.130,346.532 334.482,349.405 334.328 C 352.453 334.165,352.965 333.653,353.128 330.606 C 353.272 327.914,353.636 327.485,355.500 327.810 C 356.324 327.953,356.800 327.873,356.800 327.591 C 356.800 327.319,357.131 327.251,357.650 327.416 C 358.222 327.597,358.411 327.541,358.226 327.243 C 358.076 326.999,358.156 326.800,358.403 326.800 C 358.672 326.800,358.751 326.477,358.600 326.000 C 358.448 325.521,358.528 325.200,358.800 325.200 C 359.065 325.200,359.153 324.881,359.011 324.434 C 358.575 323.061,359.205 321.611,360.344 321.364 C 364.152 320.538,365.367 318.448,365.563 312.388 C 365.678 308.837,365.363 309.239,368.124 309.123 C 369.376 309.071,370.400 308.857,370.400 308.647 C 370.400 308.438,370.511 308.378,370.648 308.514 C 370.994 308.861,371.938 307.844,371.903 307.163 C 371.694 303.109,371.976 302.078,373.495 301.333 C 374.592 300.795,375.270 300.035,376.043 298.474 C 376.622 297.305,377.254 296.358,377.448 296.370 C 377.870 296.395,377.895 296.205,377.954 292.536 L 378.000 289.671 379.784 288.808 C 381.232 288.107,381.762 287.534,382.596 285.772 C 383.161 284.577,383.772 283.600,383.954 283.600 C 384.135 283.600,384.321 281.039,384.367 277.908 C 384.463 271.396,384.318 271.781,386.632 271.870 C 387.605 271.908,388.400 271.778,388.400 271.582 C 388.400 271.386,388.641 271.318,388.936 271.431 C 389.590 271.682,390.569 270.597,390.211 270.018 C 390.069 269.788,390.119 269.600,390.323 269.600 C 390.535 269.600,390.724 266.179,390.765 261.584 C 390.847 252.497,390.892 252.236,392.316 252.593 C 394.689 253.189,396.649 251.135,396.166 248.558 C 396.002 247.683,396.067 247.200,396.350 247.200 C 396.667 247.200,396.790 234.084,396.790 200.200 C 396.790 166.316,396.667 153.200,396.350 153.200 C 396.067 153.200,396.002 152.717,396.166 151.842 C 396.649 149.265,394.689 147.211,392.316 147.807 C 390.900 148.162,390.863 147.949,390.757 138.833 C 390.703 134.170,390.507 130.800,390.289 130.800 C 390.083 130.800,390.010 130.552,390.126 130.249 C 390.399 129.537,389.663 128.801,388.951 129.074 C 388.648 129.190,388.400 129.114,388.400 128.904 C 388.400 128.695,387.605 128.541,386.633 128.562 C 384.318 128.612,384.462 128.998,384.367 122.492 C 384.321 119.361,384.135 116.800,383.954 116.800 C 383.772 116.800,383.161 115.823,382.596 114.628 C 381.762 112.866,381.232 112.293,379.784 111.592 L 378.000 110.729 377.953 107.864 C 377.927 106.289,377.939 104.827,377.981 104.615 C 378.022 104.404,377.804 104.044,377.494 103.815 C 377.185 103.587,376.802 102.876,376.643 102.236 C 376.274 100.755,373.939 98.400,372.840 98.400 C 372.024 98.400,371.664 96.299,371.932 93.100 C 371.964 92.715,371.802 92.400,371.572 92.400 C 371.341 92.400,371.264 92.220,371.400 92.000 C 371.536 91.780,371.502 91.587,371.324 91.572 C 371.146 91.556,369.830 91.451,368.400 91.338 C 365.276 91.092,365.678 91.565,365.563 88.012 C 365.473 85.222,365.301 84.348,364.276 81.463 C 363.876 80.336,362.489 79.476,360.351 79.030 C 359.219 78.793,358.644 77.282,359.069 75.659 C 359.197 75.170,359.106 74.800,358.859 74.800 C 358.620 74.800,358.529 74.530,358.655 74.200 C 358.782 73.870,358.676 73.600,358.419 73.600 C 358.163 73.600,358.083 73.389,358.242 73.132 C 358.436 72.817,358.313 72.748,357.866 72.919 C 357.500 73.060,357.200 73.014,357.200 72.818 C 357.200 72.622,356.405 72.492,355.432 72.530 C 353.229 72.615,353.282 72.678,353.128 69.795 C 352.965 66.747,352.453 66.235,349.405 66.072 C 346.532 65.918,346.883 66.270,346.737 63.396 C 346.584 60.410,346.046 59.842,343.197 59.659 C 340.544 59.490,340.864 59.841,340.766 56.991 C 340.659 53.889,340.495 53.730,337.317 53.642 C 334.109 53.554,334.483 53.885,334.328 50.995 C 334.165 47.947,333.653 47.435,330.605 47.272 C 327.719 47.117,327.915 47.294,327.878 44.821 C 327.861 43.709,327.707 42.800,327.536 42.800 C 327.365 42.800,327.317 42.560,327.430 42.267 C 327.542 41.973,327.402 41.704,327.117 41.668 C 326.833 41.632,325.610 41.513,324.400 41.403 C 321.421 41.135,321.348 41.089,321.064 39.311 C 320.765 37.442,319.460 36.107,317.581 35.750 C 316.821 35.606,316.020 35.357,315.800 35.199 C 315.580 35.040,314.052 34.872,312.403 34.825 C 308.835 34.724,309.239 35.038,309.123 32.276 C 309.071 31.024,308.857 30.000,308.647 30.000 C 308.438 30.000,308.378 29.889,308.514 29.752 C 308.861 29.406,307.844 28.462,307.163 28.497 C 302.947 28.714,302.097 28.454,301.239 26.680 C 300.542 25.240,300.083 24.844,298.415 24.244 C 297.320 23.850,296.464 23.319,296.512 23.064 C 296.612 22.535,296.446 22.509,292.536 22.446 L 289.671 22.400 288.808 20.616 C 288.107 19.168,287.534 18.638,285.772 17.804 C 284.577 17.239,283.600 16.620,283.600 16.428 C 283.600 16.236,281.042 16.053,277.916 16.022 C 271.426 15.956,271.788 16.090,271.838 13.767 C 271.859 12.795,271.705 12.000,271.496 12.000 C 271.286 12.000,271.210 11.752,271.326 11.449 C 271.599 10.737,270.863 10.001,270.151 10.274 C 269.848 10.390,269.600 10.292,269.600 10.055 C 269.600 9.818,269.015 9.655,268.300 9.693 C 262.668 9.991,253.200 9.556,253.200 9.000 C 253.200 8.670,253.006 8.400,252.768 8.400 C 252.497 8.400,252.434 7.957,252.598 7.211 C 252.992 5.416,251.329 3.864,249.400 4.226 C 248.490 4.397,248.000 4.335,248.000 4.049 C 248.000 3.732,234.670 3.610,200.200 3.610 C 165.730 3.610,152.400 3.732,152.400 4.049 M149.701 5.014 C 149.218 5.352,148.644 5.937,148.424 6.314 C 148.197 6.704,148.019 6.784,148.012 6.500 C 147.997 5.864,149.444 4.400,150.089 4.400 C 150.358 4.400,150.183 4.676,149.701 5.014 M251.600 5.200 C 252.040 5.640,252.400 6.220,252.400 6.489 C 252.400 6.758,252.124 6.583,251.786 6.101 C 251.448 5.618,250.863 5.044,250.486 4.824 C 250.096 4.597,250.016 4.419,250.300 4.412 C 250.575 4.405,251.160 4.760,251.600 5.200 M114.769 18.910 C 114.026 19.410,113.010 20.426,112.510 21.169 C 111.463 22.722,111.314 22.513,112.219 20.762 C 112.560 20.104,113.415 19.213,114.119 18.784 C 115.899 17.699,116.417 17.799,114.769 18.910 M286.281 18.784 C 287.508 19.532,289.082 21.851,288.653 22.280 C 288.446 22.488,284.400 18.625,284.400 18.219 C 284.400 17.819,284.986 17.995,286.281 18.784 M285.825 21.300 L 287.000 22.600 285.700 21.425 C 284.985 20.779,284.400 20.194,284.400 20.125 C 284.400 19.816,284.730 20.088,285.825 21.300 M299.526 25.326 C 300.209 25.865,301.320 28.014,301.053 28.280 C 300.940 28.393,299.921 27.559,298.788 26.426 C 296.836 24.474,297.395 23.642,299.526 25.326 M100.841 26.214 C 100.159 26.992,99.600 27.832,99.600 28.081 C 99.600 28.330,99.495 28.429,99.368 28.301 C 98.900 27.833,100.923 24.800,101.703 24.800 C 101.912 24.800,101.524 25.436,100.841 26.214 M298.225 27.300 L 299.400 28.600 298.100 27.425 C 297.385 26.779,296.800 26.194,296.800 26.125 C 296.800 25.816,297.130 26.088,298.225 27.300 M83.600 36.268 C 81.680 37.094,80.507 38.264,79.972 39.886 C 79.388 41.653,79.103 41.386,79.610 39.548 C 80.066 37.899,81.427 36.499,83.048 36.014 C 84.852 35.473,85.139 35.605,83.600 36.268 M318.281 36.784 C 319.521 37.540,320.800 39.417,320.800 40.480 C 320.800 40.766,320.427 40.248,319.972 39.328 C 319.391 38.155,318.645 37.409,317.472 36.828 C 316.552 36.373,316.070 36.001,316.400 36.002 C 316.730 36.002,317.576 36.354,318.281 36.784 M205.766 78.515 C 207.449 80.159,207.985 80.983,208.171 82.215 C 209.204 89.066,209.686 90.148,212.337 91.566 C 213.525 92.202,214.119 93.689,215.045 98.349 C 215.687 101.576,215.951 102.216,216.938 102.949 C 219.751 105.037,220.314 105.916,221.169 109.558 C 221.626 111.506,222.000 113.392,222.000 113.750 C 222.000 114.483,223.122 115.731,224.128 116.117 C 225.280 116.559,226.317 118.790,227.216 122.763 C 227.694 124.873,228.147 126.817,228.223 127.083 C 228.299 127.349,229.086 128.023,229.971 128.582 C 232.375 130.099,233.807 133.667,234.471 139.789 C 234.577 140.771,234.853 141.051,236.044 141.389 C 238.413 142.063,238.882 142.695,239.767 146.400 C 240.192 148.179,240.982 148.744,243.893 149.351 C 247.198 150.040,248.921 150.835,250.640 152.465 L 251.880 153.640 262.040 154.022 C 285.820 154.916,289.174 155.354,293.050 158.069 L 295.360 159.687 305.380 160.076 C 319.965 160.642,323.231 161.342,324.905 164.261 C 325.904 166.003,325.168 168.540,323.311 169.756 C 322.298 170.419,321.931 171.028,321.597 172.600 C 321.018 175.328,320.128 176.341,317.580 177.171 C 315.559 177.830,315.379 177.995,314.912 179.607 C 314.255 181.875,313.144 183.000,310.955 183.612 C 309.008 184.158,308.400 184.903,308.400 186.745 C 308.400 188.178,307.033 189.399,304.734 190.018 C 303.368 190.386,303.054 190.707,302.221 192.591 C 301.262 194.760,299.756 196.000,298.082 196.000 C 297.079 196.000,296.153 197.098,295.815 198.689 C 295.499 200.179,293.599 201.940,291.953 202.269 C 290.579 202.544,290.280 202.911,289.660 205.079 C 289.085 207.093,287.564 208.400,285.795 208.400 C 284.288 208.400,283.991 208.715,283.019 211.345 C 282.393 213.036,282.059 213.390,280.450 214.063 C 277.595 215.256,277.483 215.351,276.909 217.073 C 276.276 218.972,274.874 220.406,273.084 220.985 C 272.163 221.283,271.573 221.870,271.000 223.060 C 269.879 225.385,268.902 226.345,267.359 226.634 C 265.279 227.024,265.078 227.531,265.398 231.574 C 265.649 234.750,265.791 235.233,266.636 235.787 C 269.765 237.837,270.482 241.858,271.594 263.579 L 271.993 271.359 273.390 272.790 C 276.040 275.503,276.960 281.679,277.450 300.049 L 277.723 310.299 276.160 311.974 C 273.376 314.960,269.525 314.437,267.800 310.839 C 266.929 309.023,266.772 308.951,262.510 308.431 C 259.031 308.005,257.077 306.910,255.988 304.776 C 255.159 303.152,254.794 302.982,250.145 302.048 C 247.489 301.514,244.615 299.765,243.747 298.154 C 243.042 296.844,241.832 296.288,238.600 295.788 C 236.634 295.484,233.837 293.903,232.089 292.109 C 231.084 291.077,230.150 290.618,228.089 290.143 C 224.529 289.322,224.027 289.053,221.433 286.580 C 219.377 284.620,218.960 284.410,215.536 283.606 C 211.340 282.621,210.945 282.401,209.024 279.974 C 206.698 277.034,195.125 275.900,193.200 278.423 C 190.177 282.385,189.902 282.547,183.780 283.965 C 182.196 284.332,181.221 284.937,179.267 286.768 C 177.423 288.496,176.284 289.226,174.887 289.575 C 173.849 289.835,172.315 290.227,171.477 290.446 C 170.606 290.675,169.323 291.495,168.477 292.365 C 166.568 294.330,164.255 295.488,161.558 295.832 C 158.708 296.195,158.157 296.524,157.176 298.447 C 156.176 300.407,153.585 301.740,149.522 302.384 C 145.879 302.961,145.753 303.031,144.800 305.000 C 143.733 307.205,141.700 308.196,137.559 308.533 C 133.642 308.851,133.564 308.888,132.454 310.980 C 130.303 315.036,125.629 314.946,123.107 310.800 C 122.311 309.491,123.140 286.802,124.251 279.498 C 124.939 274.970,125.027 274.727,126.633 272.891 C 128.590 270.653,128.571 270.778,129.215 256.200 C 129.813 242.665,130.563 238.942,133.233 236.272 C 134.997 234.509,135.847 227.914,134.400 227.218 C 134.070 227.060,133.085 226.586,132.212 226.165 C 130.791 225.480,130.233 224.780,129.214 222.400 C 129.072 222.070,128.042 221.370,126.924 220.844 C 125.135 220.003,124.754 219.596,123.746 217.444 C 122.749 215.318,122.384 214.922,120.940 214.398 C 118.870 213.648,117.749 212.655,117.409 211.271 C 116.966 209.470,116.058 208.400,114.971 208.400 C 112.784 208.400,110.400 206.047,110.400 203.889 C 110.400 203.117,109.729 202.610,107.948 202.037 C 106.109 201.445,105.266 200.509,104.629 198.352 C 104.101 196.564,103.708 196.196,101.931 195.824 C 100.402 195.504,98.501 193.772,98.207 192.431 C 97.888 190.978,97.040 190.263,94.914 189.657 C 92.985 189.107,92.084 188.042,91.740 185.908 C 91.460 184.165,91.183 183.907,88.881 183.248 C 87.040 182.722,85.604 180.997,85.601 179.309 C 85.600 178.304,84.402 177.404,82.556 177.020 C 80.848 176.665,79.398 174.971,78.844 172.684 C 78.502 171.271,77.910 170.317,76.590 169.052 C 74.228 166.789,74.111 165.087,76.194 163.259 C 78.659 161.095,80.550 160.783,94.787 160.190 C 105.670 159.737,107.849 159.548,108.232 159.025 C 108.483 158.681,108.807 158.400,108.953 158.400 C 109.098 158.400,109.888 157.957,110.709 157.416 C 113.472 155.592,122.071 154.403,132.525 154.401 C 142.104 154.399,148.464 153.668,149.800 152.415 C 151.647 150.683,156.294 148.902,159.214 148.807 C 159.631 148.793,160.701 146.580,160.957 145.200 C 161.323 143.230,162.473 141.908,164.256 141.408 C 165.696 141.004,165.804 140.863,166.103 138.989 C 167.289 131.575,168.404 129.126,170.838 128.592 C 171.507 128.445,172.109 128.117,172.175 127.862 C 172.242 127.608,172.606 125.780,172.984 123.800 C 173.944 118.779,174.790 117.002,176.642 116.117 C 178.127 115.409,178.154 115.353,178.862 111.600 C 179.865 106.280,180.554 104.910,182.757 103.858 L 184.555 103.000 185.116 99.600 C 186.019 94.130,186.760 92.313,188.400 91.543 C 190.686 90.471,191.087 89.728,191.578 85.646 C 192.116 81.170,192.304 80.752,194.872 78.300 L 196.862 76.400 200.231 76.400 L 203.599 76.400 205.766 78.515 M362.294 80.253 C 363.418 80.954,364.238 82.251,364.536 83.800 C 364.758 84.952,364.742 84.944,364.147 83.600 C 363.288 81.662,362.463 80.815,360.600 79.959 C 359.227 79.328,359.170 79.257,360.200 79.460 C 360.860 79.589,361.802 79.946,362.294 80.253 M39.328 80.428 C 38.155 81.009,37.409 81.755,36.828 82.928 C 36.373 83.848,36.000 84.366,36.000 84.080 C 35.999 82.394,38.739 79.605,40.400 79.602 C 40.730 79.601,40.248 79.973,39.328 80.428 M28.400 99.419 C 28.400 99.540,27.493 100.546,26.383 101.655 C 24.486 103.552,23.855 103.264,25.099 101.068 C 25.540 100.290,28.400 98.861,28.400 99.419 M373.413 99.679 C 374.336 100.099,376.031 102.611,375.982 103.484 C 375.973 103.658,375.604 103.117,375.164 102.283 C 374.724 101.449,373.787 100.414,373.082 99.985 C 371.646 99.109,371.816 98.951,373.413 99.679 M28.400 101.325 C 28.400 101.394,27.815 101.979,27.100 102.625 L 25.800 103.800 26.975 102.500 C 28.070 101.288,28.400 101.016,28.400 101.325 M21.169 112.510 C 20.426 113.010,19.410 114.026,18.910 114.769 C 17.863 116.322,17.714 116.113,18.619 114.362 C 18.960 113.704,19.815 112.813,20.519 112.384 C 22.299 111.299,22.817 111.399,21.169 112.510 M379.884 112.386 C 380.949 113.036,383.248 116.400,382.626 116.400 C 382.347 116.400,378.000 112.110,378.000 111.835 C 378.000 111.418,378.571 111.585,379.884 112.386 M379.425 114.900 L 380.600 116.200 379.300 115.025 C 378.088 113.930,377.816 113.600,378.125 113.600 C 378.194 113.600,378.779 114.185,379.425 114.900 M6.101 148.614 C 5.618 148.952,5.044 149.537,4.824 149.914 C 4.597 150.304,4.419 150.384,4.412 150.100 C 4.397 149.464,5.844 148.000,6.489 148.000 C 6.758 148.000,6.583 148.276,6.101 148.614 M395.018 148.982 C 395.558 149.522,395.986 150.287,395.968 150.682 C 395.944 151.240,395.888 151.266,395.716 150.800 C 395.378 149.881,394.289 148.742,393.400 148.378 C 392.696 148.090,392.686 148.048,393.318 148.025 C 393.713 148.011,394.478 148.442,395.018 148.982 M396.000 249.818 C 396.000 250.681,394.185 252.407,393.318 252.368 C 392.761 252.344,392.735 252.288,393.200 252.118 C 394.134 251.776,395.600 250.318,395.600 249.730 C 395.600 249.439,395.690 249.200,395.800 249.200 C 395.910 249.200,396.000 249.478,396.000 249.818 M6.444 251.842 C 6.970 252.133,7.167 252.378,6.882 252.386 C 6.210 252.404,4.396 250.590,4.414 249.918 C 4.422 249.633,4.667 249.830,4.958 250.356 C 5.250 250.882,5.918 251.550,6.444 251.842 M381.930 285.680 C 381.050 287.268,378.633 289.166,378.130 288.663 C 377.907 288.441,382.210 284.000,382.648 284.000 C 382.765 284.000,382.441 284.756,381.930 285.680 M21.169 287.890 C 22.817 289.001,22.299 289.101,20.519 288.016 C 19.815 287.587,18.960 286.696,18.619 286.038 C 17.714 284.287,17.863 284.078,18.910 285.631 C 19.410 286.374,20.426 287.390,21.169 287.890 M380.400 284.525 C 380.400 284.594,379.815 285.179,379.100 285.825 L 377.800 287.000 378.975 285.700 C 380.070 284.488,380.400 284.216,380.400 284.525 M28.280 301.053 C 27.569 301.764,25.042 299.552,24.639 297.864 C 24.387 296.812,24.517 296.879,26.426 298.788 C 27.559 299.921,28.393 300.940,28.280 301.053 M27.425 298.100 L 28.600 299.400 27.300 298.225 C 26.088 297.130,25.816 296.800,26.125 296.800 C 26.194 296.800,26.779 297.385,27.425 298.100 M374.400 296.925 C 374.400 296.994,373.815 297.579,373.100 298.225 L 371.800 299.400 372.975 298.100 C 374.070 296.888,374.400 296.616,374.400 296.925 M376.000 297.016 C 376.000 297.870,374.266 300.332,373.380 300.736 C 371.716 301.495,371.660 300.892,373.264 299.476 C 374.058 298.774,374.814 297.885,374.942 297.500 C 375.151 296.871,376.000 296.483,376.000 297.016 M364.377 317.297 C 363.975 318.755,362.004 320.800,361.002 320.800 C 360.707 320.800,360.136 320.893,359.733 321.006 C 359.330 321.119,359.630 320.923,360.400 320.571 C 362.347 319.679,363.499 318.518,364.028 316.914 C 364.619 315.124,364.894 315.425,364.377 317.297 M39.328 319.972 C 40.248 320.427,40.766 320.800,40.480 320.800 C 38.794 320.801,36.005 318.061,36.002 316.400 C 36.001 316.070,36.373 316.552,36.828 317.472 C 37.409 318.645,38.155 319.391,39.328 319.972 M82.928 363.572 C 83.848 364.027,84.366 364.400,84.080 364.400 C 82.394 364.401,79.605 361.661,79.602 360.000 C 79.601 359.670,79.973 360.152,80.428 361.072 C 81.009 362.245,81.755 362.991,82.928 363.572 M100.820 373.228 C 101.301 373.903,102.123 374.619,102.647 374.818 C 103.468 375.130,104.011 376.000,103.384 376.000 C 102.013 376.000,99.200 373.433,99.200 372.181 C 99.200 371.609,100.065 372.168,100.820 373.228 M102.625 373.300 L 103.800 374.600 102.500 373.425 C 101.288 372.330,101.016 372.000,101.325 372.000 C 101.394 372.000,101.979 372.585,102.625 373.300 M299.578 373.231 C 298.769 374.367,297.235 375.324,296.827 374.947 C 296.532 374.675,299.326 372.000,299.906 372.000 C 300.300 372.000,300.207 372.347,299.578 373.231 M114.235 380.218 C 115.426 381.438,116.400 382.521,116.400 382.626 C 116.400 383.248,113.036 380.949,112.386 379.884 C 110.781 377.252,111.459 377.375,114.235 380.218 M115.025 379.300 L 116.200 380.600 114.900 379.425 C 113.688 378.330,113.416 378.000,113.725 378.000 C 113.794 378.000,114.379 378.585,115.025 379.300 M286.800 378.125 C 286.800 378.194,286.215 378.779,285.500 379.425 L 284.200 380.600 285.375 379.300 C 286.470 378.088,286.800 377.816,286.800 378.125 M288.799 378.300 C 288.794 379.223,287.009 381.281,285.582 382.009 C 283.670 382.984,283.824 382.592,286.400 379.911 C 288.130 378.110,288.802 377.659,288.799 378.300 M149.453 394.848 C 149.864 395.204,150.470 395.595,150.800 395.716 C 151.266 395.888,151.240 395.944,150.682 395.968 C 149.756 396.009,147.992 394.250,148.025 393.318 C 148.048 392.686,148.090 392.696,148.378 393.400 C 148.558 393.840,149.042 394.492,149.453 394.848 M252.400 393.418 C 252.400 394.281,250.585 396.007,249.718 395.968 C 249.161 395.944,249.135 395.888,249.600 395.718 C 250.534 395.376,252.000 393.918,252.000 393.330 C 252.000 393.039,252.090 392.800,252.200 392.800 C 252.310 392.800,252.400 393.078,252.400 393.418 " stroke="none" fill="#e4ac14" fill-rule="evenodd"></path><path id="path4" d="M148.800 5.200 C 148.360 5.640,148.005 6.225,148.012 6.500 C 148.019 6.784,148.197 6.704,148.424 6.314 C 148.644 5.937,149.218 5.352,149.701 5.014 C 150.183 4.676,150.358 4.400,150.089 4.400 C 149.820 4.400,149.240 4.760,148.800 5.200 M250.486 4.824 C 250.863 5.044,251.448 5.618,251.786 6.101 C 252.124 6.583,252.400 6.758,252.400 6.489 C 252.400 5.844,250.936 4.397,250.300 4.412 C 250.016 4.419,250.096 4.597,250.486 4.824 M129.398 10.802 C 128.375 11.932,128.810 12.037,129.886 10.920 C 130.373 10.414,130.626 10.000,130.448 10.000 C 130.270 10.000,129.797 10.361,129.398 10.802 M270.514 10.920 C 271.001 11.426,271.474 11.787,271.564 11.723 C 271.798 11.555,270.342 10.000,269.952 10.000 C 269.774 10.000,270.027 10.414,270.514 10.920 M114.119 18.784 C 113.415 19.213,112.560 20.104,112.219 20.762 C 111.314 22.513,111.463 22.722,112.510 21.169 C 113.010 20.426,114.026 19.410,114.769 18.910 C 116.417 17.799,115.899 17.699,114.119 18.784 M284.400 18.219 C 284.400 18.625,288.446 22.488,288.653 22.280 C 289.082 21.851,287.508 19.532,286.281 18.784 C 284.986 17.995,284.400 17.819,284.400 18.219 M284.400 20.125 C 284.400 20.194,284.985 20.779,285.700 21.425 L 287.000 22.600 285.825 21.300 C 284.730 20.088,284.400 19.816,284.400 20.125 M298.788 26.426 C 300.990 28.628,301.631 28.793,300.656 26.908 C 299.910 25.466,299.321 24.987,297.864 24.639 C 296.812 24.387,296.879 24.517,298.788 26.426 M100.713 25.500 C 99.826 26.517,99.098 28.032,99.368 28.301 C 99.495 28.429,99.600 28.330,99.600 28.081 C 99.600 27.832,100.159 26.992,100.841 26.214 C 101.524 25.436,101.912 24.800,101.703 24.800 C 101.495 24.800,101.049 25.115,100.713 25.500 M296.800 26.125 C 296.800 26.194,297.385 26.779,298.100 27.425 L 299.400 28.600 298.225 27.300 C 297.130 26.088,296.800 25.816,296.800 26.125 M83.048 36.014 C 81.427 36.499,80.066 37.899,79.610 39.548 C 79.103 41.386,79.388 41.653,79.972 39.886 C 80.507 38.264,81.680 37.094,83.600 36.268 C 85.139 35.605,84.852 35.473,83.048 36.014 M317.472 36.828 C 318.645 37.409,319.391 38.155,319.972 39.328 C 320.427 40.248,320.800 40.766,320.800 40.480 C 320.801 38.794,318.061 36.005,316.400 36.002 C 316.070 36.001,316.552 36.373,317.472 36.828 M194.872 78.300 C 192.304 80.752,192.116 81.170,191.578 85.646 C 191.087 89.728,190.686 90.471,188.400 91.543 C 186.760 92.313,186.019 94.130,185.116 99.600 L 184.555 103.000 182.757 103.858 C 180.554 104.910,179.865 106.280,178.862 111.600 C 178.154 115.353,178.127 115.409,176.642 116.117 C 174.790 117.002,173.944 118.779,172.984 123.800 C 172.606 125.780,172.242 127.608,172.175 127.862 C 172.109 128.117,171.507 128.445,170.838 128.592 C 168.404 129.126,167.289 131.575,166.103 138.989 C 165.804 140.863,165.696 141.004,164.256 141.408 C 162.473 141.908,161.323 143.230,160.957 145.200 C 160.701 146.580,159.631 148.793,159.214 148.807 C 156.294 148.902,151.647 150.683,149.800 152.415 C 148.464 153.668,142.104 154.399,132.525 154.401 C 122.071 154.403,113.472 155.592,110.709 157.416 C 109.888 157.957,109.098 158.400,108.953 158.400 C 108.807 158.400,108.483 158.681,108.232 159.025 C 107.849 159.548,105.670 159.737,94.787 160.190 C 80.550 160.783,78.659 161.095,76.194 163.259 C 74.111 165.087,74.228 166.789,76.590 169.052 C 77.910 170.317,78.502 171.271,78.844 172.684 C 79.398 174.971,80.848 176.665,82.556 177.020 C 84.402 177.404,85.600 178.304,85.601 179.309 C 85.604 180.997,87.040 182.722,88.881 183.248 C 91.183 183.907,91.460 184.165,91.740 185.908 C 92.084 188.042,92.985 189.107,94.914 189.657 C 97.040 190.263,97.888 190.978,98.207 192.431 C 98.501 193.772,100.402 195.504,101.931 195.824 C 103.708 196.196,104.101 196.564,104.629 198.352 C 105.266 200.509,106.109 201.445,107.948 202.037 C 109.729 202.610,110.400 203.117,110.400 203.889 C 110.400 206.047,112.784 208.400,114.971 208.400 C 116.058 208.400,116.966 209.470,117.409 211.271 C 117.749 212.655,118.870 213.648,120.940 214.398 C 122.384 214.922,122.749 215.318,123.746 217.444 C 124.754 219.596,125.135 220.003,126.924 220.844 C 128.042 221.370,129.072 222.070,129.214 222.400 C 130.233 224.780,130.791 225.480,132.212 226.165 C 133.085 226.586,134.070 227.060,134.400 227.218 C 135.847 227.914,134.997 234.509,133.233 236.272 C 130.563 238.942,129.813 242.665,129.215 256.200 C 128.571 270.778,128.590 270.653,126.633 272.891 C 125.027 274.727,124.939 274.970,124.251 279.498 C 123.140 286.802,122.311 309.491,123.107 310.800 C 125.629 314.946,130.303 315.036,132.454 310.980 C 133.564 308.888,133.642 308.851,137.559 308.533 C 141.700 308.196,143.733 307.205,144.800 305.000 C 145.753 303.031,145.879 302.961,149.522 302.384 C 153.585 301.740,156.176 300.407,157.176 298.447 C 158.157 296.524,158.708 296.195,161.558 295.832 C 164.255 295.488,166.568 294.330,168.477 292.365 C 169.323 291.495,170.606 290.675,171.477 290.446 C 172.315 290.227,173.849 289.835,174.887 289.575 C 176.284 289.226,177.423 288.496,179.267 286.768 C 181.221 284.937,182.196 284.332,183.780 283.965 C 189.902 282.547,190.177 282.385,193.200 278.423 C 195.125 275.900,206.698 277.034,209.024 279.974 C 210.945 282.401,211.340 282.621,215.536 283.606 C 218.960 284.410,219.377 284.620,221.433 286.580 C 224.027 289.053,224.529 289.322,228.089 290.143 C 230.150 290.618,231.084 291.077,232.089 292.109 C 233.837 293.903,236.634 295.484,238.600 295.788 C 241.832 296.288,243.042 296.844,243.747 298.154 C 244.615 299.765,247.489 301.514,250.145 302.048 C 254.794 302.982,255.159 303.152,255.988 304.776 C 257.077 306.910,259.031 308.005,262.510 308.431 C 266.772 308.951,266.929 309.023,267.800 310.839 C 269.525 314.437,273.376 314.960,276.160 311.974 L 277.723 310.299 277.450 300.049 C 276.960 281.679,276.040 275.503,273.390 272.790 L 271.993 271.359 271.594 263.579 C 270.482 241.858,269.765 237.837,266.636 235.787 C 265.791 235.233,265.649 234.750,265.398 231.574 C 265.078 227.531,265.279 227.024,267.359 226.634 C 268.902 226.345,269.879 225.385,271.000 223.060 C 271.573 221.870,272.163 221.283,273.084 220.985 C 274.874 220.406,276.276 218.972,276.909 217.073 C 277.483 215.351,277.595 215.256,280.450 214.063 C 282.059 213.390,282.393 213.036,283.019 211.345 C 283.991 208.715,284.288 208.400,285.795 208.400 C 287.564 208.400,289.085 207.093,289.660 205.079 C 290.280 202.911,290.579 202.544,291.953 202.269 C 293.599 201.940,295.499 200.179,295.815 198.689 C 296.153 197.098,297.079 196.000,298.082 196.000 C 299.756 196.000,301.262 194.760,302.221 192.591 C 303.054 190.707,303.368 190.386,304.734 190.018 C 307.033 189.399,308.400 188.178,308.400 186.745 C 308.400 184.903,309.008 184.158,310.955 183.612 C 313.144 183.000,314.255 181.875,314.912 179.607 C 315.379 177.995,315.559 177.830,317.580 177.171 C 320.128 176.341,321.018 175.328,321.597 172.600 C 321.931 171.028,322.298 170.419,323.311 169.756 C 325.168 168.540,325.904 166.003,324.905 164.261 C 323.231 161.342,319.965 160.642,305.380 160.076 L 295.360 159.687 293.050 158.069 C 289.174 155.354,285.820 154.916,262.040 154.022 L 251.880 153.640 250.640 152.465 C 248.921 150.835,247.198 150.040,243.893 149.351 C 240.982 148.744,240.192 148.179,239.767 146.400 C 238.882 142.695,238.413 142.063,236.044 141.389 C 234.853 141.051,234.577 140.771,234.471 139.789 C 233.807 133.667,232.375 130.099,229.971 128.582 C 229.086 128.023,228.299 127.349,228.223 127.083 C 228.147 126.817,227.694 124.873,227.216 122.763 C 226.317 118.790,225.280 116.559,224.128 116.117 C 223.122 115.731,222.000 114.483,222.000 113.750 C 222.000 113.392,221.626 111.506,221.169 109.558 C 220.314 105.916,219.751 105.037,216.938 102.949 C 215.951 102.216,215.687 101.576,215.045 98.349 C 214.119 93.689,213.525 92.202,212.337 91.566 C 209.686 90.148,209.204 89.066,208.171 82.215 C 207.985 80.983,207.449 80.159,205.766 78.515 L 203.599 76.400 200.231 76.400 L 196.862 76.400 194.872 78.300 M360.600 79.959 C 362.463 80.815,363.288 81.662,364.147 83.600 C 364.742 84.944,364.758 84.952,364.536 83.800 C 364.078 81.423,362.585 79.928,360.200 79.460 C 359.170 79.257,359.227 79.328,360.600 79.959 M38.519 80.384 C 37.279 81.140,36.000 83.017,36.000 84.080 C 36.000 84.366,36.373 83.848,36.828 82.928 C 37.409 81.755,38.155 81.009,39.328 80.428 C 40.248 79.973,40.730 79.601,40.400 79.602 C 40.070 79.602,39.224 79.954,38.519 80.384 M204.902 81.544 C 206.323 83.117,208.400 88.377,208.400 90.403 C 208.400 91.049,209.085 92.129,210.339 93.457 C 212.215 95.444,213.514 98.467,214.584 103.336 C 214.721 103.960,215.661 105.310,216.673 106.336 C 218.663 108.352,219.590 110.164,220.392 113.600 C 221.051 116.422,221.377 117.057,223.167 119.000 C 224.266 120.193,224.924 121.516,225.751 124.200 C 227.260 129.097,227.830 130.308,229.148 131.417 C 230.478 132.536,232.120 136.061,232.831 139.323 C 233.216 141.089,233.706 142.025,234.878 143.232 C 235.725 144.105,237.427 146.443,238.661 148.428 C 242.082 153.932,244.163 154.542,263.200 155.616 C 274.875 156.275,284.334 157.666,287.062 159.126 C 288.380 159.832,294.132 160.759,299.881 161.192 C 316.559 162.451,317.660 162.636,320.253 164.613 C 321.560 165.610,321.561 165.611,320.992 167.223 C 320.679 168.110,320.304 169.731,320.159 170.825 C 319.861 173.067,319.004 174.113,315.805 176.138 C 314.559 176.926,313.458 178.042,312.870 179.110 C 312.281 180.181,311.363 181.109,310.415 181.592 C 309.484 182.067,308.336 183.216,307.433 184.577 C 306.625 185.794,305.486 187.107,304.903 187.495 C 304.319 187.883,302.464 189.550,300.781 191.200 C 299.098 192.850,297.132 194.637,296.412 195.171 C 295.692 195.705,294.596 196.841,293.977 197.695 C 293.358 198.549,292.037 199.871,291.040 200.632 C 290.043 201.393,288.669 202.828,287.986 203.820 C 287.303 204.813,286.031 206.076,285.159 206.626 C 284.286 207.177,282.877 208.359,282.026 209.254 C 281.176 210.148,280.327 211.040,280.140 211.236 C 279.953 211.432,278.748 212.528,277.461 213.672 C 276.175 214.815,274.966 216.163,274.775 216.667 C 274.583 217.170,273.506 218.244,272.381 219.052 C 271.256 219.860,269.624 221.484,268.755 222.661 C 267.886 223.837,266.920 224.800,266.608 224.800 C 263.415 224.800,263.310 236.447,266.443 243.167 C 268.257 247.058,269.028 251.720,270.415 267.200 C 270.962 273.301,271.775 277.392,272.985 280.131 C 274.390 283.310,275.088 287.613,275.999 298.704 C 276.539 305.287,275.830 308.417,273.358 310.362 L 272.299 311.194 270.996 310.050 C 270.233 309.380,268.473 308.546,266.747 308.035 C 262.273 306.712,261.649 306.402,259.811 304.590 C 258.634 303.429,257.203 302.578,255.156 301.819 C 250.236 299.996,248.889 299.288,247.966 298.039 C 247.287 297.121,246.051 296.461,242.641 295.196 C 239.442 294.008,237.723 293.114,236.493 291.998 C 235.554 291.147,234.384 290.335,233.893 290.196 C 229.454 288.936,225.638 287.081,224.454 285.607 C 223.408 284.306,222.683 283.880,220.311 283.173 C 215.931 281.869,213.332 280.588,211.900 279.029 C 207.401 274.130,192.998 274.116,189.048 279.007 C 187.601 280.798,186.356 281.445,181.600 282.875 C 178.247 283.883,177.609 284.227,176.179 285.804 C 174.774 287.354,173.960 287.805,170.055 289.198 C 167.191 290.220,165.096 291.231,164.297 291.977 C 163.607 292.622,162.313 293.452,161.421 293.821 C 155.909 296.106,154.045 297.097,152.723 298.446 C 151.674 299.517,150.493 300.186,148.647 300.756 C 145.069 301.862,142.853 303.054,141.177 304.778 C 139.777 306.219,138.961 306.565,133.072 308.219 C 131.792 308.579,130.154 309.392,129.432 310.026 L 128.119 311.178 126.537 309.824 C 124.297 307.907,123.929 305.659,124.451 297.112 C 124.963 288.737,125.751 283.716,127.034 280.651 C 128.676 276.728,129.155 274.574,129.808 268.200 C 130.146 264.900,130.690 259.590,131.016 256.400 C 131.658 250.133,132.500 246.381,134.115 242.579 C 136.888 236.052,136.958 224.800,134.226 224.800 C 133.946 224.800,132.601 223.544,131.237 222.010 C 129.873 220.475,128.215 218.900,127.552 218.510 C 126.890 218.119,125.829 216.958,125.195 215.928 C 124.561 214.899,123.088 213.351,121.921 212.489 C 120.754 211.627,119.556 210.466,119.258 209.909 C 118.960 209.353,117.578 208.143,116.187 207.221 C 114.795 206.300,113.357 205.063,112.991 204.473 C 112.625 203.883,111.037 202.124,109.463 200.565 C 107.888 199.006,106.164 197.141,105.632 196.420 C 105.099 195.699,103.794 194.574,102.732 193.920 C 101.669 193.266,100.800 192.606,100.800 192.453 C 100.800 191.953,97.028 188.333,95.898 187.748 C 95.292 187.434,94.362 186.507,93.833 185.689 C 93.304 184.870,92.360 183.713,91.735 183.119 C 89.005 180.519,87.322 178.771,86.249 177.421 C 85.616 176.625,84.356 175.634,83.449 175.219 C 81.754 174.444,80.400 172.692,80.400 171.274 C 80.400 170.832,80.058 169.371,79.639 168.026 L 78.878 165.581 80.141 164.618 C 82.794 162.594,84.497 162.297,98.527 161.406 C 108.427 160.778,113.348 160.116,116.000 159.055 C 119.698 157.575,125.628 156.654,137.000 155.791 C 156.922 154.280,158.400 153.853,161.558 148.711 C 162.676 146.890,164.370 144.566,165.322 143.546 C 166.673 142.097,167.164 141.178,167.564 139.346 C 168.274 136.090,169.916 132.542,171.220 131.444 C 172.891 130.038,173.858 127.688,174.987 122.294 C 175.114 121.686,176.105 120.209,177.189 119.012 C 178.451 117.618,179.318 116.219,179.600 115.118 C 180.812 110.389,181.616 108.660,183.561 106.604 C 184.900 105.188,185.682 103.945,185.982 102.756 C 187.332 97.406,188.161 95.470,189.882 93.650 C 190.845 92.633,191.727 91.350,191.843 90.800 C 192.699 86.736,194.156 83.030,195.466 81.580 L 196.893 80.000 200.200 80.000 L 203.507 80.000 204.902 81.544 M26.544 99.969 C 25.113 100.842,25.012 100.978,24.639 102.536 C 24.386 103.593,24.505 103.533,26.383 101.655 C 29.007 99.031,29.064 98.432,26.544 99.969 M373.082 99.985 C 373.787 100.414,374.724 101.449,375.164 102.283 C 375.604 103.117,375.973 103.658,375.982 103.484 C 376.031 102.611,374.336 100.099,373.413 99.679 C 371.816 98.951,371.646 99.109,373.082 99.985 M26.975 102.500 L 25.800 103.800 27.100 102.625 C 28.312 101.530,28.584 101.200,28.275 101.200 C 28.206 101.200,27.621 101.785,26.975 102.500 M20.519 112.384 C 19.815 112.813,18.960 113.704,18.619 114.362 C 17.714 116.113,17.863 116.322,18.910 114.769 C 19.410 114.026,20.426 113.010,21.169 112.510 C 22.817 111.399,22.299 111.299,20.519 112.384 M378.000 111.835 C 378.000 112.110,382.347 116.400,382.626 116.400 C 382.731 116.400,382.445 115.673,381.992 114.784 C 381.096 113.028,378.000 110.741,378.000 111.835 M378.000 113.725 C 378.000 113.794,378.585 114.379,379.300 115.025 L 380.600 116.200 379.425 114.900 C 378.330 113.688,378.000 113.416,378.000 113.725 M389.314 129.720 C 389.801 130.226,390.274 130.587,390.364 130.523 C 390.598 130.355,389.142 128.800,388.752 128.800 C 388.574 128.800,388.827 129.214,389.314 129.720 M5.200 148.800 C 4.760 149.240,4.405 149.825,4.412 150.100 C 4.419 150.384,4.597 150.304,4.824 149.914 C 5.044 149.537,5.618 148.952,6.101 148.614 C 6.583 148.276,6.758 148.000,6.489 148.000 C 6.220 148.000,5.640 148.360,5.200 148.800 M393.400 148.378 C 394.289 148.742,395.378 149.881,395.716 150.800 C 395.888 151.266,395.944 151.240,395.968 150.682 C 396.009 149.756,394.250 147.992,393.318 148.025 C 392.686 148.048,392.696 148.090,393.400 148.378 M395.600 249.730 C 395.600 250.31
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's no newline for EOF, but also the entirety of the file is on one line so I'm not sure if it's a problem

eAlasdair
eAlasdair reviewed Sep 23, 2019
View reviewed changes
Copy link
Contributor

@eAlasdair eAlasdair left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I'm behind a commit or two when reviewing this, because some pieces of text don't quite match what's here (argh loading up forks is kinda awkward but not your problem!). Functionally it works great! I mostly have comments about how it is displayed

codewof/templates/users/dashboard.html Outdated Show resolved Hide resolved
codewof/templates/users/user_detail.html Show resolved Hide resolved
codewof/__init__.py Show resolved Hide resolved
codewof/general/management/commands/sampledata.py

Badge.objects.create(
id_name='questions-solved-5',
display_name='Solved five questions!',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

Would be cool if the icon could be displayed with this message

codewof/templates/users/user_detail.html Show resolved Hide resolved
codewof/templates/users/dashboard.html Outdated
@@ -30,11 +30,24 @@ <h2>Your questions for today</h2>
<strong>Sorry!</strong> We currently don't have questions for you to do today.
</div>
{% endif %}
<p>You've solved {{number_days_used}} questions in the last month!</p>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

"...and earned X points..." perhaps?

dev Show resolved Hide resolved
courtneycb
courtneycb suggested changes Sep 23, 2019
View reviewed changes
Copy link
Contributor

@courtneycb courtneycb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work :) I agree with Alasdair's comments too. I'm not sure how harsh we are meant to be with the frontend side of things.

Impressive stuff you have made here :)

codewof/templates/users/activity_graph.html Outdated Show resolved Hide resolved
codewof/tests/programming/test_views.py Show resolved Hide resolved
@eAlasdair
Copy link
Contributor

Nice work :) I agree with Alasdair's comments too. I'm not sure how harsh we are meant to be with the frontend side of things.

Yes it does need to be made clear that we know very little about the expectations for this project and are pretty much solely relying on our experience with CSFG

@MareePalmer
Changed px to rem for activity graph css
ad62562
@MareePalmer
Renamed variables and rewrote documentation for function to get numbe…
452e77b 
…r of questions answered in the last month. Pluralized number of questions answered on the user dashboard.
@courtneycb courtneycb mentioned this pull request Mar 27, 2020
Merged
@courtneycb courtneycb mentioned this pull request Apr 14, 2020
Open
@courtneycb courtneycb merged commit 7643db8 into uccser:develop Apr 15, 2020
@courtneycb courtneycb mentioned this pull request Apr 15, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eAlasdair eAlasdair eAlasdair left review comments

@courtneycb courtneycb courtneycb requested changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@MareePalmer @eAlasdair @courtneycb