continue notif pref screen

Author: spompea-cfa

app/controllers/diy/base_controller.rb

@@ -2,7 +2,13 @@ module Diy
   class BaseController < ApplicationController
     before_action :redirect_in_offseason
 
-    helper_method :current_path #,  :illustration_folder, :illustration_path, :next_path, :prev_path, :has_unsure_option?, :method_name, :form_name
+    def current_diy_intake
+      if session[:diy_intake_id]
+        DiyIntake.find(session[:diy_intake_id])
+      else
+        DiyIntake.new(preferred_first_name: "temp")
+      end
+    end
 
     private
 

app/controllers/diy/diy_notification_preference_controller.rb

@@ -1,9 +1,25 @@
 module Diy
   class DiyNotificationPreferenceController < BaseController
+    def edit
+      @form = DiyNotificationPreferenceForm.new
+    end
+
+    def update
+      diy_intake = current_diy_intake
+      @form = DiyNotificationPreferenceForm.new(diy_intake)
+      if @form.valid?
+        @form.save
+        session[:diy_intake_id] = diy_intake.id
+        redirect_to(diy_continue_to_fsa_path)
+      else
+        render :edit
+      end
+    end
+
     private
 
     def tracking_data
-    #  @form.attributes_for(:intake).reject { |k, _| k == :sms_phone_number }
+      @form.attributes_for(:diy_intake)
     end
 
     def illustration_path

app/controllers/diy/file_yourself_controller.rb

@@ -10,7 +10,6 @@ def update
       if @form.valid?
         @form.save
         session[:diy_intake_id] = diy_intake.id
-        #redirect_to(diy_continue_to_fsa_path)
         redirect_to(diy_diy_notification_preference_path)
       else
         render :edit
@@ -19,14 +18,6 @@ def update
 
     private
 
-    def current_diy_intake
-      if session[:diy_intake_id]
-        DiyIntake.find(session[:diy_intake_id])
-      else
-        DiyIntake.new(preferred_first_name: "temp")
-      end
-    end
-
     def create_params
       form_params = params.fetch(:file_yourself_form, {}).permit(*FileYourselfForm.attribute_names)
       if DiyIntake.should_carry_over_params_from?(current_intake)

app/forms/diy_notification_preference_form.rb

@@ -1,10 +1,18 @@
 class DiyNotificationPreferenceForm < Form
+  include FormAttributes
+  attr_accessor :diy_intake
   set_attributes_for :diy_intake, :sms_notification_opt_in, :email_notification_opt_in
 
+  def initialize(diy_intake = nil, params = {})
+    @diy_intake = diy_intake
+    super(params)
+  end
+
   def save
     diy_intake.update(attributes_for(:diy_intake))
   end
 
   def self.existing_attributes(diy_intake)
     HashWithIndifferentAccess.new(diy_intake.attributes)
   end
+end

app/views/diy/diy_notification_preference/edit.html.erb

@@ -1,6 +1,11 @@
 <% content_for :page_title, t("views.questions.notification_preference.title") %>
 
-<% content_for :card do %>
+<section class="slab slab--white question-layout">
+  <div class="grid">
+    <div class="grid__item question-wrapper">
+      <div class="main-content-inner">
+        <%= image_tag("questions/contact-preference.svg", alt: "") %>
+
   <%= form_with model: @form, url: diy_diy_notification_preference_path, local: true, method: "put", builder: VitaMinFormBuilder, html: { class: "form-card" } do |f| %>
     <h1 class="h2"><%= content_for(:page_title) %></h1>
 
@@ -30,5 +35,5 @@
     </div>
 
     <%= f.continue %>
-  <% end %>
 <% end %>
+</div></div></div></section>