<%= render 'components/question_title_legend', question: question %>
<% question.question_options.each_with_index do |option, index| %>
diff --git a/db/migrate/20250115175322_add_service_stage_to_forms.rb b/db/migrate/20250115175322_add_service_stage_to_forms.rb
new file mode 100644
index 000000000..b1dec6071
--- /dev/null
+++ b/db/migrate/20250115175322_add_service_stage_to_forms.rb
@@ -0,0 +1,5 @@
+class AddServiceStageToForms < ActiveRecord::Migration[7.2]
+ def change
+ add_column :forms, :service_stage_id, :integer, default: nil
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index bf93a37d2..8340e667d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[7.2].define(version: 2025_01_10_215441) do
+ActiveRecord::Schema[7.2].define(version: 2025_01_15_175322) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -310,6 +310,7 @@
t.string "audience", default: "public", comment: "indicates whether a form is intended for a public or internal audience"
t.string "short_uuid", limit: 8
t.boolean "enforce_new_submission_validations", default: true
+ t.integer "service_stage_id"
t.index ["legacy_touchpoint_id"], name: "index_forms_on_legacy_touchpoint_id"
t.index ["legacy_touchpoint_uuid"], name: "index_forms_on_legacy_touchpoint_uuid"
t.index ["organization_id"], name: "index_forms_on_organization_id"
diff --git a/lib/fiscal_year.rb b/lib/fiscal_year.rb
index d66f441fb..25bb8f6d5 100644
--- a/lib/fiscal_year.rb
+++ b/lib/fiscal_year.rb
@@ -1,4 +1,21 @@
module FiscalYear
+ def self.first_day_of_fiscal_quarter(date)
+ # Adjust the month to align with the fiscal year starting in October
+ fiscal_month = (date.month - 10) % 12 + 1
+ fiscal_quarter = ((fiscal_month - 1) / 3) + 1
+
+ # Calculate the first month of the fiscal quarter
+ fiscal_start_month = ((fiscal_quarter - 1) * 3 + 10) % 12
+ fiscal_start_month = 12 if fiscal_start_month == 0 # Handle December correctly
+
+ # Determine the fiscal year for the quarter
+ fiscal_year = date.year
+ fiscal_year -= 1 if date.month < 10
+
+ # Return the first day of the quarter
+ Date.new(fiscal_year, fiscal_start_month, 1)
+ end
+
def self.last_day_of_fiscal_quarter(fiscal_year, fiscal_quarter)
year = fiscal_quarter == 1 ? fiscal_year - 1 : fiscal_year
month = case fiscal_quarter
diff --git a/spec/features/admin/forms_spec.rb b/spec/features/admin/forms_spec.rb
index e3ef9f519..49e1ec453 100644
--- a/spec/features/admin/forms_spec.rb
+++ b/spec/features/admin/forms_spec.rb
@@ -319,7 +319,7 @@
it "display 'Submitted' flash message" do
expect(page).to have_content("Viewing Form: #{form.name}")
- expect(page).to have_content('Form Information'.upcase)
+ expect(page).to have_link("Back to Forms")
expect(page).to have_content('This form has been Submitted successfully.')
end
end
@@ -350,7 +350,7 @@
it "display 'Published' flash message" do
expect(page).to have_content('Published')
expect(page).to have_content("Viewing Form: #{form.name}")
- expect(page).to have_content('Form Information'.upcase)
+ expect(page).to have_link("Back to Forms")
end
end
end
@@ -369,7 +369,7 @@
it "display 'Submitted' flash message" do
expect(page).to have_content("Viewing Form: #{form.name}")
- expect(page).to have_content('Form Information'.upcase)
+ expect(page).to have_link("Back to Forms")
expect(page).to have_content('This form has been Submitted successfully.')
end
end
@@ -526,7 +526,7 @@
within('table.submissions') do
expect(page).to have_content(submission.answer_01)
end
- expect_responses_fiscal_year_dropdown
+ expect_start_and_end_date_fields
end
end
end
@@ -546,7 +546,7 @@
expect(page).to have_content('RESPONSES BY STATUS')
expect(page).to have_content('Responses per day')
expect(page).to have_content('Total submissions received over period')
- expect_responses_fiscal_year_dropdown
+ expect_start_and_end_date_fields
expect(page).to have_content('Performance.gov Reporting')
expect(page).to have_content('Responses Summary')
end
@@ -1731,11 +1731,10 @@
before do
login_as(form_manager)
visit responses_admin_form_path(form)
- click_on "Export"
+ click_on "Download"
end
- it 'includes form attributes' do
- sleep 1.0 # TODO: remove, Remove all `sleep`s
+ it 'remains on page' do
expect(page.current_path).to eq(responses_admin_form_path(form))
end
end
@@ -1784,13 +1783,13 @@
within('table.submissions') do
expect(page).to have_content(submission.answer_01)
end
- expect_responses_fiscal_year_dropdown
+ expect_start_and_end_date_fields
end
end
end
context 'when Submissions exist for an a11_v2 form' do
- describe 'click the combine export button' do
+ describe 'click the combined download button' do
let(:form) { FactoryBot.create(:form, :a11_v2, organization:) }
let!(:submission) { FactoryBot.create(:submission, form:, answer_01: "1") }
@@ -1798,10 +1797,9 @@
visit responses_admin_form_path(form)
end
- it 'click the combine export button then see a flash message for an async job' do
- within(".form-and-a11-fiscal-year") do
- click_on("Export")
- end
+ it 'click the combine download button then see a flash message for an async job' do
+ expect(page).to have_content("to see form and A-11 responses together")
+ click_on("Download A11-v2 + Form Responses")
expect(page).to have_content("Touchpoints has initiated an asynchronous job that will take a few minutes.")
end
end
diff --git a/spec/support/touchpoints_spec_helpers.rb b/spec/support/touchpoints_spec_helpers.rb
index c250429c6..9308c0e35 100644
--- a/spec/support/touchpoints_spec_helpers.rb
+++ b/spec/support/touchpoints_spec_helpers.rb
@@ -1,6 +1,14 @@
# frozen_string_literal: true
module TouchpointsSpecHelpers
+ def expect_start_and_end_date_fields
+ expect(page).to have_text('Export responses')
+ expect(page).to have_text('Start Date')
+ expect(page).to have_text('End Date')
+ expect(page).to have_css("input#start-date[type='date']")
+ expect(page).to have_css("input#end-date[type='date']")
+ end
+
def expect_responses_fiscal_year_dropdown
expect(page).to have_text('Export responses')
expect(page).to have_text('Select Fiscal Year:')