Compare commits
1165 Commits
Author | SHA1 | Date |
---|---|---|
philipp lang | a456cc1889 | |
philipp lang | 784b49c3dd | |
philipp lang | c3a0381a0a | |
philipp lang | 101ac7402a | |
philipp lang | 2c38488962 | |
philipp lang | 8a26276e28 | |
philipp lang | 4651a4cb96 | |
philipp lang | 688e10e230 | |
philipp lang | 267da38c6b | |
philipp lang | 499c61afff | |
philipp lang | 02531938b3 | |
philipp lang | 1c53e81f1a | |
philipp lang | 98712093b2 | |
philipp lang | a32ef33113 | |
philipp lang | 088ea4f0a2 | |
philipp lang | 4ac89da124 | |
philipp lang | 286ceea0d4 | |
philipp lang | 52ac5937a4 | |
philipp lang | 4690e86bbf | |
philipp lang | 1a4a7c3652 | |
philipp lang | b05c5025c0 | |
philipp lang | acf7b94094 | |
philipp lang | 57b1efb065 | |
philipp lang | 3e563f8390 | |
philipp lang | 0a5590d533 | |
philipp lang | 10deaf15a1 | |
philipp lang | ae447a7a60 | |
philipp lang | baea21807a | |
philipp lang | 58426c5537 | |
philipp lang | 84cd13c085 | |
philipp lang | b8d2b37057 | |
philipp lang | 44eb3719b9 | |
philipp lang | c65a208e34 | |
philipp lang | 95a8d4d689 | |
philipp lang | e1e8669beb | |
philipp lang | a3ecfa756d | |
philipp lang | 70e085a49e | |
philipp lang | 1178b011e0 | |
philipp lang | 6a91e857d2 | |
philipp lang | 82baf67a73 | |
philipp lang | 36466420f6 | |
philipp lang | 54c37fccd1 | |
philipp lang | d03f036a2b | |
philipp lang | 75d11f9860 | |
philipp lang | da4d553ea6 | |
philipp lang | 5bad88c5f4 | |
philipp lang | 75dc0d9769 | |
philipp lang | 9fc8548504 | |
philipp lang | c990ce3171 | |
philipp lang | e7f63d19e5 | |
philipp lang | f549b31862 | |
philipp lang | 1f4efb22d3 | |
philipp lang | 3e725d9842 | |
philipp lang | 16d3bc51a3 | |
philipp lang | 0467f24ff6 | |
philipp lang | ed1a8f30bc | |
philipp lang | e5066af192 | |
philipp lang | 31afa2e418 | |
philipp lang | a897690e7a | |
philipp lang | 24ed5d4ab9 | |
philipp lang | e807aff3e6 | |
philipp lang | 096224fe98 | |
philipp lang | 646ce647da | |
philipp lang | f858716e57 | |
philipp lang | 1521aba1f8 | |
philipp lang | 664b88564d | |
philipp lang | d30a2336cf | |
philipp lang | a5f1c90003 | |
philipp lang | c3908b714b | |
philipp lang | 2f1e02151f | |
philipp lang | eaf014b7c7 | |
philipp lang | 94d34d1afa | |
philipp lang | 9b700be889 | |
philipp lang | e1ec6ad9df | |
philipp lang | aaa236fcd5 | |
philipp lang | 4d74e53fc2 | |
philipp lang | b8d389bdb9 | |
philipp lang | 3a4c99f154 | |
philipp lang | fca7fc463e | |
philipp lang | 767df11e4f | |
philipp lang | 295d85f4f8 | |
philipp lang | 42ccd32740 | |
philipp lang | bbcf2fd768 | |
philipp lang | b335c20777 | |
philipp lang | c63c8316b5 | |
philipp lang | 2e6c27b8f1 | |
philipp lang | 1cf8d34b78 | |
philipp lang | e3b52bf901 | |
philipp lang | 76e7b06630 | |
philipp lang | 21def11ae9 | |
philipp lang | 565b1ffbce | |
philipp lang | ef70203c8a | |
philipp lang | b3a29c706c | |
philipp lang | 298140e387 | |
philipp lang | 151477dbdd | |
philipp lang | a01e8adf8a | |
philipp lang | 547c9edfd5 | |
philipp lang | 6e09e2ec0d | |
philipp lang | 9d37ebefc5 | |
philipp lang | 11b1e6a198 | |
philipp lang | 5008244de2 | |
philipp lang | 8b3b3de9a8 | |
philipp lang | d9adb526ce | |
philipp lang | daf6e87814 | |
philipp lang | 2056e1ad6b | |
philipp lang | a4eba23bff | |
philipp lang | ad8cd58b4f | |
philipp lang | 3a4908f505 | |
philipp lang | 291eec3849 | |
philipp lang | 0e0f23c17e | |
philipp lang | 6d204b948e | |
philipp lang | 977e427abb | |
philipp lang | 46e070a029 | |
philipp lang | 84e05fbc52 | |
philipp lang | 343b0d418d | |
philipp lang | fe258198f4 | |
philipp lang | 8317fdca90 | |
philipp lang | 32ec479975 | |
philipp lang | ac45e0c8fa | |
philipp lang | 6f1ab73bae | |
philipp lang | c95658ae65 | |
philipp lang | d64ea85be6 | |
philipp lang | 22157b5d50 | |
philipp lang | 107b616bc1 | |
philipp lang | d7cc80afe9 | |
philipp lang | db6248999a | |
philipp lang | 9c568176ce | |
philipp lang | d56cb253a9 | |
philipp lang | 5fcee5f284 | |
philipp lang | b01ff9a677 | |
philipp lang | 0d76b3cc5f | |
philipp lang | 0972ad65a7 | |
philipp lang | 259465189f | |
philipp lang | 306fef3e07 | |
philipp lang | ca0dd11336 | |
philipp lang | 89a8feb278 | |
philipp lang | 8f7edadb99 | |
philipp lang | eee0c64106 | |
philipp lang | e50269d031 | |
philipp lang | dc40728fca | |
philipp lang | dfa17ed3db | |
philipp lang | 77c57794e1 | |
philipp lang | 1347347324 | |
philipp lang | cd9cc607f4 | |
philipp lang | 6f1efb7470 | |
philipp lang | 5fd050e116 | |
philipp lang | 3a53777dbd | |
philipp lang | 1ad2e6a978 | |
philipp lang | ac76d23941 | |
philipp lang | b67fa85539 | |
philipp lang | 5641006e2b | |
philipp lang | 607038af6b | |
philipp lang | 189b83f2a5 | |
philipp lang | 3f4c655e5e | |
philipp lang | 158cd2d352 | |
philipp lang | bf1388dbd9 | |
philipp lang | aa20329a62 | |
philipp lang | 09de9a5510 | |
philipp lang | 2982ae035f | |
philipp lang | 46740b14a2 | |
philipp lang | 885eaa5df5 | |
philipp lang | 757042bdd2 | |
philipp lang | c3f6d3827b | |
philipp lang | 1ef7995ec2 | |
philipp lang | c8676aef6d | |
philipp lang | cf93b8eff0 | |
philipp lang | e2a2d746a3 | |
philipp lang | aabba32f89 | |
philipp lang | 11b97a634b | |
philipp lang | 26cb7fd9f1 | |
philipp lang | 2b48f42734 | |
philipp lang | 74867cb09f | |
philipp lang | d4057ff08f | |
philipp lang | 657a648f46 | |
philipp lang | d9c45f5236 | |
philipp lang | 5d48521875 | |
philipp lang | 98976700a9 | |
philipp lang | 790332b25c | |
philipp lang | 56c28ae00e | |
philipp lang | a603aca80c | |
philipp lang | c05434a7fb | |
philipp lang | 248499dc60 | |
philipp lang | ad7fe80236 | |
philipp lang | dbde189575 | |
philipp lang | 146cbb0bef | |
philipp lang | e6477fff2b | |
philipp lang | 3c725c0efc | |
philipp lang | f632a8bb8f | |
philipp lang | 2f03dccebb | |
philipp lang | 235f439d51 | |
philipp lang | cf77797512 | |
philipp lang | d44ad4bc53 | |
philipp lang | 94597e57c1 | |
philipp lang | a9ecdfe4bb | |
philipp lang | 10a966c6ad | |
philipp lang | 3b63a73161 | |
philipp lang | 4e453a73a6 | |
philipp lang | 96cf0b7dd5 | |
philipp lang | b2e85211a7 | |
philipp lang | 3dacfb3e54 | |
philipp lang | c9ccebc8f3 | |
philipp lang | b6aaf6b2e1 | |
philipp lang | 793e4bacbd | |
philipp lang | 6c44a25638 | |
philipp lang | 8609f1e9c6 | |
philipp lang | 0d07975e53 | |
philipp lang | f7d9328447 | |
philipp lang | d26bdd72fb | |
philipp lang | ff40b9e805 | |
philipp lang | 92997aa78f | |
philipp lang | ee02b8df3a | |
philipp lang | 8ec4e4eb59 | |
philipp lang | fc70107aa3 | |
philipp lang | 5661d66770 | |
philipp lang | 0a8ecedb0f | |
philipp lang | fd9aff25fe | |
philipp lang | c65a25ed2a | |
philipp lang | ced2d577c0 | |
philipp lang | aafef695aa | |
philipp lang | 44a39fc5a8 | |
philipp lang | 46a353d674 | |
philipp lang | fed0e95f14 | |
philipp lang | d1dfcb3a04 | |
philipp lang | 7f9be4262c | |
philipp lang | 99a28f44dd | |
philipp lang | 9c93b13032 | |
philipp lang | 231ed3b4ad | |
philipp lang | ccfeb85e4b | |
philipp lang | 445a8ae962 | |
philipp lang | 0741984858 | |
philipp lang | 69a3ed2a60 | |
philipp lang | bbdc9e9dfb | |
philipp lang | 7e39a4da84 | |
philipp lang | ae450ef9ae | |
philipp lang | 2425ff6638 | |
philipp lang | 2586669c96 | |
philipp lang | af124f897b | |
philipp lang | c78c1cfee7 | |
philipp lang | bbd3237330 | |
philipp lang | fcc01d26ac | |
philipp lang | 93d30d10eb | |
philipp lang | c7fc76466e | |
philipp lang | 6aaeb75b2a | |
philipp lang | 8c3dc2211b | |
philipp lang | d06ae7acb5 | |
philipp lang | 63c62dc958 | |
philipp lang | 71903936a3 | |
philipp lang | 0ad6b40393 | |
philipp lang | f04cf7a1b2 | |
philipp lang | 94cc0147bc | |
philipp lang | 73633d7628 | |
philipp lang | 5482d47f0c | |
philipp lang | e1c3240290 | |
philipp lang | e9e0be83cc | |
philipp lang | 32e7f8c41d | |
philipp lang | 4cfa70e534 | |
philipp lang | 45597558e3 | |
philipp lang | c99a5a0369 | |
philipp lang | 258093f2c4 | |
philipp lang | f16b58dbc6 | |
philipp lang | 8609a648fd | |
philipp lang | b15b806948 | |
philipp lang | 19b13133a6 | |
philipp lang | d22e4b597f | |
philipp lang | f100135f33 | |
philipp lang | efc9a397f3 | |
philipp lang | ab06c7de5d | |
philipp lang | a9dea10a17 | |
philipp lang | dd4468808b | |
philipp lang | 1ef8cfdec8 | |
philipp lang | b6c9eea8ea | |
philipp lang | 12eb5016c8 | |
philipp lang | 75d9301033 | |
philipp lang | 8c820ab24d | |
philipp lang | d26463d43c | |
philipp lang | 4fda17d2c6 | |
philipp lang | 094a84c745 | |
philipp lang | 1630bce795 | |
philipp lang | cce9d4fa3e | |
philipp lang | 323f136e40 | |
philipp lang | 820b317b57 | |
philipp lang | 43c528fc46 | |
philipp lang | e9e8b193f4 | |
philipp lang | 646b292249 | |
philipp lang | 0526b52b6b | |
philipp lang | 1a5675634f | |
philipp lang | 73089ae654 | |
philipp lang | e4f195ee3e | |
philipp lang | 87377dab06 | |
philipp lang | 668cf9d292 | |
philipp lang | 03c19aa5fb | |
philipp lang | 40407214e3 | |
philipp lang | 49afcafbb2 | |
philipp lang | 8f6b8e466a | |
philipp lang | af6dd35a5b | |
philipp lang | 402e0fe5ee | |
philipp lang | 9252686e78 | |
philipp lang | c9885a8c9c | |
philipp lang | a71af994bb | |
philipp lang | f03459de58 | |
philipp lang | 3f3ecf0071 | |
philipp lang | fa2d93174a | |
philipp lang | cb3cc087d6 | |
philipp lang | 86aaf55d21 | |
philipp lang | 700d69d1a2 | |
philipp lang | 452505632e | |
philipp lang | 6ae61655de | |
philipp lang | df202d9a9a | |
philipp lang | da02a76e21 | |
philipp lang | edfd5dcbe7 | |
philipp lang | ccea9ab094 | |
philipp lang | 348fca4dd0 | |
philipp lang | 1ee2e72347 | |
philipp lang | 393d1f391c | |
philipp lang | 7e152c017a | |
philipp lang | 2b976ac03e | |
philipp lang | 68a47e3fb9 | |
philipp lang | 917a3932e1 | |
philipp lang | 5bd52e7b51 | |
philipp lang | db640c8185 | |
philipp lang | 0fb259a373 | |
philipp lang | e299e8b159 | |
philipp lang | 35a8c59055 | |
philipp lang | 0c49166392 | |
philipp lang | c4aa9b1051 | |
philipp lang | e5008d127d | |
philipp lang | a9eafb44be | |
philipp lang | e10742d298 | |
philipp lang | c0daff972b | |
philipp lang | 30d670a575 | |
philipp lang | b1581bf9c8 | |
philipp lang | b3354e1474 | |
philipp lang | ce6cc215bd | |
philipp lang | c4cec65249 | |
philipp lang | 36a9b21028 | |
philipp lang | 1c4b0b5e46 | |
philipp lang | 8f285b4aa6 | |
philipp lang | 9954ba1ee4 | |
philipp lang | 35c817d1c2 | |
philipp lang | 60c80deefe | |
philipp lang | 868dc5cf02 | |
philipp lang | 38ac195924 | |
philipp lang | 36b195b78a | |
philipp lang | 8e3054da49 | |
philipp lang | f05a919b9c | |
philipp lang | e0bd7c5add | |
philipp lang | 47cbc3321c | |
philipp lang | 2984ad9372 | |
philipp lang | 0ba8c58c76 | |
philipp lang | 0437511bf1 | |
philipp lang | 1328f359b2 | |
philipp lang | 4997895dfb | |
philipp lang | 4f1c02acac | |
philipp lang | ae39c8dd31 | |
philipp lang | dbffb4b394 | |
philipp lang | 1929c8c216 | |
philipp lang | 21dfc4f0b2 | |
philipp lang | 5e2427ee81 | |
philipp lang | 37c8f35b58 | |
philipp lang | 5310686b9c | |
philipp lang | 2363be7d61 | |
philipp lang | 2abe061c4f | |
philipp lang | fde1a9d169 | |
philipp lang | 1f4173caf8 | |
philipp lang | 6ad639730a | |
philipp lang | 096e44b767 | |
philipp lang | e08ad63313 | |
philipp lang | 594c45aede | |
philipp lang | aa81843df1 | |
philipp lang | adf0ae183e | |
philipp lang | 4095d218bd | |
philipp lang | 4b2ac19b78 | |
philipp lang | bf6e0fac85 | |
philipp lang | 85560ebec2 | |
philipp lang | daca017d96 | |
philipp lang | fd1e0bb9e1 | |
philipp lang | 913e45eb75 | |
philipp lang | 46ff7a0ca8 | |
philipp lang | f70c0db783 | |
philipp lang | df4f911d8e | |
philipp lang | 2691894b78 | |
philipp lang | edffe0ef80 | |
philipp lang | 58bb5ec87f | |
philipp lang | e480eb330e | |
philipp lang | c62f8ec676 | |
philipp lang | 55d253aa7b | |
philipp lang | f84decbb52 | |
philipp lang | 8117cfb4f4 | |
philipp lang | a6a8983ae9 | |
philipp lang | 8b42a62b2d | |
philipp lang | e6261d42ff | |
philipp lang | 56e0223492 | |
philipp lang | 5e49e5bd59 | |
philipp lang | 93d4511ee8 | |
philipp lang | 63583b9b25 | |
philipp lang | 1509efd881 | |
philipp lang | ab7e20becd | |
philipp lang | 0e2ebd9593 | |
philipp lang | 58feb20545 | |
philipp lang | a1b0f6496c | |
philipp lang | 45b559ea17 | |
philipp lang | 34ab000e37 | |
philipp lang | bd6ccf030b | |
philipp lang | 2ba31a0678 | |
philipp lang | edc7aaccd6 | |
philipp lang | 5d1571012d | |
philipp lang | 43821ec416 | |
philipp lang | c3f58cebc6 | |
philipp lang | f05c85a035 | |
philipp lang | 0e69e7c7f1 | |
philipp lang | f3f092bdf5 | |
philipp lang | 44ea68cce7 | |
philipp lang | c0096c0794 | |
philipp lang | 05bcb376c8 | |
philipp lang | 913cabc7a3 | |
philipp lang | 7cc1f349a1 | |
philipp lang | 8d2f8ec03d | |
philipp lang | 9144ae1028 | |
philipp lang | c3a2417cac | |
philipp lang | 91943a6321 | |
philipp lang | 6f03063cba | |
philipp lang | 5d576cda6a | |
philipp lang | 2a979d932e | |
philipp lang | 80def4abde | |
philipp lang | 64c2cb9408 | |
philipp lang | 78d6c6d864 | |
philipp lang | a0842afd47 | |
philipp lang | 43846d1703 | |
philipp lang | 171dd51200 | |
philipp lang | c844f2143a | |
philipp lang | 6ac539417f | |
philipp lang | 56ad09c6fa | |
philipp lang | 2f2e95cd23 | |
philipp lang | 3d270ce9a4 | |
philipp lang | eaa880127d | |
philipp lang | 6f334765bf | |
philipp lang | b806cafc8b | |
philipp lang | ada03a11ea | |
philipp lang | a12cb53274 | |
philipp lang | 458c643615 | |
philipp lang | 60b0052622 | |
philipp lang | 0bc00207b2 | |
philipp lang | 8cd2f74477 | |
philipp lang | 9d11294fde | |
philipp lang | acec968963 | |
philipp lang | 3cbb4768e8 | |
philipp lang | 09e3bcab9e | |
philipp lang | 66a76ad2b1 | |
philipp lang | 5919082211 | |
philipp lang | 2a5c203cc0 | |
philipp lang | 5f48b4e64d | |
philipp lang | 5f47729bb6 | |
philipp lang | c9cbf86626 | |
philipp lang | 8713f941c1 | |
philipp lang | 26ce8637c1 | |
philipp lang | ebf7a1d5c9 | |
philipp lang | b86b2b6063 | |
philipp lang | 94397165c6 | |
philipp lang | 9d7d039530 | |
philipp lang | 34fb96dabe | |
philipp lang | f601167893 | |
philipp lang | 54b650fb91 | |
philipp lang | f24064b9f3 | |
philipp lang | a96d879023 | |
philipp lang | b194e77966 | |
philipp lang | a830f366ad | |
philipp lang | 974c73af71 | |
philipp lang | 445590e060 | |
philipp lang | ef47480cc9 | |
philipp lang | 35b269c647 | |
philipp lang | e508dd9e6f | |
philipp lang | 891f0c21ad | |
philipp lang | a0bcd99642 | |
philipp lang | 857051434e | |
philipp lang | c7b23df01e | |
philipp lang | 7361dcccff | |
philipp lang | 590696750b | |
philipp lang | 48383b25da | |
philipp lang | de76e195e7 | |
philipp lang | ff6c2bbc2c | |
philipp lang | 5d9d7a0ffc | |
philipp lang | 89429f9812 | |
philipp lang | b813664632 | |
philipp lang | a7394e12aa | |
philipp lang | ddb44d64d6 | |
philipp lang | 3d62970baf | |
philipp lang | 9a3a0402d9 | |
philipp lang | 665b43c797 | |
philipp lang | ee926467ed | |
philipp lang | 4ffc14d503 | |
philipp lang | 1edbdab8fd | |
philipp lang | 6e6a4595cd | |
philipp lang | e3a0ca7673 | |
philipp lang | 28c821eeaf | |
philipp lang | e45a59c5ff | |
philipp lang | d3c1e89a03 | |
Philipp Lang | 6ede944d85 | |
Philipp Lang | b69c895921 | |
Philipp Lang | 539e41cffe | |
philipp lang | bdf3fa54a9 | |
philipp lang | 97fabf0f24 | |
philipp lang | e011b52534 | |
philipp lang | e005ed0d0d | |
philipp lang | ae19a6ed2b | |
philipp lang | 4ce7d428d4 | |
philipp lang | e6d0a30c7f | |
philipp lang | d16f02c8b3 | |
philipp lang | 888f4ee976 | |
philipp lang | 2a6e3aac03 | |
philipp lang | 7abf746897 | |
philipp lang | ed8e7b045d | |
philipp lang | 2a2cbd196d | |
philipp lang | 4690e0037f | |
philipp lang | 1d28827353 | |
philipp lang | 703084dbc1 | |
philipp lang | 7aa445ca74 | |
philipp lang | a2d7a36fc1 | |
philipp lang | 23c60d4330 | |
philipp lang | 79f1c71dd9 | |
philipp lang | 452416d0a4 | |
philipp lang | 589b713907 | |
philipp lang | eb60852bbf | |
philipp lang | c3db854eb5 | |
philipp lang | 5cf49489d5 | |
philipp lang | 7d880c6e29 | |
philipp lang | 743c041c35 | |
philipp lang | d3ad48ed30 | |
philipp lang | 4776c0d71b | |
philipp lang | 9355daee7e | |
philipp lang | 89b5cbd4b5 | |
philipp lang | c8bc69ae30 | |
philipp lang | 0fde33803b | |
philipp lang | 1b5c83a414 | |
philipp lang | e0558e4b13 | |
philipp lang | b421f85d89 | |
philipp lang | 0eb8928b22 | |
philipp lang | f1d4d3e428 | |
philipp lang | 5b2a290b49 | |
philipp lang | f55c174019 | |
philipp lang | d597d5ea2b | |
Philipp Lang | d4c8fdff3f | |
philipp lang | b26935fc07 | |
philipp lang | 4ddf76943d | |
philipp lang | d7e7fb3c27 | |
philipp lang | 87ee15936d | |
Philipp Lang | 6262ccdd28 | |
Philipp Lang | b109d40ebb | |
Philipp Lang | 3c81dfe7db | |
philipp lang | cc52437568 | |
philipp lang | ac28466c8d | |
philipp lang | bde8d48807 | |
philipp lang | 288533efd3 | |
philipp lang | 104b04b639 | |
philipp lang | 8bf0019c98 | |
philipp lang | 9f85809195 | |
philipp lang | 131690262e | |
philipp lang | edb1eeb0d8 | |
philipp lang | 2ecd4b9643 | |
Philipp Lang | ae679641d7 | |
philipp lang | d692cf3bdf | |
philipp lang | 339e76d874 | |
Arwed Molitor | 2d02c79c86 | |
Arwed Molitor | e21e818ac6 | |
Arwed Molitor | fecd461aef | |
philipp lang | 58d7c5671f | |
philipp lang | 54cf187ff5 | |
philipp lang | 0575fe4e5c | |
philipp lang | 3567dc3620 | |
philipp lang | 4fcdf91414 | |
philipp lang | 94f8ea3b67 | |
philipp lang | 32cc9feee0 | |
philipp lang | 4445304ef3 | |
philipp lang | d29f7b6e8a | |
philipp lang | a25d983de0 | |
philipp lang | b80b7ea600 | |
philipp lang | b0e4017780 | |
philipp lang | 1c93a977bf | |
philipp lang | b738dd8192 | |
philipp lang | 82c3ed2875 | |
philipp lang | fe578beb9b | |
philipp lang | 0f8cef6490 | |
philipp lang | dde4336cb3 | |
philipp lang | 9985ed9e44 | |
philipp lang | cc8428e6b8 | |
philipp lang | 631725c0f9 | |
philipp lang | f5d1313858 | |
philipp lang | 3e6b81aab0 | |
philipp lang | 52b7e39d4c | |
philipp lang | d14a373a76 | |
philipp lang | b5f87f2368 | |
philipp lang | 6fd0ba50b9 | |
philipp lang | 4e378c8a57 | |
philipp lang | 26d0f49568 | |
philipp lang | 994700e34a | |
philipp lang | ff4ad5daa3 | |
philipp lang | 998eb8931b | |
philipp lang | e7ef0a38c8 | |
philipp lang | 5b0bb1c81c | |
philipp lang | 18d57b1f4b | |
philipp lang | 9788ce8fe6 | |
philipp lang | e5d03e862d | |
philipp lang | 21b0d08864 | |
philipp lang | 294d0c3cb5 | |
philipp lang | c481359962 | |
philipp lang | 96ef8f2198 | |
philipp lang | 515af7724a | |
philipp lang | 83a6421bfc | |
philipp lang | 24b8ac182e | |
philipp lang | 21ea72047c | |
philipp lang | baeed70886 | |
philipp lang | 6be4697867 | |
philipp lang | f1797ed049 | |
philipp lang | f204f10b21 | |
philipp lang | 5e0dd8df62 | |
philipp lang | c14cff9118 | |
philipp lang | 857c397692 | |
philipp lang | 9e2b5411d8 | |
philipp lang | 8c32b881bc | |
philipp lang | 221815fb7e | |
philipp lang | 3469aeef93 | |
philipp lang | 6b0e0c37a5 | |
philipp lang | d630d8d6b4 | |
philipp lang | 1dc797948e | |
philipp lang | b896c37c31 | |
philipp lang | eb14189bf0 | |
philipp lang | 6972091ad0 | |
philipp lang | 4cc47e64b2 | |
philipp lang | b017d12e2e | |
Philipp Lang | 12f6852299 | |
Philipp Lang | fd75345675 | |
Philipp Lang | 225ea8f41d | |
Philipp Lang | ebf856252c | |
Philipp Lang | cc650ebf45 | |
Philipp Lang | 267aaa1776 | |
Philipp Lang | 11fe883b5c | |
Philipp Lang | acf280346f | |
Philipp Lang | 3a3b20ed72 | |
Philipp Lang | 5d5b08ed78 | |
Philipp Lang | 3697885bca | |
Philipp Lang | 2a6fd1152b | |
Philipp Lang | 156b92f765 | |
Philipp Lang | afbfdf7ca2 | |
Philipp Lang | be29a284d5 | |
Philipp Lang | 68a654494d | |
Philipp Lang | f5ad0d46fd | |
Philipp Lang | 8d0d05463f | |
Philipp Lang | 19dea7a061 | |
Philipp Lang | f4dc8b24bc | |
Philipp Lang | b0534279b6 | |
Philipp Lang | 551c658fa3 | |
Philipp Lang | 07a0c22a69 | |
Philipp Lang | 2e8c41d5d9 | |
Philipp Lang | 703c74a9f4 | |
Philipp Lang | bf8f6c87a8 | |
Philipp Lang | 0f80844d20 | |
Philipp Lang | a7b25e9b5f | |
Philipp Lang | 451680bd70 | |
Philipp Lang | c598508ceb | |
Philipp Lang | 0b9eb77e77 | |
Philipp Lang | ebeb9bc0b0 | |
Philipp Lang | 5a87d3e7f6 | |
Philipp Lang | 02cd70e0ca | |
Philipp Lang | 457d433722 | |
Philipp Lang | e37d98f168 | |
Philipp Lang | 380c18a70e | |
Philipp Lang | 5b6380b429 | |
Philipp Lang | ff2d725714 | |
Philipp Lang | b738c5e6ca | |
Philipp Lang | a755d63197 | |
Philipp Lang | 2ecdf6e362 | |
Philipp Lang | 58798146d4 | |
Philipp Lang | 27cbf8bcd9 | |
Philipp Lang | 15b62e59fc | |
Philipp Lang | 5c40b4e64d | |
Philipp Lang | ad8511874d | |
Philipp Lang | 566ed704a6 | |
Philipp Lang | fc1b647b54 | |
Philipp Lang | 20836e7228 | |
Philipp Lang | 6e1f3f3a0a | |
Philipp Lang | ebd321d166 | |
Philipp Lang | 69794b900f | |
Philipp Lang | a1790e7126 | |
Philipp Lang | 1e836b2a28 | |
Philipp Lang | f01c4f9d02 | |
Philipp Lang | 613096220f | |
Philipp Lang | fc368bcd1a | |
Philipp Lang | 972b1845ed | |
Philipp Lang | 7121e57cbb | |
Philipp Lang | a2b0de44b9 | |
philipp lang | e3d581626c | |
philipp lang | fafac446c3 | |
philipp lang | 56a5ec5885 | |
philipp lang | a104adeb5a | |
philipp lang | 41d6a71d2f | |
philipp lang | 97668add7e | |
philipp lang | 50d98c0335 | |
Philipp Lang | bda8b9c293 | |
Philipp Lang | 7b6616c292 | |
Philipp Lang | 026e7674dd | |
Philipp Lang | 3dc9513923 | |
Philipp Lang | 5207374e8b | |
Philipp Lang | 8e733d899e | |
Philipp Lang | 89bcaf12c4 | |
Philipp Lang | b83f30e35c | |
Philipp Lang | e345ace428 | |
Philipp Lang | 9a898315a0 | |
Philipp Lang | a84d9f428d | |
Philipp Lang | 36c0ebced0 | |
Philipp Lang | 6d4dda869a | |
Philipp Lang | 9813482741 | |
Philipp Lang | 1e74a6055e | |
Philipp Lang | c764f3d3b7 | |
Philipp Lang | 8846adef5b | |
Philipp Lang | 20833426ca | |
Philipp Lang | e60bc94b80 | |
Philipp Lang | 356a69507e | |
Philipp Lang | 1fb2dd19e7 | |
Philipp Lang | 767239fb62 | |
Philipp Lang | 2fbad36700 | |
Philipp Lang | 37a6dd8330 | |
Philipp Lang | bfc4663ba4 | |
Philipp Lang | 450e715acd | |
Philipp Lang | 128d9af3ee | |
philipp lang | a26f064698 | |
Philipp Lang | ff245397d5 | |
Philipp Lang | e4ff680e4f | |
Philipp Lang | 3420a03fbc | |
Philipp Lang | 6780068ca1 | |
Philipp Lang | be0a8a3ddb | |
Philipp Lang | 3d154c4154 | |
Philipp Lang | 85f0d6c515 | |
philipp lang | 17eaa2e564 | |
philipp lang | 6f4ee0b02d | |
Philipp Lang | dc832503b4 | |
Philipp Lang | 3a96b00307 | |
Philipp Lang | c89973032b | |
Philipp Lang | 20c9b84e6e | |
Philipp Lang | c554e506ea | |
Philipp Lang | 80dfebf63b | |
Philipp Lang | 6c9c27d6ab | |
Philipp Lang | 554e1af245 | |
Philipp Lang | 349d821638 | |
Philipp Lang | ff6c0e462e | |
Philipp Lang | 639d1850c7 | |
philipp lang | 38bd73cf5b | |
philipp lang | f1ad653ba8 | |
philipp lang | 560881725d | |
philipp lang | 71da52791d | |
philipp lang | 946a6c93b2 | |
Philipp Lang | b28525be7c | |
Philipp Lang | 0de90be8c3 | |
Arwed Molitor | 59c2c527fb | |
Arwed Molitor | a009fabb15 | |
Arwed Molitor | 5e416e5ed7 | |
philipp lang | cd22d41f28 | |
philipp lang | 1bdcc55d2a | |
philipp lang | 2e9ab78203 | |
Philipp Lang | a134be5f5b | |
philipp lang | 8d54c5b47c | |
philipp lang | 391de0edde | |
philipp lang | 232917a8e6 | |
philipp lang | 74b162cc23 | |
philipp lang | 37107915a1 | |
philipp lang | 1ef4689d15 | |
philipp lang | ac2428caac | |
Philipp Lang | c260fcb4e4 | |
philipp lang | 687ec80069 | |
philipp lang | 74c5faaebd | |
philipp lang | aeb926e165 | |
philipp lang | 3263e93da7 | |
philipp lang | 0ae11f753f | |
Philipp Lang | 6dffb8d4ff | |
Philipp Lang | e8e309fccd | |
Philipp Lang | a858fd40a7 | |
Philipp Lang | 925754bd26 | |
Philipp Lang | 0e023a06ec | |
philipp lang | 716c6079fe | |
philipp lang | 658414c979 | |
philipp lang | 4738c077d1 | |
philipp lang | f178d3ec86 | |
philipp lang | 7e4961f3d8 | |
philipp lang | 2d9f79ee15 | |
Philipp Lang | 6f133954ff | |
Philipp Lang | 59117682d0 | |
philipp lang | 1ac30202b1 | |
Philipp Lang | 69afeeda65 | |
Philipp Lang | eb5f03bd5a | |
Philipp Lang | 215d08aeeb | |
philipp lang | 0c45e1b2f4 | |
philipp lang | ae2eed10af | |
philipp lang | 0f88427dd5 | |
philipp lang | 5e259e9455 | |
Philipp Lang | 891e4deac1 | |
Philipp Lang | 65aeb4aeaf | |
Philipp Lang | 1141ad1cbf | |
Philipp Lang | 1eb1aa61e9 | |
Philipp Lang | 91270ea289 | |
Philipp Lang | 242bf146c0 | |
Philipp Lang | 3dcab9d719 | |
Philipp Lang | 4d97c6ff8a | |
Philipp Lang | 9d3abb4b23 | |
Philipp Lang | 0c5a3cd27d | |
Philipp Lang | 1583e77756 | |
Philipp Lang | 21ce8874f9 | |
Philipp Lang | 5bd99b47b6 | |
philipp lang | f11226b0a1 | |
Philipp Lang | 826cc43b92 | |
Philipp Lang | f8d6cf6a92 | |
Philipp Lang | 62d6730071 | |
Philipp Lang | 4672f96a5f | |
Philipp Lang | 9e39842183 | |
Philipp Lang | ddebe7cc3c | |
Philipp Lang | b383a7a515 | |
Philipp Lang | 36ea571464 | |
Philipp Lang | 81b21f5d7f | |
Philipp Lang | 437125b573 | |
Philipp Lang | c0431a6857 | |
Philipp Lang | 3bd087f729 | |
Philipp Lang | 1d808f0e10 | |
Philipp Lang | 1b2df8a59a | |
philipp lang | ad8200d6d5 | |
philipp lang | 0002249480 | |
philipp lang | 31f9ab6297 | |
philipp lang | df7f56189d | |
philipp lang | b25102cb65 | |
philipp lang | 31f5faf93a | |
philipp lang | 7d142aa864 | |
philipp lang | 6734fdf3ca | |
philipp lang | debe9969ae | |
philipp lang | 07ca1d7903 | |
Philipp Lang | 387b0e7ec4 | |
Philipp Lang | 907a6ee04a | |
Philipp Lang | 2784651533 | |
Philipp Lang | 22b5d35567 | |
Philipp Lang | cd35477253 | |
Philipp Lang | a4fd41dc98 | |
philipp lang | 07839767c4 | |
philipp lang | 9e00eed6c1 | |
philipp lang | 3d7e49965a | |
philipp lang | 42fb61bf70 | |
philipp lang | 579f35beb9 | |
philipp lang | aa9b782897 | |
philipp lang | 8ba433c6b8 | |
philipp lang | 7bffa6c5ae | |
philipp lang | 139c7623ab | |
philipp lang | 1038f26171 | |
philipp lang | 59920bac1d | |
Philipp Lang | 71e6b0216f | |
Philipp Lang | 7877f57a22 | |
Philipp Lang | bf33a91e7e | |
Philipp Lang | 0b406e11f0 | |
Philipp Lang | 9b2364bc34 | |
Philipp Lang | e37219b1ca | |
Philipp Lang | 6fd16a7dfe | |
Philipp Lang | 277259320a | |
Philipp Lang | 45a1e165fa | |
philipp lang | d38989f302 | |
philipp lang | a434388bcb | |
philipp lang | 48d9d9cc92 | |
philipp lang | c2016af587 | |
philipp lang | 4057f9fc8d | |
philipp lang | 89f5489e86 | |
philipp lang | 7497593bb2 | |
Philipp Lang | 0080a54aaf | |
Philipp Lang | d41aa466b1 | |
Philipp Lang | 188429af55 | |
Philipp Lang | 2cb04ee142 | |
philipp lang | b87b37a673 | |
philipp lang | 8f3cc95300 | |
Philipp Lang | 904ec829c1 | |
Philipp Lang | a74d0936a2 | |
philipp lang | da3197395f | |
philipp lang | 20973b3664 | |
philipp lang | b54472c14e | |
philipp lang | 8b2bdae5d6 | |
philipp lang | ab43d42869 | |
philipp lang | 79f818c0f9 | |
philipp lang | 4a452ef1fe | |
philipp lang | 36dcff9738 | |
philipp lang | a880333f35 | |
philipp lang | 68ecce179e | |
philipp lang | 06d512e8ae | |
philipp lang | 9442714086 | |
philipp lang | c653a4b0c1 | |
Philipp Lang | 0dcb3b7d5b | |
Philipp Lang | a15b54f98d | |
Philipp Lang | f75201dfaa | |
Philipp Lang | 27c61ff8af | |
Philipp Lang | d2a000cb31 | |
Philipp Lang | 62fb792e65 | |
Philipp Lang | b2a7d2a760 | |
Philipp Lang | 9e1fe63c33 | |
Philipp Lang | 1d8b5b4670 | |
Philipp Lang | 526f2d3a6c | |
Philipp Lang | fbb501519a | |
Philipp Lang | 3485832262 | |
Philipp Lang | 4bece4a761 | |
Philipp Lang | b2b53c558e | |
Philipp Lang | 2e5385b565 | |
Philipp Lang | 754e3a0a82 | |
philipp lang | 4e27dbfe67 | |
philipp lang | c68f1e00c4 | |
philipp lang | d78740d508 | |
philipp lang | 641f3a1098 | |
philipp lang | dbbe6f6171 | |
philipp lang | e26b572575 | |
philipp lang | a526683082 | |
philipp lang | 07d309f606 | |
philipp lang | 234380120e | |
Philipp Lang | 72375affee | |
Philipp Lang | d01322b1ad | |
Philipp Lang | f30eec0e80 | |
philipp lang | f1c55bedce | |
philipp lang | 50dc714f18 | |
Philipp Lang | b120e5a039 | |
Philipp Lang | 0a64f8ef0c | |
philipp lang | 978cc48385 | |
philipp lang | 668555aff5 | |
philipp lang | 2bc576d3f6 | |
Philipp Lang | f150abd1ca | |
Philipp Lang | 03d514d107 | |
Philipp Lang | 29b9959f09 | |
Philipp Lang | 07852aa72b | |
Philipp Lang | 09182821f8 | |
Philipp Lang | 708b0cf386 | |
Philipp Lang | 7ff735acac | |
Philipp Lang | ef0672334c | |
Philipp Lang | b21a89362b | |
Philipp Lang | 646d92aaa6 | |
Philipp Lang | 995c66cd8e | |
Philipp Lang | 042e5e6c0a | |
Philipp Lang | e9ee17236b | |
Philipp Lang | 5c67a45537 | |
Philipp Lang | 46f995711f | |
Philipp Lang | aaee41863a | |
Philipp Lang | 5b81c205f3 | |
Philipp Lang | a34d5ad305 | |
Philipp Lang | 3cc35348ff | |
Philipp Lang | 48b1808497 | |
Philipp Lang | ab53a80c4d | |
Philipp Lang | f690246a7e | |
Philipp Lang | 39a269d10a | |
Philipp Lang | 593386b16b | |
Philipp Lang | 6135fbec3f | |
Philipp Lang | 29c2ea738c | |
Philipp Lang | 8abe217430 | |
Philipp Lang | 444a43cf32 | |
Philipp Lang | 19bfe38a2d | |
Philipp Lang | fb8c18553c | |
Philipp Lang | f74f42f2f1 | |
Philipp Lang | 1f725ef5fc | |
Philipp Lang | 00c6719ce7 | |
philipp lang | a3f4d0573b | |
philipp lang | e11eebf6cd | |
philipp lang | ff637a5d88 | |
philipp lang | 5357106187 | |
philipp lang | 1632da9b61 | |
philipp lang | f523362b90 | |
philipp lang | 3c64dee689 | |
philipp lang | 55ef4efe50 | |
philipp lang | b48a10250c | |
philipp lang | 372e6ee8c4 | |
philipp lang | cdf2b2e429 | |
philipp lang | 45968d7349 | |
philipp lang | d7305c1a2e | |
philipp lang | d73bcd376d | |
philipp lang | 884ad31086 | |
philipp lang | 58756b6094 | |
philipp lang | f3c907c624 | |
philipp lang | c207fe0f07 | |
philipp lang | aba214614c | |
philipp lang | b0874cecda | |
philipp lang | 6a9f3e5cec | |
philipp lang | 85a3abcc82 | |
philipp lang | 38d434aef8 | |
Philipp Lang | df178c8186 | |
philipp lang | 2299e18876 | |
philipp lang | 8669199b1a | |
philipp lang | 86590f93a5 | |
philipp lang | 2fffc17ffc | |
philipp lang | ea6a98af18 | |
philipp lang | 529bdf32bf | |
philipp lang | bb9599dcf6 | |
philipp lang | 210172db64 | |
philipp lang | ed302377b5 | |
philipp lang | f322396fd9 | |
philipp lang | 6960b0295a | |
philipp lang | 1ba60a455f | |
philipp lang | 8069e2b4dd | |
Philipp Lang | 7ee1102a5d | |
Philipp Lang | c0c7071ca5 | |
Philipp Lang | 7072f07879 | |
philipp lang | 9598a44e13 | |
philipp lang | 4cb2dddb43 | |
philipp lang | f12a83b849 | |
philipp lang | 9315dafbfb | |
philipp lang | 13c9d2f2c1 | |
philipp lang | 5f7fd15cd7 | |
Philipp Lang | a3d9b69e79 | |
Philipp Lang | 0ee051879b | |
Philipp Lang | f0d0a9387d | |
Philipp Lang | 06b3f1f89c | |
Philipp Lang | bcefd9f356 | |
philipp lang | 609d452e56 | |
philipp lang | 241b46da53 | |
philipp lang | d776a66836 | |
philipp lang | 197c23354d | |
philipp lang | 0c0a049deb | |
philipp lang | 15ce834dc0 | |
philipp lang | b9c0abe49e | |
philipp lang | 7db9e10200 | |
philipp lang | 9baf5eac6b | |
philipp lang | 287f6a8c27 | |
philipp lang | 17a6a34957 | |
philipp lang | fe8ea63fa5 | |
philipp lang | 5a9f04a48f | |
Philipp Lang | 1d36c162e3 | |
philipp lang | ae4941d1e4 | |
philipp lang | a66145e105 | |
philipp lang | 9f4f2683a3 | |
philipp lang | 222bca62ee | |
philipp lang | 4512a41344 | |
philipp lang | 912c4d5f6f | |
philipp lang | cba65ce640 | |
philipp lang | afa29b416b | |
philipp lang | 1ad411bad0 | |
philipp lang | 8e382126fd | |
philipp lang | b303373b73 | |
philipp lang | ea6e3f4766 | |
philipp lang | 197690069a | |
philipp lang | 067cbe6d9d | |
philipp lang | a18214b803 | |
Philipp Lang | b00eaa7635 | |
Philipp Lang | e15e5355c9 | |
Philipp Lang | 370f7f22c1 | |
Philipp Lang | e7abc519b4 | |
Philipp Lang | 4004c425c6 | |
Philipp Lang | 1a54ade698 | |
Philipp Lang | 93f1a1e7c5 | |
Philipp Lang | 0549529a0d | |
philipp lang | 9afa34504c | |
philipp lang | 44876ed6bd | |
philipp lang | b64c821e00 | |
philipp lang | 2a49f83014 | |
philipp lang | 211f93ec17 | |
philipp lang | de7ee9cda2 | |
philipp lang | 25ffd8d1fa | |
philipp lang | b6a585fd70 | |
philipp lang | abc269d6c4 | |
philipp lang | 24d65e37c3 | |
Philipp Lang | 407338d431 | |
Philipp Lang | 58fdfe1e81 | |
philipp lang | de4daf705f | |
philipp lang | 13ad5ea55c | |
Philipp Lang | ef537b919e | |
Philipp Lang | b5dfa80a1c | |
Philipp Lang | 531f44bc94 | |
Philipp Lang | 37cbf860d0 | |
philipp lang | 2c0b9217ec | |
philipp lang | 51ddefe30b | |
philipp lang | f106f2455a | |
philipp lang | 8462a572ac | |
philipp lang | 73fb79cd1a | |
Philipp Lang | ffd67feb6a | |
Philipp Lang | 9b0a052cbe | |
Philipp Lang | 45f26ee8f8 | |
Philipp Lang | d11c99dbcf | |
Philipp Lang | 4a4f2aa8d1 | |
Philipp Lang | c463af3937 | |
Philipp Lang | 69451cb8ee | |
philipp lang | 68996d863b | |
philipp lang | e445fac564 | |
philipp lang | 3273a49336 | |
philipp lang | 2efcca2b6a | |
philipp lang | 363f51872a | |
philipp lang | a399c91a03 | |
philipp lang | b7ddffb564 | |
philipp lang | 5a01bb7ebc | |
philipp lang | 826397e92a | |
philipp lang | 50bfa59c11 | |
philipp lang | ecffc258df | |
philipp lang | ae922bbee1 | |
philipp lang | 7448a09e5b | |
philipp lang | 35a707dd66 | |
philipp lang | 311f1281f6 | |
philipp lang | 04cfd95892 | |
philipp lang | 2975b77da0 | |
philipp lang | f84c8d2cc4 | |
philipp lang | 3dfdd1ce7c | |
philipp lang | 5ecc90aa8f | |
philipp lang | e2c07a597b | |
philipp lang | 07fbba1d6a | |
philipp lang | b223dbf190 | |
philipp lang | c21aa54e85 | |
philipp lang | 920f3efbfc | |
philipp lang | 150593b5cf | |
philipp lang | 329da67ad6 | |
philipp lang | 0ffce6b25e | |
Philipp Lang | af2cb5688a | |
Philipp Lang | 42d6e2f661 | |
philipp lang | 785f9e5689 | |
Philipp Lang | 8af0e2a16e | |
Philipp Lang | 9740ea2be4 | |
philipp lang | bd34c3e835 | |
philipp lang | 49417981f1 | |
philipp lang | 20b1309ccc | |
philipp lang | 8979ddc49d | |
philipp lang | 15ba95e7e8 | |
philipp lang | 26965da04f | |
philipp lang | 71c3e98c6b | |
philipp lang | cf5445a0e3 | |
philipp lang | 945e65f49e | |
philipp lang | 94b405bcf9 | |
philipp lang | 3a93d1585f | |
philipp lang | 1f103b7539 | |
philipp lang | 74575998fa | |
philipp lang | b0f76b0ae2 | |
philipp lang | 7ee4fe5166 | |
philipp lang | 530b3fa3c3 | |
philipp lang | bfd69d6f04 | |
philipp lang | be3336a18d | |
philipp lang | 1ab866a2fe | |
philipp lang | 55e5ae1809 | |
philipp lang | 0a58d0ffdc | |
philipp lang | f2d4ad5674 | |
philipp lang | b1c8fb6dd1 | |
philipp lang | f03ae5eede | |
philipp lang | 4a31d3349a | |
philipp lang | 19a3b9c1ee | |
philipp lang | 5a97d0c84d | |
philipp lang | 4850f4ef5a | |
Philipp Lang | 4bde59ca11 | |
Philipp Lang | 713dc14b68 | |
Philipp Lang | a2fa91ff03 | |
Philipp Lang | 99c6299cfa | |
Philipp Lang | 248aee8059 | |
Philipp Lang | d3d94dd51c | |
Philipp Lang | 7257f2fe22 | |
Philipp Lang | 9308a75dcd | |
Philipp Lang | ca384540f7 | |
Philipp Lang | 80e54813b7 | |
Philipp Lang | 758498ed71 | |
Philipp Lang | 4a3ea4ae58 | |
Philipp Lang | c43c0ece42 | |
Philipp Lang | bf69f80ece | |
Philipp Lang | 7c28416660 | |
philipp lang | 117f53df77 | |
philipp lang | e6801ab978 | |
philipp lang | 5f6d19a5ff | |
philipp lang | 1e731a0661 | |
philipp lang | a1bcd08f5b | |
philipp lang | 8229f9a1aa | |
philipp lang | 4388fc073b | |
philipp lang | 76c319a6a0 | |
philipp lang | acced9c054 | |
philipp lang | 5a70d34164 | |
philipp lang | 3029fb276b | |
philipp lang | 0a457d2bb5 | |
philipp lang | fd9bc0ce6f | |
philipp lang | 919ad62b41 | |
philipp lang | 147f6af9d4 | |
philipp lang | a54ebb6487 | |
philipp lang | e1a77b8efc | |
philipp lang | 070ebaaab1 | |
philipp lang | ace61dc470 |
|
@ -0,0 +1,26 @@
|
||||||
|
APP_NAME="Adrema"
|
||||||
|
APP_ENV=production
|
||||||
|
APP_KEY=YOUR_APP_KEY
|
||||||
|
APP_DEBUG=false
|
||||||
|
APP_URL=http://localhost:8000
|
||||||
|
|
||||||
|
MAIL_MAILER=smtp
|
||||||
|
MAIL_HOST=smtp.mailtrap.io
|
||||||
|
MAIL_PORT=2525
|
||||||
|
MAIL_USERNAME=null
|
||||||
|
MAIL_PASSWORD=null
|
||||||
|
MAIL_ENCRYPTION=null
|
||||||
|
MAIL_FROM_ADDRESS=null
|
||||||
|
MAIL_FROM_NAME=me
|
||||||
|
|
||||||
|
DB_PASSWORD=secret_db_password
|
||||||
|
MYSQL_PASSWORD=secret_db_password
|
||||||
|
|
||||||
|
MEILI_MASTER_KEY=secret_meilisearch_password
|
||||||
|
|
||||||
|
PUSHER_APP_HOST=socketi
|
||||||
|
|
||||||
|
WORKERS=5
|
||||||
|
|
||||||
|
USER_EMAIL=admin@example.com
|
||||||
|
USER_PASSWORD=admin
|
|
@ -1,2 +0,0 @@
|
||||||
\App\User::factory()->create();
|
|
||||||
\App\User::factory()->create();
|
|
|
@ -0,0 +1,14 @@
|
||||||
|
FROM php:8.3.11-fpm as php
|
||||||
|
WORKDIR /app
|
||||||
|
RUN ls /app
|
||||||
|
RUN apt-get update
|
||||||
|
RUN apt-get install -y rsync libcurl3-dev apt-utils zlib1g-dev libpng-dev libicu-dev libonig-dev unzip poppler-utils libpng-dev libjpeg-dev default-mysql-client libzip-dev imagemagick libmagickwand-dev
|
||||||
|
RUN apt-get install -y --no-install-recommends texlive-base texlive-latex-base texlive-pictures texlive-latex-extra texlive-lang-german texlive-plain-generic texlive-fonts-recommended texlive-fonts-extra texlive-extra-utils
|
||||||
|
RUN docker-php-ext-install pdo_mysql curl exif intl mbstring pcntl zip
|
||||||
|
RUN pecl install redis && docker-php-ext-enable redis
|
||||||
|
RUN pecl install imagick && docker-php-ext-enable imagick
|
||||||
|
RUN docker-php-ext-configure gd --with-jpeg
|
||||||
|
RUN docker-php-ext-install gd
|
||||||
|
RUN usermod -s /bin/bash www-data
|
||||||
|
RUN echo 'memory_limit = 2G' >> /usr/local/etc/php/conf.d/99-custom-php-memlimit.ini
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
docker buildx build -f .docker/base.Dockerfile .
|
||||||
|
docker image tag sha256:... zoomyboy/adrema-base
|
||||||
|
docker push zoomyboy/adrema-base
|
||||||
|
|
|
@ -0,0 +1,22 @@
|
||||||
|
FROM composer:2.7.9 as composer
|
||||||
|
WORKDIR /app
|
||||||
|
COPY . /app
|
||||||
|
RUN composer install --ignore-platform-reqs --no-dev
|
||||||
|
RUN php artisan telescope:publish
|
||||||
|
RUN php artisan horizon:publish
|
||||||
|
|
||||||
|
FROM node:20.15.0-slim as node
|
||||||
|
WORKDIR /app
|
||||||
|
COPY . /app
|
||||||
|
RUN npm install && npm run prod && npm run img && rm -R node_modules
|
||||||
|
|
||||||
|
FROM nginx:1.21.6-alpine as nginx
|
||||||
|
WORKDIR /app
|
||||||
|
COPY --from=node /app /app
|
||||||
|
COPY --from=composer /app/public/vendor /app/public/vendor
|
||||||
|
COPY ./.docker/nginx/nginx.conf /etc/nginx/nginx.conf
|
||||||
|
EXPOSE 80
|
||||||
|
|
||||||
|
VOLUME ["/app/public/storage"]
|
||||||
|
|
||||||
|
CMD ["nginx", "-g", "daemon off;"]
|
|
@ -25,12 +25,40 @@ http {
|
||||||
root /app/public;
|
root /app/public;
|
||||||
charset utf-8;
|
charset utf-8;
|
||||||
index index.php;
|
index index.php;
|
||||||
|
location /app/adremakey {
|
||||||
|
proxy_pass http://socketi:6001;
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
|
proxy_set_header Connection "Upgrade";
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_cache_bypass $http_upgrade;
|
||||||
|
proxy_redirect off;
|
||||||
|
proxy_read_timeout 60;
|
||||||
|
proxy_connect_timeout 60;
|
||||||
|
}
|
||||||
|
location /indexes/members/search {
|
||||||
|
proxy_pass http://meilisearch:7700/indexes/members/search;
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
|
proxy_set_header Connection "Upgrade";
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
proxy_cache_bypass $http_upgrade;
|
||||||
|
proxy_redirect off;
|
||||||
|
proxy_read_timeout 60;
|
||||||
|
proxy_connect_timeout 60;
|
||||||
|
}
|
||||||
location / {
|
location / {
|
||||||
try_files $uri $uri/ /index.php?$query_string;
|
try_files $uri $uri/ /index.php?$query_string;
|
||||||
}
|
}
|
||||||
location = /favicon.ico { access_log off; log_not_found off; }
|
location = /favicon.ico { access_log off; log_not_found off; }
|
||||||
location = /robots.txt { access_log off; log_not_found off; }
|
location = /robots.txt { access_log off; log_not_found off; }
|
||||||
error_page 404 /index.php;
|
error_page 404 /index.php;
|
||||||
|
location = /.well-known/carddav {
|
||||||
|
return 301 $scheme://$host/dav;
|
||||||
|
}
|
||||||
|
location = /.well-known/caldav {
|
||||||
|
return 301 $scheme://$host/dav;
|
||||||
|
}
|
||||||
location ~ /\.ht {
|
location ~ /\.ht {
|
||||||
deny all;
|
deny all;
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,27 @@
|
||||||
|
FROM composer:2.7.9 as composer
|
||||||
|
WORKDIR /app
|
||||||
|
COPY . /app
|
||||||
|
RUN composer install --ignore-platform-reqs --no-dev
|
||||||
|
|
||||||
|
FROM node:20.15.0-slim as node
|
||||||
|
WORKDIR /app
|
||||||
|
COPY . /app
|
||||||
|
RUN npm install && npm run prod && npm run img && rm -R node_modules
|
||||||
|
|
||||||
|
FROM zoomyboy/adrema-base:latest as php
|
||||||
|
COPY --chown=www-data:www-data . /app
|
||||||
|
COPY --chown=www-data:www-data --from=node /app/public /app/public
|
||||||
|
COPY --chown=www-data:www-data --from=composer /app/vendor /app/vendor
|
||||||
|
|
||||||
|
USER www-data
|
||||||
|
RUN php artisan telescope:publish
|
||||||
|
RUN php artisan horizon:publish
|
||||||
|
|
||||||
|
USER root
|
||||||
|
COPY ./.docker/php /bin
|
||||||
|
|
||||||
|
VOLUME ["/app/packages/laravel-nami/.cookies", "/app/storage/app", "/app/resources/views/tex/invoice"]
|
||||||
|
|
||||||
|
EXPOSE 9000
|
||||||
|
|
||||||
|
CMD /bin/php-entrypoint
|
|
@ -0,0 +1,46 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
function wait_for_db {
|
||||||
|
while true; do
|
||||||
|
echo "waiting for Database init"
|
||||||
|
php -r 'new PDO("mysql:host='$DB_HOST';dbname='$DB_DATABASE'", "'$DB_USERNAME'", "'$DB_PASSWORD'");' > /dev/null && return 0
|
||||||
|
sleep 1
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
mkdir -p /app/packages/laravel-nami/.cookies || true
|
||||||
|
mkdir -p /app/storage/app/public || true
|
||||||
|
chown -R www-data:www-data /app/packages/laravel-nami/.cookies
|
||||||
|
chown -R www-data:www-data /app/storage/app
|
||||||
|
|
||||||
|
if [ $APP_KEY = "YOUR_APP_KEY" ]; then
|
||||||
|
echo "----------------------- Keinen APP KEY gefunden. Key wird generiert: $(su www-data -c 'php artisan key:generate --show') ----------------------- Füge diesen Key als APP_KEY ein ---------------------"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ $1 == "horizon" ]; then
|
||||||
|
wait_for_db
|
||||||
|
su www-data -c 'php artisan horizon'
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ $1 == "app" ]; then
|
||||||
|
# --------------------------- ensure appkey is set ----------------------------
|
||||||
|
wait_for_db
|
||||||
|
php -r '$connection = new PDO("mysql:host='$DB_HOST';dbname='$DB_DATABASE'", "'$DB_USERNAME'", "'$DB_PASSWORD'"); $connection->query("DESCRIBE migrations");' > /dev/null || php artisan migrate --seed --force
|
||||||
|
su www-data -c 'php artisan migrate --force'
|
||||||
|
php artisan scout:sync-index-settings
|
||||||
|
php-fpm -F -R -O
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
if [ $1 == "schedule" ]; then
|
||||||
|
wait_for_db
|
||||||
|
while true; do
|
||||||
|
su www-data -c 'php artisan schedule:run -n'
|
||||||
|
sleep 60
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
|
@ -1,2 +1,17 @@
|
||||||
node_modules
|
**/node_modules
|
||||||
vendor
|
data
|
||||||
|
**/vendor
|
||||||
|
public/build
|
||||||
|
public/vendor
|
||||||
|
bootstrap/cache/services.php
|
||||||
|
bootstrap/cache/packages.php
|
||||||
|
bootstrap/cache/routes.php
|
||||||
|
packages/laravel-nami/.cookies
|
||||||
|
storage/logs/**
|
||||||
|
storage/temp/**
|
||||||
|
storage/debugbar/**
|
||||||
|
storage/app/tmp/**
|
||||||
|
cookies
|
||||||
|
storage/logs/laravel.log
|
||||||
|
.git
|
||||||
|
doc
|
||||||
|
|
224
.drone.yml
224
.drone.yml
|
@ -1,26 +1,3 @@
|
||||||
# kind: pipeline
|
|
||||||
# type: ssh
|
|
||||||
# name: scoutrobot
|
|
||||||
#
|
|
||||||
# server:
|
|
||||||
# host: zoomyboy.de
|
|
||||||
# user: stammsilva
|
|
||||||
# ssh_key:
|
|
||||||
# from_secret: private_key
|
|
||||||
#
|
|
||||||
# clone:
|
|
||||||
# disable: true
|
|
||||||
#
|
|
||||||
# steps:
|
|
||||||
# - name: master
|
|
||||||
# commands:
|
|
||||||
# - /usr/local/bin/deploy_scoutrobot_master
|
|
||||||
# when:
|
|
||||||
# branch:
|
|
||||||
# - master
|
|
||||||
# event:
|
|
||||||
# - push
|
|
||||||
#
|
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
type: docker
|
type: docker
|
||||||
name: default
|
name: default
|
||||||
|
@ -31,31 +8,140 @@ workspace:
|
||||||
steps:
|
steps:
|
||||||
- name: submodules
|
- name: submodules
|
||||||
image: alpine/git
|
image: alpine/git
|
||||||
environment:
|
|
||||||
SSH_KEY:
|
|
||||||
from_secret: private_key
|
|
||||||
KNOWN_HOSTS:
|
|
||||||
from_secret: known_hosts
|
|
||||||
commands:
|
commands:
|
||||||
- mkdir $HOME/.ssh
|
|
||||||
- echo "$SSH_KEY" > $HOME/.ssh/id_rsa
|
|
||||||
- echo "$KNOWN_HOSTS" > $HOME/.ssh/known_hosts
|
|
||||||
- cat $HOME/.ssh/known_hosts
|
|
||||||
- chmod 600 $HOME/.ssh/id_rsa
|
|
||||||
- git submodule update --init --recursive
|
- git submodule update --init --recursive
|
||||||
|
|
||||||
- name: composer
|
- name: composer_dev
|
||||||
image: composer:2.2.7
|
image: composer:2.7.9
|
||||||
|
commands:
|
||||||
|
- composer install --ignore-platform-reqs --dev
|
||||||
|
|
||||||
|
- name: mysql_healthcheck
|
||||||
|
image: mysql:oracle
|
||||||
|
commands:
|
||||||
|
- while ! mysqladmin ping -h db -u db -pdb --silent; do sleep 1; done
|
||||||
|
|
||||||
|
- name: ocdb_healthcheck
|
||||||
|
image: mysql:oracle
|
||||||
|
commands:
|
||||||
|
- while ! mysqladmin ping -h ownclouddb -u owncloud -powncloud --silent; do sleep 1; done
|
||||||
|
|
||||||
|
- name: oc_healthcheck
|
||||||
|
image: zoomyboy/adrema-base:latest
|
||||||
|
commands:
|
||||||
|
- while ! curl --silent 'http://owncloudserver:8080/ocs/v1.php/cloud/capabilities?format=json' -u admin:admin | grep '"status":"ok"'; do sleep 1; done
|
||||||
|
|
||||||
|
- name: node
|
||||||
|
image: node:20.15.0-slim
|
||||||
|
commands:
|
||||||
|
- npm ci && cd packages/adrema-form && npm ci && npm run build && rm -R node_modules && cd ../../ && npm run img && npm run prod && rm -R node_modules
|
||||||
|
|
||||||
|
- name: tests
|
||||||
|
image: zoomyboy/adrema-base:latest
|
||||||
|
commands:
|
||||||
|
- touch .env
|
||||||
|
- php artisan migrate
|
||||||
|
- php artisan test
|
||||||
|
- rm -f .env
|
||||||
|
- vendor/bin/phpstan analyse
|
||||||
|
environment:
|
||||||
|
APP_NAME: Scoutrobot
|
||||||
|
APP_KEY:
|
||||||
|
from_secret: app_key
|
||||||
|
APP_ENV: local
|
||||||
|
APP_DEBUG: true
|
||||||
|
APP_URL: http://scoutrobot.test
|
||||||
|
LOG_CHANNEL: stack
|
||||||
|
DB_CONNECTION: mysql
|
||||||
|
DB_HOST: db
|
||||||
|
REDIS_HOST: redis
|
||||||
|
DB_PORT: 3306
|
||||||
|
DB_DATABASE: db
|
||||||
|
DB_USERNAME: db
|
||||||
|
DB_PASSWORD: db
|
||||||
|
BROADCAST_DRIVER: log
|
||||||
|
CACHE_DRIVER: file
|
||||||
|
QUEUE_CONNECTION: sync
|
||||||
|
SESSION_DRIVER: file
|
||||||
|
SESSION_LIFETIME: 120
|
||||||
|
MAIL_FROM_NAME: '${APP_NAME}'
|
||||||
|
PDFLATEX_BIN: /usr/bin/pdflatex
|
||||||
|
XELATEX_BIN: /usr/bin/xelatex
|
||||||
|
SCOUT_DRIVER: database
|
||||||
|
MEILI_MASTER_KEY: abc
|
||||||
|
TEST_OWNCLOUD_DOMAIN: http://owncloudserver:8080
|
||||||
|
TEST_NEXTCLOUD_DOMAIN: http://nextcloudserver:80
|
||||||
|
|
||||||
|
- name: docker_app_push
|
||||||
|
image: plugins/docker
|
||||||
|
settings:
|
||||||
|
dockerfile: ./.docker/php.Dockerfile
|
||||||
|
repo: zoomyboy/adrema-app
|
||||||
|
username: zoomyboy
|
||||||
|
password:
|
||||||
|
from_secret: docker_hub_token
|
||||||
|
tags:
|
||||||
|
- latest
|
||||||
|
- ${DRONE_TAG}
|
||||||
|
pull_image: true
|
||||||
|
when:
|
||||||
|
event: tag
|
||||||
|
|
||||||
|
- name: docker_webservice_push
|
||||||
|
image: plugins/docker
|
||||||
|
settings:
|
||||||
|
dockerfile: ./.docker/nginx.Dockerfile
|
||||||
|
repo: zoomyboy/adrema-webservice
|
||||||
|
username: zoomyboy
|
||||||
|
password:
|
||||||
|
from_secret: docker_hub_token
|
||||||
|
tags:
|
||||||
|
- latest
|
||||||
|
- ${DRONE_TAG}
|
||||||
|
pull_image: true
|
||||||
|
when:
|
||||||
|
event: tag
|
||||||
|
|
||||||
|
- name: deploy
|
||||||
|
image: zoomyboy/adrema-base:latest
|
||||||
|
environment:
|
||||||
|
SSH_KEY:
|
||||||
|
from_secret: deploy_private_key
|
||||||
|
commands:
|
||||||
|
- apt-get update > /dev/null
|
||||||
|
- apt-get install -y openssh-client
|
||||||
|
- mkdir $HOME/.ssh
|
||||||
|
- echo "UserKnownHostsFile=/dev/null" >> $HOME/.ssh/config
|
||||||
|
- echo "StrictHostKeyChecking=no" >> $HOME/.ssh/config
|
||||||
|
- echo "$SSH_KEY" > $HOME/.ssh/id_rsa
|
||||||
|
- chmod 600 $HOME/.ssh/id_rsa
|
||||||
|
- ./vendor/bin/envoy run deploy
|
||||||
|
when:
|
||||||
|
event: tag
|
||||||
|
|
||||||
|
- name: github push
|
||||||
|
image: alpine/git
|
||||||
|
environment:
|
||||||
|
SSH_KEY:
|
||||||
|
from_secret: github_private_key
|
||||||
|
commands:
|
||||||
|
- mkdir $HOME/.ssh
|
||||||
|
- git config core.sshCommand "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
|
||||||
|
- echo "$SSH_KEY" > $HOME/.ssh/id_rsa
|
||||||
|
- chmod 600 $HOME/.ssh/id_rsa
|
||||||
|
- git remote add gh git@github.com:zoomyboy/adrema.git
|
||||||
|
- git push -f gh HEAD:master
|
||||||
|
when:
|
||||||
|
branch: master
|
||||||
|
event: push
|
||||||
|
|
||||||
|
- name: composer_no_dev
|
||||||
|
image: composer:2.7.9
|
||||||
commands:
|
commands:
|
||||||
- composer install --ignore-platform-reqs --no-dev
|
- composer install --ignore-platform-reqs --no-dev
|
||||||
|
|
||||||
- name: node
|
|
||||||
image: node:17.9.0-slim
|
|
||||||
commands:
|
|
||||||
- npm install && npm run prod && rm -R node_modules
|
|
||||||
|
|
||||||
- name: compress
|
- name: compress
|
||||||
image: php:7.3
|
image: php:8.1.6
|
||||||
commands:
|
commands:
|
||||||
- apt-get update -yqq
|
- apt-get update -yqq
|
||||||
- apt-get install -yqq zip tar
|
- apt-get install -yqq zip tar
|
||||||
|
@ -73,6 +159,62 @@ steps:
|
||||||
when:
|
when:
|
||||||
event: tag
|
event: tag
|
||||||
|
|
||||||
|
services:
|
||||||
|
- name: db
|
||||||
|
image: mariadb:10.6.5
|
||||||
|
environment:
|
||||||
|
MARIADB_DATABASE: db
|
||||||
|
MARIADB_USER: db
|
||||||
|
MARIADB_PASSWORD: db
|
||||||
|
MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: yes
|
||||||
|
- name: redis
|
||||||
|
image: redis
|
||||||
|
- name: meilisearch
|
||||||
|
image: getmeili/meilisearch:v1.6
|
||||||
|
commands:
|
||||||
|
- meilisearch --master-key="abc"
|
||||||
|
- name: ownclouddb
|
||||||
|
image: mariadb:10.11
|
||||||
|
environment:
|
||||||
|
MYSQL_ROOT_PASSWORD: owncloud
|
||||||
|
MYSQL_USER: owncloud
|
||||||
|
MYSQL_PASSWORD: owncloud
|
||||||
|
MYSQL_DATABASE: owncloud
|
||||||
|
MARIADB_AUTO_UPGRADE: 1
|
||||||
|
- name: owncloudserver
|
||||||
|
image: owncloud/server:10.10.0
|
||||||
|
environment:
|
||||||
|
OWNCLOUD_DOMAIN: http://owncloudserver:8080
|
||||||
|
OWNCLOUD_TRUSTED_DOMAINS: owncloudserver
|
||||||
|
OWNCLOUD_DB_TYPE: mysql
|
||||||
|
OWNCLOUD_DB_NAME: owncloud
|
||||||
|
OWNCLOUD_DB_USERNAME: owncloud
|
||||||
|
OWNCLOUD_DB_PASSWORD: owncloud
|
||||||
|
OWNCLOUD_DB_HOST: ownclouddb
|
||||||
|
OWNCLOUD_ADMIN_USERNAME: admin
|
||||||
|
OWNCLOUD_ADMIN_PASSWORD: admin
|
||||||
|
OWNCLOUD_MYSQL_UTF8MB4: true
|
||||||
|
OWNCLOUD_REDIS_ENABLED: false
|
||||||
|
OWNCLOUD_REDIS_HOST: false
|
||||||
|
- name: nextclouddb
|
||||||
|
image: mariadb:10.11
|
||||||
|
environment:
|
||||||
|
MYSQL_ROOT_PASSWORD: nextcloud
|
||||||
|
MYSQL_USER: nextcloud
|
||||||
|
MYSQL_PASSWORD: nextcloud
|
||||||
|
MYSQL_DATABASE: nextcloud
|
||||||
|
MARIADB_AUTO_UPGRADE: 1
|
||||||
|
- name: nextcloudserver
|
||||||
|
image: nextcloud
|
||||||
|
environment:
|
||||||
|
MYSQL_PASSWORD: nextcloud
|
||||||
|
MYSQL_DATABASE: nextcloud
|
||||||
|
MYSQL_USER: nextcloud
|
||||||
|
MYSQL_HOST: nextclouddb
|
||||||
|
NEXTCLOUD_ADMIN_USER: admin
|
||||||
|
NEXTCLOUD_ADMIN_PASSWORD: admin
|
||||||
|
NEXTCLOUD_TRUSTED_DOMAINS: nextcloudserver
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
event:
|
event:
|
||||||
- push
|
- push
|
||||||
|
|
55
.env.example
55
.env.example
|
@ -1,55 +0,0 @@
|
||||||
APP_NAME=Laravel
|
|
||||||
APP_ENV=local
|
|
||||||
APP_KEY=
|
|
||||||
APP_DEBUG=true
|
|
||||||
APP_URL=http://localhost
|
|
||||||
APP_MODE=
|
|
||||||
|
|
||||||
LOG_CHANNEL=stack
|
|
||||||
|
|
||||||
DB_CONNECTION=mysql
|
|
||||||
DB_HOST=127.0.0.1
|
|
||||||
DB_PORT=3306
|
|
||||||
DB_DATABASE=laravel
|
|
||||||
DB_TEST_DATABASE=laraveltest
|
|
||||||
DB_USERNAME=root
|
|
||||||
DB_PASSWORD=
|
|
||||||
|
|
||||||
BROADCAST_DRIVER=log
|
|
||||||
CACHE_DRIVER=file
|
|
||||||
QUEUE_CONNECTION=sync
|
|
||||||
SESSION_DRIVER=file
|
|
||||||
SESSION_LIFETIME=120
|
|
||||||
|
|
||||||
REDIS_HOST=127.0.0.1
|
|
||||||
REDIS_PASSWORD=null
|
|
||||||
REDIS_PORT=6379
|
|
||||||
|
|
||||||
MAIL_MAILER=smtp
|
|
||||||
MAIL_HOST=smtp.mailtrap.io
|
|
||||||
MAIL_PORT=2525
|
|
||||||
MAIL_USERNAME=null
|
|
||||||
MAIL_PASSWORD=null
|
|
||||||
MAIL_ENCRYPTION=null
|
|
||||||
MAIL_FROM_ADDRESS=null
|
|
||||||
MAIL_FROM_NAME="${APP_NAME}"
|
|
||||||
|
|
||||||
AWS_ACCESS_KEY_ID=
|
|
||||||
AWS_SECRET_ACCESS_KEY=
|
|
||||||
AWS_DEFAULT_REGION=us-east-1
|
|
||||||
AWS_BUCKET=
|
|
||||||
|
|
||||||
XELATEX=
|
|
||||||
PDFLATEX=
|
|
||||||
|
|
||||||
PUSHER_APP_ID=
|
|
||||||
PUSHER_APP_KEY=
|
|
||||||
PUSHER_APP_SECRET=
|
|
||||||
PUSHER_APP_CLUSTER=mt1
|
|
||||||
|
|
||||||
NAMI_MGLNR=-1
|
|
||||||
NAMI_GROUP=-1
|
|
||||||
NAMI_PASSWORD=password
|
|
||||||
|
|
||||||
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
|
|
||||||
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
|
|
|
@ -5,7 +5,8 @@
|
||||||
},
|
},
|
||||||
"extends": [
|
"extends": [
|
||||||
"eslint:recommended",
|
"eslint:recommended",
|
||||||
"plugin:vue/essential"
|
"plugin:vue/vue3-recommended",
|
||||||
|
"prettier"
|
||||||
],
|
],
|
||||||
"parserOptions": {
|
"parserOptions": {
|
||||||
"ecmaVersion": "latest",
|
"ecmaVersion": "latest",
|
||||||
|
@ -14,6 +15,14 @@
|
||||||
"plugins": [
|
"plugins": [
|
||||||
"vue"
|
"vue"
|
||||||
],
|
],
|
||||||
"rules": {
|
"overrides": [
|
||||||
}
|
{
|
||||||
|
"files": [
|
||||||
|
"*.vue"
|
||||||
|
],
|
||||||
|
"rules": {
|
||||||
|
"vue/multi-word-component-names": "off"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,27 +1,43 @@
|
||||||
/node_modules
|
node_modules/
|
||||||
/public/hot
|
|
||||||
/public/storage
|
|
||||||
/public/js
|
|
||||||
/public/css
|
|
||||||
/public/fonts
|
|
||||||
/public/img
|
|
||||||
/storage/*.key
|
|
||||||
/vendor
|
|
||||||
.env
|
|
||||||
.env.backup
|
|
||||||
.phpunit.result.cache
|
|
||||||
Homestead.json
|
|
||||||
Homestead.yaml
|
|
||||||
npm-debug.log
|
npm-debug.log
|
||||||
yarn-error.log
|
yarn-error.log
|
||||||
tags
|
/bootstrap/compiled.php
|
||||||
|
/app/storage/
|
||||||
|
/public/storage
|
||||||
|
/public/hot
|
||||||
|
/public/build
|
||||||
/public/vendor
|
/public/vendor
|
||||||
/storage/temp
|
storage/*.key
|
||||||
|
/storage/media-library/*
|
||||||
|
/vendor/
|
||||||
|
Homestead.yaml
|
||||||
|
Homestead.json
|
||||||
|
.vagrant/
|
||||||
|
.phpunit.result.cache
|
||||||
|
/storage/temp/
|
||||||
|
/storage/debugbar/
|
||||||
|
/tests/Fileshare/oc_tmp/*
|
||||||
|
|
||||||
|
# User data files
|
||||||
|
/data/
|
||||||
|
/.app.env
|
||||||
|
.config/psysh
|
||||||
|
|
||||||
|
# Development files
|
||||||
|
/docker-compose.yml
|
||||||
|
/.env
|
||||||
|
/.env.backup
|
||||||
|
/.env.testing
|
||||||
|
|
||||||
|
# Editor config files
|
||||||
|
/.vscode/
|
||||||
|
|
||||||
# Temporary files
|
# Temporary files
|
||||||
*.swp
|
*.swp
|
||||||
*.swo
|
*.swo
|
||||||
*.swm
|
*.swm
|
||||||
/public/mix-manifest.json
|
/resources/img/sprite.svg
|
||||||
resources/img/sprite.svg
|
/public/sprite.svg
|
||||||
/.php-cs-fixer.cache
|
/.php-cs-fixer.cache
|
||||||
|
/groups.sql
|
||||||
|
/.phpunit.cache
|
||||||
|
|
|
@ -1,9 +1,19 @@
|
||||||
[submodule "packages/silvaletter"]
|
|
||||||
path = packages/silvaletter
|
|
||||||
url = git@zoomyboy.de:silva/silvaletter.git
|
|
||||||
[submodule "packages/laravel-nami"]
|
[submodule "packages/laravel-nami"]
|
||||||
path = packages/laravel-nami
|
path = packages/laravel-nami
|
||||||
url = git@github.com:DPSGKoeln/laravel-nami.git
|
url = https://git.zoomyboy.de/silva/laravel-nami-api
|
||||||
[submodule "packages/tex"]
|
[submodule "packages/tex"]
|
||||||
path = packages/tex
|
path = packages/tex
|
||||||
url = git@zoomyboy.de:pille/tex.git
|
url = https://git.zoomyboy.de/pille/tex
|
||||||
|
[submodule "packages/adrema-form"]
|
||||||
|
path = packages/adrema-form
|
||||||
|
url = https://git.zoomyboy.de/silva/adrema-form.git
|
||||||
|
[submodule "packages/medialibrary-helper"]
|
||||||
|
path = packages/medialibrary-helper
|
||||||
|
url = https://git.zoomyboy.de/zoomyboy/medialibrary-helper.git
|
||||||
|
branch = version2
|
||||||
|
[submodule "packages/flysystem-webdav"]
|
||||||
|
path = packages/flysystem-webdav
|
||||||
|
url = https://github.com/zoomyboy/flysystem-webdav.git
|
||||||
|
[submodule "packages/table-document"]
|
||||||
|
path = packages/table-document
|
||||||
|
url = https://git.zoomyboy.de/zoomyboy/table-document.git
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"printWidth": 120,
|
"printWidth": 200,
|
||||||
"singleQuote": true,
|
"singleQuote": true,
|
||||||
"tabWidth": 4,
|
"tabWidth": 4,
|
||||||
"quoteProps": "consistent",
|
"quoteProps": "consistent",
|
||||||
|
|
|
@ -0,0 +1,94 @@
|
||||||
|
# Letzte Änderungen
|
||||||
|
|
||||||
|
### 1.12.2
|
||||||
|
|
||||||
|
- Zuschussliste Gallier
|
||||||
|
|
||||||
|
### 1.12.1
|
||||||
|
|
||||||
|
- In Teilnehmer-Liste von Veranstaltungen kann nun sortiert und gefiltert werden.
|
||||||
|
- Formulare: Feld Registrierung von / bis
|
||||||
|
|
||||||
|
### 1.11.5
|
||||||
|
|
||||||
|
- Fix: Synchronisation von NaMi-Mitgliedern
|
||||||
|
|
||||||
|
### 1.11.4
|
||||||
|
|
||||||
|
- Fix: Nicht an Präventions-Unterlagen für vergangene Veranstaltungen erinnern
|
||||||
|
|
||||||
|
### 1.11.1
|
||||||
|
|
||||||
|
- Es kann nun auch das Feld "Datenweiterverwendung" über Adrema gepflegt werden.
|
||||||
|
|
||||||
|
### 1.10.20
|
||||||
|
|
||||||
|
- Fixed: Bei Textfeldern wird nun die Einleitung dargestellt
|
||||||
|
|
||||||
|
### 1.10.19
|
||||||
|
|
||||||
|
- Fixed: Erweiterte Führungszeugnisse und Präventionsschulungen nur für aktive Mitgliedschaften auf Dashboard anzeigen
|
||||||
|
|
||||||
|
### 1.10.18
|
||||||
|
|
||||||
|
- Fixed: All Gruppen als Option anbieten bei Bedingungen
|
||||||
|
|
||||||
|
### 1.10.17
|
||||||
|
|
||||||
|
- Es können nun auch Bedingungen für Felder vom Typ Gruppierung definiert werden
|
||||||
|
|
||||||
|
### 1.10.16
|
||||||
|
|
||||||
|
- Rechnungen und Erinnerungen werden nun automatisch täglich um 10 Uhr verschickt
|
||||||
|
- Es kann eingestellt werden, nach wie vielen Wochen an Rechnungen erinnert werden soll (Standard: 12)
|
||||||
|
- Name und Profilbild des angemeldeten Benutzers wird nun oben rechts angezeigt
|
||||||
|
|
||||||
|
### 1.10.15
|
||||||
|
|
||||||
|
- "Für Mitglieder zusätzlich abfragen" kann nun im Formular auch gesetzt werden, wenn ein NaMi Feld ausgewählt ist.
|
||||||
|
|
||||||
|
### 1.10.14
|
||||||
|
|
||||||
|
- Fixed: Ist eine Präventionsschulung älter als 5 Jahre, so ist nur eine Auffrischungs-Schulung erforderlich
|
||||||
|
|
||||||
|
### 1.10.13
|
||||||
|
|
||||||
|
- Bei Veranstaltungs-Übersicht alle Veranstaltungen anzeigen
|
||||||
|
- Download von Teilnehmern als Tabellen-Dokument
|
||||||
|
- Spalte "Prävention" bei TN-Liste eingefügt für benötigte Unterlagen
|
||||||
|
|
||||||
|
### 1.10.11
|
||||||
|
|
||||||
|
- Bei Prävention auch an Verhaltenskodex erinnern
|
||||||
|
|
||||||
|
### 1.10.10
|
||||||
|
|
||||||
|
- Eine Formular-Vorlage kann nun auch Mail-Inhalte enthalten, die für die Formulare übernommen werden
|
||||||
|
|
||||||
|
### 1.10.9
|
||||||
|
|
||||||
|
- Nextcloud als neuen Type bei Datei-Verbindungen angelegt
|
||||||
|
|
||||||
|
### 1.10.8
|
||||||
|
|
||||||
|
- Anmeldeformulare: Bearbeiten von Teilnehmer\*innen ist nun möglich
|
||||||
|
|
||||||
|
### 1.10.7
|
||||||
|
|
||||||
|
- Anmeldeformulare: Versenden von Präventions-Unterlagen können nun an eine Feld-Bedingung geknüpft werden innerhalb der Veranstaltung
|
||||||
|
|
||||||
|
### 1.10.6
|
||||||
|
|
||||||
|
- Kleinere Fehler behoben
|
||||||
|
|
||||||
|
### 1.10.5
|
||||||
|
|
||||||
|
- Kleinere Fehler behoben
|
||||||
|
|
||||||
|
### 1.10.4
|
||||||
|
|
||||||
|
- Anmeldeformular: Erinnerung an Präventions-Unterlagen bei Teilnehmer\*innnen
|
||||||
|
|
||||||
|
### 1.10.3
|
||||||
|
|
||||||
|
- Anmeldeformulare: Ist NaMi-Feld "E-Mail" ausgewählt bei Formular-Feldern, muss die E-Mail-Adresse nun nicht mehr auf das Mitglied matchen. Dies ist nur noch bei Formular-Feldern mit NaMi-Feldern "Vorname", "Nachname" und "Geburtsdatum" der Fall.
|
19
Dockerfile
19
Dockerfile
|
@ -1,19 +0,0 @@
|
||||||
FROM composer:2.2.7 as composer
|
|
||||||
WORKDIR /app
|
|
||||||
COPY . /app
|
|
||||||
RUN composer install --ignore-platform-reqs --no-dev
|
|
||||||
|
|
||||||
FROM node:17.9.0-slim as node
|
|
||||||
WORKDIR /app
|
|
||||||
COPY . /app
|
|
||||||
RUN npm install && npm run prod && rm -R node_modules
|
|
||||||
|
|
||||||
FROM php:8.1.6-fpm as php
|
|
||||||
RUN apt-get update && apt-get install -y libcurl3-dev apt-utils zlib1g-dev libpng-dev libicu-dev libonig-dev texlive
|
|
||||||
RUN docker-php-ext-install pdo_mysql curl gd intl mbstring
|
|
||||||
COPY --chown=www-data:www-data . /app
|
|
||||||
COPY --chown=www-data:www-data --from=node /app/public /app/public
|
|
||||||
COPY --chown=www-data:www-data --from=composer /app/vendor /app/vendor
|
|
||||||
EXPOSE 9000
|
|
||||||
|
|
||||||
CMD ["php-fpm", "-F", "-R", "-O"]
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
@servers(['docker' => ['stammsilva@zoomyboy.de', 'stammgallier@stamm-gallier.de', 'dpsg-lennep@zoomyboy.de', 'dpsgbergischland@zoomyboy.de', 'dpsg-koeln@dpsg-koeln.de']])
|
||||||
|
|
||||||
|
@task('deploy', ['on' => 'docker'])
|
||||||
|
cd $ADREMA_PATH
|
||||||
|
docker compose down
|
||||||
|
docker compose pull
|
||||||
|
docker compose up -d
|
||||||
|
@endtask
|
132
README.md
132
README.md
|
@ -1,12 +1,126 @@
|
||||||
# DPSG Köln Adrema
|
# Adrema
|
||||||
|
|
||||||
## Installation
|
**Schön, dass du den Weg hierhin gefunden hast!**
|
||||||
|
|
||||||
Init and update git submodules to get laravel-nami Package
|
Da du diese Seite besuchst, gehörst du sicherlich zu den Leuten, die möglichst einfach die Daten ihrer Mitglieder pfelgen wollen. Das ist offiziell in der DPSG nur mit NaMi möglich.
|
||||||
|
|
||||||
```
|
Die AdReMa (= "AddRessManagement") macht das auch, nur einfacher, schöner und intuitiver als es NaMi tut.
|
||||||
composer install --no-dev
|
|
||||||
npm ci
|
![Mitglieder-Übersicht](https://git.zoomyboy.de/silva/adrema/raw/branch/master/doc/page/assets/img/member.jpg)
|
||||||
npm run prod
|
|
||||||
php artisan serve
|
AdReMa kann von jedem und jeder genutzt werden, die einen NaMi-Account besitzt und Schreibrechte hat (i.d.R. sind das Stammesvorstände, e.V.-Mitglieder und andere, die Mitgliederdaten und deren Abrechungen und Beiträge pflegen müssen).
|
||||||
```
|
|
||||||
|
## Was kann ich mit AdReMa machen?
|
||||||
|
|
||||||
|
- Basisdaten von Mitgliedern anzeigen und bearbeiten
|
||||||
|
- Einfacher Filter nach Gruppierung, Tätigkeit, etc
|
||||||
|
- Detailansichten mit allen zugehörigen Daten
|
||||||
|
- Führungszeugnisse und Präventionssulungen nachhalten
|
||||||
|
- Beitragszahlungen eintragen
|
||||||
|
- Automatische Rechunungserstellung
|
||||||
|
- Eigenen Beitragssatz hinterlegen (z.B. interner Stammes-Jahresbeitrag)
|
||||||
|
- Generieren von Zuschusslisten (aktuell RdP NRW, Bdkj Hessen, Stadt Solingen, Stadt Remscheid, Stadt Frankfurt a. M.)
|
||||||
|
- Einpflegen von internen Tätigkeiten, die nicht in NaMi vorhanden sind (um z.B. stammes-interne AGs / AKs zu verwalten)
|
||||||
|
- Automatisches Erstellen und Managen von E-Mail-Verteilern mittels Mailman 3.0
|
||||||
|
- eFz-Bescheinigung abrufen für alle Leitenden (das kann in NaMi nur jede\*r für sich selbst)
|
||||||
|
- Ausbildungen eintragen (WBK-Bausteine)
|
||||||
|
- Abrufen von Kontakten ins eigene Telefonbuch (mittels CardDAV)
|
||||||
|
|
||||||
|
Ziel dieses Projektes ist es, viele Dinge, die man normalerweise manuell zu tun hat so gut es geht zu automatisieren oder zumindest zu vereinfachen. So kann man sich als Leitende\*r / Vorstand auf die wichtigeren Dinge konzentrieren wie Gruppenstunden, Lager, Leiterrunden, etc.
|
||||||
|
|
||||||
|
Außerdem ist AdReMa auch problemlos auf Handys und Tablets bedienbar ("mobiles Design")
|
||||||
|
|
||||||
|
## Installation des Produktivsystems
|
||||||
|
|
||||||
|
1. Herunterladen der Beispiel Docker-Compose
|
||||||
|
|
||||||
|
```cmd
|
||||||
|
curl https://git.zoomyboy.de/silva/adrema/raw/branch/master/docker-compose.prod.yml -o docker-compose.yml
|
||||||
|
```
|
||||||
|
|
||||||
|
2. Herunterladen der Beispiel Environmentvariablen-Datei
|
||||||
|
|
||||||
|
```cmd
|
||||||
|
curl https://git.zoomyboy.de/silva/adrema/raw/branch/master/.app.env.example -o .app.env
|
||||||
|
```
|
||||||
|
|
||||||
|
3. In der `.app.env` notwendige Einstellungen vornehmen:
|
||||||
|
|
||||||
|
- `APP_URL`: Hier sollte die URL (mit HTTPS) stehen, unter der Adrema erreichbar sein soll (z.B. `https://adrema.stamm-bipi.de`)
|
||||||
|
- Mail-Server Einstellungen `MAIL_PORT`, `MAIL_HOST`, `MAIL_USERNAME`, `MAIL_PASSWORD` und `MAIL_ENCRYPTION` anpassen
|
||||||
|
- `MAIL_FROM_NAME`: Der Name, der als Absender von E-Mails gesetzt wird (z.B. `Stamm Bipi Service`)
|
||||||
|
- `MAIL_FROM_ADDRESS`: Die dazu gehörige E-Mail-Adresse, die natürlich für antworten erreichbar sein sollte (z.B. `vorstand@stamm-bipi.de`)
|
||||||
|
- `DB_PASSWORD` und `MYSQL_PASSWORD`: Mit dem selben sicheren Passwort für die Datenbank versehen
|
||||||
|
- `USER_EMAIL` und `USER_PASSWORD`: Einstellen des standard Adrema Logins
|
||||||
|
|
||||||
|
4. Container zur Gennerierung des App-Key starten
|
||||||
|
|
||||||
|
```cmd
|
||||||
|
docker compose up php
|
||||||
|
```
|
||||||
|
|
||||||
|
Nach einiger zeit wird ein App-Key generiert:
|
||||||
|
|
||||||
|
```cmd
|
||||||
|
Keinen APP KEY gefunden. Key wird generiert: base64:xxx
|
||||||
|
```
|
||||||
|
|
||||||
|
Container herunterfahren und entfernen
|
||||||
|
|
||||||
|
```cmd
|
||||||
|
docker compose down
|
||||||
|
```
|
||||||
|
|
||||||
|
5. Der generierte App-Key muss als Environmentvariable (`APP_KEY`) mit in den Docker-Container gegeben werden. Kopiere den App-Key in die Datei `.app.env`
|
||||||
|
|
||||||
|
```env
|
||||||
|
APP_KEY=base64:xxx
|
||||||
|
```
|
||||||
|
|
||||||
|
6. Alle Container starten
|
||||||
|
|
||||||
|
```cmd
|
||||||
|
docker compose up -d
|
||||||
|
```
|
||||||
|
|
||||||
|
7. Nach kurzer Zeit ist AdReMa über <http://localhost:8000> erreichbar und es kann sich mit dem zuvor festgelegten Login eingeloggt werden
|
||||||
|
|
||||||
|
### Individuelle anpassungen
|
||||||
|
|
||||||
|
#### Rechnungswesen
|
||||||
|
|
||||||
|
Bei dem Setup wird im Daten-Verzeichniss ein Ordner `./data/setup` angelegt. Hier kann das Logo des Stammes in den Briefkopf eingefügt werden. Zusätzlich kann der Text der Rechnung und der Zahlungserinnerung angepasst werden, dafür ist ein grundlegendes Verständnis für `.tex` Datein erforderlich.
|
||||||
|
|
||||||
|
## Nutzen des Entwicklungssystmes
|
||||||
|
|
||||||
|
1. Klonen des Reposetories
|
||||||
|
|
||||||
|
```cmd
|
||||||
|
git clone https://git.zoomyboy.de/silva/adrema.git
|
||||||
|
```
|
||||||
|
|
||||||
|
2. Kopieren der Beispiel Docker-Compose für das Entwickeln und nach Wünschen anpassen
|
||||||
|
|
||||||
|
```cmd
|
||||||
|
cp docker-compose.dev.yml docker-compose.yml
|
||||||
|
```
|
||||||
|
|
||||||
|
3. Kopieren der Beispiel Environmentvariablen-Datei
|
||||||
|
|
||||||
|
```cmd
|
||||||
|
cp .app.env.example .app.env
|
||||||
|
```
|
||||||
|
|
||||||
|
4. Submodule aktuallisieren
|
||||||
|
|
||||||
|
```cmd
|
||||||
|
git submodule update --init
|
||||||
|
```
|
||||||
|
|
||||||
|
5. Container erstellen
|
||||||
|
|
||||||
|
```cmd
|
||||||
|
docker compose build
|
||||||
|
```
|
||||||
|
|
||||||
|
6. Mit Schritt 3 und den folgenden der [Installation des Produktivsystems](#installation-des-produktivsystems) fortfahren
|
||||||
|
|
|
@ -0,0 +1,23 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Actions;
|
||||||
|
|
||||||
|
use DB;
|
||||||
|
use Illuminate\Support\Facades\Artisan;
|
||||||
|
use Illuminate\Support\Facades\Http;
|
||||||
|
use Laravel\Telescope\Console\PruneCommand;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
|
||||||
|
class DbMaintainAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
|
||||||
|
public string $commandSignature = 'db:maintain';
|
||||||
|
|
||||||
|
public function handle(): void
|
||||||
|
{
|
||||||
|
Artisan::call(PruneCommand::class, ['--hours' => 168]); // 168h = 7 Tage
|
||||||
|
DB::select('optimize table telescope_entries');
|
||||||
|
Http::post('https://zoomyboy.de/maintain', ['url' => url()->current()]);
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,37 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Actions;
|
||||||
|
|
||||||
|
use App\Course\Models\Course;
|
||||||
|
use App\Member\Member;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
use Zoomyboy\LaravelNami\Data\Course as NamiCourse;
|
||||||
|
|
||||||
|
class InsertCoursesAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param Collection<int, NamiCourse> $courses
|
||||||
|
*/
|
||||||
|
public function handle(Member $member, Collection $courses): void
|
||||||
|
{
|
||||||
|
if (!$member->hasNami) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($courses as $course) {
|
||||||
|
$member->courses()->updateOrCreate(['nami_id' => $course->id], [
|
||||||
|
'course_id' => Course::nami($course->courseId)->id,
|
||||||
|
'organizer' => $course->organizer,
|
||||||
|
'nami_id' => $course->id,
|
||||||
|
'completed_at' => $course->completedAt,
|
||||||
|
'event_name' => $course->eventName,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$courseIds = $courses->map(fn ($course) => $course->id)->toArray();
|
||||||
|
$member->courses()->whereNotIn('nami_id', $courseIds)->whereNotNull('nami_id')->delete();
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,74 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Actions;
|
||||||
|
|
||||||
|
use App\Confession;
|
||||||
|
use App\Country;
|
||||||
|
use App\Fee;
|
||||||
|
use App\Gender;
|
||||||
|
use App\Group;
|
||||||
|
use App\Member\Member;
|
||||||
|
use App\Nationality;
|
||||||
|
use App\Payment\Subscription;
|
||||||
|
use App\Region;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
use Zoomyboy\LaravelNami\Data\Member as NamiMember;
|
||||||
|
|
||||||
|
class InsertMemberAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
|
||||||
|
public function handle(NamiMember $member): Member
|
||||||
|
{
|
||||||
|
$region = Region::firstWhere('nami_id', $member->regionId ?: -1);
|
||||||
|
|
||||||
|
return Member::updateOrCreate(['nami_id' => $member->id], [
|
||||||
|
'firstname' => $member->firstname,
|
||||||
|
'lastname' => $member->lastname,
|
||||||
|
'joined_at' => $member->joinedAt,
|
||||||
|
'birthday' => $member->birthday,
|
||||||
|
'send_newspaper' => $member->sendNewspaper,
|
||||||
|
'address' => $member->address,
|
||||||
|
'zip' => $member->zip,
|
||||||
|
'location' => $member->location,
|
||||||
|
'nickname' => $member->nickname,
|
||||||
|
'other_country' => $member->otherCountry,
|
||||||
|
'further_address' => $member->furtherAddress,
|
||||||
|
'main_phone' => $member->mainPhone,
|
||||||
|
'mobile_phone' => $member->mobilePhone,
|
||||||
|
'work_phone' => $member->workPhone,
|
||||||
|
'fax' => $member->fax,
|
||||||
|
'email' => $member->email,
|
||||||
|
'email_parents' => $member->emailParents,
|
||||||
|
'nami_id' => $member->id,
|
||||||
|
'group_id' => Group::firstOrCreate(['nami_id' => $member->groupId], ['nami_id' => $member->groupId, 'name' => $member->groupName])->id,
|
||||||
|
'gender_id' => optional(Gender::firstWhere('nami_id', $member->genderId ?: -1))->id,
|
||||||
|
'confession_id' => optional(Confession::firstWhere('nami_id', $member->confessionId ?: -1))->id,
|
||||||
|
'region_id' => $region && !$region->is_null ? $region->id : null,
|
||||||
|
'country_id' => optional(Country::where('nami_id', $member->countryId)->first())->id,
|
||||||
|
'subscription_id' => $this->getSubscription($member)?->id,
|
||||||
|
'nationality_id' => Nationality::where('nami_id', $member->nationalityId)->firstOrFail()->id,
|
||||||
|
'mitgliedsnr' => $member->memberId,
|
||||||
|
'version' => $member->version,
|
||||||
|
'keepdata' => $member->keepdata,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getSubscription(NamiMember $member): ?Subscription
|
||||||
|
{
|
||||||
|
if (is_null($member->feeId)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$fee = Fee::nami($member->feeId);
|
||||||
|
|
||||||
|
if (is_null($fee)) {
|
||||||
|
$feeName = $member->feeName ?: 'Default';
|
||||||
|
$fee = Fee::create(['name' => $feeName, 'nami_id' => $member->feeId]);
|
||||||
|
$subscription = $fee->subscriptions()->create(['name' => $feeName]);
|
||||||
|
$subscription->children()->create(['name' => $feeName, 'amount' => 1000]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $fee->subscriptions()->first();
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,113 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Actions;
|
||||||
|
|
||||||
|
use App\Activity;
|
||||||
|
use App\Group;
|
||||||
|
use App\Initialize\ActivityCreator;
|
||||||
|
use App\Member\Member;
|
||||||
|
use App\Member\Membership;
|
||||||
|
use App\Setting\NamiSettings;
|
||||||
|
use App\Subactivity;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
use Zoomyboy\LaravelNami\Api;
|
||||||
|
use Zoomyboy\LaravelNami\Data\MembershipEntry as NamiMembershipEntry;
|
||||||
|
|
||||||
|
class InsertMembershipsAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param Collection<int, NamiMembershipEntry> $memberships
|
||||||
|
*/
|
||||||
|
public function handle(Member $member, Collection $memberships): void
|
||||||
|
{
|
||||||
|
if (!$member->hasNami) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($memberships as $membership) {
|
||||||
|
$existingMembership = Membership::where('nami_id', $membership->id)->first();
|
||||||
|
|
||||||
|
$group = Group::where('name', $membership->group)->whereNotNull('nami_id')->first();
|
||||||
|
if (!$group) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (null !== $this->overviewStrategy($member, $group, $membership)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->singleStrategy($member, $group, $membership);
|
||||||
|
}
|
||||||
|
|
||||||
|
$membershipIds = $memberships->map(fn ($membership) => $membership->id)->toArray();
|
||||||
|
$member->memberships()->whereNotIn('nami_id', $membershipIds)->whereNotNull('nami_id')->delete();
|
||||||
|
}
|
||||||
|
|
||||||
|
private function overviewStrategy(Member $member, Group $group, NamiMembershipEntry $membership): ?Membership
|
||||||
|
{
|
||||||
|
$activity = 1 === preg_match('/\(([0-9]+)\)/', $membership->activity, $activityMatches)
|
||||||
|
? Activity::where('nami_id', (int) $activityMatches[1])->first()
|
||||||
|
: null;
|
||||||
|
|
||||||
|
if (!$activity) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (null !== $membership->subactivity) {
|
||||||
|
$subactivity = Subactivity::remote()->where('name', $membership->subactivity)->first();
|
||||||
|
|
||||||
|
if (!$subactivity) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
$subactivity = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $member->memberships()->updateOrCreate(['nami_id' => $membership->id], [
|
||||||
|
'nami_id' => $membership->id,
|
||||||
|
'from' => $membership->startsAt,
|
||||||
|
'to' => $membership->endsAt,
|
||||||
|
'group_id' => $group->id,
|
||||||
|
'activity_id' => $activity->id,
|
||||||
|
'subactivity_id' => $subactivity?->id,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function singleStrategy(Member $member, Group $group, NamiMembershipEntry $membershipEntry): ?Membership
|
||||||
|
{
|
||||||
|
$membership = $this->api()->membership($member->nami_id, $membershipEntry->id);
|
||||||
|
app(ActivityCreator::class)->createFor($this->api(), $membership->group());
|
||||||
|
|
||||||
|
$activity = Activity::nami($membership->activityId);
|
||||||
|
if (!$activity) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (null !== $membership->subactivityId) {
|
||||||
|
$subactivity = Subactivity::nami($membership->subactivityId);
|
||||||
|
|
||||||
|
if (!$subactivity) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
$subactivity = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $member->memberships()->updateOrCreate(['nami_id' => $membership->id], [
|
||||||
|
'nami_id' => $membership->id,
|
||||||
|
'from' => $membership->startsAt,
|
||||||
|
'to' => $membership->endsAt,
|
||||||
|
'group_id' => $group->id,
|
||||||
|
'activity_id' => $activity->id,
|
||||||
|
'subactivity_id' => $subactivity?->id,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
private function api(): Api
|
||||||
|
{
|
||||||
|
return app(NamiSettings::class)->login();
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,193 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Actions;
|
|
||||||
|
|
||||||
use App\Activity;
|
|
||||||
use App\Confession;
|
|
||||||
use App\Country;
|
|
||||||
use App\Course\Models\Course;
|
|
||||||
use App\Fee;
|
|
||||||
use App\Gender;
|
|
||||||
use App\Group;
|
|
||||||
use App\Initialize\ActivityCreator;
|
|
||||||
use App\Member\Member;
|
|
||||||
use App\Member\Membership;
|
|
||||||
use App\Nationality;
|
|
||||||
use App\Region;
|
|
||||||
use App\Subactivity;
|
|
||||||
use Illuminate\Database\Eloquent\ModelNotFoundException;
|
|
||||||
use Zoomyboy\LaravelNami\Api;
|
|
||||||
use Zoomyboy\LaravelNami\Data\MembershipEntry;
|
|
||||||
use Zoomyboy\LaravelNami\Exceptions\RightException;
|
|
||||||
use Zoomyboy\LaravelNami\Member as NamiMember;
|
|
||||||
use Zoomyboy\LaravelNami\NamiException;
|
|
||||||
|
|
||||||
class MemberPullAction
|
|
||||||
{
|
|
||||||
private NamiMember $member;
|
|
||||||
private Api $api;
|
|
||||||
|
|
||||||
public function api(Api $api): self
|
|
||||||
{
|
|
||||||
$this->api = $api;
|
|
||||||
|
|
||||||
return $this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function member(int $groupId, int $memberId): self
|
|
||||||
{
|
|
||||||
$this->member = NamiMember::fromNami($this->api->member($groupId, $memberId));
|
|
||||||
|
|
||||||
return $this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function execute(): void
|
|
||||||
{
|
|
||||||
if (!$this->member->joined_at) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
$region = Region::firstWhere('nami_id', $this->member->region_id ?: -1);
|
|
||||||
$m = Member::updateOrCreate(['nami_id' => $this->member->id], [
|
|
||||||
'firstname' => $this->member->firstname,
|
|
||||||
'lastname' => $this->member->lastname,
|
|
||||||
'joined_at' => $this->member->joined_at,
|
|
||||||
'birthday' => $this->member->birthday,
|
|
||||||
'send_newspaper' => $this->member->send_newspaper,
|
|
||||||
'address' => $this->member->address,
|
|
||||||
'zip' => $this->member->zip,
|
|
||||||
'location' => $this->member->location,
|
|
||||||
'nickname' => $this->member->nickname,
|
|
||||||
'other_country' => $this->member->other_country,
|
|
||||||
'further_address' => $this->member->further_address,
|
|
||||||
'main_phone' => $this->member->main_phone,
|
|
||||||
'mobile_phone' => $this->member->mobile_phone,
|
|
||||||
'work_phone' => $this->member->work_phone,
|
|
||||||
'fax' => $this->member->fax,
|
|
||||||
'email' => $this->member->email,
|
|
||||||
'email_parents' => $this->member->email_parents,
|
|
||||||
'nami_id' => $this->member->id,
|
|
||||||
'group_id' => Group::firstOrCreate(['nami_id' => $this->member->group_id], ['nami_id' => $this->member->group_id, 'name' => $this->member->group_name])->id,
|
|
||||||
'gender_id' => optional(Gender::firstWhere('nami_id', $this->member->gender_id ?: -1))->id,
|
|
||||||
'confession_id' => optional(Confession::firstWhere('nami_id', $this->member->confession_id ?: -1))->id,
|
|
||||||
'region_id' => $region && !$region->is_null ? $region->id : null,
|
|
||||||
'country_id' => optional(Country::where('nami_id', $this->member->country_id)->first())->id,
|
|
||||||
'subscription_id' => $this->getSubscriptionId($this->member),
|
|
||||||
'nationality_id' => Nationality::where('nami_id', $this->member->nationality_id)->firstOrFail()->id,
|
|
||||||
'version' => $this->member->version,
|
|
||||||
]);
|
|
||||||
|
|
||||||
try {
|
|
||||||
foreach ($this->api->coursesFor($this->member->id) as $course) {
|
|
||||||
$m->courses()->updateOrCreate(['nami_id' => $course->id], [
|
|
||||||
'course_id' => Course::where('nami_id', $course->courseId)->firstOrFail()->id,
|
|
||||||
'organizer' => $course->organizer,
|
|
||||||
'event_name' => $course->eventName,
|
|
||||||
'completed_at' => $course->completedAt,
|
|
||||||
'nami_id' => $course->id,
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
} catch (RightException $e) {
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
foreach ($this->api->membershipsOf($this->member->id) as $membership) {
|
|
||||||
$existingMembership = Membership::where('nami_id', $membership->id)->first();
|
|
||||||
if (null !== $membership->endsAt && !$existingMembership) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (null !== $membership->endsAt && $existingMembership) {
|
|
||||||
$existingMembership->delete();
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
[$activityId, $subactivityId, $groupId] = $this->fetchMembership($membership);
|
|
||||||
} catch (RightException $e) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
if (is_null($activityId)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
$m->memberships()->updateOrCreate(['nami_id' => $membership->id], [
|
|
||||||
'nami_id' => $membership->id,
|
|
||||||
'from' => $membership->startsAt,
|
|
||||||
'group_id' => $groupId,
|
|
||||||
'activity_id' => $activityId,
|
|
||||||
'subactivity_id' => $subactivityId,
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
} catch (RightException $e) {
|
|
||||||
}
|
|
||||||
} catch (ModelNotFoundException $e) {
|
|
||||||
dd($e->getMessage(), $this->member);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private function fetchMembership(MembershipEntry $membershipEntry): array
|
|
||||||
{
|
|
||||||
if ($this->shouldSyncMembership($membershipEntry)) {
|
|
||||||
$membership = $this->api->membership($this->member->id, $membershipEntry->id);
|
|
||||||
|
|
||||||
if (is_null($membership)) {
|
|
||||||
return [null, null, null];
|
|
||||||
}
|
|
||||||
app(ActivityCreator::class)->createFor($this->api, $membership->groupId);
|
|
||||||
$group = Group::firstOrCreate(['nami_id' => $membership->groupId], [
|
|
||||||
'nami_id' => $membership->groupId,
|
|
||||||
'name' => $membership->group,
|
|
||||||
]);
|
|
||||||
try {
|
|
||||||
$activityId = Activity::where('nami_id', $membership->activityId)->firstOrFail()->id;
|
|
||||||
$subactivityId = $membership->subactivityId
|
|
||||||
? Subactivity::where('nami_id', $membership->subactivityId)->firstOrFail()->id
|
|
||||||
: null;
|
|
||||||
|
|
||||||
return [$activityId, $subactivityId, $group->id];
|
|
||||||
} catch (ModelNotFoundException $e) {
|
|
||||||
return [null, null, null];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (null === $membershipEntry->subactivity) {
|
|
||||||
$subactivityId = null;
|
|
||||||
} else {
|
|
||||||
$subactivityId = Subactivity::where('name', $membershipEntry->subactivity)->firstOrFail()->id;
|
|
||||||
}
|
|
||||||
preg_match('/\(([0-9]+)\)$/', $membershipEntry->activity, $activityMatches);
|
|
||||||
$activityId = Activity::where('nami_id', $activityMatches[1])->firstOrFail()->id;
|
|
||||||
$groupId = Group::where('name', $membershipEntry->group)->firstOrFail()->id;
|
|
||||||
|
|
||||||
return [$activityId, $subactivityId, $groupId];
|
|
||||||
}
|
|
||||||
|
|
||||||
private function shouldSyncMembership(MembershipEntry $membershipEntry): bool
|
|
||||||
{
|
|
||||||
if (!Group::where('name', $membershipEntry->group)->exists()) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
if (1 !== preg_match('/\(([0-9]+)\)/', $membershipEntry->activity, $activityMatches)) {
|
|
||||||
throw new NamiException("ID in taetigkeit string not found: {$membershipEntry->activity}");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!Activity::where('nami_id', (int) $activityMatches[1])->exists()) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (null === $membershipEntry->subactivity) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return !Subactivity::where('name', $membershipEntry->subactivity)->exists();
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getSubscriptionId(NamiMember $member): ?int
|
|
||||||
{
|
|
||||||
$fee = Fee::firstWhere('nami_id', $member->fee_id ?: -1);
|
|
||||||
if (is_null($fee)) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
return optional($fee->subscriptions()->first())->id;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -0,0 +1,28 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Actions;
|
||||||
|
|
||||||
|
use App\Member\Member;
|
||||||
|
use App\Nami\Api\CoursesOfAction;
|
||||||
|
use App\Setting\NamiSettings;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
use Zoomyboy\LaravelNami\Api;
|
||||||
|
|
||||||
|
class PullCoursesAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
|
||||||
|
public function handle(Member $member): void
|
||||||
|
{
|
||||||
|
if (!$member->hasNami) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
InsertCoursesAction::run($member, CoursesOfAction::run($this->api(), $member->nami_id));
|
||||||
|
}
|
||||||
|
|
||||||
|
private function api(): Api
|
||||||
|
{
|
||||||
|
return app(NamiSettings::class)->login();
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,24 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Actions;
|
||||||
|
|
||||||
|
use App\Member\Member;
|
||||||
|
use App\Nami\Api\MemberAction;
|
||||||
|
use App\Setting\NamiSettings;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
use Zoomyboy\LaravelNami\Api;
|
||||||
|
|
||||||
|
class PullMemberAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
|
||||||
|
public function handle(int $groupId, int $memberId): Member
|
||||||
|
{
|
||||||
|
return InsertMemberAction::run(MemberAction::run($this->api(), $groupId, $memberId));
|
||||||
|
}
|
||||||
|
|
||||||
|
private function api(): Api
|
||||||
|
{
|
||||||
|
return app(NamiSettings::class)->login();
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,28 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Actions;
|
||||||
|
|
||||||
|
use App\Member\Member;
|
||||||
|
use App\Nami\Api\MembershipsOfAction;
|
||||||
|
use App\Setting\NamiSettings;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
use Zoomyboy\LaravelNami\Api;
|
||||||
|
|
||||||
|
class PullMembershipsAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
|
||||||
|
public function handle(Member $member): void
|
||||||
|
{
|
||||||
|
if (!$member->hasNami) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
InsertMembershipsAction::run($member, MembershipsOfAction::run($this->api(), $member->nami_id));
|
||||||
|
}
|
||||||
|
|
||||||
|
private function api(): Api
|
||||||
|
{
|
||||||
|
return app(NamiSettings::class)->login();
|
||||||
|
}
|
||||||
|
}
|
|
@ -4,12 +4,14 @@ namespace App;
|
||||||
|
|
||||||
use App\Nami\HasNamiField;
|
use App\Nami\HasNamiField;
|
||||||
use Cviebrock\EloquentSluggable\Sluggable;
|
use Cviebrock\EloquentSluggable\Sluggable;
|
||||||
|
use Database\Factories\ActivityFactory;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
|
||||||
|
|
||||||
class Activity extends Model
|
class Activity extends Model
|
||||||
{
|
{
|
||||||
|
/** @use HasFactory<ActivityFactory> */
|
||||||
use HasFactory;
|
use HasFactory;
|
||||||
use HasNamiField;
|
use HasNamiField;
|
||||||
use Sluggable;
|
use Sluggable;
|
||||||
|
@ -19,6 +21,7 @@ class Activity extends Model
|
||||||
|
|
||||||
public $casts = [
|
public $casts = [
|
||||||
'nami_id' => 'integer',
|
'nami_id' => 'integer',
|
||||||
|
'is_filterable' => 'boolean',
|
||||||
];
|
];
|
||||||
|
|
||||||
public function sluggable(): array
|
public function sluggable(): array
|
||||||
|
@ -30,6 +33,9 @@ class Activity extends Model
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return BelongsToMany<Subactivity>
|
||||||
|
*/
|
||||||
public function subactivities(): BelongsToMany
|
public function subactivities(): BelongsToMany
|
||||||
{
|
{
|
||||||
return $this->belongsToMany(Subactivity::class);
|
return $this->belongsToMany(Subactivity::class);
|
||||||
|
|
|
@ -0,0 +1,45 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Activity\Actions;
|
||||||
|
|
||||||
|
use App\Activity;
|
||||||
|
use Illuminate\Http\RedirectResponse;
|
||||||
|
use Lorisleiva\Actions\ActionRequest;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
|
||||||
|
class ActivityStoreAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array<string, mixed> $payload
|
||||||
|
*/
|
||||||
|
public function handle(array $payload): Activity
|
||||||
|
{
|
||||||
|
$activity = Activity::create($payload);
|
||||||
|
|
||||||
|
$activity->subactivities()->sync($payload['subactivities']);
|
||||||
|
|
||||||
|
return $activity;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, string>
|
||||||
|
*/
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'name' => 'required|max:255',
|
||||||
|
'is_filterable' => 'present|boolean',
|
||||||
|
'subactivities' => 'present|array',
|
||||||
|
'subactivities.*' => 'integer',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function asController(ActionRequest $request): RedirectResponse
|
||||||
|
{
|
||||||
|
$this->handle($request->validated());
|
||||||
|
|
||||||
|
return redirect()->route('activity.index');
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,85 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Activity\Actions;
|
||||||
|
|
||||||
|
use App\Activity;
|
||||||
|
use App\Member\Membership;
|
||||||
|
use App\Subactivity;
|
||||||
|
use Illuminate\Http\RedirectResponse;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Validation\ValidationException;
|
||||||
|
use Lorisleiva\Actions\ActionRequest;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @template Payload of array{name: string, subactivities: array<int, int>}
|
||||||
|
*/
|
||||||
|
class ActivityUpdateAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param Payload $payload
|
||||||
|
*/
|
||||||
|
public function handle(Activity $activity, array $payload): void
|
||||||
|
{
|
||||||
|
DB::transaction(function () use ($activity, $payload) {
|
||||||
|
$activity->update($payload);
|
||||||
|
$activity->subactivities()->sync($payload['subactivities']);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, string>
|
||||||
|
*/
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'name' => 'required|max:255',
|
||||||
|
'is_filterable' => 'present|boolean',
|
||||||
|
'subactivities' => 'present|array',
|
||||||
|
'subactivities.*' => 'integer',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function asController(ActionRequest $request, Activity $activity): RedirectResponse
|
||||||
|
{
|
||||||
|
if ($activity->hasNami) {
|
||||||
|
$this->validateNami($activity, $request->validated());
|
||||||
|
}
|
||||||
|
|
||||||
|
$removingSubactivities = $activity->subactivities()->whereNotIn('id', $request->validated('subactivities'))->pluck('id');
|
||||||
|
|
||||||
|
if ($removingSubactivities->first(fn ($subactivity) => Membership::where(['activity_id' => $activity->id, 'subactivity_id' => $subactivity])->exists())) {
|
||||||
|
throw ValidationException::withMessages(['subactivities' => 'Untergliederung hat noch Mitglieder.']);
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->handle($activity, $request->validated());
|
||||||
|
|
||||||
|
return redirect()->route('activity.index');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @todo handle this with a model event on the pivot model
|
||||||
|
*
|
||||||
|
* @param Payload $payload
|
||||||
|
*/
|
||||||
|
private function validateNami(Activity $activity, array $payload): void
|
||||||
|
{
|
||||||
|
if ($activity->name !== $payload['name']) {
|
||||||
|
throw ValidationException::withMessages(['nami_id' => 'Aktivität ist in NaMi. Update des Namens nicht möglich.']);
|
||||||
|
}
|
||||||
|
|
||||||
|
$removingSubactivities = $activity->subactivities()->whereNotIn('id', $payload['subactivities'])->pluck('id');
|
||||||
|
|
||||||
|
if ($removingSubactivities->first(fn ($subactivity) => Subactivity::find($subactivity)->hasNami)) {
|
||||||
|
throw ValidationException::withMessages(['nami_id' => 'Untertätigkeit kann nicht entfernt werden.']);
|
||||||
|
}
|
||||||
|
|
||||||
|
$addingSubactivities = collect($payload['subactivities'])->filter(fn ($subactivityId) => $activity->subactivities->doesntContain($subactivityId));
|
||||||
|
|
||||||
|
if ($addingSubactivities->first(fn ($subactivity) => Subactivity::find($subactivity)->hasNami)) {
|
||||||
|
throw ValidationException::withMessages(['nami_id' => 'Untertätigkeit kann nicht hinzugefügt werden.']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,28 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Activity\Actions;
|
||||||
|
|
||||||
|
use App\Activity\Resources\ActivityResource;
|
||||||
|
use Inertia\Inertia;
|
||||||
|
use Inertia\Response;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
|
||||||
|
class CreateAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
|
||||||
|
public function handle(): Response
|
||||||
|
{
|
||||||
|
session()->put('menu', 'activity');
|
||||||
|
session()->put('title', 'Tätigkeit erstellen');
|
||||||
|
|
||||||
|
return Inertia::render('activity/VForm', [
|
||||||
|
'meta' => ActivityResource::meta(),
|
||||||
|
'data' => [
|
||||||
|
'name' => '',
|
||||||
|
'is_filterable' => false,
|
||||||
|
'subactivities' => [],
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,35 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Activity\Actions;
|
||||||
|
|
||||||
|
use App\Activity;
|
||||||
|
use App\Member\Membership;
|
||||||
|
use Illuminate\Http\RedirectResponse;
|
||||||
|
use Illuminate\Validation\ValidationException;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
|
||||||
|
class DestroyAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
|
||||||
|
public function handle(Activity $activity): void
|
||||||
|
{
|
||||||
|
$activity->subactivities()->sync([]);
|
||||||
|
$activity->delete();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function asController(Activity $activity): RedirectResponse
|
||||||
|
{
|
||||||
|
if (Membership::where('activity_id', $activity->id)->count()) {
|
||||||
|
throw ValidationException::withMessages(['activity' => 'Tätigkeit besitzt noch Mitglieder.']);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($activity->hasNami) {
|
||||||
|
throw ValidationException::withMessages(['activity' => 'Tätigkeit ist in NaMi.']);
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->handle($activity);
|
||||||
|
|
||||||
|
return redirect()->route('activity.index');
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,22 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Activity\Actions;
|
||||||
|
|
||||||
|
use App\Activity;
|
||||||
|
use App\Activity\Resources\ActivityResource;
|
||||||
|
use Inertia\Inertia;
|
||||||
|
use Inertia\Response;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
|
||||||
|
class EditAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
|
||||||
|
public function handle(Activity $activity): Response
|
||||||
|
{
|
||||||
|
return Inertia::render('activity/VForm', [
|
||||||
|
'meta' => ActivityResource::meta(),
|
||||||
|
'data' => new ActivityResource($activity->load('subactivities')),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,31 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Activity\Actions;
|
||||||
|
|
||||||
|
use App\Activity;
|
||||||
|
use App\Activity\Resources\ActivityResource;
|
||||||
|
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
|
||||||
|
use Inertia\Inertia;
|
||||||
|
use Inertia\Response;
|
||||||
|
use Lorisleiva\Actions\ActionRequest;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
|
||||||
|
class IndexAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
|
||||||
|
public function handle(): AnonymousResourceCollection
|
||||||
|
{
|
||||||
|
return ActivityResource::collection(Activity::paginate(20));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function asController(ActionRequest $request): Response
|
||||||
|
{
|
||||||
|
session()->put('menu', 'activity');
|
||||||
|
session()->put('title', 'Tätigkeiten');
|
||||||
|
|
||||||
|
return Inertia::render('activity/VIndex', [
|
||||||
|
'data' => $this->handle(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,26 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Activity\Api;
|
||||||
|
|
||||||
|
use App\Resources\SubactivityResource;
|
||||||
|
use App\Subactivity;
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
|
||||||
|
class SubactivityShowAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
|
||||||
|
public function handle(): void
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function asController(Subactivity $subactivity): JsonResponse
|
||||||
|
{
|
||||||
|
return response()->json([
|
||||||
|
'data' => new SubactivityResource($subactivity),
|
||||||
|
'meta' => SubactivityResource::meta(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,56 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Activity\Api;
|
||||||
|
|
||||||
|
use App\Subactivity;
|
||||||
|
use DB;
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
use Illuminate\Support\Arr;
|
||||||
|
use Lorisleiva\Actions\ActionRequest;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
|
||||||
|
class SubactivityStoreAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array<string, string|array<int, int>> $payload
|
||||||
|
*/
|
||||||
|
public function handle(array $payload): Subactivity
|
||||||
|
{
|
||||||
|
return DB::transaction(function () use ($payload) {
|
||||||
|
$subactivity = Subactivity::create(Arr::except($payload, 'activities'));
|
||||||
|
$subactivity->activities()->sync($payload['activities']);
|
||||||
|
|
||||||
|
return $subactivity;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, string>
|
||||||
|
*/
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'name' => 'required|unique:subactivities,name',
|
||||||
|
'activities' => 'present|array|min:1',
|
||||||
|
'activities.*' => 'integer',
|
||||||
|
'is_filterable' => 'present|boolean',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, string>
|
||||||
|
*/
|
||||||
|
public function getValidationAttributes(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'activities' => 'Tätigkeiten',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function asController(ActionRequest $request): JsonResponse
|
||||||
|
{
|
||||||
|
return response()->json($this->handle($request->validated()));
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,100 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Activity\Api;
|
||||||
|
|
||||||
|
use App\Activity;
|
||||||
|
use App\Member\Membership;
|
||||||
|
use App\Subactivity;
|
||||||
|
use DB;
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
use Illuminate\Support\Arr;
|
||||||
|
use Illuminate\Validation\Rule;
|
||||||
|
use Illuminate\Validation\ValidationException;
|
||||||
|
use Lorisleiva\Actions\ActionRequest;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
|
||||||
|
class SubactivityUpdateAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array<string, string|array<int, int>> $payload
|
||||||
|
*/
|
||||||
|
public function handle(Subactivity $subactivity, array $payload): Subactivity
|
||||||
|
{
|
||||||
|
return DB::transaction(function () use ($subactivity, $payload) {
|
||||||
|
$subactivity->update(Arr::except($payload, 'activities'));
|
||||||
|
|
||||||
|
if (null !== data_get($payload, 'activities')) {
|
||||||
|
$subactivity->activities()->sync($payload['activities']);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $subactivity;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, string|array<int, mixed>>
|
||||||
|
*/
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
/** @var Subactivity */
|
||||||
|
$subactivity = request()->route('subactivity');
|
||||||
|
|
||||||
|
return [
|
||||||
|
'name' => ['required', 'string', 'max:255', Rule::unique('subactivities', 'name')->ignore($subactivity->id)],
|
||||||
|
'activities' => ['present', 'array', 'min:1'],
|
||||||
|
'activities.*' => 'integer',
|
||||||
|
'is_filterable' => 'present|boolean',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, string>
|
||||||
|
*/
|
||||||
|
public function getValidationAttributes(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'activities' => 'Tätigkeiten',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function asController(ActionRequest $request, Subactivity $subactivity): JsonResponse
|
||||||
|
{
|
||||||
|
if ($subactivity->hasNami) {
|
||||||
|
$this->validateNami($subactivity, $request->validated());
|
||||||
|
}
|
||||||
|
|
||||||
|
$removingActivities = $subactivity->activities()->whereNotIn('id', $request->validated('activities'))->pluck('id');
|
||||||
|
|
||||||
|
if ($removingActivities->first(fn ($activity) => Membership::where(['activity_id' => $activity, 'subactivity_id' => $subactivity->id])->exists())) {
|
||||||
|
throw ValidationException::withMessages(['activities' => 'Tätigkeit hat noch Mitglieder.']);
|
||||||
|
}
|
||||||
|
|
||||||
|
return response()->json($this->handle($subactivity, $request->validated()));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @todo handle this with a model event on the pivot model
|
||||||
|
*
|
||||||
|
* @param array{name: string, activities: array<int, int>} $payload
|
||||||
|
*/
|
||||||
|
private function validateNami(Subactivity $subactivity, array $payload): void
|
||||||
|
{
|
||||||
|
if ($subactivity->name !== $payload['name']) {
|
||||||
|
throw ValidationException::withMessages(['name' => 'Untertätigkeit ist in NaMi. Update des Namens nicht möglich.']);
|
||||||
|
}
|
||||||
|
|
||||||
|
$removingActivities = $subactivity->activities()->whereNotIn('id', $payload['activities'])->pluck('id');
|
||||||
|
|
||||||
|
if ($removingActivities->first(fn ($activity) => Activity::find($activity)->hasNami)) {
|
||||||
|
throw ValidationException::withMessages(['activities' => 'Tätigkeit kann nicht entfernt werden.']);
|
||||||
|
}
|
||||||
|
|
||||||
|
$addingActivities = collect($payload['activities'])->filter(fn ($activityId) => $subactivity->activities->doesntContain($activityId));
|
||||||
|
|
||||||
|
if ($addingActivities->first(fn ($activity) => Activity::find($activity)->hasNami)) {
|
||||||
|
throw ValidationException::withMessages(['activities' => 'Tätigkeit kann nicht hinzugefügt werden.']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,60 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Activity\Resources;
|
||||||
|
|
||||||
|
use App\Activity;
|
||||||
|
use App\Lib\HasMeta;
|
||||||
|
use App\Resources\SubactivityResource;
|
||||||
|
use App\Subactivity;
|
||||||
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @mixin Activity
|
||||||
|
*/
|
||||||
|
class ActivityResource extends JsonResource
|
||||||
|
{
|
||||||
|
use HasMeta;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Transform the resource into an array.
|
||||||
|
*
|
||||||
|
* @param \Illuminate\Http\Request $request
|
||||||
|
*
|
||||||
|
* @return array{id: int, name: string}
|
||||||
|
*/
|
||||||
|
public function toArray($request)
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'name' => $this->name,
|
||||||
|
'id' => $this->id,
|
||||||
|
'subactivities' => $this->subactivities->pluck('id')->toArray(),
|
||||||
|
'is_filterable' => $this->is_filterable,
|
||||||
|
'links' => [
|
||||||
|
'edit' => route('activity.edit', ['activity' => $this->getModel()]),
|
||||||
|
'update' => route('activity.update', ['activity' => $this->getModel()]),
|
||||||
|
'destroy' => route('activity.destroy', ['activity' => $this->getModel()]),
|
||||||
|
],
|
||||||
|
'subactivity_model' => [
|
||||||
|
'activities' => [$this->id],
|
||||||
|
'is_age_group' => false,
|
||||||
|
'is_filterable' => false,
|
||||||
|
'name' => '',
|
||||||
|
],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, mixed>
|
||||||
|
*/
|
||||||
|
public static function meta(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'subactivities' => SubactivityResource::collectionWithoutMeta(Subactivity::get()),
|
||||||
|
'links' => [
|
||||||
|
'index' => route('activity.index'),
|
||||||
|
'create' => route('activity.create'),
|
||||||
|
'membership_masslist' => route('membership.masslist.index'),
|
||||||
|
],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,26 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Auth;
|
||||||
|
|
||||||
|
use Illuminate\Notifications\Messages\MailMessage;
|
||||||
|
use Illuminate\Support\Facades\Lang;
|
||||||
|
use Illuminate\Auth\Notifications\ResetPassword as BaseResetPassword;
|
||||||
|
|
||||||
|
class ResetPassword extends BaseResetPassword
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Get the reset password notification mail message for the given URL.
|
||||||
|
*
|
||||||
|
* @param string $url
|
||||||
|
* @return MailMessage
|
||||||
|
*/
|
||||||
|
protected function buildMailMessage($url)
|
||||||
|
{
|
||||||
|
return (new MailMessage)
|
||||||
|
->subject(Lang::get('Passwort zurücksetzen | Adrema'))
|
||||||
|
->line(Lang::get('Du erhälst diese E-Mail, weil du eine Anfrage zum zurücksetzen deines Account-Passworts gestellt hast.'))
|
||||||
|
->action(Lang::get('Passwort zurücksetzen'), $url)
|
||||||
|
->line(Lang::get('Dieser Link wird in :count Minuten ablaufen.', ['count' => config('auth.passwords.' . config('auth.defaults.passwords') . '.expire')]))
|
||||||
|
->line(Lang::get('Wenn du die Anfrage nicht selbst gestellt hast, ist keine weitere Aktion erforderlich.'));
|
||||||
|
}
|
||||||
|
}
|
|
@ -2,11 +2,13 @@
|
||||||
|
|
||||||
namespace App;
|
namespace App;
|
||||||
|
|
||||||
|
use Database\Factories\ConfessionFactory;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
class Confession extends Model
|
class Confession extends Model
|
||||||
{
|
{
|
||||||
|
/** @use HasFactory<ConfessionFactory> */
|
||||||
use HasFactory;
|
use HasFactory;
|
||||||
|
|
||||||
public $fillable = ['name', 'nami_id', 'is_null'];
|
public $fillable = ['name', 'nami_id', 'is_null'];
|
||||||
|
|
|
@ -1,41 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Console\Commands;
|
|
||||||
|
|
||||||
use App\Actions\MemberPullAction;
|
|
||||||
use App\Setting\NamiSettings;
|
|
||||||
use Illuminate\Console\Command;
|
|
||||||
use Zoomyboy\LaravelNami\Member as NamiMember;
|
|
||||||
|
|
||||||
class MemberResyncCommand extends Command
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* The name and signature of the console command.
|
|
||||||
*
|
|
||||||
* @var string
|
|
||||||
*/
|
|
||||||
protected $signature = 'member:resync';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The console command description.
|
|
||||||
*
|
|
||||||
* @var string
|
|
||||||
*/
|
|
||||||
protected $description = 'Command description';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Execute the console command.
|
|
||||||
*
|
|
||||||
* @return int
|
|
||||||
*/
|
|
||||||
public function handle(NamiSettings $settings)
|
|
||||||
{
|
|
||||||
$api = $settings->login();
|
|
||||||
|
|
||||||
$api->search([])->each(
|
|
||||||
fn (NamiMember $member) => app(MemberPullAction::class)->api($api)->member($member->group_id, $member->id)->execute()
|
|
||||||
);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,52 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Console\Commands;
|
|
||||||
|
|
||||||
use App\Initialize\Initializer;
|
|
||||||
use Illuminate\Console\Command;
|
|
||||||
use Zoomyboy\LaravelNami\NamiException;
|
|
||||||
|
|
||||||
class NamiInitializeCommand extends Command
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* The name and signature of the console command.
|
|
||||||
*
|
|
||||||
* @var string
|
|
||||||
*/
|
|
||||||
protected $signature = 'nami:initialize {--mglnr=} {--password=} {--group_id=}';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The console command description.
|
|
||||||
*
|
|
||||||
* @var string
|
|
||||||
*/
|
|
||||||
protected $description = 'Initializes nami';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a new command instance.
|
|
||||||
*
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
public function __construct()
|
|
||||||
{
|
|
||||||
parent::__construct();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Execute the console command.
|
|
||||||
*
|
|
||||||
* @return int
|
|
||||||
*/
|
|
||||||
public function handle()
|
|
||||||
{
|
|
||||||
try {
|
|
||||||
app(Initializer::class)->run();
|
|
||||||
} catch (NamiException $e) {
|
|
||||||
$e->outputToConsole($this);
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -2,7 +2,10 @@
|
||||||
|
|
||||||
namespace App\Console;
|
namespace App\Console;
|
||||||
|
|
||||||
use App\Letter\Actions\LetterSendAction;
|
use App\Actions\DbMaintainAction;
|
||||||
|
use App\Form\Actions\PreventionRememberAction;
|
||||||
|
use App\Initialize\InitializeMembers;
|
||||||
|
use App\Invoice\Actions\InvoiceSendAction;
|
||||||
use Illuminate\Console\Scheduling\Schedule;
|
use Illuminate\Console\Scheduling\Schedule;
|
||||||
use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
|
use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
|
||||||
|
|
||||||
|
@ -11,10 +14,13 @@ class Kernel extends ConsoleKernel
|
||||||
/**
|
/**
|
||||||
* The Artisan commands provided by your application.
|
* The Artisan commands provided by your application.
|
||||||
*
|
*
|
||||||
* @var array
|
* @var array<int, class-string>
|
||||||
*/
|
*/
|
||||||
protected $commands = [
|
protected $commands = [
|
||||||
LetterSendAction::class,
|
InvoiceSendAction::class,
|
||||||
|
InitializeMembers::class,
|
||||||
|
DbMaintainAction::class,
|
||||||
|
PreventionRememberAction::class,
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -24,7 +30,10 @@ class Kernel extends ConsoleKernel
|
||||||
*/
|
*/
|
||||||
protected function schedule(Schedule $schedule)
|
protected function schedule(Schedule $schedule)
|
||||||
{
|
{
|
||||||
// $schedule->command('inspire')->hourly();
|
$schedule->command(DbMaintainAction::class)->daily();
|
||||||
|
$schedule->command(InitializeMembers::class)->dailyAt('03:00');
|
||||||
|
$schedule->command(PreventionRememberAction::class)->dailyAt('11:00');
|
||||||
|
$schedule->command(InvoiceSendAction::class)->dailyAt('10:00');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -34,7 +43,7 @@ class Kernel extends ConsoleKernel
|
||||||
*/
|
*/
|
||||||
protected function commands()
|
protected function commands()
|
||||||
{
|
{
|
||||||
$this->load(__DIR__.'/Commands');
|
$this->load(__DIR__ . '/Commands');
|
||||||
|
|
||||||
require base_path('routes/console.php');
|
require base_path('routes/console.php');
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,8 +4,6 @@ namespace App\Contribution\Actions;
|
||||||
|
|
||||||
use App\Contribution\ContributionFactory;
|
use App\Contribution\ContributionFactory;
|
||||||
use App\Country;
|
use App\Country;
|
||||||
use App\Member\Member;
|
|
||||||
use App\Member\MemberResource;
|
|
||||||
use Inertia\Inertia;
|
use Inertia\Inertia;
|
||||||
use Inertia\Response;
|
use Inertia\Response;
|
||||||
use Lorisleiva\Actions\Concerns\AsAction;
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
@ -20,9 +18,10 @@ class FormAction
|
||||||
public function handle(): array
|
public function handle(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'allMembers' => MemberResource::collection(Member::slangOrdered()->get()),
|
'countries' => Country::select('name', 'id')->get(),
|
||||||
'countries' => Country::pluck('name', 'id'),
|
'data' => [
|
||||||
'defaultCountry' => Country::firstWhere('name', 'Deutschland')->id,
|
'country' => Country::firstWhere('name', 'Deutschland')->id,
|
||||||
|
],
|
||||||
'compilers' => app(ContributionFactory::class)->compilerSelect(),
|
'compilers' => app(ContributionFactory::class)->compilerSelect(),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,54 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Contribution\Actions;
|
||||||
|
|
||||||
|
use App\Contribution\ContributionFactory;
|
||||||
|
use App\Contribution\Documents\ContributionDocument;
|
||||||
|
use App\Rules\JsonBase64Rule;
|
||||||
|
use Illuminate\Support\Facades\Validator;
|
||||||
|
use Lorisleiva\Actions\ActionRequest;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
use Zoomyboy\Tex\BaseCompiler;
|
||||||
|
use Zoomyboy\Tex\Tex;
|
||||||
|
|
||||||
|
class GenerateAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param class-string<ContributionDocument> $document
|
||||||
|
* @param array<string, mixed> $payload
|
||||||
|
*/
|
||||||
|
public function handle(string $document, array $payload): BaseCompiler
|
||||||
|
{
|
||||||
|
return Tex::compile($document::fromRequest($payload));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function asController(ActionRequest $request): BaseCompiler
|
||||||
|
{
|
||||||
|
$payload = $this->payload($request);
|
||||||
|
$type = data_get($payload, 'type');
|
||||||
|
ValidateAction::validateType($type);
|
||||||
|
Validator::make($payload, app(ContributionFactory::class)->rules($type))->validate();
|
||||||
|
|
||||||
|
return $this->handle($type, $payload);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, mixed>
|
||||||
|
*/
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'payload' => [new JsonBase64Rule()],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, string>
|
||||||
|
*/
|
||||||
|
private function payload(ActionRequest $request): array
|
||||||
|
{
|
||||||
|
return json_decode(rawurldecode(base64_decode($request->input('payload', ''))), true);
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,38 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Contribution\Actions;
|
||||||
|
|
||||||
|
use App\Contribution\Documents\ContributionDocument;
|
||||||
|
use Lorisleiva\Actions\ActionRequest;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
use Zoomyboy\Tex\BaseCompiler;
|
||||||
|
use Zoomyboy\Tex\Tex;
|
||||||
|
|
||||||
|
class GenerateApiAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param class-string<ContributionDocument> $document
|
||||||
|
* @param array<string, mixed> $payload
|
||||||
|
*/
|
||||||
|
public function handle(string $document, array $payload): BaseCompiler
|
||||||
|
{
|
||||||
|
return Tex::compile($document::fromApiRequest($payload));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function asController(ActionRequest $request): BaseCompiler
|
||||||
|
{
|
||||||
|
ValidateAction::validateType($request->input('type'));
|
||||||
|
|
||||||
|
return $this->handle($request->input('type'), $request->input());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, mixed>
|
||||||
|
*/
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,37 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Contribution\Actions;
|
||||||
|
|
||||||
|
use App\Contribution\ContributionFactory;
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
use Illuminate\Support\Facades\Validator;
|
||||||
|
use Lorisleiva\Actions\ActionRequest;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
|
||||||
|
class ValidateAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
|
||||||
|
public function asController(): JsonResponse
|
||||||
|
{
|
||||||
|
return response()->json(['valid' => true]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, mixed>
|
||||||
|
*/
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
return app(ContributionFactory::class)->rules(request()->type);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function prepareForValidation(ActionRequest $request): void
|
||||||
|
{
|
||||||
|
static::validateType($request->input('type'));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function validateType(?string $type = null): void
|
||||||
|
{
|
||||||
|
Validator::make(['type' => $type], app(ContributionFactory::class)->typeRule())->validate();
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,20 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Contribution;
|
|
||||||
|
|
||||||
use App\Contribution\Documents\SolingenDocument;
|
|
||||||
use App\Http\Controllers\Controller;
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use Zoomyboy\Tex\BaseCompiler;
|
|
||||||
use Zoomyboy\Tex\Tex;
|
|
||||||
|
|
||||||
class ContributionController extends Controller
|
|
||||||
{
|
|
||||||
public function generate(Request $request): BaseCompiler
|
|
||||||
{
|
|
||||||
/** @var class-string<SolingenDocument> */
|
|
||||||
$type = $request->query('type');
|
|
||||||
|
|
||||||
return Tex::compile($type::fromRequest($request));
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -2,10 +2,15 @@
|
||||||
|
|
||||||
namespace App\Contribution;
|
namespace App\Contribution;
|
||||||
|
|
||||||
|
use App\Contribution\Documents\BdkjHesse;
|
||||||
use App\Contribution\Documents\ContributionDocument;
|
use App\Contribution\Documents\ContributionDocument;
|
||||||
use App\Contribution\Documents\DvDocument;
|
use App\Contribution\Documents\RdpNrwDocument;
|
||||||
use App\Contribution\Documents\RemscheidDocument;
|
use App\Contribution\Documents\CityRemscheidDocument;
|
||||||
use App\Contribution\Documents\SolingenDocument;
|
use App\Contribution\Documents\CitySolingenDocument;
|
||||||
|
use App\Contribution\Documents\CityFrankfurtMainDocument;
|
||||||
|
use App\Contribution\Documents\WuppertalDocument;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
use Illuminate\Validation\Rule;
|
||||||
|
|
||||||
class ContributionFactory
|
class ContributionFactory
|
||||||
{
|
{
|
||||||
|
@ -13,19 +18,45 @@ class ContributionFactory
|
||||||
* @var array<int, class-string<ContributionDocument>>
|
* @var array<int, class-string<ContributionDocument>>
|
||||||
*/
|
*/
|
||||||
private array $documents = [
|
private array $documents = [
|
||||||
DvDocument::class,
|
RdpNrwDocument::class,
|
||||||
SolingenDocument::class,
|
CitySolingenDocument::class,
|
||||||
RemscheidDocument::class,
|
CityRemscheidDocument::class,
|
||||||
|
CityFrankfurtMainDocument::class,
|
||||||
|
BdkjHesse::class,
|
||||||
|
WuppertalDocument::class,
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return array<int, array{id: string, name: string}>
|
* @return Collection<int, array{title: string, class: class-string<ContributionDocument>}>
|
||||||
*/
|
*/
|
||||||
public function compilerSelect(): array
|
public function compilerSelect(): Collection
|
||||||
{
|
{
|
||||||
return collect($this->documents)->map(fn ($document) => [
|
return collect($this->documents)->map(fn ($document) => [
|
||||||
'title' => $document::getName(),
|
'title' => $document::buttonName(),
|
||||||
'class' => $document,
|
'class' => $document,
|
||||||
])->toArray();
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, mixed>
|
||||||
|
*/
|
||||||
|
public function typeRule(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'type' => ['required', Rule::in($this->documents)],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param class-string<ContributionDocument> $type
|
||||||
|
*
|
||||||
|
* @return array<string, mixed>
|
||||||
|
*/
|
||||||
|
public function rules(string $type): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
...$type::globalRules(),
|
||||||
|
...$type::rules(),
|
||||||
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,94 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Contribution\Data;
|
||||||
|
|
||||||
|
use App\Gender;
|
||||||
|
use App\Member\Member;
|
||||||
|
use Carbon\Carbon;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
use Spatie\LaravelData\Data;
|
||||||
|
|
||||||
|
class MemberData extends Data
|
||||||
|
{
|
||||||
|
public function __construct(
|
||||||
|
public string $firstname,
|
||||||
|
public string $lastname,
|
||||||
|
public string $address,
|
||||||
|
public string $zip,
|
||||||
|
public string $location,
|
||||||
|
public Carbon $birthday,
|
||||||
|
public ?Gender $gender,
|
||||||
|
public bool $isLeader
|
||||||
|
) {
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array<int, int> $ids
|
||||||
|
*
|
||||||
|
* @return Collection<int, static>
|
||||||
|
*/
|
||||||
|
public static function fromModels(array $ids): Collection
|
||||||
|
{
|
||||||
|
return Member::whereIn('id', $ids)->orderByRaw('lastname, firstname')->get()->map(fn ($member) => self::factory()->withoutMagicalCreation()->from([
|
||||||
|
...$member->toArray(),
|
||||||
|
'birthday' => $member->birthday->toAtomString(),
|
||||||
|
'isLeader' => $member->isLeader(),
|
||||||
|
'gender' => $member->gender,
|
||||||
|
]))->toBase();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array<int, ContributionMemberData> $data
|
||||||
|
*
|
||||||
|
* @return Collection<int, static>
|
||||||
|
*/
|
||||||
|
public static function fromApi(array $data): Collection
|
||||||
|
{
|
||||||
|
return collect($data)->map(fn ($member) => self::factory()->withoutMagicalCreation()->from([
|
||||||
|
...$member,
|
||||||
|
'birthday' => Carbon::parse($member['birthday'])->toAtomString(),
|
||||||
|
'gender' => Gender::fromString($member['gender']),
|
||||||
|
'isLeader' => $member['is_leader'],
|
||||||
|
]));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function fullname(): string
|
||||||
|
{
|
||||||
|
return $this->firstname . ' ' . $this->lastname;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function separatedName(): string
|
||||||
|
{
|
||||||
|
return $this->lastname . ', ' . $this->firstname;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function fullAddress(): string
|
||||||
|
{
|
||||||
|
return $this->address . ', ' . $this->zip . ' ' . $this->location;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function city(): string
|
||||||
|
{
|
||||||
|
return $this->zip . ' ' . $this->location;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function age(): int
|
||||||
|
{
|
||||||
|
return intval($this->birthday->diffInYears(now()));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function birthYear(): string
|
||||||
|
{
|
||||||
|
return (string) $this->birthday->year;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function birthdayHuman(): string
|
||||||
|
{
|
||||||
|
return $this->birthday->format('d.m.Y');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function genderLetter(): string
|
||||||
|
{
|
||||||
|
return $this->gender->short;
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,136 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Contribution\Documents;
|
||||||
|
|
||||||
|
use App\Contribution\Data\MemberData;
|
||||||
|
use App\Contribution\Traits\HasPdfBackground;
|
||||||
|
use App\Country;
|
||||||
|
use Carbon\Carbon;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
|
class BdkjHesse extends ContributionDocument
|
||||||
|
{
|
||||||
|
|
||||||
|
use HasPdfBackground;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param Collection<int, Collection<int, MemberData>> $members
|
||||||
|
*/
|
||||||
|
public function __construct(
|
||||||
|
public string $dateFrom,
|
||||||
|
public string $dateUntil,
|
||||||
|
public string $zipLocation,
|
||||||
|
public ?Country $country,
|
||||||
|
public Collection $members,
|
||||||
|
public string $eventName,
|
||||||
|
public ?string $filename = '',
|
||||||
|
public string $type = 'F',
|
||||||
|
) {
|
||||||
|
$this->setEventName($eventName);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function dateFrom(): string
|
||||||
|
{
|
||||||
|
return Carbon::parse($this->dateFrom)->format('d.m.Y');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function dateUntil(): string
|
||||||
|
{
|
||||||
|
return Carbon::parse($this->dateUntil)->format('d.m.Y');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@inheritdoc}
|
||||||
|
*/
|
||||||
|
public static function fromRequest(array $request): self
|
||||||
|
{
|
||||||
|
return new self(
|
||||||
|
dateFrom: $request['dateFrom'],
|
||||||
|
dateUntil: $request['dateUntil'],
|
||||||
|
zipLocation: $request['zipLocation'],
|
||||||
|
country: Country::where('id', $request['country'])->firstOrFail(),
|
||||||
|
members: MemberData::fromModels($request['members'])->chunk(20),
|
||||||
|
eventName: $request['eventName'],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@inheritdoc}
|
||||||
|
*/
|
||||||
|
public static function fromApiRequest(array $request): self
|
||||||
|
{
|
||||||
|
return new self(
|
||||||
|
dateFrom: $request['dateFrom'],
|
||||||
|
dateUntil: $request['dateUntil'],
|
||||||
|
zipLocation: $request['zipLocation'],
|
||||||
|
country: Country::where('id', $request['country'])->firstOrFail(),
|
||||||
|
members: MemberData::fromApi($request['member_data'])->chunk(20),
|
||||||
|
eventName: $request['eventName'],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function countryName(): string
|
||||||
|
{
|
||||||
|
return $this->country->name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function durationDays(): int
|
||||||
|
{
|
||||||
|
return intVal(Carbon::parse($this->dateUntil)->diffInDays(Carbon::parse($this->dateFrom))) + 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param Collection<int, MemberData> $chunk
|
||||||
|
*/
|
||||||
|
public function membersDays(Collection $chunk): int
|
||||||
|
{
|
||||||
|
return $this->durationDays() * $chunk->count();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function pages(): int
|
||||||
|
{
|
||||||
|
return count($this->members);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function memberName(MemberData $member): string
|
||||||
|
{
|
||||||
|
return $member->separatedName();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function memberCity(MemberData $member): string
|
||||||
|
{
|
||||||
|
return $member->city();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function memberGender(MemberData $member): string
|
||||||
|
{
|
||||||
|
if (!$member->gender) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
return strtolower(substr($member->gender->name, 0, 1));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function memberBirthYear(MemberData $member): string
|
||||||
|
{
|
||||||
|
return $member->birthYear();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function getName(): string
|
||||||
|
{
|
||||||
|
return 'BDKJ Hessen';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, mixed>
|
||||||
|
*/
|
||||||
|
public static function rules(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'dateFrom' => 'required|string|date_format:Y-m-d',
|
||||||
|
'dateUntil' => 'required|string|date_format:Y-m-d',
|
||||||
|
'country' => 'required|integer|exists:countries,id',
|
||||||
|
'zipLocation' => 'required|string',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,93 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Contribution\Documents;
|
||||||
|
|
||||||
|
use App\Contribution\Data\MemberData;
|
||||||
|
use App\Contribution\Traits\FormatsDates;
|
||||||
|
use App\Contribution\Traits\HasPdfBackground;
|
||||||
|
use App\Country;
|
||||||
|
use App\Invoice\InvoiceSettings;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
|
class CityFrankfurtMainDocument extends ContributionDocument
|
||||||
|
{
|
||||||
|
use HasPdfBackground;
|
||||||
|
use FormatsDates;
|
||||||
|
|
||||||
|
public string $fromName;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param Collection<int, Collection<int, MemberData>> $members
|
||||||
|
*/
|
||||||
|
public function __construct(
|
||||||
|
public string $dateFrom,
|
||||||
|
public string $dateUntil,
|
||||||
|
public string $zipLocation,
|
||||||
|
public ?Country $country,
|
||||||
|
public Collection $members,
|
||||||
|
public string $eventName,
|
||||||
|
public ?string $filename = '',
|
||||||
|
public string $type = 'F',
|
||||||
|
) {
|
||||||
|
$this->setEventName($eventName);
|
||||||
|
$this->fromName = app(InvoiceSettings::class)->from_long;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@inheritdoc}
|
||||||
|
*/
|
||||||
|
public static function fromRequest(array $request): self
|
||||||
|
{
|
||||||
|
return new self(
|
||||||
|
dateFrom: $request['dateFrom'],
|
||||||
|
dateUntil: $request['dateUntil'],
|
||||||
|
zipLocation: $request['zipLocation'],
|
||||||
|
country: Country::where('id', $request['country'])->firstOrFail(),
|
||||||
|
members: MemberData::fromModels($request['members'])->chunk(15),
|
||||||
|
eventName: $request['eventName'],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@inheritdoc}
|
||||||
|
*/
|
||||||
|
public static function fromApiRequest(array $request): self
|
||||||
|
{
|
||||||
|
return new self(
|
||||||
|
dateFrom: $request['dateFrom'],
|
||||||
|
dateUntil: $request['dateUntil'],
|
||||||
|
zipLocation: $request['zipLocation'],
|
||||||
|
country: Country::where('id', $request['country'])->firstOrFail(),
|
||||||
|
members: MemberData::fromApi($request['member_data'])->chunk(15),
|
||||||
|
eventName: $request['eventName'],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function countryName(): string
|
||||||
|
{
|
||||||
|
return $this->country->name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function pages(): int
|
||||||
|
{
|
||||||
|
return count($this->members);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function getName(): string
|
||||||
|
{
|
||||||
|
return 'Frankfurt';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, mixed>
|
||||||
|
*/
|
||||||
|
public static function rules(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'dateFrom' => 'required|string|date_format:Y-m-d',
|
||||||
|
'dateUntil' => 'required|string|date_format:Y-m-d',
|
||||||
|
'country' => 'required|integer|exists:countries,id',
|
||||||
|
'zipLocation' => 'required|string',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,89 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Contribution\Documents;
|
||||||
|
|
||||||
|
use App\Contribution\Data\MemberData;
|
||||||
|
use App\Contribution\Traits\FormatsDates;
|
||||||
|
use App\Contribution\Traits\HasPdfBackground;
|
||||||
|
use App\Country;
|
||||||
|
use App\Member\Member;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
|
class CityRemscheidDocument extends ContributionDocument
|
||||||
|
{
|
||||||
|
use HasPdfBackground;
|
||||||
|
use FormatsDates;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param Collection<int, Collection<int, Member>> $leaders
|
||||||
|
* @param Collection<int, Collection<int, Member>> $children
|
||||||
|
*/
|
||||||
|
public function __construct(
|
||||||
|
public string $dateFrom,
|
||||||
|
public string $dateUntil,
|
||||||
|
public string $zipLocation,
|
||||||
|
public ?Country $country,
|
||||||
|
public Collection $leaders,
|
||||||
|
public Collection $children,
|
||||||
|
public ?string $filename = '',
|
||||||
|
public string $type = 'F',
|
||||||
|
public string $eventName = '',
|
||||||
|
) {
|
||||||
|
$this->setEventName($eventName);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@inheritdoc}
|
||||||
|
*/
|
||||||
|
public static function fromRequest(array $request): self
|
||||||
|
{
|
||||||
|
[$leaders, $children] = MemberData::fromModels($request['members'])->partition(fn ($member) => $member->isLeader);
|
||||||
|
|
||||||
|
return new self(
|
||||||
|
dateFrom: $request['dateFrom'],
|
||||||
|
dateUntil: $request['dateUntil'],
|
||||||
|
zipLocation: $request['zipLocation'],
|
||||||
|
country: Country::where('id', $request['country'])->firstOrFail(),
|
||||||
|
leaders: $leaders->values()->toBase()->chunk(6),
|
||||||
|
children: $children->values()->toBase()->chunk(20),
|
||||||
|
eventName: $request['eventName'],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@inheritdoc}
|
||||||
|
*/
|
||||||
|
public static function fromApiRequest(array $request): self
|
||||||
|
{
|
||||||
|
$members = MemberData::fromApi($request['member_data']);
|
||||||
|
[$leaders, $children] = $members->partition(fn ($member) => $member->isLeader);
|
||||||
|
|
||||||
|
return new self(
|
||||||
|
dateFrom: $request['dateFrom'],
|
||||||
|
dateUntil: $request['dateUntil'],
|
||||||
|
zipLocation: $request['zipLocation'],
|
||||||
|
country: Country::where('id', $request['country'])->firstOrFail(),
|
||||||
|
leaders: $leaders->values()->toBase()->chunk(6),
|
||||||
|
children: $children->values()->toBase()->chunk(20),
|
||||||
|
eventName: $request['eventName'],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function getName(): string
|
||||||
|
{
|
||||||
|
return 'Remscheid';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, mixed>
|
||||||
|
*/
|
||||||
|
public static function rules(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'dateFrom' => 'required|string|date_format:Y-m-d',
|
||||||
|
'dateUntil' => 'required|string|date_format:Y-m-d',
|
||||||
|
'zipLocation' => 'required|string',
|
||||||
|
'country' => 'required|integer|exists:countries,id',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,112 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Contribution\Documents;
|
||||||
|
|
||||||
|
use App\Contribution\Data\MemberData;
|
||||||
|
use App\Invoice\InvoiceSettings;
|
||||||
|
use Carbon\Carbon;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
use Zoomyboy\Tex\Engine;
|
||||||
|
|
||||||
|
class CitySolingenDocument extends ContributionDocument
|
||||||
|
{
|
||||||
|
public string $fromName;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param Collection<int, MemberData> $members
|
||||||
|
*/
|
||||||
|
final private function __construct(
|
||||||
|
public string $dateFrom,
|
||||||
|
public string $dateUntil,
|
||||||
|
public string $zipLocation,
|
||||||
|
public Collection $members,
|
||||||
|
public string $eventName,
|
||||||
|
public string $type = 'F',
|
||||||
|
) {
|
||||||
|
$this->setEventName($eventName);
|
||||||
|
$this->fromName = app(InvoiceSettings::class)->from_long;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@inheritdoc}
|
||||||
|
*/
|
||||||
|
public static function fromRequest(array $request): static
|
||||||
|
{
|
||||||
|
return new static(
|
||||||
|
dateFrom: $request['dateFrom'],
|
||||||
|
dateUntil: $request['dateUntil'],
|
||||||
|
zipLocation: $request['zipLocation'],
|
||||||
|
members: MemberData::fromModels($request['members']),
|
||||||
|
eventName: $request['eventName'],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@inheritdoc}
|
||||||
|
*/
|
||||||
|
public static function fromApiRequest(array $request): static
|
||||||
|
{
|
||||||
|
return new static(
|
||||||
|
dateFrom: $request['dateFrom'],
|
||||||
|
dateUntil: $request['dateUntil'],
|
||||||
|
zipLocation: $request['zipLocation'],
|
||||||
|
members: MemberData::fromApi($request['member_data']),
|
||||||
|
eventName: $request['eventName'],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Collection<int, Collection<int, MemberData>>
|
||||||
|
*/
|
||||||
|
public function memberModels(): Collection
|
||||||
|
{
|
||||||
|
return $this->members->chunk(14);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function niceEventFrom(): string
|
||||||
|
{
|
||||||
|
return Carbon::parse($this->dateFrom)->format('d.m.Y');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function niceEventUntil(): string
|
||||||
|
{
|
||||||
|
return Carbon::parse($this->dateUntil)->format('d.m.Y');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function checkboxes(): string
|
||||||
|
{
|
||||||
|
$output = '';
|
||||||
|
|
||||||
|
$firstRow = collect(['B' => 'Jugendbildungsmaßnahme', 'G' => 'Gruppenleiter/innenschulung', 'FK' => 'Ferienkolonie', 'F' => 'Freizeitnaßnahme'])->map(function ($item, $key) {
|
||||||
|
return ($this->type === $key ? '\\checkedcheckbox' : '\\checkbox') . '{' . $item . '}';
|
||||||
|
})->implode(' & ') . ' \\\\';
|
||||||
|
|
||||||
|
$secondRow = collect(['I' => 'Int. Jugendbegegnung', 'P' => 'politische Jugendbildung', 'PR' => 'Projekte'])->map(function ($item, $key) {
|
||||||
|
return ($this->type === $key ? '\\checkedcheckbox' : '\\checkbox') . '{' . $item . '}';
|
||||||
|
})->implode(' & ') . ' & \\emptycheckbox \\\\';
|
||||||
|
|
||||||
|
return $firstRow . "\n" . $secondRow;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getEngine(): Engine
|
||||||
|
{
|
||||||
|
return Engine::PDFLATEX;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function getName(): string
|
||||||
|
{
|
||||||
|
return 'Stadt Solingen';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, mixed>
|
||||||
|
*/
|
||||||
|
public static function rules(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'dateFrom' => 'required|string|date_format:Y-m-d',
|
||||||
|
'dateUntil' => 'required|string|date_format:Y-m-d',
|
||||||
|
'zipLocation' => 'required|string',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
|
@ -3,8 +3,63 @@
|
||||||
namespace App\Contribution\Documents;
|
namespace App\Contribution\Documents;
|
||||||
|
|
||||||
use Zoomyboy\Tex\Document;
|
use Zoomyboy\Tex\Document;
|
||||||
|
use Zoomyboy\Tex\Template;
|
||||||
|
|
||||||
abstract class ContributionDocument extends Document
|
abstract class ContributionDocument extends Document
|
||||||
{
|
{
|
||||||
|
private string $eventName;
|
||||||
|
|
||||||
abstract public static function getName(): string;
|
abstract public static function getName(): string;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param ContributionRequestArray $request
|
||||||
|
*/
|
||||||
|
abstract public static function fromRequest(array $request): self;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param ContributionApiRequestArray $request
|
||||||
|
*/
|
||||||
|
abstract public static function fromApiRequest(array $request): self;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, mixed>
|
||||||
|
*/
|
||||||
|
abstract public static function rules(): array;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, mixed>
|
||||||
|
*/
|
||||||
|
public static function globalRules(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'eventName' => 'required|string',
|
||||||
|
'members' => 'present|array|min:1',
|
||||||
|
'members.*' => 'integer|exists:members,id',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function buttonName(): string
|
||||||
|
{
|
||||||
|
return 'Für ' . static::getName() . ' erstellen';;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setEventName(string $eventName): void
|
||||||
|
{
|
||||||
|
$this->eventName = $eventName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function basename(): string
|
||||||
|
{
|
||||||
|
return str('Zuschüsse ')->append($this->getName())->append(' ')->append($this->eventName)->slug();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function template(): Template
|
||||||
|
{
|
||||||
|
return Template::make('tex.templates.contribution');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function view(): string
|
||||||
|
{
|
||||||
|
return 'tex.contribution.' . str(class_basename(static::class))->replace('Document', '')->kebab()->toString();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,110 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Contribution\Documents;
|
|
||||||
|
|
||||||
use App\Country;
|
|
||||||
use App\Member\Member;
|
|
||||||
use Carbon\Carbon;
|
|
||||||
use Illuminate\Database\Eloquent\Collection;
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use Zoomyboy\Tex\Engine;
|
|
||||||
use Zoomyboy\Tex\Template;
|
|
||||||
|
|
||||||
class DvDocument extends ContributionDocument
|
|
||||||
{
|
|
||||||
public function __construct(
|
|
||||||
public string $dateFrom,
|
|
||||||
public string $dateUntil,
|
|
||||||
public string $zipLocation,
|
|
||||||
public ?Country $country,
|
|
||||||
/* @var Collection<int, Collection<int, Member>> */
|
|
||||||
public Collection $members,
|
|
||||||
public ?string $filename = '',
|
|
||||||
public string $type = 'F',
|
|
||||||
) {
|
|
||||||
}
|
|
||||||
|
|
||||||
public function dateRange(): string
|
|
||||||
{
|
|
||||||
return Carbon::parse($this->dateFrom)->format('d.m.Y')
|
|
||||||
.' - '
|
|
||||||
.Carbon::parse($this->dateUntil)->format('d.m.Y');
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function fromRequest(Request $request): self
|
|
||||||
{
|
|
||||||
return new self(
|
|
||||||
dateFrom: $request->dateFrom,
|
|
||||||
dateUntil: $request->dateUntil,
|
|
||||||
zipLocation: $request->zipLocation,
|
|
||||||
country: Country::where('id', $request->country)->firstOrFail(),
|
|
||||||
members: Member::whereIn('id', $request->members)->orderByRaw('lastname, firstname')->get()->chunk(17),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function countryName(): string
|
|
||||||
{
|
|
||||||
return $this->country->name;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function memberShort(Member $member): string
|
|
||||||
{
|
|
||||||
return $member->isLeader() ? 'L' : '';
|
|
||||||
}
|
|
||||||
|
|
||||||
public function memberName(Member $member): string
|
|
||||||
{
|
|
||||||
return $member->lastname.', '.$member->firstname;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function memberAddress(Member $member): string
|
|
||||||
{
|
|
||||||
return $member->fullAddress;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function memberGender(Member $member): string
|
|
||||||
{
|
|
||||||
if (!$member->gender) {
|
|
||||||
return '';
|
|
||||||
}
|
|
||||||
|
|
||||||
return strtolower(substr($member->gender->name, 0, 1));
|
|
||||||
}
|
|
||||||
|
|
||||||
public function memberAge(Member $member): string
|
|
||||||
{
|
|
||||||
return (string) $member->getAge();
|
|
||||||
}
|
|
||||||
|
|
||||||
public function basename(): string
|
|
||||||
{
|
|
||||||
return 'zuschuesse-dv';
|
|
||||||
}
|
|
||||||
|
|
||||||
public function view(): string
|
|
||||||
{
|
|
||||||
return 'tex.zuschuss-dv';
|
|
||||||
}
|
|
||||||
|
|
||||||
public function template(): Template
|
|
||||||
{
|
|
||||||
return Template::make('tex.templates.contribution');
|
|
||||||
}
|
|
||||||
|
|
||||||
public function setFilename(string $filename): static
|
|
||||||
{
|
|
||||||
$this->filename = $filename;
|
|
||||||
|
|
||||||
return $this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getEngine(): Engine
|
|
||||||
{
|
|
||||||
return Engine::PDFLATEX;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function getName(): string
|
|
||||||
{
|
|
||||||
return 'Für DV erstellen';
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -0,0 +1,84 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Contribution\Documents;
|
||||||
|
|
||||||
|
use App\Contribution\Data\MemberData;
|
||||||
|
use App\Contribution\Traits\FormatsDates;
|
||||||
|
use App\Contribution\Traits\HasPdfBackground;
|
||||||
|
use App\Country;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
|
class RdpNrwDocument extends ContributionDocument
|
||||||
|
{
|
||||||
|
use HasPdfBackground;
|
||||||
|
use FormatsDates;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param Collection<int, Collection<int, MemberData>> $members
|
||||||
|
*/
|
||||||
|
public function __construct(
|
||||||
|
public string $dateFrom,
|
||||||
|
public string $dateUntil,
|
||||||
|
public string $zipLocation,
|
||||||
|
public ?Country $country,
|
||||||
|
public Collection $members,
|
||||||
|
public ?string $filename = '',
|
||||||
|
public string $type = 'F',
|
||||||
|
public string $eventName = '',
|
||||||
|
) {
|
||||||
|
$this->setEventName($eventName);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@inheritdoc}
|
||||||
|
*/
|
||||||
|
public static function fromRequest(array $request): self
|
||||||
|
{
|
||||||
|
return new self(
|
||||||
|
dateFrom: $request['dateFrom'],
|
||||||
|
dateUntil: $request['dateUntil'],
|
||||||
|
zipLocation: $request['zipLocation'],
|
||||||
|
country: Country::where('id', $request['country'])->firstOrFail(),
|
||||||
|
members: MemberData::fromModels($request['members'])->chunk(17),
|
||||||
|
eventName: $request['eventName'],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@inheritdoc}
|
||||||
|
*/
|
||||||
|
public static function fromApiRequest(array $request): self
|
||||||
|
{
|
||||||
|
return new self(
|
||||||
|
dateFrom: $request['dateFrom'],
|
||||||
|
dateUntil: $request['dateUntil'],
|
||||||
|
zipLocation: $request['zipLocation'],
|
||||||
|
country: Country::where('id', $request['country'])->firstOrFail(),
|
||||||
|
members: MemberData::fromApi($request['member_data'])->chunk(17),
|
||||||
|
eventName: $request['eventName'],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function countryName(): string
|
||||||
|
{
|
||||||
|
return $this->country->name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function getName(): string
|
||||||
|
{
|
||||||
|
return 'RdP NRW';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, mixed>
|
||||||
|
*/
|
||||||
|
public static function rules(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'dateFrom' => 'required|string|date_format:Y-m-d',
|
||||||
|
'dateUntil' => 'required|string|date_format:Y-m-d',
|
||||||
|
'country' => 'required|integer|exists:countries,id',
|
||||||
|
'zipLocation' => 'required|string',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,84 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Contribution\Documents;
|
|
||||||
|
|
||||||
use App\Country;
|
|
||||||
use App\Member\Member;
|
|
||||||
use Carbon\Carbon;
|
|
||||||
use Illuminate\Database\Eloquent\Collection;
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use Zoomyboy\Tex\Engine;
|
|
||||||
use Zoomyboy\Tex\Template;
|
|
||||||
|
|
||||||
class RemscheidDocument extends ContributionDocument
|
|
||||||
{
|
|
||||||
public function __construct(
|
|
||||||
public string $dateFrom,
|
|
||||||
public string $dateUntil,
|
|
||||||
public string $zipLocation,
|
|
||||||
public ?Country $country,
|
|
||||||
/* @var Collection<int, Collection<int, Member>> */
|
|
||||||
public Collection $leaders,
|
|
||||||
/* @var Collection<int, Collection<int, Member>> */
|
|
||||||
public Collection $children,
|
|
||||||
public ?string $filename = '',
|
|
||||||
public string $type = 'F',
|
|
||||||
) {
|
|
||||||
}
|
|
||||||
|
|
||||||
public function niceDateFrom(): string
|
|
||||||
{
|
|
||||||
return Carbon::parse($this->dateFrom)->format('d.m.Y');
|
|
||||||
}
|
|
||||||
|
|
||||||
public function niceDateUntil(): string
|
|
||||||
{
|
|
||||||
return Carbon::parse($this->dateUntil)->format('d.m.Y');
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function fromRequest(Request $request): self
|
|
||||||
{
|
|
||||||
[$leaders, $children] = Member::whereIn('id', $request->members)->orderByRaw('lastname, firstname')->get()->partition(fn ($member) => $member->isLeader());
|
|
||||||
|
|
||||||
return new self(
|
|
||||||
dateFrom: $request->dateFrom,
|
|
||||||
dateUntil: $request->dateUntil,
|
|
||||||
zipLocation: $request->zipLocation,
|
|
||||||
country: Country::where('id', $request->country)->firstOrFail(),
|
|
||||||
leaders: $leaders->values()->chunk(6),
|
|
||||||
children: $children->values()->chunk(20),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function basename(): string
|
|
||||||
{
|
|
||||||
return 'zuschuesse-remscheid';
|
|
||||||
}
|
|
||||||
|
|
||||||
public function view(): string
|
|
||||||
{
|
|
||||||
return 'tex.zuschuss-remscheid';
|
|
||||||
}
|
|
||||||
|
|
||||||
public function template(): Template
|
|
||||||
{
|
|
||||||
return Template::make('tex.templates.contribution');
|
|
||||||
}
|
|
||||||
|
|
||||||
public function setFilename(string $filename): static
|
|
||||||
{
|
|
||||||
$this->filename = $filename;
|
|
||||||
|
|
||||||
return $this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getEngine(): Engine
|
|
||||||
{
|
|
||||||
return Engine::PDFLATEX;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function getName(): string
|
|
||||||
{
|
|
||||||
return 'Für Remscheid erstellen';
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,94 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Contribution\Documents;
|
|
||||||
|
|
||||||
use App\Member\Member;
|
|
||||||
use Carbon\Carbon;
|
|
||||||
use Illuminate\Database\Eloquent\Collection;
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use Illuminate\Support\Str;
|
|
||||||
use Zoomyboy\Tex\Engine;
|
|
||||||
use Zoomyboy\Tex\Template;
|
|
||||||
|
|
||||||
class SolingenDocument extends ContributionDocument
|
|
||||||
{
|
|
||||||
final private function __construct(
|
|
||||||
public string $dateFrom,
|
|
||||||
public string $dateUntil,
|
|
||||||
public string $zipLocation,
|
|
||||||
/** @var array<int, int> */
|
|
||||||
public array $members,
|
|
||||||
public string $eventName,
|
|
||||||
public string $type = 'F',
|
|
||||||
) {
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function fromRequest(Request $request): static
|
|
||||||
{
|
|
||||||
return new static(
|
|
||||||
dateFrom: $request->dateFrom,
|
|
||||||
dateUntil: $request->dateUntil,
|
|
||||||
zipLocation: $request->zipLocation,
|
|
||||||
members: $request->members,
|
|
||||||
eventName: $request->eventName,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return Collection<Collection<Member>>
|
|
||||||
*/
|
|
||||||
public function memberModels(): Collection
|
|
||||||
{
|
|
||||||
return Member::whereIn('id', $this->members)->orderByRaw('lastname, firstname')->get()->chunk(14);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function niceEventFrom(): string
|
|
||||||
{
|
|
||||||
return Carbon::parse($this->dateFrom)->format('d.m.Y');
|
|
||||||
}
|
|
||||||
|
|
||||||
public function niceEventUntil(): string
|
|
||||||
{
|
|
||||||
return Carbon::parse($this->dateUntil)->format('d.m.Y');
|
|
||||||
}
|
|
||||||
|
|
||||||
public function template(): Template
|
|
||||||
{
|
|
||||||
return Template::make('tex.templates.contribution');
|
|
||||||
}
|
|
||||||
|
|
||||||
public function checkboxes(): string
|
|
||||||
{
|
|
||||||
$output = '';
|
|
||||||
|
|
||||||
$firstRow = collect(['B' => 'Jugendbildungsmaßnahme', 'G' => 'Gruppenleiter/innenschulung', 'FK' => 'Ferienkolonie', 'F' => 'Freizeitnaßnahme'])->map(function ($item, $key) {
|
|
||||||
return ($this->type === $key ? '\\checkedcheckbox' : '\\checkbox').'{'.$item.'}';
|
|
||||||
})->implode(' & ').' \\\\';
|
|
||||||
|
|
||||||
$secondRow = collect(['I' => 'Int. Jugendbegegnung', 'P' => 'politische Jugendbildung', 'PR' => 'Projekte'])->map(function ($item, $key) {
|
|
||||||
return ($this->type === $key ? '\\checkedcheckbox' : '\\checkbox').'{'.$item.'}';
|
|
||||||
})->implode(' & ').' & \\emptycheckbox \\\\';
|
|
||||||
|
|
||||||
return $firstRow."\n".$secondRow;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function basename(): string
|
|
||||||
{
|
|
||||||
return 'zuschuesse-solingen-'.Str::slug($this->eventName);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function view(): string
|
|
||||||
{
|
|
||||||
return 'tex.zuschuss-stadt';
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getEngine(): Engine
|
|
||||||
{
|
|
||||||
return Engine::PDFLATEX;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static function getName(): string
|
|
||||||
{
|
|
||||||
return 'Für Stadt Solingen erstellen';
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -0,0 +1,79 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Contribution\Documents;
|
||||||
|
|
||||||
|
use App\Contribution\Data\MemberData;
|
||||||
|
use App\Contribution\Traits\FormatsDates;
|
||||||
|
use App\Contribution\Traits\HasPdfBackground;
|
||||||
|
use App\Country;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
|
class WuppertalDocument extends ContributionDocument
|
||||||
|
{
|
||||||
|
|
||||||
|
use HasPdfBackground;
|
||||||
|
use FormatsDates;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param Collection<int, Collection<int, MemberData>> $members
|
||||||
|
*/
|
||||||
|
public function __construct(
|
||||||
|
public string $dateFrom,
|
||||||
|
public string $dateUntil,
|
||||||
|
public string $zipLocation,
|
||||||
|
public ?Country $country,
|
||||||
|
public Collection $members,
|
||||||
|
public ?string $filename = '',
|
||||||
|
public string $type = 'F',
|
||||||
|
public string $eventName = '',
|
||||||
|
) {
|
||||||
|
$this->setEventName($eventName);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@inheritdoc}
|
||||||
|
*/
|
||||||
|
public static function fromRequest(array $request): self
|
||||||
|
{
|
||||||
|
return new self(
|
||||||
|
dateFrom: $request['dateFrom'],
|
||||||
|
dateUntil: $request['dateUntil'],
|
||||||
|
zipLocation: $request['zipLocation'],
|
||||||
|
country: Country::where('id', $request['country'])->firstOrFail(),
|
||||||
|
members: MemberData::fromModels($request['members'])->chunk(14),
|
||||||
|
eventName: $request['eventName'],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@inheritdoc}
|
||||||
|
*/
|
||||||
|
public static function fromApiRequest(array $request): self
|
||||||
|
{
|
||||||
|
return new self(
|
||||||
|
dateFrom: $request['dateFrom'],
|
||||||
|
dateUntil: $request['dateUntil'],
|
||||||
|
zipLocation: $request['zipLocation'],
|
||||||
|
country: Country::where('id', $request['country'])->firstOrFail(),
|
||||||
|
members: MemberData::fromApi($request['member_data'])->chunk(14),
|
||||||
|
eventName: $request['eventName'],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function getName(): string
|
||||||
|
{
|
||||||
|
return 'Wuppertal';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, mixed>
|
||||||
|
*/
|
||||||
|
public static function rules(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'dateFrom' => 'required|string|date_format:Y-m-d',
|
||||||
|
'dateUntil' => 'required|string|date_format:Y-m-d',
|
||||||
|
'zipLocation' => 'required|string',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,24 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Contribution\Traits;
|
||||||
|
|
||||||
|
use Carbon\Carbon;
|
||||||
|
|
||||||
|
trait FormatsDates
|
||||||
|
{
|
||||||
|
|
||||||
|
public function niceDateFrom(): string
|
||||||
|
{
|
||||||
|
return Carbon::parse($this->dateFrom)->format('d.m.Y');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function niceDateUntil(): string
|
||||||
|
{
|
||||||
|
return Carbon::parse($this->dateUntil)->format('d.m.Y');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function dateRange(): string
|
||||||
|
{
|
||||||
|
return implode(' - ', [$this->niceDateFrom(), $this->niceDateUntil()]);
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,13 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Contribution\Traits;
|
||||||
|
|
||||||
|
use Zoomyboy\Tex\Engine;
|
||||||
|
|
||||||
|
trait HasPdfBackground
|
||||||
|
{
|
||||||
|
public function getEngine(): Engine
|
||||||
|
{
|
||||||
|
return Engine::PDFLATEX;
|
||||||
|
}
|
||||||
|
}
|
|
@ -3,11 +3,13 @@
|
||||||
namespace App;
|
namespace App;
|
||||||
|
|
||||||
use App\Nami\HasNamiField;
|
use App\Nami\HasNamiField;
|
||||||
|
use Database\Factories\CountryFactory;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
class Country extends Model
|
class Country extends Model
|
||||||
{
|
{
|
||||||
|
/** @use HasFactory<CountryFactory> */
|
||||||
use HasFactory;
|
use HasFactory;
|
||||||
use HasNamiField;
|
use HasNamiField;
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,46 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Course\Actions;
|
||||||
|
|
||||||
|
use App\Course\Models\CourseMember;
|
||||||
|
use App\Lib\JobMiddleware\JobChannels;
|
||||||
|
use App\Lib\JobMiddleware\WithJobState;
|
||||||
|
use App\Lib\Queue\TracksJob;
|
||||||
|
use App\Setting\NamiSettings;
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
|
||||||
|
class CourseDestroyAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
use TracksJob;
|
||||||
|
|
||||||
|
public function handle(int $courseId): void
|
||||||
|
{
|
||||||
|
$course = CourseMember::find($courseId);
|
||||||
|
app(NamiSettings::class)->login()->deleteCourse($course->member->nami_id, $course->nami_id);
|
||||||
|
|
||||||
|
$course->delete();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function asController(CourseMember $course): JsonResponse
|
||||||
|
{
|
||||||
|
$this->startJob($course->id, $course->member->fullname);
|
||||||
|
|
||||||
|
return response()->json([]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param mixed $parameters
|
||||||
|
*/
|
||||||
|
public function jobState(WithJobState $jobState, ...$parameters): WithJobState
|
||||||
|
{
|
||||||
|
$memberFullname = $parameters[1];
|
||||||
|
|
||||||
|
return $jobState
|
||||||
|
->before('Ausbildung für ' . $memberFullname . ' wird gelöscht')
|
||||||
|
->after('Ausbildung für ' . $memberFullname . ' gelöscht')
|
||||||
|
->failed('Fehler beim Löschen der Ausbildung für ' . $memberFullname)
|
||||||
|
->shouldReload(JobChannels::make()->add('member')->add('course'));
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,31 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Course\Actions;
|
||||||
|
|
||||||
|
use App\Course\Models\CourseMember;
|
||||||
|
use App\Course\Resources\CourseMemberResource;
|
||||||
|
use App\Member\Member;
|
||||||
|
use Illuminate\Database\Eloquent\Collection;
|
||||||
|
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
|
||||||
|
class CourseIndexAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Collection<int, CourseMember>
|
||||||
|
*/
|
||||||
|
public function handle(Member $member): Collection
|
||||||
|
{
|
||||||
|
return $member->courses()->with('course')->get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function asController(Member $member): AnonymousResourceCollection
|
||||||
|
{
|
||||||
|
return CourseMemberResource::collection($this->handle($member))
|
||||||
|
->additional([
|
||||||
|
'meta' => CourseMemberResource::memberMeta($member),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,72 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Course\Actions;
|
||||||
|
|
||||||
|
use App\Course\Models\Course;
|
||||||
|
use App\Lib\JobMiddleware\JobChannels;
|
||||||
|
use App\Lib\JobMiddleware\WithJobState;
|
||||||
|
use App\Lib\Queue\TracksJob;
|
||||||
|
use App\Member\Member;
|
||||||
|
use App\Setting\NamiSettings;
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
use Lorisleiva\Actions\ActionRequest;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
|
||||||
|
class CourseStoreAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
use TracksJob;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array<string, mixed> $attributes
|
||||||
|
*/
|
||||||
|
public function handle(Member $member, array $attributes): void
|
||||||
|
{
|
||||||
|
$course = Course::where('id', $attributes['course_id'])->firstOrFail();
|
||||||
|
|
||||||
|
$payload = collect($attributes)->only(['event_name', 'completed_at', 'organizer'])->merge([
|
||||||
|
'course_id' => $course->nami_id,
|
||||||
|
])->toArray();
|
||||||
|
|
||||||
|
$namiId = app(NamiSettings::class)->login()->createCourse($member->nami_id, $payload);
|
||||||
|
|
||||||
|
$member->courses()->create([
|
||||||
|
...$attributes,
|
||||||
|
'nami_id' => $namiId,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, string>
|
||||||
|
*/
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'organizer' => 'required|max:255',
|
||||||
|
'event_name' => 'required|max:255',
|
||||||
|
'completed_at' => 'required|date',
|
||||||
|
'course_id' => 'required|exists:courses,id',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function asController(Member $member, ActionRequest $request): JsonResponse
|
||||||
|
{
|
||||||
|
$this->startJob($member, $request->validated());
|
||||||
|
|
||||||
|
return response()->json([]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param mixed $parameters
|
||||||
|
*/
|
||||||
|
public function jobState(WithJobState $jobState, ...$parameters): WithJobState
|
||||||
|
{
|
||||||
|
$member = $parameters[0];
|
||||||
|
|
||||||
|
return $jobState
|
||||||
|
->before('Ausbildung für ' . $member->fullname . ' wird gespeichert')
|
||||||
|
->after('Ausbildung für ' . $member->fullname . ' gespeichert')
|
||||||
|
->failed('Fehler beim Erstellen der Ausbildung für ' . $member->fullname)
|
||||||
|
->shouldReload(JobChannels::make()->add('member')->add('course'));
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,70 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Course\Actions;
|
||||||
|
|
||||||
|
use App\Course\Models\Course;
|
||||||
|
use App\Course\Models\CourseMember;
|
||||||
|
use App\Lib\JobMiddleware\JobChannels;
|
||||||
|
use App\Lib\JobMiddleware\WithJobState;
|
||||||
|
use App\Lib\Queue\TracksJob;
|
||||||
|
use App\Setting\NamiSettings;
|
||||||
|
use Illuminate\Http\JsonResponse;
|
||||||
|
use Lorisleiva\Actions\ActionRequest;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
|
||||||
|
class CourseUpdateAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
use TracksJob;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param array<string, string> $attributes
|
||||||
|
*/
|
||||||
|
public function handle(CourseMember $course, array $attributes): void
|
||||||
|
{
|
||||||
|
app(NamiSettings::class)->login()->updateCourse(
|
||||||
|
$course->member->nami_id,
|
||||||
|
$course->nami_id,
|
||||||
|
[
|
||||||
|
...$attributes,
|
||||||
|
'course_id' => Course::find($attributes['course_id'])->nami_id,
|
||||||
|
]
|
||||||
|
);
|
||||||
|
|
||||||
|
$course->update($attributes);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, string>
|
||||||
|
*/
|
||||||
|
public function rules()
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'organizer' => 'required|max:255',
|
||||||
|
'event_name' => 'required|max:255',
|
||||||
|
'completed_at' => 'required|date',
|
||||||
|
'course_id' => 'required|exists:courses,id',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function asController(CourseMember $course, ActionRequest $request): JsonResponse
|
||||||
|
{
|
||||||
|
$this->startJob($course, $request->validated());
|
||||||
|
|
||||||
|
return response()->json([]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param mixed $parameters
|
||||||
|
*/
|
||||||
|
public function jobState(WithJobState $jobState, ...$parameters): WithJobState
|
||||||
|
{
|
||||||
|
$member = $parameters[0]->member;
|
||||||
|
|
||||||
|
return $jobState
|
||||||
|
->before('Ausbildung für ' . $member->fullname . ' wird gespeichert')
|
||||||
|
->after('Ausbildung für ' . $member->fullname . ' gespeichert')
|
||||||
|
->failed('Fehler beim Erstellen der Ausbildung für ' . $member->fullname)
|
||||||
|
->shouldReload(JobChannels::make()->add('member')->add('course'));
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,36 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Course\Controllers;
|
|
||||||
|
|
||||||
use App\Course\Models\CourseMember;
|
|
||||||
use App\Course\Requests\DestroyRequest;
|
|
||||||
use App\Course\Requests\StoreRequest;
|
|
||||||
use App\Course\Requests\UpdateRequest;
|
|
||||||
use App\Http\Controllers\Controller;
|
|
||||||
use App\Member\Member;
|
|
||||||
use App\Setting\NamiSettings;
|
|
||||||
use Illuminate\Http\RedirectResponse;
|
|
||||||
|
|
||||||
class CourseController extends Controller
|
|
||||||
{
|
|
||||||
public function store(Member $member, StoreRequest $request, NamiSettings $settings): RedirectResponse
|
|
||||||
{
|
|
||||||
$request->persist($member, $settings);
|
|
||||||
|
|
||||||
return redirect()->back()->success('Ausbildung erstellt');
|
|
||||||
}
|
|
||||||
|
|
||||||
public function update(Member $member, CourseMember $course, UpdateRequest $request, NamiSettings $settings): RedirectResponse
|
|
||||||
{
|
|
||||||
$request->persist($member, $course, $settings);
|
|
||||||
|
|
||||||
return redirect()->back()->success('Ausbildung aktualisiert');
|
|
||||||
}
|
|
||||||
|
|
||||||
public function destroy(Member $member, CourseMember $course, DestroyRequest $request, NamiSettings $settings): RedirectResponse
|
|
||||||
{
|
|
||||||
$request->persist($member, $course, $settings);
|
|
||||||
|
|
||||||
return redirect()->back()->success('Ausbildung gelöscht');
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -2,12 +2,16 @@
|
||||||
|
|
||||||
namespace App\Course\Models;
|
namespace App\Course\Models;
|
||||||
|
|
||||||
|
use App\Nami\HasNamiField;
|
||||||
|
use Database\Factories\Course\Models\CourseFactory;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
class Course extends Model
|
class Course extends Model
|
||||||
{
|
{
|
||||||
|
/** @use HasFactory<CourseFactory> */
|
||||||
use HasFactory;
|
use HasFactory;
|
||||||
|
use HasNamiField;
|
||||||
|
|
||||||
public $timestamps = false;
|
public $timestamps = false;
|
||||||
public $fillable = ['name', 'nami_id'];
|
public $fillable = ['name', 'nami_id'];
|
||||||
|
@ -20,4 +24,12 @@ class Course extends Model
|
||||||
->trim()
|
->trim()
|
||||||
->replaceMatches('/ - .*/', '');
|
->replaceMatches('/ - .*/', '');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<int, array{id: int, name: string}>
|
||||||
|
*/
|
||||||
|
public static function forSelect(): array
|
||||||
|
{
|
||||||
|
return static::select('name', 'id')->get()->toArray();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,18 +2,33 @@
|
||||||
|
|
||||||
namespace App\Course\Models;
|
namespace App\Course\Models;
|
||||||
|
|
||||||
|
use App\Member\Member;
|
||||||
|
use Database\Factories\Course\Models\CourseMemberFactory;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||||
|
|
||||||
class CourseMember extends Model
|
class CourseMember extends Model
|
||||||
{
|
{
|
||||||
|
/** @use HasFactory<CourseMemberFactory> */
|
||||||
use HasFactory;
|
use HasFactory;
|
||||||
|
|
||||||
|
/** @var array<int, string> */
|
||||||
public $guarded = [];
|
public $guarded = [];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return BelongsTo<Course, self>
|
||||||
|
*/
|
||||||
public function course(): BelongsTo
|
public function course(): BelongsTo
|
||||||
{
|
{
|
||||||
return $this->belongsTo(Course::class);
|
return $this->belongsTo(Course::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return BelongsTo<Member, self>
|
||||||
|
*/
|
||||||
|
public function member(): BelongsTo
|
||||||
|
{
|
||||||
|
return $this->belongsTo(Member::class);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,38 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Course\Requests;
|
|
||||||
|
|
||||||
use App\Course\Models\CourseMember;
|
|
||||||
use App\Member\Member;
|
|
||||||
use App\Setting\NamiSettings;
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
|
||||||
|
|
||||||
class DestroyRequest extends FormRequest
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Determine if the user is authorized to make this request.
|
|
||||||
*
|
|
||||||
* @return bool
|
|
||||||
*/
|
|
||||||
public function authorize()
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the validation rules that apply to the request.
|
|
||||||
*
|
|
||||||
* @return array<string, string>
|
|
||||||
*/
|
|
||||||
public function rules()
|
|
||||||
{
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
|
|
||||||
public function persist(Member $member, CourseMember $course, NamiSettings $settings): void
|
|
||||||
{
|
|
||||||
$settings->login()->deleteCourse($member->nami_id, $course->nami_id);
|
|
||||||
|
|
||||||
$course->delete();
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,49 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Course\Requests;
|
|
||||||
|
|
||||||
use App\Course\Models\Course;
|
|
||||||
use App\Member\Member;
|
|
||||||
use App\Setting\NamiSettings;
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
|
||||||
|
|
||||||
class StoreRequest extends FormRequest
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Determine if the user is authorized to make this request.
|
|
||||||
*
|
|
||||||
* @return bool
|
|
||||||
*/
|
|
||||||
public function authorize()
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the validation rules that apply to the request.
|
|
||||||
*
|
|
||||||
* @return array<string, string>
|
|
||||||
*/
|
|
||||||
public function rules()
|
|
||||||
{
|
|
||||||
return [
|
|
||||||
'organizer' => 'required|max:255',
|
|
||||||
'event_name' => 'required|max:255',
|
|
||||||
'completed_at' => 'required|date',
|
|
||||||
'course_id' => 'required|exists:courses,id',
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
public function persist(Member $member, NamiSettings $settings): void
|
|
||||||
{
|
|
||||||
$course = Course::where('id', $this->input('course_id'))->firstOrFail();
|
|
||||||
|
|
||||||
$payload = collect($this->input())->only(['event_name', 'completed_at', 'organizer'])->merge([
|
|
||||||
'course_id' => $course->nami_id,
|
|
||||||
])->toArray();
|
|
||||||
|
|
||||||
$namiId = $settings->login()->createCourse($member->nami_id, $payload);
|
|
||||||
|
|
||||||
$member->courses()->create($this->safe()->collect()->put('nami_id', $namiId)->toArray());
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,48 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Course\Requests;
|
|
||||||
|
|
||||||
use App\Course\Models\Course;
|
|
||||||
use App\Course\Models\CourseMember;
|
|
||||||
use App\Member\Member;
|
|
||||||
use App\Setting\NamiSettings;
|
|
||||||
use Illuminate\Foundation\Http\FormRequest;
|
|
||||||
|
|
||||||
class UpdateRequest extends FormRequest
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Determine if the user is authorized to make this request.
|
|
||||||
*
|
|
||||||
* @return bool
|
|
||||||
*/
|
|
||||||
public function authorize()
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the validation rules that apply to the request.
|
|
||||||
*
|
|
||||||
* @return array<string, string>
|
|
||||||
*/
|
|
||||||
public function rules()
|
|
||||||
{
|
|
||||||
return [
|
|
||||||
'organizer' => 'required|max:255',
|
|
||||||
'event_name' => 'required|max:255',
|
|
||||||
'completed_at' => 'required|date',
|
|
||||||
'course_id' => 'required|exists:courses,id',
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
public function persist(Member $member, CourseMember $course, NamiSettings $settings): void
|
|
||||||
{
|
|
||||||
$settings->login()->updateCourse(
|
|
||||||
$member->nami_id,
|
|
||||||
$course->nami_id,
|
|
||||||
$this->safe()->merge(['course_id' => Course::find($this->input('course_id'))->nami_id])->toArray()
|
|
||||||
);
|
|
||||||
|
|
||||||
$course->update($this->safe()->toArray());
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -2,6 +2,8 @@
|
||||||
|
|
||||||
namespace App\Course\Resources;
|
namespace App\Course\Resources;
|
||||||
|
|
||||||
|
use App\Course\Models\Course;
|
||||||
|
use App\Member\Member;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use Illuminate\Http\Resources\Json\JsonResource;
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
|
@ -28,6 +30,29 @@ class CourseMemberResource extends JsonResource
|
||||||
'course_name' => $this->course->name,
|
'course_name' => $this->course->name,
|
||||||
'course_id' => $this->course->id,
|
'course_id' => $this->course->id,
|
||||||
'course' => new CourseResource($this->whenLoaded('course')),
|
'course' => new CourseResource($this->whenLoaded('course')),
|
||||||
|
'links' => [
|
||||||
|
'update' => route('course.update', ['course' => $this->getModel()]),
|
||||||
|
'destroy' => route('course.destroy', ['course' => $this->getModel()]),
|
||||||
|
]
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, mixed>
|
||||||
|
*/
|
||||||
|
public static function memberMeta(Member $member): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'default' => [
|
||||||
|
'event_name' => '',
|
||||||
|
'completed_at' => null,
|
||||||
|
'course_id' => null,
|
||||||
|
'organizer' => ''
|
||||||
|
],
|
||||||
|
'courses' => Course::forSelect(),
|
||||||
|
'links' => [
|
||||||
|
'store' => route('member.course.store', ['member' => $member]),
|
||||||
|
]
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,7 @@ class CourseResource extends JsonResource
|
||||||
*
|
*
|
||||||
* @param \Illuminate\Http\Request $request
|
* @param \Illuminate\Http\Request $request
|
||||||
*
|
*
|
||||||
* @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
|
* @return array<string, mixed>
|
||||||
*/
|
*/
|
||||||
public function toArray($request)
|
public function toArray($request)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace App\Home\Actions;
|
namespace App\Dashboard\Actions;
|
||||||
|
|
||||||
use App\Home\DashboardFactory;
|
use App\Dashboard\DashboardFactory;
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use Inertia;
|
use Inertia;
|
||||||
use Inertia\Response;
|
use Inertia\Response;
|
||||||
use Lorisleiva\Actions\Concerns\AsAction;
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
@ -22,11 +21,11 @@ class IndexAction
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
public function asController(Request $request): Response
|
public function asController(): Response
|
||||||
{
|
{
|
||||||
session()->put('menu', 'dashboard');
|
session()->put('menu', 'dashboard');
|
||||||
session()->put('title', 'Dashboard');
|
session()->put('title', 'Dashboard');
|
||||||
|
|
||||||
return Inertia::render('home/VIndex', $this->handle());
|
return Inertia::render('dashboard/VIndex', $this->handle());
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,6 +1,6 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace App\Home\Blocks;
|
namespace App\Dashboard\Blocks;
|
||||||
|
|
||||||
abstract class Block
|
abstract class Block
|
||||||
{
|
{
|
|
@ -1,13 +1,13 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace App\Home;
|
namespace App\Dashboard;
|
||||||
|
|
||||||
|
use App\Dashboard\Blocks\Block;
|
||||||
use App\Efz\EfzPendingBlock;
|
use App\Efz\EfzPendingBlock;
|
||||||
use App\Home\Blocks\Block;
|
use App\Invoice\MemberPaymentBlock;
|
||||||
use App\Member\PsPendingBlock;
|
use App\Member\PsPendingBlock;
|
||||||
use App\Membership\AgeGroupCountBlock;
|
use App\Membership\AgeGroupCountBlock;
|
||||||
use App\Membership\TestersBlock;
|
use App\Membership\TestersBlock;
|
||||||
use App\Payment\MemberPaymentBlock;
|
|
||||||
|
|
||||||
class DashboardFactory
|
class DashboardFactory
|
||||||
{
|
{
|
|
@ -1,10 +1,12 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace App\Home;
|
namespace App\Dashboard;
|
||||||
|
|
||||||
|
use Illuminate\Routing\Router;
|
||||||
use Illuminate\Support\ServiceProvider;
|
use Illuminate\Support\ServiceProvider;
|
||||||
|
use App\Dashboard\Actions\IndexAction as DashboardIndexAction;
|
||||||
|
|
||||||
class HomeServiceProvider extends ServiceProvider
|
class DashboardServiceProvider extends ServiceProvider
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Register services.
|
* Register services.
|
||||||
|
@ -23,5 +25,8 @@ class HomeServiceProvider extends ServiceProvider
|
||||||
*/
|
*/
|
||||||
public function boot()
|
public function boot()
|
||||||
{
|
{
|
||||||
|
app(Router::class)->middleware(['web', 'auth:web'])->group(function ($router) {
|
||||||
|
$router->get('/', DashboardIndexAction::class)->name('home');
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -8,9 +8,6 @@ use Sabre\CardDAV\Backend\AbstractBackend;
|
||||||
use Sabre\DAV\PropPatch;
|
use Sabre\DAV\PropPatch;
|
||||||
use Sabre\VObject\Component\VCard;
|
use Sabre\VObject\Component\VCard;
|
||||||
|
|
||||||
/**
|
|
||||||
* @template M as array{lastmodified: int, etag: string, uri: string, id: int, size: int}
|
|
||||||
*/
|
|
||||||
class AddressBookBackend extends AbstractBackend
|
class AddressBookBackend extends AbstractBackend
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
|
@ -115,7 +112,7 @@ class AddressBookBackend extends AbstractBackend
|
||||||
*
|
*
|
||||||
* @param mixed $addressbookId
|
* @param mixed $addressbookId
|
||||||
*
|
*
|
||||||
* @return array<int, M>
|
* @return array<int, AddressBookCard>
|
||||||
*/
|
*/
|
||||||
public function getCards($addressbookId): array
|
public function getCards($addressbookId): array
|
||||||
{
|
{
|
||||||
|
@ -133,7 +130,7 @@ class AddressBookBackend extends AbstractBackend
|
||||||
* @param mixed $addressBookId
|
* @param mixed $addressBookId
|
||||||
* @param string $cardUri
|
* @param string $cardUri
|
||||||
*
|
*
|
||||||
* @return M
|
* @return AddressBookCard|bool
|
||||||
*/
|
*/
|
||||||
public function getCard($addressBookId, $cardUri)
|
public function getCard($addressBookId, $cardUri)
|
||||||
{
|
{
|
||||||
|
@ -158,8 +155,9 @@ class AddressBookBackend extends AbstractBackend
|
||||||
* If the backend supports this, it may allow for some speed-ups.
|
* If the backend supports this, it may allow for some speed-ups.
|
||||||
*
|
*
|
||||||
* @param mixed $addressBookId
|
* @param mixed $addressBookId
|
||||||
|
* @param array<int, string> $uris
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array<int, mixed>
|
||||||
*/
|
*/
|
||||||
public function getMultipleCards($addressBookId, array $uris)
|
public function getMultipleCards($addressBookId, array $uris)
|
||||||
{
|
{
|
||||||
|
@ -248,13 +246,13 @@ class AddressBookBackend extends AbstractBackend
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return M
|
* @return AddressBookCard
|
||||||
*/
|
*/
|
||||||
private function cardMeta(Member $member): array
|
private function cardMeta(Member $member): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'lastmodified' => $member->updated_at->timestamp,
|
'lastmodified' => $member->updated_at->timestamp,
|
||||||
'etag' => '"'.$member->etag.'"',
|
'etag' => '"' . $member->etag . '"',
|
||||||
'uri' => $member->slug,
|
'uri' => $member->slug,
|
||||||
'id' => $member->id,
|
'id' => $member->id,
|
||||||
'size' => strlen($member->toVcard()->serialize()),
|
'size' => strlen($member->toVcard()->serialize()),
|
||||||
|
|
|
@ -136,10 +136,11 @@ class Principal implements PrincipalBackendInterface
|
||||||
*
|
*
|
||||||
* @param string $principal
|
* @param string $principal
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array<int, string>|null
|
||||||
*/
|
*/
|
||||||
public function getGroupMemberSet($principal)
|
public function getGroupMemberSet($principal)
|
||||||
{
|
{
|
||||||
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -147,7 +148,7 @@ class Principal implements PrincipalBackendInterface
|
||||||
*
|
*
|
||||||
* @param string $principal
|
* @param string $principal
|
||||||
*
|
*
|
||||||
* @return array
|
* @return array<int, string>|null
|
||||||
*/
|
*/
|
||||||
public function getGroupMembership($principal)
|
public function getGroupMembership($principal)
|
||||||
{
|
{
|
||||||
|
@ -155,7 +156,7 @@ class Principal implements PrincipalBackendInterface
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return ['addressbooks/'.$matches[1]];
|
return ['addressbooks/' . $matches[1]];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -164,6 +165,8 @@ class Principal implements PrincipalBackendInterface
|
||||||
* The principals should be passed as a list of uri's.
|
* The principals should be passed as a list of uri's.
|
||||||
*
|
*
|
||||||
* @param string $principal
|
* @param string $principal
|
||||||
|
* @param array<int, string> $members
|
||||||
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function setGroupMemberSet($principal, array $members)
|
public function setGroupMemberSet($principal, array $members)
|
||||||
{
|
{
|
||||||
|
@ -175,8 +178,8 @@ class Principal implements PrincipalBackendInterface
|
||||||
private function userToPrincipal(User $user): array
|
private function userToPrincipal(User $user): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'{DAV:}displayname' => $user->name,
|
'{DAV:}displayname' => $user->firstname . ' ' . $user->lastname,
|
||||||
'uri' => 'principals/'.$user->email,
|
'uri' => 'principals/' . $user->email,
|
||||||
'{http://sabredav.org/ns}email-address' => $user->email,
|
'{http://sabredav.org/ns}email-address' => $user->email,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,6 +9,7 @@ use Sabre\CardDAV\AddressBookRoot;
|
||||||
use Sabre\CardDAV\Plugin as CardDAVPlugin;
|
use Sabre\CardDAV\Plugin as CardDAVPlugin;
|
||||||
use Sabre\DAV\Auth\Plugin as AuthPlugin;
|
use Sabre\DAV\Auth\Plugin as AuthPlugin;
|
||||||
use Sabre\DAV\Browser\Plugin as BrowserPlugin;
|
use Sabre\DAV\Browser\Plugin as BrowserPlugin;
|
||||||
|
use Sabre\DAV\ServerPlugin;
|
||||||
use Sabre\DAVACL\AbstractPrincipalCollection;
|
use Sabre\DAVACL\AbstractPrincipalCollection;
|
||||||
use Sabre\DAVACL\Plugin as AclPlugin;
|
use Sabre\DAVACL\Plugin as AclPlugin;
|
||||||
use Sabre\DAVACL\PrincipalCollection;
|
use Sabre\DAVACL\PrincipalCollection;
|
||||||
|
@ -50,6 +51,9 @@ class ServiceProvider extends BaseServiceProvider
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<int, ServerPlugin>
|
||||||
|
*/
|
||||||
private function plugins(): array
|
private function plugins(): array
|
||||||
{
|
{
|
||||||
$authBackend = new AuthBackend();
|
$authBackend = new AuthBackend();
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
namespace App\Efz;
|
namespace App\Efz;
|
||||||
|
|
||||||
use App\Home\Blocks\Block;
|
use App\Dashboard\Blocks\Block;
|
||||||
use App\Member\Member;
|
use App\Member\Member;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
|
|
||||||
|
@ -17,8 +17,9 @@ class EfzPendingBlock extends Block
|
||||||
return $query->where('efz', '<=', now()->subYears(5)->endOfYear())
|
return $query->where('efz', '<=', now()->subYears(5)->endOfYear())
|
||||||
->orWhereNull('efz');
|
->orWhereNull('efz');
|
||||||
})
|
})
|
||||||
|
->whereCurrentGroup()
|
||||||
->orderByRaw('lastname, firstname')
|
->orderByRaw('lastname, firstname')
|
||||||
->whereHas('memberships', fn ($builder) => $builder->isLeader());
|
->whereHas('memberships', fn ($builder) => $builder->isLeader()->active());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -12,15 +12,14 @@ class Handler extends ExceptionHandler
|
||||||
/**
|
/**
|
||||||
* A list of the exception types that are not reported.
|
* A list of the exception types that are not reported.
|
||||||
*
|
*
|
||||||
* @var string[]
|
* @var array<int, class-string<Throwable>>
|
||||||
*/
|
*/
|
||||||
protected $dontReport = [
|
protected $dontReport = [];
|
||||||
];
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A list of the inputs that are never flashed for validation exceptions.
|
* A list of the inputs that are never flashed for validation exceptions.
|
||||||
*
|
*
|
||||||
* @var string[]
|
* @var array<int, string>
|
||||||
*/
|
*/
|
||||||
protected $dontFlash = [
|
protected $dontFlash = [
|
||||||
'password',
|
'password',
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Exceptions;
|
||||||
|
|
||||||
|
use Exception;
|
||||||
|
|
||||||
|
class MemberNotInNamiException extends Exception
|
||||||
|
{
|
||||||
|
//
|
||||||
|
}
|
10
app/Fee.php
10
app/Fee.php
|
@ -2,18 +2,28 @@
|
||||||
|
|
||||||
namespace App;
|
namespace App;
|
||||||
|
|
||||||
|
use App\Nami\HasNamiField;
|
||||||
use App\Payment\Subscription;
|
use App\Payment\Subscription;
|
||||||
|
use Database\Factories\FeeFactory;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||||
|
|
||||||
class Fee extends Model
|
class Fee extends Model
|
||||||
{
|
{
|
||||||
|
/** @use HasFactory<FeeFactory> */
|
||||||
use HasFactory;
|
use HasFactory;
|
||||||
|
use HasNamiField;
|
||||||
|
|
||||||
|
/** @var array<int, string> */
|
||||||
public $fillable = ['name', 'nami_id'];
|
public $fillable = ['name', 'nami_id'];
|
||||||
|
|
||||||
|
/** @var bool */
|
||||||
public $timestamps = false;
|
public $timestamps = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return HasMany<Subscription>
|
||||||
|
*/
|
||||||
public function subscriptions(): HasMany
|
public function subscriptions(): HasMany
|
||||||
{
|
{
|
||||||
return $this->hasMany(Subscription::class);
|
return $this->hasMany(Subscription::class);
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Fileshare\Actions;
|
||||||
|
|
||||||
|
use App\Fileshare\Models\Fileshare;
|
||||||
|
use App\Fileshare\Resources\FileshareResource;
|
||||||
|
use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
|
||||||
|
class FileshareApiIndexAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
|
||||||
|
public function handle(): AnonymousResourceCollection
|
||||||
|
{
|
||||||
|
session()->put('menu', 'setting');
|
||||||
|
session()->put('title', 'Datei-Verbindungen');
|
||||||
|
|
||||||
|
return FileshareResource::collection(Fileshare::paginate(15));
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,42 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Fileshare\Actions;
|
||||||
|
|
||||||
|
use App\Fileshare\Models\Fileshare;
|
||||||
|
use App\Lib\Events\Succeeded;
|
||||||
|
use Illuminate\Validation\ValidationException;
|
||||||
|
use Lorisleiva\Actions\ActionRequest;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
|
||||||
|
class FileshareStoreAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, mixed>
|
||||||
|
*/
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'name' => 'required|string|max:255',
|
||||||
|
'type' => 'required|string|max:255|exclude',
|
||||||
|
'config' => 'array|exclude',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function asController(ActionRequest $request): void
|
||||||
|
{
|
||||||
|
$type = $request->input('type')::from($request->input('config'));
|
||||||
|
|
||||||
|
if (!$type->check()) {
|
||||||
|
throw ValidationException::withMessages(['type' => 'Verbindung fehlgeschlagen']);
|
||||||
|
}
|
||||||
|
|
||||||
|
Fileshare::create([
|
||||||
|
...$request->validated(),
|
||||||
|
'type' => $type,
|
||||||
|
]);
|
||||||
|
|
||||||
|
Succeeded::message('Verbindung erstellt.')->dispatch();
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,42 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Fileshare\Actions;
|
||||||
|
|
||||||
|
use App\Fileshare\Models\Fileshare;
|
||||||
|
use App\Lib\Events\Succeeded;
|
||||||
|
use Illuminate\Validation\ValidationException;
|
||||||
|
use Lorisleiva\Actions\ActionRequest;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
|
||||||
|
class FileshareUpdateAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, mixed>
|
||||||
|
*/
|
||||||
|
public function rules(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'name' => 'required|string|max:255',
|
||||||
|
'type' => 'required|string|max:255|exclude',
|
||||||
|
'config' => 'array|exclude',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function handle(ActionRequest $request, Fileshare $fileshare): void
|
||||||
|
{
|
||||||
|
$type = $request->input('type')::from($request->input('config'));
|
||||||
|
|
||||||
|
if (!$type->check()) {
|
||||||
|
throw ValidationException::withMessages(['type' => 'Verbindung fehlgeschlagen']);
|
||||||
|
}
|
||||||
|
|
||||||
|
$fileshare->update([
|
||||||
|
...$request->validated(),
|
||||||
|
'type' => $type,
|
||||||
|
]);
|
||||||
|
|
||||||
|
Succeeded::message('Verbindung bearbeitet.')->dispatch();
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,22 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Fileshare\Actions;
|
||||||
|
|
||||||
|
use App\Fileshare\Data\ResourceData;
|
||||||
|
use App\Fileshare\Models\Fileshare;
|
||||||
|
use Lorisleiva\Actions\ActionRequest;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
use Spatie\LaravelData\DataCollection;
|
||||||
|
|
||||||
|
class ListFilesAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return DataCollection<int, ResourceData>
|
||||||
|
*/
|
||||||
|
public function handle(ActionRequest $request, Fileshare $fileshare): DataCollection
|
||||||
|
{
|
||||||
|
return ResourceData::collect($fileshare->type->getSubDirectories($request->input('parent')), DataCollection::class)->wrap('data');
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,57 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Fileshare\ConnectionTypes;
|
||||||
|
|
||||||
|
use Illuminate\Filesystem\FilesystemAdapter;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
use Spatie\LaravelData\Data;
|
||||||
|
|
||||||
|
abstract class ConnectionType extends Data
|
||||||
|
{
|
||||||
|
abstract public function check(): bool;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, mixed>
|
||||||
|
*/
|
||||||
|
abstract public static function defaults(): array;
|
||||||
|
|
||||||
|
abstract public static function title(): string;
|
||||||
|
|
||||||
|
abstract public function getFilesystem(): FilesystemAdapter;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<int, array{label: string, key: string, type: string}>
|
||||||
|
*/
|
||||||
|
abstract public static function fields(): array;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<int, mixed>
|
||||||
|
*/
|
||||||
|
public static function forSelect(): array
|
||||||
|
{
|
||||||
|
return self::types()
|
||||||
|
->map(fn ($file) => ['id' => $file, 'name' => $file::title(), 'defaults' => $file::defaults(), 'fields' => $file::fields()])
|
||||||
|
->toArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<int, string>
|
||||||
|
*/
|
||||||
|
public function getSubDirectories(?string $parent): array
|
||||||
|
{
|
||||||
|
$filesystem = $this->getFilesystem();
|
||||||
|
|
||||||
|
return $filesystem->directories($parent ?: '/');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Collection<int, class-string<ConnectionType>>
|
||||||
|
*/
|
||||||
|
private static function types(): Collection
|
||||||
|
{
|
||||||
|
return collect(glob(base_path('app/Fileshare/ConnectionTypes/*')))
|
||||||
|
->map(fn ($file) => 'App\\Fileshare\\ConnectionTypes\\' . pathinfo($file, PATHINFO_FILENAME))
|
||||||
|
->filter(fn ($file) => $file !== static::class)
|
||||||
|
->values();
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,44 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Fileshare\ConnectionTypes;
|
||||||
|
|
||||||
|
use Illuminate\Filesystem\FilesystemAdapter;
|
||||||
|
use Illuminate\Http\Client\ConnectionException;
|
||||||
|
use Illuminate\Support\Facades\Http;
|
||||||
|
use League\Flysystem\Filesystem;
|
||||||
|
use League\Flysystem\WebDAV\WebDAVAdapter;
|
||||||
|
use Sabre\DAV\Client;
|
||||||
|
|
||||||
|
class NextcloudConnection extends OwncloudConnection
|
||||||
|
{
|
||||||
|
|
||||||
|
public function check(): bool
|
||||||
|
{
|
||||||
|
try {
|
||||||
|
$response = Http::withoutVerifying()
|
||||||
|
->withBasicAuth($this->user, $this->password)
|
||||||
|
->withHeaders(['OCS-APIRequest' => 'true'])
|
||||||
|
->acceptJson()
|
||||||
|
->get($this->baseUrl . '/ocs/v2.php/cloud/capabilities');
|
||||||
|
return $response->ok();
|
||||||
|
} catch (ConnectionException $e) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function title(): string
|
||||||
|
{
|
||||||
|
return 'Nextcloud';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getFilesystem(): FilesystemAdapter
|
||||||
|
{
|
||||||
|
$adapter = new WebDAVAdapter(new Client([
|
||||||
|
'baseUri' => $this->baseUrl . '/remote.php/dav/files/' . $this->user,
|
||||||
|
'userName' => $this->user,
|
||||||
|
'password' => $this->password,
|
||||||
|
]), '/remote.php/dav/files/' . $this->user);
|
||||||
|
|
||||||
|
return new FilesystemAdapter(new Filesystem($adapter), $adapter);
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,76 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Fileshare\ConnectionTypes;
|
||||||
|
|
||||||
|
use Illuminate\Filesystem\FilesystemAdapter;
|
||||||
|
use Illuminate\Http\Client\ConnectionException;
|
||||||
|
use Illuminate\Support\Facades\Http;
|
||||||
|
use League\Flysystem\Filesystem;
|
||||||
|
use League\Flysystem\WebDAV\WebDAVAdapter;
|
||||||
|
use Sabre\DAV\Client;
|
||||||
|
use Spatie\LaravelData\Attributes\MapInputName;
|
||||||
|
use Spatie\LaravelData\Attributes\MapOutputName;
|
||||||
|
use Spatie\LaravelData\Mappers\SnakeCaseMapper;
|
||||||
|
|
||||||
|
#[MapInputName(SnakeCaseMapper::class)]
|
||||||
|
#[MapOutputName(SnakeCaseMapper::class)]
|
||||||
|
class OwncloudConnection extends ConnectionType
|
||||||
|
{
|
||||||
|
|
||||||
|
public function __construct(
|
||||||
|
public string $user,
|
||||||
|
public string $password,
|
||||||
|
public string $baseUrl,
|
||||||
|
) {
|
||||||
|
}
|
||||||
|
|
||||||
|
public function check(): bool
|
||||||
|
{
|
||||||
|
try {
|
||||||
|
$response = Http::withoutVerifying()->withBasicAuth($this->user, $this->password)->acceptJson()->get($this->baseUrl . '/ocs/v1.php/cloud/capabilities?format=json');
|
||||||
|
return $response->ok();
|
||||||
|
} catch (ConnectionException $e) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @inheritdoc
|
||||||
|
*/
|
||||||
|
public static function defaults(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'user' => '',
|
||||||
|
'password' => '',
|
||||||
|
'base_url' => '',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function title(): string
|
||||||
|
{
|
||||||
|
return 'Owncloud';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @inheritdoc
|
||||||
|
*/
|
||||||
|
public static function fields(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
['label' => 'URL', 'key' => 'base_url', 'type' => 'text'],
|
||||||
|
['label' => 'Benutzer', 'key' => 'user', 'type' => 'text'],
|
||||||
|
['label' => 'Passwort', 'key' => 'password', 'type' => 'password'],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getFilesystem(): FilesystemAdapter
|
||||||
|
{
|
||||||
|
$adapter = new WebDAVAdapter(new Client([
|
||||||
|
'baseUri' => $this->baseUrl . '/remote.php/dav/files/' . $this->user,
|
||||||
|
'userName' => $this->user,
|
||||||
|
'password' => $this->password,
|
||||||
|
]), '/remote.php/dav/files/' . $this->user);
|
||||||
|
|
||||||
|
return new FilesystemAdapter(new Filesystem($adapter), $adapter);
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,30 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Fileshare\Data;
|
||||||
|
|
||||||
|
use App\Fileshare\Models\Fileshare;
|
||||||
|
use Illuminate\Filesystem\FilesystemAdapter;
|
||||||
|
use Spatie\LaravelData\Attributes\MapInputName;
|
||||||
|
use Spatie\LaravelData\Attributes\MapOutputName;
|
||||||
|
use Spatie\LaravelData\Data;
|
||||||
|
use Spatie\LaravelData\Mappers\SnakeCaseMapper;
|
||||||
|
|
||||||
|
#[MapInputName(SnakeCaseMapper::class)]
|
||||||
|
#[MapOutputName(SnakeCaseMapper::class)]
|
||||||
|
class FileshareResourceData extends Data
|
||||||
|
{
|
||||||
|
|
||||||
|
public function __construct(public int $connectionId, public string $resource)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getConnection(): Fileshare
|
||||||
|
{
|
||||||
|
return Fileshare::find($this->connectionId);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getStorage(): FilesystemAdapter
|
||||||
|
{
|
||||||
|
return $this->getConnection()->type->getFilesystem();
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,24 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Fileshare\Data;
|
||||||
|
|
||||||
|
use Spatie\LaravelData\Data;
|
||||||
|
|
||||||
|
class ResourceData extends Data
|
||||||
|
{
|
||||||
|
|
||||||
|
public function __construct(public string $name, public string $path, public string $parent)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function fromString(string $path): self
|
||||||
|
{
|
||||||
|
$dir = '/' . trim($path, '\\/');
|
||||||
|
|
||||||
|
return self::from([
|
||||||
|
'path' => $dir,
|
||||||
|
'name' => pathinfo($dir, PATHINFO_BASENAME),
|
||||||
|
'parent' => pathinfo($dir, PATHINFO_DIRNAME),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,30 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Fileshare;
|
||||||
|
|
||||||
|
use App\Fileshare\Models\Fileshare;
|
||||||
|
use App\Fileshare\Resources\FileshareResource;
|
||||||
|
use App\Setting\LocalSettings;
|
||||||
|
|
||||||
|
class FileshareSettings extends LocalSettings
|
||||||
|
{
|
||||||
|
public static function group(): string
|
||||||
|
{
|
||||||
|
return 'fileshare';
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function title(): string
|
||||||
|
{
|
||||||
|
return 'Datei-Verbindungen';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @inheritdoc
|
||||||
|
*/
|
||||||
|
public function viewData(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'data' => FileshareResource::collection(Fileshare::paginate(15))
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,20 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Fileshare\Models;
|
||||||
|
|
||||||
|
use App\Fileshare\ConnectionTypes\ConnectionType;
|
||||||
|
use Database\Factories\Fileshare\Models\FileshareFactory;
|
||||||
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
|
class Fileshare extends Model
|
||||||
|
{
|
||||||
|
/** @use HasFactory<FileshareFactory> */
|
||||||
|
use HasFactory;
|
||||||
|
|
||||||
|
public $guarded = [];
|
||||||
|
|
||||||
|
public $casts = [
|
||||||
|
'type' => ConnectionType::class,
|
||||||
|
];
|
||||||
|
}
|
|
@ -0,0 +1,56 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Fileshare\Resources;
|
||||||
|
|
||||||
|
use App\Fileshare\ConnectionTypes\ConnectionType;
|
||||||
|
use App\Fileshare\Models\Fileshare;
|
||||||
|
use App\Lib\HasMeta;
|
||||||
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @mixin Fileshare
|
||||||
|
*/
|
||||||
|
class FileshareResource extends JsonResource
|
||||||
|
{
|
||||||
|
|
||||||
|
use HasMeta;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Transform the resource into an array.
|
||||||
|
*
|
||||||
|
* @param \Illuminate\Http\Request $request
|
||||||
|
* @return array<string, mixed>
|
||||||
|
*/
|
||||||
|
public function toArray($request)
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'name' => $this->name,
|
||||||
|
'is_active' => $this->type->check(),
|
||||||
|
'type' => get_class($this->type),
|
||||||
|
'config' => $this->type->toArray(),
|
||||||
|
'id' => $this->id,
|
||||||
|
'type_human' => $this->type::title(),
|
||||||
|
'links' => [
|
||||||
|
'update' => route('fileshare.update', ['fileshare' => $this->getModel()]),
|
||||||
|
]
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return array<string, mixed>
|
||||||
|
*/
|
||||||
|
public static function meta(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'default' => [
|
||||||
|
'name' => '',
|
||||||
|
'type' => null,
|
||||||
|
'config' => null,
|
||||||
|
],
|
||||||
|
'types' => ConnectionType::forSelect(),
|
||||||
|
'links' => [
|
||||||
|
'store' => route('fileshare.store'),
|
||||||
|
]
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,17 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Form\Actions;
|
||||||
|
|
||||||
|
use App\Form\FormSettings;
|
||||||
|
use Illuminate\Support\Facades\Http;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
|
||||||
|
class ClearFrontendCacheAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
|
||||||
|
public function handle(): void
|
||||||
|
{
|
||||||
|
Http::get(app(FormSettings::class)->clearCacheUrl);
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,71 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Form\Actions;
|
||||||
|
|
||||||
|
use App\Form\Models\Form;
|
||||||
|
use App\Form\Models\Participant;
|
||||||
|
use Illuminate\Database\Eloquent\Collection;
|
||||||
|
use Lorisleiva\Actions\Concerns\AsAction;
|
||||||
|
use Zoomyboy\TableDocument\SheetData;
|
||||||
|
use Zoomyboy\TableDocument\TableDocumentData;
|
||||||
|
|
||||||
|
class CreateExcelDocumentAction
|
||||||
|
{
|
||||||
|
use AsAction;
|
||||||
|
|
||||||
|
public Form $form;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param Collection<int, Participant> $participants
|
||||||
|
*/
|
||||||
|
public function handle(Form $form, Collection $participants): string
|
||||||
|
{
|
||||||
|
$this->form = $form;
|
||||||
|
|
||||||
|
return file_get_contents($this->allSheet($participants)->compile($this->tempPath()));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param Collection<int, Participant> $participants
|
||||||
|
*/
|
||||||
|
private function allSheet(Collection $participants): TableDocumentData
|
||||||
|
{
|
||||||
|
$document = TableDocumentData::from(['title' => 'Anmeldungen für ' . $this->form->name, 'sheets' => []]);
|
||||||
|
$headers = $this->form->getFields()->map(fn ($field) => $field->name)->toArray();
|
||||||
|
|
||||||
|
$document->addSheet(SheetData::from([
|
||||||
|
'header' => $headers,
|
||||||
|
'data' => $participants
|
||||||
|
->map(fn ($participant) => $this->form->getFields()->map(fn ($field) => $participant->getFields()->find($field)->presentRaw())->toArray())
|
||||||
|
->toArray(),
|
||||||
|
'name' => 'Alle',
|
||||||
|
]));
|
||||||
|
|
||||||
|
if ($this->form->export->groupBy) {
|
||||||
|
$groups = $participants->groupBy(fn ($participant) => $participant->getFields()->findByKey($this->form->export->groupBy)->presentRaw());
|
||||||
|
|
||||||
|
foreach ($groups as $name => $participants) {
|
||||||
|
$document->addSheet(SheetData::from([
|
||||||
|
'header' => $headers,
|
||||||
|
'data' => $participants
|
||||||
|
->map(fn ($participant) => $this->form->getFields()->map(fn ($field) => $participant->getFields()->find($field)->presentRaw())->toArray())
|
||||||
|
->toArray(),
|
||||||
|
'name' => $name,
|
||||||
|
]));
|
||||||
|
}
|
||||||
|
|
||||||
|
$document->addSheet(SheetData::from([
|
||||||
|
'header' => ['Wert', 'Anzahl'],
|
||||||
|
'data' => $groups->map(fn ($participants, $name) => [$name, (string) count($participants)])->toArray(),
|
||||||
|
'name' => 'Statistik',
|
||||||
|
]));
|
||||||
|
}
|
||||||
|
|
||||||
|
return $document;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function tempPath(): string
|
||||||
|
{
|
||||||
|
return sys_get_temp_dir() . '/' . str()->uuid()->toString();
|
||||||
|
}
|
||||||
|
}
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue