Skip to content

Commit 1aa7139

Browse files
authored
SITU-1485 Public Record Exemption Request | Form 1.1 + misc webform fixes (#3407)
* SITU-1496 Find Tree Planting Programs | Add Friends of Trees to Back Yard * SITU-1484 Apply Sidewalk Bike Racks Form | Update file upload text * SITU-1490 BES Stormwater Review Form | Tweaks to contact info section * SITU-1449 Report Noise Concern Form | Update textarea limits * SITU-1481 Contact Elected Form | Require official to be selected * SITU-1486 Apply for an Outdoor Dining Permit | Form 1.2 * SITU-1485 Public Record Exemption Request | Form 1.1 * BES Stormwater Review Form | Fix conditionality * SITU-1497 Report Hazardous Tree form | Add test submission box and photo upload * SITU-1498 Report an Abandoned Bicycle | Form 1.1 * fix: config conflict
1 parent 27f7b94 commit 1aa7139

10 files changed

Lines changed: 148 additions & 110 deletions

web/sites/default/config/views.view.manage_council_documents.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3948,10 +3948,10 @@ display:
39483948
previously_dispositioned: '0'
39493949
filename: 'upcoming-council-documents-[date:html_datetime].csv'
39503950
automatic_download: false
3951+
export_filesystem: private
39513952
custom_redirect_path: false
39523953
redirect_to_display: none
39533954
include_query_params: false
3954-
export_filesystem: private
39553955
cache_metadata:
39563956
max-age: -1
39573957
contexts:
@@ -5052,10 +5052,10 @@ display:
50525052
previously_dispositioned: '0'
50535053
filename: ''
50545054
automatic_download: true
5055+
export_filesystem: private
50555056
custom_redirect_path: false
50565057
redirect_to_display: none
50575058
include_query_params: false
5058-
export_filesystem: private
50595059
cache_metadata:
50605060
max-age: -1
50615061
contexts:
@@ -5878,10 +5878,10 @@ display:
58785878
previously_dispositioned: '0'
58795879
filename: agenda-scheduling.csv
58805880
automatic_download: false
5881+
export_filesystem: private
58815882
custom_redirect_path: false
58825883
redirect_to_display: none
58835884
include_query_params: false
5884-
export_filesystem: private
58855885
cache_metadata:
58865886
max-age: -1
58875887
contexts:
@@ -6394,10 +6394,10 @@ display:
63946394
previously_dispositioned: '0'
63956395
filename: 'council-document-contacts-[date:html_datetime].csv'
63966396
automatic_download: false
6397+
export_filesystem: private
63976398
custom_redirect_path: false
63986399
redirect_to_display: none
63996400
include_query_params: false
6400-
export_filesystem: private
64016401
cache_metadata:
64026402
max-age: -1
64036403
contexts:
@@ -7891,10 +7891,10 @@ display:
78917891
previously_dispositioned: '0'
78927892
filename: my-assignments.csv
78937893
automatic_download: false
7894+
export_filesystem: private
78947895
custom_redirect_path: false
78957896
redirect_to_display: none
78967897
include_query_params: false
7897-
export_filesystem: private
78987898
cache_metadata:
78997899
max-age: -1
79007900
contexts:
@@ -9473,10 +9473,10 @@ display:
94739473
previously_dispositioned: '0'
94749474
filename: 'submitted-items-[date:html_datetime].csv'
94759475
automatic_download: false
9476+
export_filesystem: private
94769477
custom_redirect_path: false
94779478
redirect_to_display: none
94789479
include_query_params: false
9479-
export_filesystem: private
94809480
cache_metadata:
94819481
max-age: -1
94829482
contexts:

web/sites/default/config/webform.webform.apply_outdoor_dining_permit.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ elements: |-
142142
'#address_suggest': '0'
143143
apply_acknowledgement_application_requirements:
144144
'#type': checkbox
145-
'#title': 'I understand that PBOT staff will reach out to me for additional application requirements after submitting this form. I will be required to provide the following to begin the application process: application payment, a site plan or drawing, a completed property owner consent form, a completed American Rescue Plan form, and current insurance documents.'
145+
'#title': 'I understand that PBOT staff will reach out to me for additional application requirements after submitting this form. I will be required to provide the following to begin the application process: application payment, a site plan or drawing, a completed property owner consent form, and current insurance documents.'
146146
'#required': true
147147
apply_acknowledgement_inspection:
148148
'#type': checkbox
@@ -185,7 +185,7 @@ elements: |-
185185
'#mode': text
186186
'#template': |-
187187
{% for type in data.apply_permit_type %}
188-
26630232631319_{{ type }}
188+
26630232631319_{{ type }}
189189
{% endfor %}
190190
'#whitespace': trim
191191
'#store': true
@@ -394,7 +394,7 @@ handlers:
394394
assignee_id: ''
395395
type: question
396396
collaborators: ''
397-
custom_fields: "6353388345367: 'apply_outdoor_dining'\r\n26253458420759: ['[webform_submission:values:org_name_escaped:htmldecode]', 'apply_org_name']\r\n25600783638295: ['[webform_submission:values:contact_phone]', 'contact_phone']\r\n1500012743961: ['[webform_submission:values:apply_site_address:location_full_address]', 'apply_site_address:location_full_address']\r\n26252965203991: '[current-date:html_date]'\r\n14639926333463: ['[webform_submission:values:computed_ivr]', 'apply_ivr_number']\r\n1500013095781: '[webform_submission:uuid]'\r\n27773229365143: ['[webform_submission:values:contact_mailing_address:location_address], [webform_submission:values:contact_mailing_address:location_city], [webform_submission:values:contact_mailing_address:location_state] [webform_submission:values:contact_mailing_address:location_zip]', 'contact_mailing_address:location_full_address']\r\n"
397+
custom_fields: "6353388345367: 'apply_outdoor_dining'\r\n26253458420759: ['[webform_submission:values:org_name_escaped:htmldecode]', 'apply_org_name']\r\n25600783638295: ['[webform_submission:values:contact_phone]', 'contact_phone']\r\n1500012743961: ['[webform_submission:values:apply_site_address:location_full_address]', 'apply_site_address:location_full_address']\r\n5581480390679: ['[webform_submission:values:apply_site_address:location_lat]', 'apply_site_address:location_lat']\r\n5581490332439: ['[webform_submission:values:apply_site_address:location_lon]', 'apply_site_address:location_lon']\r\n13407901552407: ['[webform_submission:values:apply_site_address:location_x]', 'apply_site_address:location_x']\r\n13407918835095: ['[webform_submission:values:apply_site_address:location_y]', 'apply_site_address:location_y']\r\n26252965203991: '[current-date:html_date]'\r\n14639926333463: ['[webform_submission:values:computed_ivr]', 'apply_ivr_number']\r\n1500013095781: '[webform_submission:uuid]'\r\n27773229365143: ['[webform_submission:values:contact_mailing_address:location_address], [webform_submission:values:contact_mailing_address:location_city], [webform_submission:values:contact_mailing_address:location_state] [webform_submission:values:contact_mailing_address:location_zip]', 'contact_mailing_address:location_full_address']\r\n"
398398
ticket_id_field: report_ticket_id
399399
ticket_fork_field: ''
400400
ticket_form_id: '26628296208535'

web/sites/default/config/webform.webform.apply_sidewalk_bike_rack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ elements: |-
3838
'#require_portland_city_limits': 1
3939
apply_attachments:
4040
'#type': webform_document_file
41-
'#title': 'Upload a photo of the desired rack location'
41+
'#title': 'Upload a photo of the desired rack location (optional)'
4242
'#max_filesize': '10'
4343
'#file_extensions': 'pdf jpg jpeg png'
4444
section_application_details:

web/sites/default/config/webform.webform.bes_stormwater_intake.yml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -184,13 +184,17 @@ elements: |-
184184
'#max_filesize': '10'
185185
'#file_extensions': 'pdf jpg jpeg png'
186186
'#sanitize': true
187+
'#states':
188+
invisible:
189+
':input[name="hidden_tier_change"]':
190+
value: none
187191
section_contact:
188192
'#type': webform_section
189193
'#title': 'Your contact information'
190194
'#states':
191195
invisible:
192-
':input[name="no_tier_change"]':
193-
value: 'true'
196+
':input[name="hidden_tier_change"]':
197+
value: none
194198
contact_name:
195199
'#type': textfield
196200
'#title': Name
@@ -210,14 +214,6 @@ elements: |-
210214
'#autocomplete': tel-national
211215
'#required': true
212216
'#input_mask': '(999) 999-9999'
213-
preferred_communication_method:
214-
'#type': radios
215-
'#title': 'What is your preferred method of communication?'
216-
'#options':
217-
address: 'Address on file with the Portland Water Bureau'
218-
email: Email
219-
phone: Phone
220-
'#required': true
221217
section_acknowledgement:
222218
'#type': webform_section
223219
'#title': Acknowledgement
@@ -455,7 +451,6 @@ handlers:
455451
6025748329484164: contact_name
456452
1522148702113668: contact_email
457453
4613465244389252: contact_phone
458-
7151648236326788: preferred_communication_method
459454
7923926305820548: sqft_roof_area
460455
2929523585666948: sqft_driveway_and_parking
461456
4055423492509572: sqft_other_hard_surfaces
@@ -534,7 +529,6 @@ handlers:
534529
3608434433019780: contact_name
535530
8112034060390276: contact_email
536531
793684665913220: contact_phone
537-
5297284293283716: preferred_communication_method
538532
3045484479598468: sqft_roof_area
539533
7549084106968964: sqft_driveway_and_parking
540534
1919584572755844: sqft_other_hard_surfaces

web/sites/default/config/webform.webform.contact_elected_official_2025.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ elements: |-
8282
'#type': select
8383
'#title': 'Please select an elected official'
8484
'#prepopulate': true
85+
'#required': true
8586
'#options':
8687
'Mayor Keith Wilson': 'Mayor Keith Wilson'
8788
'Auditor Simone Rede': 'Auditor Simone Rede'

web/sites/default/config/webform.webform.find_tree_planting_programs.yml

Lines changed: 33 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ elements: |-
4242
- ':input[name="apply_planting_location"]':
4343
value: 'Front Yard'
4444
- or
45+
- ':input[name="apply_planting_location"]':
46+
value: 'Back Yard'
47+
- or
4548
- ':input[name="apply_planting_location"]':
4649
value: 'Apartment complex'
4750
- or
@@ -83,6 +86,11 @@ elements: |-
8386
':input[name="apply_address[location_capture_field]"]':
8487
value: ''
8588
- or
89+
- ':input[name="apply_planting_location"]':
90+
value: 'Back Yard'
91+
':input[name="apply_address[location_capture_field]"]':
92+
value: ''
93+
- or
8694
- ':input[name="apply_planting_location"]':
8795
value: 'Apartment complex'
8896
':input[name="apply_address[location_capture_field]"]':
@@ -93,6 +101,31 @@ elements: |-
93101
':input[name="apply_address[location_capture_field]"]':
94102
value: ''
95103
'#markup': '<hr><p><strong>You might qualify for the following programs:</strong></p>'
104+
markup_ytg:
105+
'#type': webform_markup
106+
'#states':
107+
visible:
108+
- ':input[name="apply_planting_location"]':
109+
value: 'Front Yard'
110+
':input[name="apply_address[location_capture_field]"]':
111+
'!value': ''
112+
- or
113+
- ':input[name="apply_planting_location"]':
114+
value: 'Apartment complex'
115+
':input[name="apply_address[location_capture_field]"]':
116+
'!value': ''
117+
- or
118+
- ':input[name="apply_planting_location"]':
119+
value: 'Business'
120+
':input[name="apply_address[location_capture_field]"]':
121+
'!value': ''
122+
- or
123+
- ':input[name="apply_planting_location"]':
124+
value: 'Back Yard'
125+
':input[name="apply_address[location_capture_field]"]':
126+
'!value': ''
127+
'#admin_title': 'Yard Tree Giveaway'
128+
'#markup': '<div class="card mb-4"><div class="card-body"><h2 class="card-title mt-0">Trees for your Yard</h2><p>Portlanders can receive up to three free trees for their yards! Choose from evergreens, flowering trees, nut-bearing, and trees rich with autumn colors. Trees must be planted on private property (not in planting strips) and cared for by the recipient. While we hold giveaway events in neighborhoods with the greatest need for tree cover, all Portland residents are able to participate. Registration opens each September for fall pick-up locations across the city.</p><p><a class="btn-cta-outline" href="https://www.portland.gov/trees/tree-planting/find-your-free-trees/trees-your-yard">Yard Tree Giveaway</a></p></div></div>'
96129
container_neighborhood_based:
97130
'#type': container
98131
markup_planting_strip_ineligible:
@@ -173,29 +206,6 @@ elements: |-
173206
value: 'School yard'
174207
'#admin_title': 'School Yard - Learning Landscapes'
175208
'#markup': '<div class="card mb-4"><div class="card-body"><h2 class="card-title mt-0">Trees for Schools</h2><p>Students of all ages can get their hands dirty planting trees with Urban Forestry at their schools! Schools receive planning, free trees, planting, and three years of water and care through the Learning Landscapes program. Applications are accepted year-round and tree plantings occur in the fall and winter.</p><p><a class="btn-cta-outline" href="https://www.portland.gov/trees/tree-planting/trees-schools">Learning Landscapes</a></p></div></div>'
176-
markup_ytg:
177-
'#type': webform_markup
178-
'#states':
179-
visible:
180-
- ':input[name="apply_planting_location"]':
181-
value: 'Front Yard'
182-
':input[name="apply_address[location_capture_field]"]':
183-
'!value': ''
184-
- or
185-
- ':input[name="apply_planting_location"]':
186-
value: 'Apartment complex'
187-
':input[name="apply_address[location_capture_field]"]':
188-
'!value': ''
189-
- or
190-
- ':input[name="apply_planting_location"]':
191-
value: 'Business'
192-
':input[name="apply_address[location_capture_field]"]':
193-
'!value': ''
194-
- or
195-
- ':input[name="apply_planting_location"]':
196-
value: 'Back Yard'
197-
'#admin_title': 'Yard Tree Giveaway'
198-
'#markup': '<div class="card mb-4"><div class="card-body"><h2 class="card-title mt-0">Trees for your Yard</h2><p>Portlanders can receive up to three free trees for their yards! Choose from evergreens, flowering trees, nut-bearing, and trees rich with autumn colors. Trees must be planted on private property (not in planting strips) and cared for by the recipient. While we hold giveaway events in neighborhoods with the greatest need for tree cover, all Portland residents are able to participate. Registration opens each September for fall pick-up locations across the city.</p><p><a class="btn-cta-outline" href="https://www.portland.gov/trees/tree-planting/find-your-free-trees/trees-your-yard">Yard Tree Giveaway</a></p></div></div>'
199209
actions:
200210
'#type': webform_actions
201211
'#title': 'Submit button(s)'

web/sites/default/config/webform.webform.report_abandoned_bicycle.yml

Lines changed: 36 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -27,39 +27,30 @@ description: ''
2727
categories:
2828
- Report
2929
elements: |-
30-
contact_name:
31-
'#type': textfield
32-
'#title': 'Your name'
33-
'#autocomplete': name
34-
contact_phone_number:
35-
'#type': textfield
36-
'#title': 'Your contact phone number'
37-
'#autocomplete': tel
38-
'#input_mask': '(999) 999-9999'
39-
contact_email:
40-
'#type': textfield
41-
'#title': 'Your contact email'
42-
'#autocomplete': email
43-
'#pattern': '^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$'
44-
'#pattern_error': 'Please enter a correctly formatted email address, such as myname@example.com.'
45-
report_bicycle_location:
46-
'#type': textarea
30+
report_location:
31+
'#type': portland_location_picker
4732
'#title': 'Bicycle location'
48-
'#description': '<p>Please be as specific as possible.</p>'
49-
'#description_display': before
33+
'#required': true
34+
'#place_name__access': false
35+
'#location_search__title': 'Bicycle location'
36+
'#location_details__access': false
37+
'#require_boundary': true
5038
report_bicycle_description:
5139
'#type': textarea
5240
'#title': 'Bicycle description'
5341
'#description': '<p>Please be as detailed as possible.</p>'
5442
'#description_display': before
43+
'#required': true
5544
report_bike_movement:
5645
'#type': radios
5746
'#title': 'Has the bicycle moved within 72 hours?'
5847
'#options': yes_no
48+
'#required': true
5949
report_bike_storage:
6050
'#type': radios
6151
'#title': 'Is the bicycle attached to a City of Portland rack?'
6252
'#options': yes_no
53+
'#required': true
6354
report_additional_comments_questions:
6455
'#type': textarea
6556
'#title': 'Additional comments or questions'
@@ -73,6 +64,26 @@ elements: |-
7364
'#sanitize': true
7465
'#max_resolution': 1280x1280
7566
'#attachment_image_style': webform_report_uploaded_image
67+
section_contact:
68+
'#type': webform_section
69+
'#title': 'Your contact information'
70+
contact_name:
71+
'#type': textfield
72+
'#title': Name
73+
'#autocomplete': name
74+
contact_email:
75+
'#type': textfield
76+
'#title': Email
77+
'#description': '<p>We will use your email to confirm your submission.</p>'
78+
'#autocomplete': email
79+
'#required': true
80+
'#pattern': '^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$'
81+
'#pattern_error': 'Please enter a correctly formatted email address, such as myname@example.com.'
82+
contact_phone:
83+
'#type': textfield
84+
'#title': Phone
85+
'#autocomplete': tel-national
86+
'#input_mask': '(999) 999-9999'
7687
css: ''
7788
javascript: ''
7889
settings:
@@ -270,9 +281,10 @@ handlers:
270281
column_mappings:
271282
7898164926648196: _submission_id_
272283
579815532171140: contact_name
273-
5083415159541636: contact_phone_number
284+
5083415159541636: contact_phone
274285
2831615345856388: contact_email
275-
7377946609487748: report_bicycle_location
286+
7377946609487748: report_location__location_lat
287+
6843166736289668: report_location__location_lon
276288
1748447075274628: report_bicycle_description
277289
6252046702645124: report_bike_movement
278290
4000246888959876: report_bike_storage
@@ -342,25 +354,16 @@ handlers:
342354
bcc_options: { }
343355
cc_mail: ''
344356
cc_options: { }
345-
from_mail: _default
357+
from_mail: noreply@portlandoregon.gov
346358
from_options: { }
347359
from_name: _default
348360
reply_to: ''
349361
return_path: ''
350362
sender_mail: ''
351363
sender_name: ''
352364
subject: 'Abandoned bicycle report received'
353-
body: '<p>Thank you for reporting an abandoned bicycle. A City staff person will investigate within 10 business days. &nbsp;</p><p>You may not receive a direct response to your report, but the issue will be investigated. If you would like to contact a staff person please email <a href="mailto:abandonedbikes@portlandoregon.gov">abandonedbikes@portlandoregon.gov</a> or call <a href="tel:+1-503-823-5816">(503) 823-5816</a>.</p><p>Thank you!</p>'
354-
excluded_elements:
355-
contact_name: contact_name
356-
contact_phone_number: contact_phone_number
357-
contact_email: contact_email
358-
report_bicycle_location: report_bicycle_location
359-
report_bicycle_description: report_bicycle_description
360-
report_bike_movement: report_bike_movement
361-
report_bike_storage: report_bike_storage
362-
report_additional_comments_questions: report_additional_comments_questions
363-
report_bike_pictures: report_bike_pictures
365+
body: '<p><em><strong>This is an automated message, please do not reply.</strong></em></p><p>Thank you for reporting an abandoned bicycle. A City staff person will investigate within 10 business days. &nbsp;</p><p>You may not receive a direct response to your report, but the issue will be investigated. If you would like to contact a staff person please email <a href="mailto:abandonedbikes@portlandoregon.gov">abandonedbikes@portlandoregon.gov</a> or call <a href="tel:+1-503-823-5816">(503) 823-5816</a>.</p><p>Thank you!</p>'
366+
excluded_elements: { }
364367
ignore_access: false
365368
exclude_empty: true
366369
exclude_empty_checkbox: false

0 commit comments

Comments
 (0)