WMDE
/
foerderbarometer
forked from beba/foerderbarometer
2
1
Fork 0
Code Pull Requests Releases Activity
498 Commits 3 Branches 1 Tag 1.8 MiB
Commit Graph

390 Commits

Author SHA1 Message Date
Roman 0db5cb7fd9 Add 'Antrag (URL)' request_url field to service models via RequestUrlMixin 2025-09-30 15:44:03 +02:00
Oliver Zander 38f6deee51 Merge branch 'feature/replace-radios-with-links' into 'cosmocode' 
refactor(forms): Split Views and Template Restructure

See merge request wikimedia/foerderbarometer!5
 2025-09-29 16:31:43 +02:00
Oliver Zander aa5c981872 Merge branch 'feature/terms-consent' into 'cosmocode' 
Store user agreement to terms

See merge request wikimedia/foerderbarometer!4
 2025-09-29 16:31:06 +02:00
Roman cda7d7a79d Switch to single quotes across models.py for consistent string formatting 2025-09-29 00:51:13 +02:00
Roman c9959988cb Fix: use Django URL tag for project funding link instead of hardcoded path 2025-09-29 00:40:20 +02:00
Roman 46240fedc1 Add public route, view, and navigation link for project funding requests under 1000 EUR 2025-09-29 00:33:42 +02:00
Roman 98f8414576 Add migrations for ProjectRequest and ProjectsDeclined models with updated options and field constraints 2025-09-29 00:32:09 +02:00
Roman cc55b17cff Add service layer for approving and declining ProjectRequest with transactional logic 2025-09-29 00:27:09 +02:00
Roman 14717c8318 Add admin integration for ProjectRequest with approve/decline actions and custom ApproveActionForm 2025-09-29 00:25:16 +02:00
Roman 4e6906e318 Add ProjectRequestForm and ProjectRequestAdminForm with JSON-backed multi-selects and help texts 2025-09-29 00:22:47 +02:00
Roman 011e262df6 Add ProjectRequest and ProjectsDeclined models for project funding under 1000 EUR 2025-09-29 00:18:40 +02:00
Roman a239922e14 use walrus operator for user session check 2025-09-01 13:33:17 +02:00
Roman 238c674517 change all string literals to single quotes 2025-09-01 13:24:59 +02:00
Roman 6585eeaf78 replace regex assertion and remove status code check in test_extern_lit 2025-09-01 12:04:52 +02:00
Roman ed2db04309 add negative test for Literature form submission without terms_accepted 2025-09-01 01:45:50 +02:00
Roman 8ba54bdca9 add CSS styles for form layout 2025-08-31 23:55:50 +02:00
Roman a2ec4071b4 restructure templates: introduce base with header/footer, replace old extern template, add generic form layout, and update info page 2025-08-31 23:47:27 +02:00
Roman 35ae9ab0e5 update URL routing to use new class-based application views and static extern page 2025-08-31 23:43:29 +02:00
Roman 7cfd477d40 refactor ExternView into separate class-based views with BaseApplicationView 2025-08-31 23:41:11 +02:00
Roman 98d1ae9284 refactor(forms): unify forms with BaseApplicationForm and CommonOrderMixin for consistent fields and order 2025-08-31 23:38:22 +02:00
Roman eea08e6075 Merge branch 'cosmocode' into feature/replace-radios-with-links 2025-08-27 17:53:54 +02:00
Roman Fen 1159cd3394 moved inline styles to base.css and button.css and adjusted button styles 2025-08-27 12:18:58 +02:00
Roman 8d57909a17 Add static info page for project funding ≥ 1,000 € 2025-08-27 11:58:40 +02:00
Roman 0d033e7e25 Refactor CheckForm to use model field 'terms_accepted' instead of separate 'check' field 2025-08-26 22:48:13 +02:00
Roman e10ec7e691 Add migration 0099: add terms_accepted field to BusinessCard, Email, List, and Literature 2025-08-26 15:39:43 +02:00
Roman c187bf2e9e Add custom save() in CheckForm to map 'check' field to model's 'terms_accepted' 2025-08-26 15:37:33 +02:00
Roman 9ef2af0a2f add terms_accepted to admin list display for BusinessCard, Literature, Email and List 2025-08-26 13:53:39 +02:00
Roman 7816ac4237 add terms_accepted field to Email, List, Literature and BusinessCard via mixin 2025-08-26 12:54:29 +02:00
Oliver Zander 94882d9039 fixed literature test 2025-08-21 10:47:17 +02:00
Oliver Zander 2973741696 added tests for internal views 2025-08-21 10:43:38 +02:00
Oliver Zander 860205cac9 skip finance id test 2025-08-21 10:11:59 +02:00
Oliver Zander 257b10310d readded test module file 2025-08-21 10:10:17 +02:00
Oliver Zander 656cfe8cc9 renamed model test file accordingly 2025-08-21 10:09:15 +02:00
Oliver Zander dff9ef858d added whitespace 2025-08-21 10:08:38 +02:00
Oliver Zander c329c84661 clean up tests 2025-08-21 10:08:24 +02:00
Oliver Zander 7698eb0648 removed intern view 2025-08-21 10:02:19 +02:00
Oliver Zander fa84fc6bd0 use a table form renderer 2025-08-20 14:28:52 +02:00
Oliver Zander 6dc1b22eb8 separate library, e-literature and software by using proxy models 2025-08-20 12:06:43 +02:00
Oliver Zander df8a9708ea set explicit library type choices 2025-08-20 11:19:05 +02:00
Oliver Zander b3c181bacc added missing migration for real- & username fields 2025-08-20 11:17:20 +02:00
Oliver Zander f5134e491f prettify type choices 2025-08-20 11:02:31 +02:00
Oliver Zander 8259be4e7d removed duplicate admin path 2025-08-19 16:11:34 +02:00
Oliver Zander ee672a4f2f replaced format_html with mark_safe where no formatting is applied 2025-08-19 16:08:48 +02:00
Oliver Zander 147398f3f4 simplified code 2025-08-19 16:02:57 +02:00
Oliver Zander b88c024645 toggle intern view and tests by setting 2025-08-19 16:02:18 +02:00
Oliver Zander 56a5d5b103 added tests for sendmails command 2025-08-19 16:00:57 +02:00
Oliver Zander febebec67c added more tests for extern view 2025-08-19 14:52:18 +02:00
Oliver Zander 4370292c55 fixed read only fields of travel admin 2025-08-19 14:10:36 +02:00
Oliver Zander 452fda2cb5 auto formatting: removed whitespace 2025-08-19 14:10:15 +02:00
Oliver Zander 5f0394afb5 merged settings & use .env files to configure differences 2025-08-19 09:45:14 +02:00
Oliver Zander bbfaddcc4a added basic tests for extern view 2025-08-18 16:42:09 +02:00
Oliver Zander 45bbe23560 conditionally set username so it can work local and in tests 2025-08-18 16:33:04 +02:00
Oliver Zander 2ae9a37083 auto formatting: removed whitespace 2025-08-18 16:32:31 +02:00
Oliver Zander 6c1c13cba8 moved tests 2025-08-18 12:55:24 +02:00
Oliver Zander 39cd2af768 fixed test 2025-08-18 12:54:14 +02:00
Oliver Zander b55b9aada0 fixed and improved quarter calculation 2025-08-18 12:53:40 +02:00
Oliver Zander bf7e1131db auto formatting: removed whitespace 2025-08-18 12:11:44 +02:00
Tobias Herre 4aeb330fa4 Neue Nutzungsbedingungen verlinkt 2025-06-16 09:43:08 +00:00
Tobias Herre c691bc8c80 Inserted otrs-link-fixing to honorary forms 2025-02-27 09:15:25 +00:00
Tobias Herre 7930d7af40 otrs_link.js fixes *all* links on a page. for travel and project forms. 2025-02-26 12:13:46 +00:00
Tobias Herre fc2b748664 Fix otrs links correctly 2025-02-19 12:59:42 +00:00
Tobias Herre 2a77188887 Fixes wrong project counter when saving with modyfied start year. PID 
is also constant now.
 2025-02-18 14:34:05 +00:00
Tobias Herre 4e3d915e90 Fixes for gdb with OATH 2024-01-08 13:31:18 +00:00
alpcentaur 6b41d3320b added html and css for the landing page, almost done 2024-01-07 17:42:07 +00:00
alpcentaur a5834ee8c9 implemented the logic for having a landingpage with a button poining to oauth login for extern view, while leaving /admin with passwort login 2024-01-07 14:13:21 +00:00
alpcentaur a51552d4dd prettifying the otrs links as wished through a javascript function onload, in /static/dropdown/js/otrs_link.js 2023-12-30 19:01:06 +00:00
alpcentaur 1454fce9ba corrected small error regarding pid financeid bug fix, started javascript manipulation to get browsers to not translate url to url encoded characters for otrs link bug fix 2023-12-30 17:46:15 +00:00
alpcentaur 7c05040d7b created if cases for changing of year for projects that were already there, but already have a project_of_year number 2023-12-27 15:48:11 +00:00
alpcentaur f60623d485 user gets automatically written, not in the form anymore 2023-10-25 15:50:40 +00:00
alpcentaur d0fb14bf17 whitelisted admin url for oauth 2023-10-25 13:45:17 +00:00
alpcentaur 777d05c26c basic oauth added 2023-10-25 09:47:56 +00:00
alpcentaur 9537aaf667 removed wrongly generated logfile within input folder 2023-02-27 17:09:29 +00:00
alpcentaur fc0414a286 bugfixFDB completed 2023-02-27 17:09:29 +00:00
alpcentaur 440df28b0e last version, talked to admin today 2023-02-27 17:09:29 +00:00
alpcentaur 5c35948859 trying with different username 2023-02-27 17:09:29 +00:00
alpcentaur ebdc3be903 changed mail_state, implemented live, changed mail sender 2023-02-27 17:09:29 +00:00
alpcentaur cf784a05f1 search fields for travel and honorary are using foreign keys now, with the notation of double underscores 2023-02-27 17:09:29 +00:00
alpcentaur e32cc87f63 honorary certificate model now has autocomplete field foreign key project too 2023-02-27 17:09:29 +00:00
alpcentaur c29b410ec5 changed order of fields in admin panel of model project 2023-02-27 17:09:29 +00:00
alpcentaur 0b7b161383 deleted variable persons in admin model project 2023-02-27 17:09:29 +00:00
alpcentaur b8cdaa1bf7 send end mails var in admin.model.project changed to boolean check field, also true is false now, so changed logic in sendmails.py 2023-02-27 17:09:29 +00:00
alpcentaur 9200459028 admin model travel has now datefields instead of datetimefields for checkin and checkout 2023-02-27 17:09:29 +00:00
alpcentaur 29cdd7b653 now the | in datefield is also hidden via css 2023-02-27 17:09:29 +00:00
alpcentaur 914989d6ac literature self_buy_giveData variable is now required in extern view 2023-02-27 17:09:29 +00:00
alpcentaur 6d3888172f model travel is now based on extern instead of intern, service id is displayed and a readonly field 2023-02-27 17:09:29 +00:00
alpcentaur 08dd961cbe all service ids are readonly fields now 2023-02-27 17:09:29 +00:00
alpcentaur 5402733a9c added search bar to foreign key choice field project in model travel 2023-02-27 17:09:29 +00:00
alpcentaur 5b91d335de hotel in forms.py is now radioselect choicefield and required 2023-02-27 17:09:29 +00:00
alpcentaur 94f82d5733 fixed literature selfbuy variables in admin view 2023-02-27 17:09:29 +00:00
alpcentaur 1d9811b0ff custom css is now only applied to travel form, not to all forms 2023-02-27 17:09:29 +00:00
alpcentaur 0b450feac9 changed logic of generation of finId and pId, solved Travelform error, hotel variable travelmodel is not required anymore 2023-02-27 17:09:29 +00:00
alpcentaur a064b78958 hidden for all 'today' shortcuts in datetimefields via css 2023-02-27 17:09:29 +00:00
alpcentaur e638afabd5 added adult multiple choice radio button by changing admin.py and forms.py 2023-02-27 17:09:29 +00:00
alpcentaur 402a6f047c travel und project models now have date hierarchy based on project end 2023-02-27 17:09:29 +00:00
alpcentaur b451cbbb16 added a presave signal for travel model to update own field with foreign key project field 2023-02-27 17:09:29 +00:00
alpcentaur 37e629de70 rewrote the javascript part 2023-02-27 17:09:29 +00:00
alpcentaur 73ad8f90cf changed languages default to german, translated last labels (verbosename) for variables 2023-02-27 17:09:29 +00:00
alpcentaur 26a1c9a500 added link to Reisekosten in label choices in extern.html view 2023-02-27 17:09:29 +00:00
alpcentaur 76d68531f9 sort of label choices on extern.html view alphabetically, change of text when form was sent to communitys und engagement instead of Ideenfoerderung 2023-02-27 17:09:29 +00:00
alpcentaur 997c45d1ee changed the data protection link in html mails 2023-02-27 17:09:29 +00:00