Commit Graph
100 Commits
Author SHA1 Message Date
James Graham 4a46466f1e Merge branch 'master' of github.com:Southampton-RSG/breccia-mapper 2021-07-30 18:31:18 +01:00
James Graham 4019749930 Merge branch dev 2021-07-30 18:30:13 +01:00
James Graham 40c138de00 fix: sort relationships by names in admin panel 2021-05-20 16:43:28 +01:00
James Graham 3ea4ea88a7 refactor: reorganise network page
Backend form handling slightly simplified - date is own form now
2021-05-20 15:28:59 +01:00
James Graham 9d14cf4b38 fix: restrict csv exports to staff only 2021-05-17 19:29:53 +01:00
James Graham 48cce12c32 feat: embed extra data in person csv
Resolves #113
2021-05-17 19:29:26 +01:00
James Graham 264c353b1d feat: add export views for organisation types 2021-05-17 19:13:45 +01:00
James Graham f37d7c77c4 fix: update exports for static answerset fields
Resolves #99
2021-05-17 18:26:52 +01:00
James Graham 479ef038d4 fix: rendering of select2 fields in network filter 2021-05-12 21:05:37 +01:00
James Graham 8f7767fa5c fix: button correctly resets filters after POST 2021-05-12 20:52:59 +01:00
James Graham 8ca1ba3d95 feat: add panzoom widget to network view 2021-05-12 20:32:18 +01:00
James Graham e7a113c4ee feat: add buttons to anonymise nodes on graph 2021-05-12 19:56:18 +01:00
James Graham b28d714e9e fix: add arrow to organisation relationships 2021-05-12 19:39:33 +01:00
James Graham 1ea2c5448b feat: add button to hide organisations from graph 2021-05-12 19:37:46 +01:00
James Graham c57392e83c feat: add configurable help text for relationships
Displayed at the top of relationship forms
2021-05-10 13:21:37 +01:00
James Graham 4f1dfe16cd feat: expand node and bring to front when selected 2021-05-10 12:21:20 +01:00
James Graham 9ead2ab05f fix: fit node labels inside nodes 2021-05-10 12:14:09 +01:00
James Graham bc28c238ea fix: use correct url in breadcrumb 2021-05-09 15:26:28 +01:00
James Graham e7542e70a5 fix: hide free text fields by default
Script was missing from Organisation and Relationship forms

Resolves #114
2021-05-09 15:17:11 +01:00
James Graham 7f01bff993 fix: sort organisations by name within groups
Resolves #115
2021-05-09 13:53:07 +01:00
James Graham 4e87176c17 fix: restore map picker marker
Marker was broken on map picker for entities with no location set yet
2021-04-27 11:07:25 +01:00
James Graham 6a5addc917 fix: increase force between nodes in network view 2021-04-26 21:31:19 +01:00
James Graham 0e08feee01 fix: 'new relationship' -> 'add relationship' 2021-04-26 21:06:40 +01:00
James Graham 311a90fe09 fix: hide map on detail pages when no location set 2021-04-26 21:04:02 +01:00
James Graham fa6a4339d8 fix: fix org map pin color on detail view 2021-04-26 21:03:03 +01:00
James Graham d5f85c84c8 fix: hide relationship buttons on own profile page 2021-04-26 20:29:22 +01:00
James Graham 123a123050 fix: change default map location to Null Island
Apply sensible default zoom
Distinguish people and orgs on map
2021-04-26 20:21:46 +01:00
James Graham adc9021002 fix: Force new user workflow through right forms
Resolves #112
Resolves #68
2021-04-25 17:13:59 +01:00
James Graham 7681e78a50 perf: prefetch for serializers on network view
Reduces request time by more than 50%
2021-04-25 15:11:21 +01:00
James Graham 7d14fed90f fix: distinguish kinds of relationship with orgs
Refactor node/edge style method to improve performance
2021-04-25 14:00:37 +01:00
James Graham bd13bb29e8 style: add yapf style config 2021-04-25 13:58:55 +01:00
James Graham 0f4e39fcaf feat: add network filter reset button 2021-04-25 12:00:57 +01:00
James Graham 7d1c05cfd8 feat: add organisation relationships to network 2021-04-25 11:50:52 +01:00
James Graham cc25a154ac refactor: reduce duplication in network filters 2021-04-25 11:25:15 +01:00
James Graham 20812dfc40 feat: add person and org filters to network
Resolves #54
2021-04-22 21:16:39 +01:00
James Graham 5a2890ece1 refactor: move network js to own file
Add initial styling to network - only placeholder at the moment

See #83
2021-04-19 17:14:54 +01:00
James Graham 78e35b70e0 feat: add button to save image of network
Resolves #84
2021-04-19 12:49:27 +01:00
James Graham 9f5253834f fix: hide 'become user' button on own profile
Resolves #89
2021-04-19 12:09:38 +01:00
James Graham 78056c7752 fix: add back name to person table export 2021-04-19 09:48:39 +01:00
James Graham 2664ff6e83 refactor: allow question prefix on dynamic forms
Setup to support multiple network filters
See #54
2021-03-26 11:36:19 +00:00
James Graham 9f067249de fix: show free text for 'other' in multi-select
Resolves #104
Should resolve #101
See #75
2021-03-21 11:59:29 +00:00
James Graham 27b16c2212 feat: allow multiple nationalities
Resolves #108
2021-03-19 15:57:32 +00:00
James Graham 81598ea624 refactor: allow admin config of static questions
Text and visibility set in admin panel are now respected everywhere
2021-03-19 15:36:09 +00:00
James Graham 74fffb0cac refactor: views to handled ended relationships
Add ending of organisation relationships
2021-03-19 12:41:36 +00:00
James Graham 42d95beb5a feat: add view to end relationship 2021-03-19 12:00:32 +00:00
James Graham 8093b23870 refactor: making static qs more admin configurable 2021-03-18 18:09:02 +00:00
James Graham c20b2b5a0a feat: add rel create / update buttons to profiles
See #109
2021-03-18 17:52:14 +00:00
James Graham 2c68877cc8 fix: make disciplinary background public
Resolves #105
2021-03-18 17:29:19 +00:00
James Graham 1de4f741b8 feat: add configurable help text to list pages
Resolves #103
2021-03-18 17:26:59 +00:00
James Graham 98e9148998 refactor: move disciplines and orgs to free text
Resolves #102
2021-03-16 11:54:34 +00:00
James Graham 583a49fdd3 fix: attr error if non-admin updates relationship 2021-03-11 12:59:57 +00:00
James Graham 87e5e6cbf3 fix: redirect to index if no profile exists
New users were sent to profile page before they had a profile
2021-03-10 15:40:10 +00:00
James Graham 3ad8d4a5c9 fix: error when viewing profile with no answerset 2021-03-10 15:03:24 +00:00
James Graham 667a51d1c7 refactor: remove duped code in relationship update 2021-03-10 12:41:07 +00:00
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