WMDE
/
foerderbarometer
forked from beba/foerderbarometer
1
0
Fork 0
Code Pull Requests Activity
362 Commits 2 Branches 0 Tags 1.3 MiB
Commit Graph

277 Commits

Author SHA1 Message Date
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