Merge pull request #925 from civis-vote/make-safisfaction-optional-main

Feat:Made Satisfaction Rating Optional

app/controllers/admin/consultations_controller.rb

@@ -194,7 +194,7 @@ def import_responses
 	private
 
 	def secure_params
-    params.require(:consultation).permit(:title, :title_hindi, :title_odia, :url, :ministry_id, :response_deadline, :summary, :consultation_feedback_email, :review_type, :visibility, :response_submission_message, :private_response, :officer_name, :officer_designation)
+    params.require(:consultation).permit(:title, :title_hindi, :title_odia, :url, :ministry_id, :response_deadline, :summary, :consultation_feedback_email, :review_type, :visibility, :response_submission_message, :private_response, :officer_name, :officer_designation, :is_satisfaction_rating_optional)
  end
 
 	def set_consultation

app/controllers/organisation/consultations_controller.rb

@@ -144,7 +144,7 @@ def import_responses
   private
 
   def secure_params
-    params.require(:consultation).permit(:title, :title_hindi, :title_odia, :url, :ministry_id, :response_deadline, :summary, :consultation_feedback_email, :review_type, :visibility, :private_response, :organisation_id)  
+    params.require(:consultation).permit(:title, :title_hindi, :title_odia, :url, :ministry_id, :response_deadline, :summary, :consultation_feedback_email, :review_type, :visibility, :private_response, :organisation_id, :is_satisfaction_rating_optional)  
   end
 
   def set_consultation

app/graphql/types/inputs/consultation_response/create.rb

@@ -7,7 +7,7 @@ class Create < Types::BaseInputObject
 				argument :consultation_id,							Int,																										nil,	required: true
 				argument :response_text,								String,																								nil,	required: false
 				argument :response_status,							Int,																										nil,	required: true
-				argument :satisfaction_rating,					Types::Enums::ConsultationResponseSatisfactionRatings,	nil,	required: true
+				argument :satisfaction_rating,					Types::Enums::ConsultationResponseSatisfactionRatings,	nil,	required: false
 				argument :template_id,									Int,																										"ID of the response you are using as a template",	required: false, default_value: nil
 				argument :visibility,										Types::Enums::ConsultationResponseVisibilities,					nil,	required: true
 			end

app/graphql/types/objects/consultation/base.rb

@@ -26,6 +26,7 @@ def visible?(context)
 				end
 				field :response_submission_message,				String, nil, null: true
 				field :review_type,												Types::Enums::ConsultationReviewType, nil, null: false
+				field :is_satisfaction_rating_optional,			Boolean, nil, null: false
 				field :satisfaction_rating_distribution, 	GraphQL::Types::JSON, nil, null: true
 				field :shared_responses,									Types::Connections::ConsultationResponse, nil, null: true do 
 					argument :sort,													Types::Enums::ConsultationResponseSorts, 	required: false, default_value: nil
@@ -72,7 +73,6 @@ def odia_title
 					 object.title_odia
 				end
 
-
 				def english_summary
 					return unless object.english_summary.to_s.present?
 

app/graphql/types/objects/consultation_response/base.rb

@@ -14,7 +14,7 @@ class Base < BaseObject
 				field :response_text,											String, nil, null: true
 				field :response_status,												Integer, nil, null: false
 				field :round_number,											Integer, nil, null: true
-				field :satisfaction_rating,								Types::Enums::ConsultationResponseSatisfactionRatings, nil, null: false
+				field :satisfaction_rating,								Types::Enums::ConsultationResponseSatisfactionRatings, nil, null: true
 				field :satisfaction_rating_distribution, 	GraphQL::Types::JSON, nil, null: true
 				field :templates_count,										Integer, "Count of responses that used this response as a template", null: false
 				field :up_vote_count,											Integer, "Count of users that up-voted this response", null: false

app/views/admin/consultations/_form.html.slim

@@ -10,6 +10,8 @@
         = f.input :visibility, as: :boolean, checked_value: "private_consultation", unchecked_value: "public_consultation", label: "Private Consultation"
       .private-consultation
         = f.input :private_response, as: :boolean, checked_value: 1, unchecked_value: 0, label: "Enforce Private Response"
+      .private-consultation
+        = f.input :is_satisfaction_rating_optional, as: :boolean, label: "Is Satisfaction Rating Optional", include_hidden: true       
       = f.input :consultation_feedback_email, placeholder: "Consultation feedback email address", required: false, autofocus: true, wrapper: :form_input_group, input_html: { id: "consultation_feedback_email" }
       = f.input :officer_name, placeholder: "Officer name", required: false, autofocus: true, wrapper: :form_input_group, input_html: { id: "officer_name" }
       = f.input :officer_designation, placeholder: "Officer designation", required: false, autofocus: true, wrapper: :form_input_group, input_html: { id: "officer_designation" }

app/views/admin/consultations/show.html.slim

@@ -166,6 +166,13 @@
   .admin-list-bg.mt-4
     .consultation-feedback-flex
       .width-50 class="#{@consultation.private_consultation? ? '' : 'width-75'}"
+        .p-4
+          .question-parent
+            .question-header-text
+              | Is Satisfaction Rating optional?
+            .question-text
+              .padding-right-40
+                = @consultation.is_satisfaction_rating_optional ? "Yes" : "No"
         - if (@consultation.private_consultation? && @response_rounds.size > 1)
           ul.questions-rounds-tab.nav.nav-tabs.mt-2.pb-3.questions-box-shadow-top role="tablist"
             - @response_rounds.each_with_index do |response_round, index|

app/views/organisation/consultations/show.html.slim

@@ -122,6 +122,13 @@
   .admin-list-bg.mt-4
     .consultation-feedback-flex
       .width-50
+        .p-4
+            .question-parent
+              .question-header-text
+                | Is Satisfaction Rating optional?
+              .question-text
+                .padding-right-40
+                  = @consultation.is_satisfaction_rating_optional ? "Yes" : "No"
         - if @response_rounds.size > 1
           ul.questions-rounds-tab.nav.nav-tabs.mt-2.pb-3.questions-box-shadow-top role="tablist"
             - @response_rounds.each_with_index do |response_round, index|

db/migrate/20241021070453_add_is_satisfaction_rating_enabled_to_consultations.rb

@@ -0,0 +1,9 @@
+class AddIsSatisfactionRatingEnabledToConsultations < ActiveRecord::Migration[7.1]
+  def up
+    add_column :consultations, :is_satisfaction_rating_optional, :boolean, default: false, null: false
+  end
+
+  def down
+    remove_column :consultations, :is_satisfaction_rating_optional
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2024_09_02_200244) do
+ActiveRecord::Schema[7.1].define(version: 2024_10_21_070453) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
   enable_extension "uuid-ossp"
@@ -193,6 +193,7 @@
     t.string "officer_designation"
     t.string "title_hindi"
     t.string "title_odia"
+    t.boolean "is_satisfaction_rating_optional", default: false, null: false
     t.index ["deleted_at"], name: "index_consultations_on_deleted_at"
     t.index ["ministry_id"], name: "index_consultations_on_ministry_id"
   end