Compare commits
	
		
			18 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 9fc4ad63c4 | |||
| 97054a71c1 | |||
| 2391668a25 | |||
| 717d33547c | |||
| 997be32679 | |||
| 134f00c40e | |||
| 47c898bdfd | |||
| e752ee12d1 | |||
| cc4515ff66 | |||
| f190292171 | |||
| b246f2b349 | |||
| 76b69d851a | |||
| 224f586368 | |||
| 9add6c8ff1 | |||
| 7a63d4eed1 | |||
| e54a4807f7 | |||
| cee04c1d6f | |||
| cbec78589d | 
							
								
								
									
										41
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										41
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -2,8 +2,49 @@ | |||||||
|  |  | ||||||
| All notable changes to this project will be documented in this file. Dates are displayed in UTC. | All notable changes to this project will be documented in this file. Dates are displayed in UTC. | ||||||
|  |  | ||||||
|  | #### [0.15.6](https://git.odit.services/lfk/frontend/compare/0.15.5...0.15.6) | ||||||
|  |  | ||||||
|  | - Fixed donations getting reduced to the first one on certificates [`2391668`](https://git.odit.services/lfk/frontend/commit/2391668a25a1e11a1409df572d77ad1635070fbc) | ||||||
|  | - new license file version [CI SKIP] [`97054a7`](https://git.odit.services/lfk/frontend/commit/97054a71c1ab8a045762a55148124965c6994373) | ||||||
|  |  | ||||||
|  | #### [0.15.5](https://git.odit.services/lfk/frontend/compare/0.15.4...0.15.5) | ||||||
|  |  | ||||||
|  | > 5 July 2021 | ||||||
|  |  | ||||||
|  | - 🚀RELEASE v0.15.5 [`717d335`](https://git.odit.services/lfk/frontend/commit/717d33547c3378424dd720005da9952f8a753f1a) | ||||||
|  | - Merge pull request 'Fixed kilometer conversion' (#142) from bugfix/141-runner_kilometers into dev [`997be32`](https://git.odit.services/lfk/frontend/commit/997be32679dc38c9fb0e92b6ce011057b854d99d) | ||||||
|  | - Fixed kilometer conversion [`134f00c`](https://git.odit.services/lfk/frontend/commit/134f00c40e0c8252e7604a73151e8d6685b2c61d) | ||||||
|  | - new license file version [CI SKIP] [`e752ee1`](https://git.odit.services/lfk/frontend/commit/e752ee12d17a4423f4364f7766eafbe7d4cef2d1) | ||||||
|  |  | ||||||
|  | #### [0.15.4](https://git.odit.services/lfk/frontend/compare/0.15.3...0.15.4) | ||||||
|  |  | ||||||
|  | > 5 July 2021 | ||||||
|  |  | ||||||
|  | - Merge pull request 'fix total donation sum in dashboard' (#140) from bugfix/139-total-donation-sum-is-wrong into dev [`#139`](https://git.odit.services/lfk/frontend/issues/139) | ||||||
|  | - 🚀RELEASE v0.15.4 [`cc4515f`](https://git.odit.services/lfk/frontend/commit/cc4515ff66b1c1de3747d0ee6cc465574accedb7) | ||||||
|  | - divide by 100 + toFixes(2) [`b246f2b`](https://git.odit.services/lfk/frontend/commit/b246f2b349b06d1adea318dfad58f97fb1a249bb) | ||||||
|  |  | ||||||
|  | #### [0.15.3](https://git.odit.services/lfk/frontend/compare/0.15.2...0.15.3) | ||||||
|  |  | ||||||
|  | > 16 April 2021 | ||||||
|  |  | ||||||
|  | - 🚀RELEASE v0.15.3 [`76b69d8`](https://git.odit.services/lfk/frontend/commit/76b69d851aa590ecf8caac135b72962a72e83635) | ||||||
|  | - Small bugfix (null got displayed) 🛠 [`224f586`](https://git.odit.services/lfk/frontend/commit/224f5863683ae2543a4a435510ed2c558dc5d307) | ||||||
|  |  | ||||||
|  | #### [0.15.2](https://git.odit.services/lfk/frontend/compare/0.15.1...0.15.2) | ||||||
|  |  | ||||||
|  | > 16 April 2021 | ||||||
|  |  | ||||||
|  | - 🚀RELEASE v0.15.2 [`9add6c8`](https://git.odit.services/lfk/frontend/commit/9add6c8ff1fbeed91fe97a7cf262921b716f4e3c) | ||||||
|  | - Footer - noopener link [`cee04c1`](https://git.odit.services/lfk/frontend/commit/cee04c1d6fb6005cefe77fb95855ab6fe2cc448f) | ||||||
|  | - Hotfix: Team change recognition 🐞 [`cbec785`](https://git.odit.services/lfk/frontend/commit/cbec78589d2fa21f12ce87e71bff2b49c3a7d345) | ||||||
|  | - NGINX cache assets [`e54a480`](https://git.odit.services/lfk/frontend/commit/e54a4807f70bc333396885f81d3dcc7ae6c115d9) | ||||||
|  |  | ||||||
| #### [0.15.1](https://git.odit.services/lfk/frontend/compare/0.15.0...0.15.1) | #### [0.15.1](https://git.odit.services/lfk/frontend/compare/0.15.0...0.15.1) | ||||||
|  |  | ||||||
|  | > 16 April 2021 | ||||||
|  |  | ||||||
|  | - 🚀RELEASE v0.15.1 [`a85db7c`](https://git.odit.services/lfk/frontend/commit/a85db7cb3f89881794e37a66ecd822f8ad5873f1) | ||||||
| - Merge pull request '🐞🐳 fix Dockerfile' (#138) from bugfix/136-opacity_reactivity into dev [`2bd3779`](https://git.odit.services/lfk/frontend/commit/2bd3779839de16a89b91a3da93033e2a2b742ab7) | - Merge pull request '🐞🐳 fix Dockerfile' (#138) from bugfix/136-opacity_reactivity into dev [`2bd3779`](https://git.odit.services/lfk/frontend/commit/2bd3779839de16a89b91a3da93033e2a2b742ab7) | ||||||
| - 🚚 move to tailwind [`07ac041`](https://git.odit.services/lfk/frontend/commit/07ac041d69b3b1810e5db538b53fe62084490f7a) | - 🚚 move to tailwind [`07ac041`](https://git.odit.services/lfk/frontend/commit/07ac041d69b3b1810e5db538b53fe62084490f7a) | ||||||
| - 🐞🐳 fix Dockerfile [`303e33c`](https://git.odit.services/lfk/frontend/commit/303e33cafb4a1be01e4c4b43f46ff0c651cb4620) | - 🐞🐳 fix Dockerfile [`303e33c`](https://git.odit.services/lfk/frontend/commit/303e33cafb4a1be01e4c4b43f46ff0c651cb4620) | ||||||
|   | |||||||
| @@ -13,7 +13,7 @@ | |||||||
| </head> | </head> | ||||||
|  |  | ||||||
| <body> | <body> | ||||||
|   <span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.15.1-RELEASE_INFO</span> |   <span style="display: none;visibility: hidden;" id="buildinfo">RELEASE_INFO-0.15.6-RELEASE_INFO</span> | ||||||
|   <noscript>You need to enable JavaScript to run this app.</noscript> |   <noscript>You need to enable JavaScript to run this app.</noscript> | ||||||
|   <script src="/env.js"></script> |   <script src="/env.js"></script> | ||||||
|   <script type="module" src="/src/main.js"></script> |   <script type="module" src="/src/main.js"></script> | ||||||
|   | |||||||
| @@ -6,6 +6,11 @@ http { | |||||||
|     server { |     server { | ||||||
|         error_page 404 /index.html; |         error_page 404 /index.html; | ||||||
|         root /usr/share/nginx/html; |         root /usr/share/nginx/html; | ||||||
|  |         location /assets { | ||||||
|  |             expires 1y; | ||||||
|  |             log_not_found off; | ||||||
|  |             access_log off; | ||||||
|  |         } | ||||||
|         location = /index.html { |         location = /index.html { | ||||||
|             add_header Cache-Control 'no-store'; |             add_header Cache-Control 'no-store'; | ||||||
|         } |         } | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| { | { | ||||||
| 	"name": "@odit/lfk-frontend", | 	"name": "@odit/lfk-frontend", | ||||||
| 	"version": "0.15.1", | 	"version": "0.15.6", | ||||||
| 	"scripts": { | 	"scripts": { | ||||||
| 		"i18n-order": "node order.js", | 		"i18n-order": "node order.js", | ||||||
| 		"dev": "vite", | 		"dev": "vite", | ||||||
|   | |||||||
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							| @@ -70,7 +70,7 @@ | |||||||
|             <div class="text-xs uppercase font-light text-grey-500"> |             <div class="text-xs uppercase font-light text-grey-500"> | ||||||
|               {$_('total-donations')} |               {$_('total-donations')} | ||||||
|             </div> |             </div> | ||||||
|             <div class="text-xl font-bold">{stats.total_donation} €</div> |             <div class="text-xl font-bold">{(stats.total_donation/100).toFixed(2)} €</div> | ||||||
|           </div><svg |           </div><svg | ||||||
|             xmlns="http://www.w3.org/2000/svg" |             xmlns="http://www.w3.org/2000/svg" | ||||||
|             height="24" |             height="24" | ||||||
|   | |||||||
| @@ -132,7 +132,7 @@ | |||||||
|                           <a |                           <a | ||||||
|                             href="../donations/{d.id}" |                             href="../donations/{d.id}" | ||||||
|                             class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-blue-600 text-white mr-1">{d.runner.firstname} |                             class="px-2 inline-flex text-xs leading-5 font-semibold rounded-full bg-blue-600 text-white mr-1">{d.runner.firstname} | ||||||
|                             {d.runner.middlename} |                             {d.runner.middlename || ''} | ||||||
|                             {d.runner.lastname}</a> |                             {d.runner.lastname}</a> | ||||||
|                         {:else} |                         {:else} | ||||||
|                           <a |                           <a | ||||||
|   | |||||||
| @@ -32,8 +32,12 @@ | |||||||
|       target="_blank" |       target="_blank" | ||||||
|       rel="noopener, noreferrer" |       rel="noopener, noreferrer" | ||||||
|       href="https://git.odit.services/lfk/frontend/src/tag/{releaseinfo}">{releaseinfo}</a> |       href="https://git.odit.services/lfk/frontend/src/tag/{releaseinfo}">{releaseinfo}</a> | ||||||
|       - |     - | ||||||
|     <a class="underline" href="https://docs.lauf-fuer-kaya.de" target="_blank">{$_('documentation')}</a> |     <a | ||||||
|  |       rel="noopener, noreferrer" | ||||||
|  |       class="underline" | ||||||
|  |       href="https://docs.lauf-fuer-kaya.de" | ||||||
|  |       target="_blank">{$_('documentation')}</a> | ||||||
|     - |     - | ||||||
|     <a class="underline" href="/privacy">{$_('privacy')}</a> |     <a class="underline" href="/privacy">{$_('privacy')}</a> | ||||||
|     - |     - | ||||||
|   | |||||||
| @@ -40,7 +40,8 @@ | |||||||
|         const current_donations = (await DonationService.donationControllerGetAll()) || []; |         const current_donations = (await DonationService.donationControllerGetAll()) || []; | ||||||
|         let certificateRunners = []; |         let certificateRunners = []; | ||||||
|         for (let runner of generate_runners) { |         for (let runner of generate_runners) { | ||||||
|             runner.distanceDonations = current_donations.find((d) => d.runner?.id == runner.id) || []; |             runner.distanceDonations = current_donations.filter((d) => d.runner?.id == runner.id) || []; | ||||||
|  |             console.log(runner.distanceDonations) | ||||||
|             certificateRunners.push(runner); |             certificateRunners.push(runner); | ||||||
|         } |         } | ||||||
|         fetch( |         fetch( | ||||||
| @@ -103,7 +104,7 @@ | |||||||
|                 ); |                 ); | ||||||
|             let certificateRunners = []; |             let certificateRunners = []; | ||||||
|             for (let runner of runners) { |             for (let runner of runners) { | ||||||
|                 runner.distanceDonations = current_donations.find((d) => d.runner?.id == runner.id) || []; |                 runner.distanceDonations = current_donations.filter((d) => d.runner?.id == runner.id) || []; | ||||||
|                 certificateRunners.push(runner); |                 certificateRunners.push(runner); | ||||||
|             } |             } | ||||||
|             fetch( |             fetch( | ||||||
| @@ -166,7 +167,7 @@ | |||||||
|             let runners = await RunnerOrganizationService.runnerOrganizationControllerGetRunners(o.id, true) |             let runners = await RunnerOrganizationService.runnerOrganizationControllerGetRunners(o.id, true) | ||||||
|             let certificateRunners = []; |             let certificateRunners = []; | ||||||
|             for (let runner of runners) { |             for (let runner of runners) { | ||||||
|                 runner.distanceDonations = current_donations.find((d) => d.runner?.id == runner.id) || []; |                 runner.distanceDonations = current_donations.filter((d) => d.runner?.id == runner.id) || []; | ||||||
|                 certificateRunners.push(runner); |                 certificateRunners.push(runner); | ||||||
|             } |             } | ||||||
|             await fetch( |             await fetch( | ||||||
| @@ -219,7 +220,7 @@ | |||||||
|                 ); |                 ); | ||||||
|                 let certificateRunners = []; |                 let certificateRunners = []; | ||||||
|             for (let runner of runners) { |             for (let runner of runners) { | ||||||
|                 runner.distanceDonations = current_donations.find((d) => d.runner?.id == runner.id) || []; |                 runner.distanceDonations = current_donations.filter((d) => d.runner?.id == runner.id) || []; | ||||||
|                 certificateRunners.push(runner); |                 certificateRunners.push(runner); | ||||||
|             } |             } | ||||||
|             await fetch( |             await fetch( | ||||||
|   | |||||||
| @@ -294,7 +294,7 @@ | |||||||
|     <div class="text-sm w-full"> |     <div class="text-sm w-full"> | ||||||
|       <span class="font-medium text-gray-700">{$_('distance')}</span> |       <span class="font-medium text-gray-700">{$_('distance')}</span> | ||||||
|       <br /> |       <br /> | ||||||
|       <span class="text-gray-700">{original_data.distance} km</span> |       <span class="text-gray-700">{original_data.distance /1000 } km</span> | ||||||
|     </div> |     </div> | ||||||
|   </section> |   </section> | ||||||
| {:catch error} | {:catch error} | ||||||
|   | |||||||
| @@ -206,7 +206,7 @@ | |||||||
|                       {/if} |                       {/if} | ||||||
|                     </td> |                     </td> | ||||||
|                     <td class="px-6 py-4 whitespace-nowrap"> |                     <td class="px-6 py-4 whitespace-nowrap"> | ||||||
|                       {runner.distance} |                       {runner.distance /1000 } km | ||||||
|                     </td> |                     </td> | ||||||
|                     {#if active_deletes[runner.id] === true} |                     {#if active_deletes[runner.id] === true} | ||||||
|                       <td |                       <td | ||||||
|   | |||||||
| @@ -26,9 +26,9 @@ | |||||||
|   export let params; |   export let params; | ||||||
|   export let import_modal_open = false; |   export let import_modal_open = false; | ||||||
|   $: delete_triggered = false; |   $: delete_triggered = false; | ||||||
|   $: save_enabled = !data_changed && teamdata.parentGroup != null; |   $: save_enabled = data_changed && teamdata.parentGroup != null; | ||||||
|   $: data_loaded = false; |   $: data_loaded = false; | ||||||
|   $: data_changed = JSON.stringify(teamdata) === JSON.stringify(original); |   $: data_changed = !(JSON.stringify(teamdata) === JSON.stringify(original)); | ||||||
|   $: sponsoring_contracts_show = true; |   $: sponsoring_contracts_show = true; | ||||||
|   $: cards_show = true; |   $: cards_show = true; | ||||||
|   $: certificates_show = true; |   $: certificates_show = true; | ||||||
| @@ -47,6 +47,8 @@ | |||||||
|     RunnerOrganizationService.runnerOrganizationControllerGetAll().then( |     RunnerOrganizationService.runnerOrganizationControllerGetAll().then( | ||||||
|       (val) => { |       (val) => { | ||||||
|         orgs = val.map((r) => { |         orgs = val.map((r) => { | ||||||
|  |           delete r.contact; | ||||||
|  |           r.teams = []; | ||||||
|           return { label: r.name, value: r }; |           return { label: r.name, value: r }; | ||||||
|         }); |         }); | ||||||
|         group = orgs.find((g) => g.value.id == teamdata.parentGroup.id); |         group = orgs.find((g) => g.value.id == teamdata.parentGroup.id); | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user