Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Activate team section #834

Merged
merged 98 commits into from
Jun 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
91242f3
remove msg
edwardchalstrey1 Jun 1, 2022
d078205
fix mistake on use
edwardchalstrey1 Jun 1, 2022
41ad098
change categories intro
edwardchalstrey1 Jun 1, 2022
562d17c
add is_extension
edwardchalstrey1 Jun 1, 2022
3c18b98
import datafields team
edwardchalstrey1 Jun 1, 2022
7f6beca
import SelectDataEntry
edwardchalstrey1 Jun 1, 2022
47ea144
remove bullet points
edwardchalstrey1 Jun 1, 2022
a283e75
activate
edwardchalstrey1 Jun 1, 2022
3b42d1b
just one additional item
edwardchalstrey1 Jun 1, 2022
8923213
add work_carried_out field
edwardchalstrey1 Jun 1, 2022
63eb2c3
import NumericDataEntry
edwardchalstrey1 Jun 1, 2022
1adfc5f
upddate work_carried_out
edwardchalstrey1 Jun 1, 2022
1dbd4f2
addd currentYear var
edwardchalstrey1 Jun 1, 2022
92fcc44
enable date_year to be edited via Planning
edwardchalstrey1 Jun 1, 2022
7e5df0a
remove tooltip
edwardchalstrey1 Jun 1, 2022
6a7bfdf
add tooltip for work_carried_out
edwardchalstrey1 Jun 1, 2022
2d65372
add logic based on is_extension
edwardchalstrey1 Jun 1, 2022
14fd83b
add extension logic
edwardchalstrey1 Jun 1, 2022
3716e0f
rename work_carried_out to year_work_carried_out
edwardchalstrey1 Jun 1, 2022
e0cdfb5
add example value to year_work_carried_out
edwardchalstrey1 Jun 1, 2022
bacaf77
move is_extension example to items
edwardchalstrey1 Jun 1, 2022
e80d19a
add verification buttons
edwardchalstrey1 Jun 1, 2022
d2c7258
rename year_work_carried_out to extension_year
edwardchalstrey1 Jun 1, 2022
50621b4
add developer_type
edwardchalstrey1 Jun 1, 2022
d2f3157
add blank example developer_type
edwardchalstrey1 Jun 1, 2022
29a0eb1
fix category
edwardchalstrey1 Jun 1, 2022
663a910
add designers
edwardchalstrey1 Jun 1, 2022
61b2a40
add a maxLength designers
edwardchalstrey1 Jun 1, 2022
fa9bf39
import MultiDataEntry
edwardchalstrey1 Jun 1, 2022
0955611
set max length as longest human name
edwardchalstrey1 Jun 1, 2022
5e23f7b
add verification button designers
edwardchalstrey1 Jun 1, 2022
ee70071
add designers_source_link
edwardchalstrey1 Jun 1, 2022
24f153d
finish prev commit
edwardchalstrey1 Jun 1, 2022
226910d
add lead_designer_type
edwardchalstrey1 Jun 1, 2022
3c02aa1
add designer_awards yes/no
edwardchalstrey1 Jun 1, 2022
2b24d49
clarification suggestion
edwardchalstrey1 Jun 1, 2022
e48414d
refactor logic to use <form>
edwardchalstrey1 Jun 6, 2022
e244826
fix last commit dont use "this"
edwardchalstrey1 Jun 6, 2022
0ab06f6
split Fragments
edwardchalstrey1 Jun 6, 2022
591ad5b
Revert "split Fragments"
edwardchalstrey1 Jun 6, 2022
d332cc0
single fragment with internal logic
edwardchalstrey1 Jun 6, 2022
c126400
remove <fragment> entirely
edwardchalstrey1 Jun 6, 2022
77140ae
remove conditional logic
edwardchalstrey1 Jun 6, 2022
23e4503
remove commented code last commit
edwardchalstrey1 Jun 6, 2022
8af1f03
revert last 2 commits
edwardchalstrey1 Jun 6, 2022
f748948
add Fragment inside extension logic
edwardchalstrey1 Jun 6, 2022
0bcb13e
Revert "add Fragment inside extension logic"
edwardchalstrey1 Jun 6, 2022
7077ab2
remove logic
edwardchalstrey1 Jun 6, 2022
a2d1ec4
2nd container test
edwardchalstrey1 Jun 6, 2022
7aa7f81
Revert "2nd container test"
edwardchalstrey1 Jun 6, 2022
d639006
restore logic
edwardchalstrey1 Jun 6, 2022
7d0889c
remove <form>
edwardchalstrey1 Jun 6, 2022
3ed3d6f
Revert "remove <form>"
edwardchalstrey1 Jun 6, 2022
e47d1fa
add extra tags
edwardchalstrey1 Jun 6, 2022
dbcd3ec
add awards_source_link
edwardchalstrey1 Jun 6, 2022
43a6cff
add extra verify buttons
edwardchalstrey1 Jun 6, 2022
147fcd0
fix mistake
edwardchalstrey1 Jun 6, 2022
db9159e
add team migrations
edwardchalstrey1 Jun 6, 2022
be00d24
add exception to validation
edwardchalstrey1 Jun 6, 2022
ff283f2
Revert "add exception to validation"
edwardchalstrey1 Jun 6, 2022
631bcc7
add exception to validation in right place
edwardchalstrey1 Jun 6, 2022
87e93cd
update dataFields
edwardchalstrey1 Jun 6, 2022
7dae80e
remove breaking logic
edwardchalstrey1 Jun 6, 2022
40fbc1d
restore exception validation logic with proper operator
edwardchalstrey1 Jun 6, 2022
0dcad9d
Revert "restore exception validation logic with proper operator"
edwardchalstrey1 Jun 6, 2022
0cf4660
add is_extension to dataFields
edwardchalstrey1 Jun 6, 2022
a01a567
make is_extension editable
edwardchalstrey1 Jun 6, 2022
b59e811
change to has_extension bool
edwardchalstrey1 Jun 6, 2022
d031239
change logic to use has_extension
edwardchalstrey1 Jun 6, 2022
66462fe
switch has_extension to LogicalDataEntry
edwardchalstrey1 Jun 6, 2022
3874427
change title for has_extension
edwardchalstrey1 Jun 6, 2022
ee53050
rearrange so date_year
edwardchalstrey1 Jun 6, 2022
06cb9fc
Revert "change title for has_extension"
edwardchalstrey1 Jun 6, 2022
ce340d7
change title for extension_year
edwardchalstrey1 Jun 6, 2022
fc515f0
add has_extension to down migration
edwardchalstrey1 Jun 6, 2022
2b53dba
rename to has_extension in dataFields
edwardchalstrey1 Jun 6, 2022
6ff10ee
fix has_extension type as bool
edwardchalstrey1 Jun 6, 2022
a34a2c6
remove duplications
edwardchalstrey1 Jun 6, 2022
0a9d4c3
rename designers to building_designers
edwardchalstrey1 Jun 6, 2022
1d187c2
try again building_designers MultiDataEntry
edwardchalstrey1 Jun 6, 2022
8fca3bc
completely remove problematic field
edwardchalstrey1 Jun 6, 2022
b3ca4fe
reintroduce designers field
edwardchalstrey1 Jun 6, 2022
26f79f3
religious body
edwardchalstrey1 Jun 10, 2022
3cf2827
Architect/ architectural firm
edwardchalstrey1 Jun 10, 2022
d73e49a
add developer_source_link
edwardchalstrey1 Jun 10, 2022
2f2c0b9
finish prev commit
edwardchalstrey1 Jun 10, 2022
e5c0e4e
add builder and builder_source_link
edwardchalstrey1 Jun 10, 2022
69f4705
remove non-existant tooltips
edwardchalstrey1 Jun 10, 2022
0611eaa
add other_team and other_team_source_link
edwardchalstrey1 Jun 10, 2022
68abacc
add developer_name
edwardchalstrey1 Jun 10, 2022
b581264
fix prev commit
edwardchalstrey1 Jun 10, 2022
b950c89
revert 68abacc685ac2bb48d001b886c73a7c001663f78
edwardchalstrey1 Jun 10, 2022
3ef764d
add developer_name 2nd attempt
edwardchalstrey1 Jun 10, 2022
691b68e
test team colour scale (but using location vals for now)
edwardchalstrey1 Jun 10, 2022
1642c2c
add team
edwardchalstrey1 Jun 10, 2022
56abebf
add team_info_count to deteermin colour
edwardchalstrey1 Jun 10, 2022
1fdcee6
finish prev commit
edwardchalstrey1 Jun 10, 2022
e1e8328
use date_year
edwardchalstrey1 Jun 10, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions app/map_styles/polygon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,39 @@
<LineSymbolizer stroke="#888" stroke-width="3.0"/>
</Rule>
</Style>
<Style name="team">
<Rule>
<Filter>[team_info_count] &gt;= 8</Filter>
<PolygonSymbolizer fill="#994d00" />
</Rule>
<Rule>
<Filter>[team_info_count] &gt;= 6 and [team_info_count] &lt; 8</Filter>
<PolygonSymbolizer fill="#e67300" />
</Rule>
<Rule>
<Filter>[team_info_count] &gt;= 4 and [team_info_count] &lt; 6</Filter>
<PolygonSymbolizer fill="#ff9933" />
</Rule>
<Rule>
<Filter>[team_info_count] &gt;= 2 and [team_info_count] &lt; 4</Filter>
<PolygonSymbolizer fill="#ffbf80" />
</Rule>
<Rule>
<Filter>[team_info_count] &gt; 0 and [team_info_count] &lt; 2</Filter>
<PolygonSymbolizer fill="#ffe6cc" />
</Rule>

<Rule>
<MaxScaleDenominator>17061</MaxScaleDenominator>
<MinScaleDenominator>4264</MinScaleDenominator>
<LineSymbolizer stroke="#888" stroke-width="1.0"/>
</Rule>
<Rule>
<MaxScaleDenominator>4264</MaxScaleDenominator>
<MinScaleDenominator>0</MinScaleDenominator>
<LineSymbolizer stroke="#888" stroke-width="3.0"/>
</Rule>
</Style>
<Style name="size_storeys">
<Rule>
<Filter>[size_storeys] &gt;= 40</Filter>
Expand Down
56 changes: 56 additions & 0 deletions app/src/api/config/dataFields.ts
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,62 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
community_public_ownership_sources: {
edit: true,
verify: true
},
has_extension: {
edit: true,
verify: true
},
extension_year: {
edit: true,
verify: true
},
developer_type: {
edit: true,
verify: true
},
developer_name: {
edit: true,
verify: true
},
developer_source_link: {
edit: true,
verify: true
},
designers: {
edit: true,
verify: true
},
designers_source_link: {
edit: true,
verify: true
},
lead_designer_type: {
edit: true,
verify: true
},
designer_awards: {
edit: true,
verify: true
},
awards_source_link: {
edit: true,
verify: true
},
builder: {
edit: true,
verify: true
},
builder_source_link: {
edit: true,
verify: true
},
other_team: {
edit: true,
verify: true
},
other_team_source_link: {
edit: true,
verify: true
}

});
Expand Down
Loading