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.

Sign up for GitHub

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

Jump to bottom

Jl form functionality cleanup #157

Merged
merged 8 commits into from
Mar 28, 2017
Merged

Jl form functionality cleanup #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4b33116
Converting from military time. Still need to add am/pm.
jleonardw9 Mar 15, 2017
0af5194
Adding in the am/pm.
jleonardw9 Mar 15, 2017
fb31334
Cleanup
jleonardw9 Mar 15, 2017
f106c48
Allowing multiple values for the checkboxs. Getting values to display…
jleonardw9 Mar 15, 2017
c27070d
Adding back in the checkbox option.
jleonardw9 Mar 15, 2017
e900204
fix for viewing checkboxes on edit
Mar 16, 2017
8a903a4
Forgot to account for 10 and 11 AM.
jleonardw9 Mar 17, 2017
343f10f
Using built in tool for dealing with am/pm for converting military time.
jleonardw9 Mar 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/helpers/additional_details/application_helper.rb
View file
Open in desktop
@@ -1,2 +1,6 @@
module AdditionalDetails::ApplicationHelper

def convert_time(time)
DateTime.strptime(time, '%H:%M').strftime('%l:%M %p')
end
end
4 changes: 4 additions & 0 deletions app/views/additional_details/submissions/_submission_info.html.haml
View file
Open in desktop
Expand Up @@ -9,6 +9,10 @@
%p.list-group-item-text
- if item.item_type == 'multiple_dropdown'
= qr.content.delete('[]').delete('\"')
- elsif item.item_type == 'time'
= convert_time(qr.content)
- elsif item.item_type == 'checkbox'
= qr.content.gsub(/["\[\]]/, '')
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested qr.content.delete('[]').delete('\"') and qr.content.gsub(/["\[\]]/, '') and they appear to be doing the same thing: Replacing/removing the characters []". We should combine this block and the if block into a single statement.
if ['checkbox', 'multiple_dropdown'].include?(item.item_type)
qr.content.delete('[]\"') or qr.content.gsub(/["\[\]]/, '')

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would label that a refactor and make another pull request. Not necessary to proceed. In the same thought you could change 'qr.content.gsub' to another method call similar to convert_time.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair enough.

- else
= qr.content
- unless item == @items.last
Expand Down
2 changes: 1 addition & 1 deletion app/views/additional_details/submissions/form_partials/_checkbox_form_partial.html.haml
View file
Open in desktop
@@ -1,5 +1,5 @@
%br
- item.item_options.each do |item_option|
= qr.label :content, class: 'checkbox-inline' do
= qr.check_box :content, {}, item_option.content, nil
= qr.check_box :content, { multiple: true, checked: (qr.object.content.include?(item_option.content) unless qr.object.content.nil?)}, item_option.content, nil
= item_option.content
1 change: 1 addition & 0 deletions config/constants.yml
View file
Open in desktop
Expand Up @@ -840,6 +840,7 @@ additional_detail_question_types: {
'Text': 'text',
'Text Area': 'textarea',
'Radio Button': 'radio_button',
'Checkbox': 'checkbox',
'Yes/No': 'yes_no',
'Email': 'email',
'Date': 'date',
Expand Down