|
@@ -818,8 +818,7 @@ class ActivitiesController extends \BaseController
|
818
|
818
|
->addSelect('activity_criterion.activity_id', 'activity_criterion.weight', 'activity_criterion.id as activity_criterion_id')
|
819
|
819
|
->addSelect('rubric_criterion.rubric_id', 'rubric_criterion.id as rubric_criterion_id')
|
820
|
820
|
->get();
|
821
|
|
- //Log::info("EN mi cuarto o o o");
|
822
|
|
- //Log::info($rubric_criterion);
|
|
821
|
+
|
823
|
822
|
|
824
|
823
|
foreach ($rubric_criterion as $index => $crit) {
|
825
|
824
|
$crit->scales = DB::table('scales')
|
|
@@ -1003,8 +1002,6 @@ class ActivitiesController extends \BaseController
|
1003
|
1002
|
->select('activity_criterion.id', 'activity_criterion.criterion_id')
|
1004
|
1003
|
->addSelect('criteria.name')
|
1005
|
1004
|
->get();
|
1006
|
|
- Log::info("AAAA");
|
1007
|
|
- Log::info($results_2);
|
1008
|
1005
|
|
1009
|
1006
|
|
1010
|
1007
|
|