Show credit hours/hours if present on education card

Author: bencalegari

app/app/services/education_activity_card_builder.rb

@@ -71,9 +71,12 @@ def validated_month_data(month_start:, effective_term:)
   end
 
   def partial_self_attested_month_data(term:, month_start:)
+    credit_hours = @activity.review_term_credit_hours(term)
     {
       month: month_start,
-      enrollment_status: term.enrollment_status_display
+      enrollment_status: term.enrollment_status_display,
+      credit_hours: credit_hours,
+      community_engagement_hours: @activity.community_engagement_hours(credit_hours)
     }
   end
 

app/app/views/activities/activities/index.html.erb

@@ -156,9 +156,10 @@
                   <div class="activity-month-details__data">
                     <% if month_data[:enrollment_status].present? %>
                       <p class="margin-y-0"><%= t("activities.hub.cards.enrollment_status", status: month_data[:enrollment_status]) %></p>
-                    <% else %>
-                      <p class="margin-y-0"><%= t("activities.hub.cards.credit_hours", amount: month_data[:credit_hours]) %></p>
-                      <p class="margin-y-0"><%= t("activities.hub.cards.hours", count: month_data[:community_engagement_hours]) %></p>
+                    <% end %>
+                    <% if month_data[:credit_hours].present? %>
+                      <p class="margin-y-0"><%= t("activities.hub.cards.credit_hours", amount: format_decimal_amount(month_data[:credit_hours])) %></p>
+                      <p class="margin-y-0"><%= t("activities.hub.cards.hours", count: format_decimal_amount(month_data[:community_engagement_hours])) %></p>
                     <% end %>
                   </div>
                 </div>

app/spec/controllers/activities/activities_controller_spec.rb

@@ -648,16 +648,16 @@
       get :index
     end
 
-    it "shows only enrollment status on the education card" do
+    it "shows enrollment status alongside credit hours on the education card" do
       expect(response.body).to include("Test University")
       expect(response.body).to include(
         I18n.t(
           "activities.hub.cards.enrollment_status",
           status: I18n.t("components.enrollment_term_table_component.status.less_than_half_time")
         )
       )
-      expect(response.body).not_to include(I18n.t("activities.hub.cards.credit_hours", amount: 4))
-      expect(response.body).not_to include(I18n.t("activities.hub.cards.hours", count: 52))
+      expect(response.body).to include(I18n.t("activities.hub.cards.credit_hours", amount: 4))
+      expect(response.body).to include(I18n.t("activities.hub.cards.hours", count: 52))
       expect(response.body).not_to include(I18n.t("activities.hub.empty.education"))
     end
 
@@ -719,8 +719,8 @@
           status: I18n.t("components.enrollment_term_table_component.status.less_than_half_time")
         )
       ).length).to eq(2)
-      expect(response.body).not_to include(I18n.t("activities.hub.cards.credit_hours", amount: 3))
-      expect(response.body).not_to include(I18n.t("activities.hub.cards.credit_hours", amount: 5))
+      expect(response.body).to include(I18n.t("activities.hub.cards.credit_hours", amount: 3))
+      expect(response.body).to include(I18n.t("activities.hub.cards.credit_hours", amount: 5))
     end
   end
 

app/spec/helpers/activities_helper_spec.rb

@@ -507,16 +507,20 @@
       expect(result.first[:months]).to eq([
         {
           month: first_month,
-          enrollment_status: I18n.t("components.enrollment_term_table_component.status.less_than_half_time")
+          enrollment_status: I18n.t("components.enrollment_term_table_component.status.less_than_half_time"),
+          credit_hours: 3,
+          community_engagement_hours: 39
         },
         {
           month: second_month,
-          enrollment_status: I18n.t("components.enrollment_term_table_component.status.less_than_half_time")
+          enrollment_status: I18n.t("components.enrollment_term_table_component.status.less_than_half_time"),
+          credit_hours: 5,
+          community_engagement_hours: 65
         }
       ])
     end
 
-    it "shows enrollment status only for partially self-attested months" do
+    it "shows enrollment status and credit hours for partially self-attested months" do
       activity = create(:education_activity, activity_flow: flow, data_source: :partially_self_attested)
       create(
         :nsc_enrollment_term,
@@ -533,11 +537,15 @@
       expect(result.first[:months]).to eq([
         {
           month: first_month,
-          enrollment_status: I18n.t("components.enrollment_term_table_component.status.less_than_half_time")
+          enrollment_status: I18n.t("components.enrollment_term_table_component.status.less_than_half_time"),
+          credit_hours: 6,
+          community_engagement_hours: 78
         },
         {
           month: second_month,
-          enrollment_status: I18n.t("components.enrollment_term_table_component.status.less_than_half_time")
+          enrollment_status: I18n.t("components.enrollment_term_table_component.status.less_than_half_time"),
+          credit_hours: 6,
+          community_engagement_hours: 78
         }
       ])
     end
@@ -560,7 +568,9 @@
       expect(result.first[:months].first).to eq(
         {
           month: first_month,
-          enrollment_status: I18n.t("components.enrollment_term_table_component.status.less_than_half_time")
+          enrollment_status: I18n.t("components.enrollment_term_table_component.status.less_than_half_time"),
+          credit_hours: 4,
+          community_engagement_hours: 52
         }
       )
     end
@@ -591,12 +601,14 @@
       expect(result.first[:months]).to eq([
         {
           month: second_month,
-          enrollment_status: I18n.t("components.enrollment_term_table_component.status.less_than_half_time")
+          enrollment_status: I18n.t("components.enrollment_term_table_component.status.less_than_half_time"),
+          credit_hours: 5,
+          community_engagement_hours: 65
         }
       ])
     end
 
-    it "shows enrollment status only for enrolled partially self-attested months" do
+    it "shows enrollment status and credit hours for enrolled partially self-attested months" do
       activity = create(:education_activity, activity_flow: flow, data_source: :partially_self_attested)
       create(
         :nsc_enrollment_term,
@@ -613,11 +625,15 @@
       expect(result.first[:months]).to eq([
         {
           month: first_month,
-          enrollment_status: I18n.t("components.enrollment_term_table_component.status.enrolled")
+          enrollment_status: I18n.t("components.enrollment_term_table_component.status.enrolled"),
+          credit_hours: 5,
+          community_engagement_hours: 65
         },
         {
           month: second_month,
-          enrollment_status: I18n.t("components.enrollment_term_table_component.status.enrolled")
+          enrollment_status: I18n.t("components.enrollment_term_table_component.status.enrolled"),
+          credit_hours: 5,
+          community_engagement_hours: 65
         }
       ])
     end