Transforming actions

app/models/Course.php

@@ -61,7 +61,7 @@ class Course extends Eloquent
       ->select('activities.id')
       ->distinct()
       ->lists('activities.id');
-    //return $this->hasMany('Activity')->whereNotNull('activities.outcomes_attempted')->where('activities.draft', 0)->orderBy('date', 'asc');
+    //$this->hasMany('Activity')->whereNotNull('activities.outcomes_attempted')->where('activities.draft', 0)->orderBy('date', 'asc');
     return  $this->hasMany('Activity')->whereIn('activities.id', $activitiesAssessed)->orderBy('date', 'asc');
   }
 

app/views/local/professors/activity.blade.php

@@ -236,11 +236,19 @@
         <hr>
             <h5>Description</h5>
             <p>{{ $activity->description }}</p>
-
-        @if($activity->transforming_actions != NULL)
+        <?php
+        $formative_actions = $activity->formativeActionsWithCriteria();
+        ?>
+        @if($formative_actions != NULL)
             <hr>
-            <h5>Transforming Actions</h5>
-            {{{ $activity->transforming_actions }}}
+            <h5>Formative Actions</h5>
+            <p><strong>{{ $formative_actions[0]->at_text }}: </strong> {{$formative_actions[0]->description}}</p>
+            <h5>Formative Action's Associated Criteria</h5>
+            <ul>
+                @foreach($formative_actions as $criteria)
+                <li>{{$criteria->name}}</li>
+                @endforeach
+            </ul>
         @endif
 
         @if($activity->assessment_comments != NULL)