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

410 Commits

Author SHA1 Message Date
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
alpcentaur bdd6d25b70 admin search bar working now for all models, gave a 500 error because of wrong syntax in admin.py - searchfields 2023-02-27 17:09:29 +00:00
alpcentaur a117b484d9 html format geändert 2023-02-27 17:09:29 +00:00
alpcentaur d9db5238ea added mail_state to all objects, added filters regarding sendmail.py 2023-02-27 17:09:29 +00:00
alpcentaur 1050308712 conditional hiding of address textfield in literature form added 2023-02-27 17:09:29 +00:00
alpcentaur e9de3fcb99 changing saved value in database selfbuy_give_data to false when selfbuy true also in internview done() 2023-02-27 17:09:29 +00:00
alpcentaur 2254b77a0d changed fields in Travel to required, changed saving of value of selfbuy_give_data when person wants to selfbuy to false 2023-02-27 17:09:29 +00:00
alpcentaur 34857ccf03 changed sending of last mails in sendmails.py and in views.py 2023-02-27 17:09:29 +00:00
alpcentaur 1ed10b2b8c sendmails is sending html regarding the informing of the organisator when not happened 2023-02-27 17:09:29 +00:00
alpcentaur 5eb2ee2b9d created html versions of all mail templates 2023-02-27 17:09:29 +00:00
alpcentaur 980ee45066 added intern_notes variable to all dbs, not excluded in extern view for all 2023-02-27 17:09:29 +00:00
alpcentaur f58ac52109 added date hierarchy and overview in admin panel to all other forms in admin.py, also created variable intern_notes 2023-02-27 17:09:29 +00:00
alpcentaur a8d8f6fdd6 made mail.adult a required field 2023-02-27 17:09:29 +00:00
alpcentaur 0d72a4b7c0 intern url commented out in urls.py 2023-02-27 17:09:29 +00:00
alpcentaur 960ec8841c added the automated mail with the possibility to grant travel costs by link in email 2023-02-27 17:09:29 +00:00
alpcentaur 95774952e2 if not happened mail is now in html format, if not html then txt 2023-02-27 17:09:29 +00:00
alpcentaur 9bc852a23e buttons in input form displaying 'Weiter', if last step then displaying 'Absenden' 2023-02-27 17:09:29 +00:00
alpcentaur 95e9bdd5a8 added two sendmails functions, that are executed when admins change status of ended project 2023-02-27 17:09:29 +00:00
alpcentaur b5b0dc61e4 added templates for changed sendmail.txt 2023-02-27 17:09:29 +00:00
alpcentaur cb6710e758 Anfang code der Funktion end of proj approved in sendmails.py 2023-02-27 17:09:28 +00:00
alpcentaur 2f4ee1ee13 added dropdown agreement to send my data for buying literature for me 2023-02-27 17:09:28 +00:00
alpcentaur 9d0f8fd477 pic_of_url hidden in all views 2023-02-27 17:09:28 +00:00
alpcentaur 418fef477a added boolean field send_data_to_print with html formatted link to businesscard 2023-02-27 17:09:28 +00:00
alpcentaur 28e1570bee notes field is now bigger, changed to Textfield analog. new entry url_of_pic, migrated, javascript to hide in businesscard if nopic is choice 2023-02-27 17:09:28 +00:00
alpcentaur f6ae9e640e added NOT choice, 'nicht stattgefunden', to project status button 2023-02-27 17:09:28 +00:00
alpcentaur 94d8d7a50b dates in tabulatures, based on django style with almost no new code. only applied to projects change list page 2023-02-27 17:09:28 +00:00
alpcentaur 14de26de70 full search and display fields for Projects, Services also added fields 2023-02-27 17:09:28 +00:00
alpcentaur b403ef1cdd added search field in admin panel model Projects, added displayed fields almost like wanted 2023-02-27 17:09:28 +00:00
alpcentaur 4ba8ad0e6c Datenschutzbestimmungen und Förderrichtlinien öffnen nun auch in neuem Tab 2023-02-27 17:09:28 +00:00
corsaronero 018d6bbc1b links in choice field opening new tab now 2022-11-01 10:30:30 +00:00
Benni Bärmann 5286b54441 impressum added 2021-12-15 15:27:07 +01:00
Benni Bärmann 9fae639677 Ideenfoerderung -> Communitys und Engagement 2021-11-08 15:46:20 +01:00
Benni Bärmann b228285344 just removed some debug prints 2021-11-08 14:31:10 +01:00
Benni Bärmann 8faf072aa9 removed broken test 2021-11-08 14:28:19 +01:00
Benni Bärmann 335744cea3 BUGFIX: project.start should be required because we need it to 
calculate year of project
 2021-11-03 13:47:39 +01:00
Benni Bärmann 1b045fb77d fixture added to fix deployment problem with key constraints 2021-11-03 13:43:40 +01:00
Benni Bärmann d915f327dc db_constraint = False to solve deployment problem? 2021-11-01 15:21:25 +01:00
Benni Bärmann fb25c3f641 broken test deaktivated 2021-11-01 15:01:31 +01:00
Benni Bärmann 2bf0ff1504 step two for test_bib added, but not working 2021-10-11 15:50:16 +02:00
Benni Bärmann 0da3b2a4b5 added first step for test_bib 2021-10-11 13:04:28 +02:00
Benni Bärmann fd46dd2f5a some documentation for clarification added 2021-10-07 10:29:04 +02:00
Benni Bärmann 4e4edc390c new test for extern grant literature. removed args/kwargs from save 
here too
 2021-10-06 16:15:58 +02:00
Benni Bärmann 0c863bce22 stripped html-tags from emails 2021-10-05 11:49:57 +02:00
Benni Bärmann 49a0fa63ac added test for pid. bugfix for pid 2021-10-05 10:13:19 +02:00
Benni Bärmann 35bbd4b8a7 new autogenerated fields shown in admin but not in form 2021-10-04 15:45:51 +02:00
Benni Bärmann e28aca4313 finance_id now working 2021-10-04 14:49:18 +02:00
Benni Bärmann 466ce45e13 new test for finance_id added. failes as expected 2021-10-04 14:35:03 +02:00
Benni Bärmann 99a70229a1 refined project of year test 2021-10-04 14:32:09 +02:00
Benni Bärmann ea3072e559 project_of_year ist working now 2021-10-04 14:14:01 +02:00
Benni Bärmann bef1f6d5ae projects_of_year test expanded, fails now (as expected) 2021-10-04 12:57:13 +02:00
Benni Bärmann 86d08db262 new field project_of_year 2021-10-04 12:39:09 +02:00
Benni Bärmann 6fdd04306f new field finance_id 2021-10-04 10:43:50 +02:00
Benni Bärmann e4c8967a07 pid test working (and failing - as it should) 2021-09-30 15:29:50 +02:00
Benni Bärmann 79dc33e125 test working, but still problems with project.pid 2021-09-29 16:04:09 +02:00
Benni Bärmann 9eda1c7f1f broken test added 2021-09-29 15:53:53 +02:00
Benni Bärmann 6a2dc6f1c9 accounts now user editable in own table 2021-07-08 08:00:28 +02:00
Benni Bärmann cdb27e6b89 first steps to editable accounts 2021-07-07 15:16:39 +02:00
Benni Bärmann a23ffdf67f intern view now works with django 3.2, too 2021-07-07 09:42:51 +02:00
Benni Bärmann 94164c3d6a fixed TypeError for django 3.2 2021-07-06 13:00:34 +02:00
Benni Bärmann ad8d58a134 layout changes in static file 2021-05-12 16:43:46 +02:00
Benni Bärmann 283e557be7 new static file 2021-05-12 11:49:04 +02:00
Benni Bärmann d31b55e47c . 2021-04-14 15:47:06 +02:00
Benni Bärmann 6b65626af4 stupid commit for test purposes 2021-04-14 15:34:05 +02:00
Benni Bärmann 5bfadc6365 stupid error 2021-04-14 15:09:49 +02:00
Benni Bärmann 837b0bd9d5 moved additional survey mails from TO to BCC fields 2021-04-14 14:37:49 +02:00
Benni Bärmann b289df8dd3 additional survey mails to an intern adress added 2021-04-13 13:43:29 +02:00
Benni Bärmann ea2c6f6f20 write surveymail_date in sendmails command 2021-04-12 13:58:50 +02:00
Benni Bärmann f373fceaab added new field survey_mail_date 2021-04-12 13:44:45 +02:00
Benni Bärmann ada102a516 changed some fields from CharField to URLField 2021-04-12 11:48:41 +02:00
Benni Bärmann d39fb2c87a BUGFIX: more wrong names in surveymails 2021-03-17 13:54:11 +01:00
Benni Bärmann be72261f5d BUGFIX: name in surveymail for Travel should be project not request_url 2021-03-17 12:46:45 +01:00
Benni Bärmann 276acec502 fixed bug which leeds to mails not be sent 2021-03-16 13:08:50 +01:00
Benni Bärmann f870fcab08 BUGFIX: correct project name is used now in surveymail 2021-02-08 09:57:21 +01:00
Benni Bärmann 9c23d8bddd BUGFIX: survey mails for project and travel should be sent after 
project end not after granted_date
 2021-02-08 09:12:56 +01:00
Benni Bärmann 36d56bbfa5 survey mail slightly changed 2021-02-04 15:40:27 +01:00
Benni Bärmann fd00d1b67a add leading zeros to project PID 2021-02-02 14:42:34 +01:00
Benni Bärmann 8d8216fafb bugfix: username was not written to database 2021-01-04 16:19:26 +01:00
Benni Bärmann b5e0dbdd44 minor typo fixed. TODO with known bug added 2021-01-04 11:24:20 +01:00
Benni Bärmann ea5aa5a1f5 bugfix: Literature needed to be registered in admin.py 2021-01-04 10:58:47 +01:00
Benni Bärmann bd8aced23f bugfix in auth_deny 2021-01-04 10:44:03 +01:00
Benni Bärmann f2ec1a4994 new accounts settings 2020-12-21 11:27:06 +00:00
Benni Bärmann 5822b4c7ad new mail adress, new migrations, changes in .gitignore for production 2020-12-17 12:23:52 +00:00
Benni Bärmann dde1f6a1c0 format change in Nutzungsbedingungen 2020-11-24 14:08:30 +01:00
Benni Bärmann 18669a4116 new action save as csv in admin 2020-11-24 13:44:07 +01:00
Benni Bärmann 3132bc9647 basic login test, fixture deleted (no longer needed) 2020-11-24 11:12:04 +01:00
Benni Bärmann bcefb026d1 some documentation 2020-11-23 17:16:03 +01:00
Benni Bärmann adc34e6d2d new test for acces denied for /intern 2020-11-23 17:05:54 +01:00
Benni Bärmann 6659d1a4a0 first client test 2020-11-23 14:38:47 +01:00
Benni Bärmann b398b3a511 first test 2020-11-23 14:08:01 +01:00
Benni Bärmann 89bd3b0de6 first steps towards an csv export view 2020-11-19 15:55:10 +01:00
Benni Bärmann e0d5ddee5d save as new added in project admin 2020-11-19 14:41:31 +01:00
Benni Bärmann 886140d771 changes in /intern 2020-11-19 11:26:39 +01:00
Benni Bärmann c5f98a529b grammar error in template 2020-11-18 18:27:06 +01:00
Benni Bärmann 7caed36483 translation for done() view 2020-11-18 18:07:57 +01:00
Benni Bärmann c02fd9864a removed code duplication, new basis class CheckForm 2020-11-18 18:06:00 +01:00
Benni Bärmann 2a182215c5 fancy stuff for LiteratureForm 2020-11-18 18:02:23 +01:00
Benni Bärmann 32da9ccd16 help texts for Mailinglists and EMail Form 2020-11-18 17:46:05 +01:00
Benni Bärmann 3a062c7c7c check for nutzungsbedingungen added to some other forms 2020-11-18 16:50:58 +01:00
Benni Bärmann f2945c8c77 added static file nutzungsbedingungen.html 2020-11-18 16:44:41 +01:00
Benni Bärmann 6b21066173 more finetuning in BusinessCards 2020-11-18 16:31:55 +01:00
Benni Bärmann 4d720aa6a3 some more help texts and field changes 2020-11-18 16:24:51 +01:00
Benni Bärmann 7b5802e6ea some more fancy help texts 2020-11-18 16:16:05 +01:00
Benni Bärmann 3580bfe161 some changes in help texts 2020-11-18 16:03:27 +01:00
Benni Bärmann eaea801f73 some labels for LibraryForm changed 2020-11-18 15:38:38 +01:00
Benni Bärmann 7a1fbcbc06 choice nicely displayed 2020-11-18 15:19:42 +01:00
Benni Bärmann f375280b22 access to choice in second form 2020-11-18 12:05:18 +01:00
Benni Bärmann 91cfb6607f added some linebreaks in the helptextx 2020-11-17 16:46:32 +01:00
Benni Bärmann 0a1184178e added some helptexts 2020-11-17 16:42:25 +01:00
Benni Bärmann 96dda66021 marked required fields with red stars 2020-11-17 16:11:10 +01:00
Benni Bärmann f899567ab9 new link for DATAPROTECTION 2020-11-17 14:01:47 +01:00
Benni Bärmann bf72789d16 "Abschicken" -> "Weiter" 2020-11-17 13:57:50 +01:00
Benni Bärmann 96329632bd links and pictures added 2020-11-17 13:30:33 +01:00
Benni Bärmann bb39d4e3d9 sort choices in extern form 2020-11-17 13:06:07 +01:00
Benni Bärmann 677ae57766 link to sourcecode added 2020-11-17 12:37:28 +01:00
Benni Bärmann e578990f36 changed /extern to / 2020-11-17 12:29:49 +01:00
Benni Bärmann d0cd9114d2 removed dots in choices 2020-11-17 12:17:24 +01:00
Benni Bärmann e56dbe88ef added links to choices in /extern form 2020-11-17 10:56:24 +01:00
Benni Bärmann 8848c91e1c email field migration 2020-11-16 16:32:40 +01:00
Benni Bärmann 1809287852 added EMailField for validation 2020-11-16 16:31:29 +01:00
Benni Bärmann 1c4d1b2e2e delete entry in database if error during mail sending occured 2020-11-16 16:10:31 +01:00
Benni Bärmann 06a3d727ca strange bugs, wrong ideas, not sure what this was all about?!? 2020-11-16 15:53:43 +01:00
Benni Bärmann 0df4cc9b93 import bugfix 2020-11-16 12:19:12 +01:00
Benni Bärmann c39d2b3146 changed URLPREFIX in sendmails command 2020-11-16 12:02:50 +01:00
Benni Bärmann 3fed406be5 GO AWAY! 2020-11-09 12:42:29 +01:00
Benni Bärmann 2cd26f0d0e another fix for deployment 2020-11-09 12:35:23 +01:00
Benni Bärmann 0a62bd426f bugfix 2020-11-09 10:33:31 +01:00
Benni Bärmann 40372a0945 more settings for production 2020-11-06 15:08:42 +01:00
Benni Bärmann 36562f5855 buttons fixed 2020-11-03 12:56:40 +01:00
Benni Bärmann dc986d19e0 fixed order of fields. notes should be at the end 2020-11-02 15:41:08 +01:00
Benni Bärmann 13f0259e88 /extern modells finished 2020-11-02 14:25:07 +01:00
Benni Bärmann bf9e89763c finished extern forms 2020-11-02 14:04:01 +01:00
Benni Bärmann 03a413cb44 template centered, start button removed 2020-11-02 12:21:41 +01:00
Benni Bärmann 8d4ba91d52 project modell finished 2020-11-02 11:56:07 +01:00
Benni Bärmann d4815129df some new fields for Project Model 2020-11-02 10:58:20 +01:00
Benni Bärmann d35c9c55d1 wikimedia logo added 2020-10-29 15:26:17 +01:00
Benni Bärmann 9ef3f27502 service id added 2020-10-29 15:05:11 +01:00
Benni Bärmann 71249aa73e new fields for project: status, persons 2020-10-29 13:14:06 +01:00
Benni Bärmann a903e5ed1f login template added 2020-10-29 12:40:30 +01:00
Benni Bärmann fa41a93325 broken version, still working on authentification 2020-10-28 15:49:18 +01:00
Benni Bärmann a0c57c7d4d work on intern/PRO, korrekt pid implemented 2020-10-28 15:04:53 +01:00
Benni Bärmann 4d623f0aa8 volunteermail template finished 2020-10-28 11:43:53 +01:00
Benni Bärmann 4edfd4f3c5 if mail template finished 2020-10-28 10:28:56 +01:00
Benni Bärmann c7bde110a7 some changes (sorry, i lost track) 2020-10-27 15:50:46 +01:00
Benni Bärmann 209beea756 small translation changes in extern.html 2020-10-27 14:35:31 +01:00
Benni Bärmann d583bf7c91 some work on mail template if_mail.txt 2020-10-27 14:13:53 +01:00
Benni Bärmann 33387f7648 more work on LIT and VIS, some restructuring 2020-10-27 13:47:46 +01:00
Benni Bärmann afa0f6b55a added IFG to sendmails command 2020-10-27 13:08:47 +01:00
Benni Bärmann 34936c7ef2 more work on MAIL, LIST and VIS modells and forms 2020-10-27 12:37:18 +01:00
Benni Bärmann 02d5a542bc added MAIL, VIS and LIST to sendmails command 2020-10-27 11:55:16 +01:00
Benni Bärmann 275741ab47 added Email modell and form 2020-10-27 11:00:58 +01:00
Benni Bärmann b0e268df75 surveylinks now with unique IDs 2020-10-26 15:06:19 +01:00
Benni Bärmann a64de479e6 added parameter I/O for Service/Project in surveylink 2020-10-26 14:46:45 +01:00
Benni Bärmann 0c44eb8224 code duplication removed 2020-10-26 13:55:36 +01:00
Benni Bärmann 1458a1cb6b sned mails for Travel objects 3 weeks after the related project has ended 2020-10-26 13:23:05 +01:00
Benni Bärmann cdc8b01d2f project field in HonoraryCertificate class blank=True 2020-10-26 13:15:38 +01:00
Benni Bärmann 422094a240 send mails 4 weeks after project end reached 2020-10-26 13:01:11 +01:00
Benni Bärmann c816fbd2fe reorganisation of functions in sendmails command 2020-10-26 12:56:29 +01:00
Benni Bärmann d82cea75e9 set granted and granted_date in InternView.done() 2020-10-26 12:34:09 +01:00
Benni Bärmann aa5de1c08d send mails two weeks after HonoraryCertificate is granted 2020-10-26 12:26:41 +01:00
Benni Bärmann a6474e07e8 some reorganisations of models, forms and views 2020-10-26 12:06:26 +01:00
Benni Bärmann 5a014d4696 Travel model and form added 2020-10-26 11:38:56 +01:00
Benni Bärmann 4a315b8163 reorganisation of abstract model classes, minor change in /intern form 2020-10-26 11:00:12 +01:00
Benni Bärmann 0ce0151b16 use Library.granted_date in sendmails command 2020-10-22 16:08:11 +02:00
Benni Bärmann bb2b40e50d granted_date added 2020-10-22 16:02:59 +02:00
Benni Bärmann d3ba817b09 new modell field survey_mail_send to make sure every mail is sendet only once 2020-10-22 14:38:23 +02:00
Benni Bärmann 7fa5110865 survey mails send (for Library only in the moment) 2020-10-22 14:17:34 +02:00
Benni Bärmann af68b71018 preliminary work for sending surveylinks out 2020-10-22 13:08:58 +02:00
Benni Bärmann 73b41066e9 added new modell field Project.end_mail_send to assure that mails will be only send once 2020-10-22 11:36:16 +02:00
Benni Bärmann 2bb8ee517d database change link to end of project mail added 2020-10-22 10:53:40 +02:00
Benni Bärmann f2d209688b send mail 30 days after assumed end of project in sendmails command 2020-10-22 10:27:14 +02:00
Benni Bärmann 541b9d8f7e preliminary work for the sendmails command 2020-10-21 15:01:05 +02:00
Benni Bärmann a78c10c043 new Project Field end date. some cleanup in ProjectForm and Project 2020-10-21 13:53:39 +02:00
Benni Bärmann 9e0903ca0e changed TYPE_CHOICES to dict to simplify some code 2020-10-21 13:27:05 +02:00
Benni Bärmann 74eacb26c5 fixed accounts choices 2020-10-21 13:10:08 +02:00
Benni Bärmann d35775b1c4 added Accounts to project form 2020-10-21 13:00:44 +02:00
Benni Bärmann 6f87ea69cc some more cleanup 2020-10-21 12:06:30 +02:00
Benni Bärmann e916a9a86b included ProjectForm in InternView. fixed DatePicker. use admin-css 2020-10-21 11:15:55 +02:00
Benni Bärmann 8e0c48c354 deleted old code which is not longer in use 2020-10-21 10:55:54 +02:00
Benni Bärmann bc99551f77 changed some print() to raise RuntimeError() 2020-10-21 10:37:30 +02:00
Benni Bärmann 93d1f2f9d5 More Work on InternView. Basic HonoraryCertificate works 2020-10-21 10:24:18 +02:00
Benni Bärmann a7e8b9a19a some work towards InternView 2020-10-21 09:54:12 +02:00