mg/breccia-mapper
1
0
Fork 0
mirror of https://github.com/Southampton-RSG/breccia-mapper.git synced 2026-08-23 20:55:39 +01:00
Code Issues Packages Projects Releases Wiki Activity
202 Commits 3 Branches 3 Tags
75bc12de57bdc2f50339f2a13f7f7b1091f45ff7
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
James Graham 75bc12de57 fix: use prev answers as initial for relationships 
Resolves #65
 2021-03-10 12:38:49 +00:00
James Graham 6f72244331 fix: set table column widths to 50% on profile 2021-03-10 11:48:14 +00:00
James Graham df13bcf46d fix: exclude hardcoded qs from dynamic table 2021-03-10 11:38:52 +00:00
James Graham 8697d726b6 fix: condense multiple answers to same question 
Show on same row on profile page

See #97
 2021-03-10 11:20:34 +00:00
James Graham 7ce47fc0ef fix: undo previous change 2021-03-10 10:46:32 +00:00
James Graham b00ca4c1a2 feat: add question on external organisations 2021-03-10 10:37:42 +00:00
James Graham af31971565 feat: add configurable help text to questions 2021-03-10 09:48:44 +00:00
James Graham e3e8a2ada4 refactor: move themes to admin question 
Resolves #95
 2021-03-10 09:36:21 +00:00
James Graham 5d1caf98ba fix: indentation error in last commit 2021-03-09 17:50:22 +00:00
James Graham 97473a46e2 fix: attribute error on org list page 
Error for organisations with no AnswerSet
 2021-03-09 17:43:46 +00:00
James Graham 989c8141b3 feat: display organisations on map 
Add buttons to toggle organisations and people

Resolves #87
 2021-03-09 14:55:31 +00:00
James Graham 6670a87a52 fix: add organisation relationships to profile 
Resolves #92
 2021-03-09 12:39:20 +00:00
James Graham e457086c50 fix: update button text on org list 
Resolves #93
 2021-03-09 12:29:57 +00:00
James Graham 7d74a99518 feat: sort by country on organisation list 2021-03-09 12:24:46 +00:00
James Graham 7e9a6e992a feat: configurable order for static questions 2021-03-08 18:20:34 +00:00
James Graham ba4f8d8ffd fix: add back buttons on org list 2021-03-08 12:00:13 +00:00
James Graham 85c13033e8 fix: account for org with no answers when get name 2021-03-08 11:56:17 +00:00
James Graham d1dc505b37 feat: group org list by hq country 
Resolves #86
 2021-03-08 11:45:43 +00:00
James Graham 12bc9f886f fix: use organisation name from answer set if set 
Resolves #90
 2021-03-05 12:21:39 +00:00
James Graham 8d68e1b0c3 feat: add hardcoded organisation questions 
Resolves #91
Resolves #88
 2021-03-05 12:16:31 +00:00
James Graham 02b0132f9c style: resolve linting complaints 2021-03-05 09:24:00 +00:00
James Graham bf2422c6dd refactor: move organisation models to own module 2021-03-04 12:42:32 +00:00
James Graham 936a375992 feat: add relationships from person to org 
Resolves #77
See #78
 2021-03-02 09:03:10 +00:00
James Graham 6d5188af72 feat: add project started date to person questions 
Resolves #60
 2021-03-01 19:26:59 +00:00
James Graham db76d57971 feat: alternate filter text and hide private 
Resolves #53
Resolves #82
 2021-03-01 19:01:57 +00:00
James Graham b73e2dcb2d feat: add organisations to network view 
See #78
 2021-03-01 14:43:16 +00:00
James Graham 550d7cede0 fix: hide relationship list from non-admins 
Resolves #81
 2021-02-26 15:57:09 +00:00
James Graham 71e5352b6b refactor: move organisation latlng to answerset 2021-02-24 15:44:34 +00:00
James Graham c8a68d542a feat: add organisation questions to update view 2021-02-24 14:59:43 +00:00
James Graham adf12442a4 feat: add organisation questions and admin pages 
See #76
 2021-02-24 12:08:52 +00:00
James Graham 25cc33e2c1 fix: correct title of organisation list page 
Resolves #79
 2021-02-23 11:58:12 +00:00
James Graham 9be49f4faf fix: accept any option starting with 'other' 
See #75
 2021-02-15 19:13:14 +00:00
James Graham a6e8f06441 feat: hide free text field unless 'other' selected 
See #75
 2021-02-15 19:02:41 +00:00
James Graham 7021f05b67 refactor: move disciplines to admin-question 
Resolves #59
 2021-02-15 15:29:47 +00:00
James Graham 0b1f303d62 fix: populate themes with prev val on person form 
Resolves #66
 2021-02-15 12:00:54 +00:00
James Graham 8a94a46cd5 fix: replace 'hijack' with 'become' on button 2021-02-08 15:59:02 +00:00
James Graham 0c92554561 fix: set page title 2021-02-08 15:40:43 +00:00
James Graham a24f5157cd feat: sort people by name 
Resolves #71
 2021-02-08 15:03:06 +00:00
James Graham c102cbf091 fix: update export views to match model changes 
Resolves #72
 2021-02-08 14:58:32 +00:00
James Graham a141b93644 feat: specify whether question answers are public 
Resolves #62
 2021-02-08 14:42:07 +00:00
James Graham 9164ea8a05 feat: use django-hijack to switch user accounts 
Resolves #74
 2021-02-08 14:40:37 +00:00
James Graham f4bd9a0cef fix: move existing marker in map picker widget 
Resolves #49
 2021-02-02 09:00:10 +00:00
James Graham 25a28755c6 feat: use proper datepicker widgets 
Resolves #58
 2021-02-01 16:50:12 +00:00
James Graham afae0fd943 feat: add relationship buttons on person list 
Resolves #63
 2021-02-01 15:47:51 +00:00
James Graham 4bbe4eac3a refactor: simplify relationship create workflow 2021-02-01 09:47:53 +00:00
James Graham 4d4d7ab70b feat: show basic profiles to non-admins 
Resolves #61
 2021-01-29 14:35:15 +00:00
James Graham 9b98ce73f0 fix: remove 'as target' relationships from profile 
Resolves #64
 2021-01-29 14:02:33 +00:00
James Graham 94b2ee9d70 feat: allow free form text answers 
see #52
 2021-01-22 17:15:18 +00:00
James Graham 6dc4bd770f feat: add consent form for data processing 2021-01-20 11:53:08 +00:00
James Graham f2e945c67f fix: populate foreign key fields initial value 
fixes #45
 2021-01-18 14:45:02 +00:00
James Graham 4cfee6362d refactor: add person update form fields to initial 2021-01-15 17:45:55 +00:00
James Graham f94627e4c8 refactor: remove redundancy between js maps 2021-01-15 16:33:34 +00:00
James Graham 59f717829a refactor: add map marker to context on update 2021-01-15 16:32:57 +00:00
James Graham 9db870bcb0 feat: add views for Organisation model 
Location picker on update view
 2021-01-15 14:58:05 +00:00
James Graham 2d85ab4370 feat: add location to organisations 2021-01-15 13:44:20 +00:00
James Graham 95fda6a3d5 refactor: prep for fallback to organisation latlng 2021-01-15 12:31:49 +00:00
James Graham 90c40b2e2e fix: hide lat-long fields on person update form 2021-01-04 14:44:56 +00:00
James Graham 20342ef671 fix: restore marker on location picker map 
fixes #43
 2021-01-04 14:37:27 +00:00
James Graham cbc70ab85a fix: do lookup by person in person update view 
Fixes #42
 2020-12-18 15:56:19 +00:00
James Graham e54c717ada refactor: allow custom repo to extend constance 2020-12-18 15:21:07 +00:00
James Graham efecfa8e43 Merge branch 'maps' into dev 2020-12-16 15:35:16 +00:00
James Graham 2998a7e3fb deploy: entry for google maps api key 2020-12-16 15:35:00 +00:00
James Graham b2cd5f4940 feature: add map of all people 2020-12-16 14:54:46 +00:00
James Graham 1a27774177 feat: add location search to picker 
Requires API key with Google Places API access
Currently untested
 2020-12-16 12:09:10 +00:00
James Graham 9e6d1a495e feat: add initial location picker to person update 2020-12-16 11:11:48 +00:00
James Graham 8e52f779ee feat: add location fields to person answer sets 2020-12-15 14:23:51 +00:00
James Graham 82a235e6ff refactor: clean up unused bits of map.js 2020-12-15 13:35:18 +00:00
James Graham c2961b911f feat: add initial map code from activity mapper 2020-12-15 13:21:17 +00:00
James Graham 76fcb7ceb2 fix: revert relationship link change 
Fixes issue where migrations will not run on MySQL
 2020-12-07 17:37:47 +00:00
James Graham 80491623de Merge remote-tracking branch 'origin/dev' 2020-12-07 17:05:15 +00:00
James Graham 7e8dba4806 feat: allow multiple choice questions in forms 2020-12-07 17:01:53 +00:00
James Graham e045b084d0 refactor: extract code share between question sets 2020-12-07 14:19:00 +00:00
James Graham 6bb4f09454 refactor: update forms to match moved questions 2020-12-02 15:53:30 +00:00
James Graham 2027d9d3ab fix: remove refactored questions from person form 2020-12-02 14:57:27 +00:00
James Graham 0288b0320d refactor: move questions on person detail page 2020-12-02 14:57:07 +00:00
James Graham 91a47b4fdc refactor: move static person qs to answerset 2020-12-02 14:40:59 +00:00
James Graham d6e42cc18d style: fix pyflakes warnings of unused imports 2020-12-02 14:25:49 +00:00
James Graham f95e06aa18 refactor: move age and gender to question set 2020-11-26 14:10:38 +00:00
James Graham 5035b121a6 refactor: migrate to question sets for person qs 
This means we're starting to use the same system for person questions
as for relationship questions
 2020-11-26 12:59:30 +00:00
James Graham a94db2713e fix: Only allow users to create rels as source 
There is now no field for users to define the source of a relationship
The source is always the person in the URL
And only that user or staff can access the form
 2020-08-14 17:38:22 +01:00
James Graham 6435ec69a1 fix: Show 'add person' button to all users 
See #33
 2020-07-03 15:48:53 +01:00
James Graham a1f9510a8c style: Fix minor formatting issue in base template 2020-06-26 11:58:15 +01:00
James Graham 8689c1a204 style: Fix some autoformatting issues 2020-06-26 11:45:21 +01:00
James Graham 387cebd0d4 fix: Improve clarity of network form time filter 
Resolves #34
 2020-06-26 10:54:40 +01:00
James Graham 0e4234cb35 fix: Hide person details from non-admin users 
See #35
 2020-06-25 11:38:26 +01:00
James Graham aafb6c0a21 fix: Remove Person.name from CSV export 
See #35
 2020-06-25 11:11:14 +01:00
James Graham b84076ec3b refactor: Make Person.discipline free text 
See #33
 2020-06-24 16:29:50 +01:00
James Graham 57349a6007 fix: Add changes to detail page missing 
See #33
 2020-06-24 15:10:00 +01:00
James Graham ab37139429 feat: Add date started at organisation 
See #33
 2020-06-24 15:09:23 +01:00
James Graham 26bf55b4b4 fix: Remove Person.core_member field 
See #33
 2020-06-24 13:47:12 +01:00
James Graham 9a84f77ec4 fix: Don't insert form CSS/JS when no form 2020-06-24 13:40:02 +01:00
James Graham 62d7a1e48c fix: Set defaults if customisation app not loaded 2020-06-24 12:01:45 +01:00
James Graham a1dc5721e6 Merge branch 'dev' 2020-06-02 09:48:11 +01:00
James Graham 0cceb604dd fix: Fix welcome email bugs 
Send only when new user is created
Require email address when user created

Resolves #32
 2020-05-28 16:24:44 +01:00
James Graham c6eda514ca fix: Fix time filtering of relationships on MySQL 
Resolves #31
 2020-05-28 13:51:00 +01:00
James Graham 8bc82b2a15 temp fix: Temporarily disable welcome emails 2020-05-27 14:47:10 +01:00
James Graham c364db4f16 fix: Add DEFAULT_FROM_EMAIL 2020-05-27 14:42:28 +01:00
James Graham 82fbdd2ca1 deploy: Add allowed hosts to Ansible variables 
Move DB credentials to inventory file
 2020-05-27 11:26:52 +01:00
James Graham 567322c0af feat: Send welcome email from template 2020-04-28 15:17:58 +01:00
James Graham a39cf0e7ca Merge branch 'dev' 2020-04-24 15:23:54 +01:00