Push de views a formative actions.

Falta algo, falta arreglar activity cobntroller a ver como cataloga los transformative actions.

.gitignore

@@ -12,4 +12,5 @@ app/config/app.php
 app/config/database.php
 node_modules/
 app/config/
-app/controllers/AuthController.php
+app/controllers/AuthController.php
+app/controllers/AuthController.php

app/controllers/ActivitiesController.php

@@ -197,8 +197,7 @@ class ActivitiesController extends \BaseController
             ->join('rubric_title', 'rubric_title.title_id', '=', 'titles.id')
             ->where('rubric_title.rubric_id', '=', $rubric->id)
             ->lists('text');
-        Log::info($rubric);
-        Log::info($activity);
+
         $rubric_criterion = DB::table('criteria')
             ->join("rubric_criterion", "rubric_criterion.criterion_id", "=", "criteria.id")
             ->join("activity_criterion", "criteria.id", '=', 'activity_criterion.criterion_id')
@@ -208,8 +207,7 @@ class ActivitiesController extends \BaseController
             ->addSelect('activity_criterion.activity_id', 'activity_criterion.weight', 'activity_criterion.id as activity_criterion_id')
             ->addSelect('rubric_criterion.rubric_id', 'rubric_criterion.id as rubric_criterion_id')
             ->get();
-        Log::info("EN mi cuarto o o o");
-        Log::info($rubric_criterion);
+
         foreach ($rubric_criterion as $index => $singleCR) {
             $singleCR->scales = json_encode(DB::table('scales')
                 ->join('criterion_scale', 'criterion_scale.scale_id', '=', 'scales.id')
@@ -218,8 +216,7 @@ class ActivitiesController extends \BaseController
                 ->lists('description'));
         }
         $rubric_criterion_ids = DB::table('rubric_criterion')->where('rubric_id', '=', $rubric->id)->lists('id');
-        Log::info($rubric);
-        Log::info($rubric_criterion);
+
 
 
 
@@ -227,12 +224,12 @@ class ActivitiesController extends \BaseController
 
         // Get results
         $activity_criterion_ids = DB::table('activity_criterion')->where("activity_id", '=', $activity->id)->lists('id');
-        Log::info($activity_criterion_ids);
+
         $assessments = DB::table('assessments')
             ->join('students', 'assessments.student_id', '=', 'students.id')
             ->whereIn('activity_criterion_id', $activity_criterion_ids)
             ->orderBy('assessments.id', 'asc')->get();
-        Log::info($assessments);
+
         // Decode the scores (blade workaround)
         $scores_array = array();
 
@@ -242,8 +239,6 @@ class ActivitiesController extends \BaseController
                 ->where("activity_id", '=', $activity->id)
                 ->select('comments')->first()->comments;
         }
-        Log::info($assessments);
-        Log::info($scores_array);
 
 
         return View::make('local.professors.assessment', compact('activity', 'title', 'students', 'course', 'rubric_criterion', 'assessments', 'scores_array', 'rubric'));

app/controllers/AuthController.php

@@ -28,9 +28,9 @@ class AuthController extends \BaseController
 
 		if (!$validator->fails()) {
 			//			TODO: Remove this for production environment
-// 			if (App::environment('local', 'staging')) {
-// 				return $this->processLogin();
-// 			}
+			if (App::environment('local', 'staging')) {
+				return $this->processLogin();
+			}
 			try {
 				// User input
 				$username = str_replace('@upr.edu', '', Input::get('email'));

app/controllers/TransformativeActionsController.php

@@ -1229,8 +1229,8 @@ class TransformativeActionsController extends \BaseController
         break;
 
       case 2:
-        $schools = DB::table('schools')->where('id', Auth::user()->school_id)->first();
-        $programs = DB::table('programs')->where('school_id', $schools->id)->get();
+        $schools = DB::table('schools')->where('id', Auth::user()->school_id)->get();
+        $programs = DB::table('programs')->where('school_id', $schools[0]->id)->get();
         break;
       case 3:
         $programs = DB::table('programs')
@@ -1241,6 +1241,7 @@ class TransformativeActionsController extends \BaseController
         $schools = DB::table('schools')->where('id', $programs[0]->school_id)->get();
         break;
     }
+
     return View::make('local.managers.shared.view_formative', compact('title', 'outcomes', 'schools', 'programs', 'semesters'));
   }
 
@@ -1285,7 +1286,7 @@ class TransformativeActionsController extends \BaseController
 
 
     //each row has objectives, repeated ta, but distinct activity_criterion_id
-    $objective_ta = DB::table('typ_semester_objectives')
+    /* $objective_ta = DB::table('typ_semester_objectives')
       ->join('transformative_objective as trob', 'trob.objective_id', '=', 'typ_semester_objectives.objective_id')
       ->join('objectives', 'trob.objective_id', '=', 'objective_id')
       ->join('transformative_actions', 'transformative_actions.id', 'trob.ta_id')
@@ -1295,7 +1296,7 @@ class TransformativeActionsController extends \BaseController
       ->distinct()
       ->get();
 
-    $objective_ta = DB::table('typ_semester_objectives')
+     $objective_ta = DB::table('typ_semester_objectives')
       ->join('transformative_objective as trob', 'trob.objective_id', '=', 'typ_semester_objectives.objective_id')
       ->join('objectives', 'trob.objective_id', '=', 'objective_id')
       ->join('transformative_actions', 'transformative_actions.id', 'trob.ta_id')
@@ -1303,7 +1304,7 @@ class TransformativeActionsController extends \BaseController
       ->select('transformative_actions.*')
       ->addSelect('objectives.*')
       ->distinct()
-      ->lists();
+      ->lists();*/
 
 
 
@@ -1315,6 +1316,8 @@ class TransformativeActionsController extends \BaseController
       ->whereIn('program_id', $programs)
       ->whereIn('semester_id', $semesters)
       ->join('activities', 'activities.course_id', '=', 'courses.id')
+      ->join('activity_criterion', 'activities.id', '=', 'activity_criterion.activity_id')
+      ->join('transformative_activity_criterion as tac', 'tac.activity_criterion_id', '=', 'activity_criterion.id')
       ->select('courses.*')
       ->groupBy(array('courses.code', 'courses.name', 'courses.semester_id'))
       ->get();
@@ -1328,7 +1331,7 @@ class TransformativeActionsController extends \BaseController
       $course_name->sections = DB::table('courses')
         ->where('code', $course_name->code)
         ->where('name', $course_name->name)
-        ->where('semester_id', $course_name->semester)
+        ->where('semester_id', $course_name->semester_id)
         ->where('program_id', $course_name->program_id)
         ->get();
       foreach ($course_name->sections as $section) {
@@ -1339,20 +1342,38 @@ class TransformativeActionsController extends \BaseController
           ->join('criterion_objective_outcome', 'criterion_objective_outcome.criterion_id', '=', 'activity_criterion.criterion_id')
           ->join('transformative_actions', 'transformative_activity_criterion.trans_action_id', '=', 'transformative_actions.id')
           ->where('activities.course_id', $section->id)
+          ->where('activities.draft', 0)
           ->where('criterion_objective_outcome.outcome_id', $outcome_id)
           ->select('activities.id as activity_id', 'activities.name')
           ->addSelect('transformative_actions.*', 'transformative_activity_criterion.trans_action_id as trans_action_id')
-          ->groupBy('transformative_actions.id_')
+          ->groupBy('transformative_actions.id')
           ->get();
         foreach ($section->activities as $activity) {
+          /*$activity->criterion = DB::table('transformative_activity_criterion')
+          ->join('activity_criterion','activity_criterion.id','=','transformative_activity_criterion.activity_criterion_id')
+          ->join('activities','activities.id','=','activity_criterion.activity_id')
+          ->join('criteria','activity_criterion.criterion_id','=','criteria.id')
+          ->where('activity_id', $activity->id)
+          ->select('criteria')*/
+          Log::info($activity->trans_action_id);
           $activity->objectives = DB::table('transformative_objective')
             ->join('objectives', 'transformative_objective.objective_id', '=', 'objectives.id')
             ->where('ta_id', $activity->trans_action_id)
             ->get();
           foreach ($activity->objectives as $objective) {
+            Log::info($activity->activity_id);
+            Log::info($objective->objective_id);
+            Log::info(DB::table('criterion_objective_outcome')
+              ->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'criterion_objective_outcome.criterion_id')
+              ->join('criteria', 'criteria.id', '=', 'activity_criterion.criterion_id')
+              ->where('activity_criterion.activity_id', $activity->activity_id)
+              ->where('objective_id', $objective->objective_id)
+              ->select('criteria.*')
+              ->distinct()
+              ->toSql());
             $objective->criterion = DB::table('criterion_objective_outcome')
               ->join('activity_criterion', 'activity_criterion.criterion_id', '=', 'criterion_objective_outcome.criterion_id')
-              ->join('criteria', 'criteria.id', '=', 'activity_criterion.criteria_id')
+              ->join('criteria', 'criteria.id', '=', 'activity_criterion.criterion_id')
               ->where('activity_criterion.activity_id', $activity->activity_id)
               ->where('objective_id', $objective->objective_id)
               ->select('criteria.*')
@@ -1362,6 +1383,6 @@ class TransformativeActionsController extends \BaseController
         }
       }
     }
-    Log::info($grouped_courses);
+    return $grouped_courses;
   }
 }

app/views/local/managers/sCoords/_navigation.blade.php

@@ -10,6 +10,7 @@
         <ul class="dropdown-menu" role="menu">
           <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
           <li>{{ HTML::linkAction('CriteriaController@objectivesIndex', 'Objectives and Criteria') }}</li>
+          <li>{{ HTML::linkAction('TransformativeActionsController@viewFormativeActions', 'Tranformative and Formative Actions')}}
         </ul>
       </li>
       <li class="dropdown">

app/views/local/managers/shared/view_formative.blade.php

@@ -84,14 +84,17 @@
         @foreach ($outcomes as $outcome)
           
             
-              <li data-outcome-id="{{ $outcome->id }}"class="list-group-item">{{ $outcome->name }} </li>
+              <li data-outcome-id="{{ $outcome->id }}"class="list-group-item" onclick = "fetchData($(this),$('#semesters'), $('#program') )">{{ $outcome->name }} </li>
         
         @endforeach
       </div>
     </div>
 
     <div class="col-md-9">
-      <div id="outcome-display" class="panel panel-default">
+      <div id= "transformative-display">
+
+      </div>
+      <!--<div id="outcome-display" class="panel panel-default">
         <div class="panel-heading">
           <h4 class=" panel-title" style="cursor:auto!important;">
           </h4>
@@ -106,7 +109,7 @@
             {{-- <table id="example" class="table table-striped table-condensed" width="100%"></table> --}}
           </div>
         </div>
-      </div>
+      </div>-->
     </div>
 
     <div class="col-md-9">
@@ -277,7 +280,99 @@ function createDataTable(table1){
         return table;
 }
 
+function fetchData(outcome, semester, program){
+  //$('.list-group-item').on('click', function()
+ // {
+    var id = outcome.data('outcome-id');
+    var semesters = semester.val();
+    var programs = program.val();
+
+    $.post(
+    "{{ URL::action('TransformativeActionsController@fetchCourses') }}",
+    { id: id, 
+        
+        programs:programs,
+        semesters:semesters,
+
+    
+    },
+    function(data)
+    {
+        $('#transformative-display').html('');
+        var ul = $('<ul/>',{
+          'id':'levelTabs',
+          'class':'nav nav-tabs',
+          'role':'tablist'
+        });
+        var divContent = $("<div/>",{
+          'class':'tab-content'});
+
+
+
+        $.each(data, function(index, groupedCourse){
+          var li = $('<li/>',{
+            'role':'presentation',
+            
+          
+          })
+          var a = $('<a/>', {
+            'onclick':"$(this).tab('show')",
+            "data-toggle":"tab",
+            'href':'#'+groupedCourse.code+'-'+groupedCourse.number,
+            'aria-controls':groupedCourse.code+'-'+groupedCourse.number,
+            'role':'tab'
+          }).html( groupedCourse.code+' '+groupedCourse.number);
+
+          li.append(a);
+          ul.append(li);
+
+          divPanel = $('<div/>', {
+            'role':'tabpanel',
+            'class':'tab-pane',
+            'id':groupedCourse.code+'-'+groupedCourse.number
+          });
+          $table= $('<table/>',{
+               "class": "table table-striped table-condensed datatable",
+               //"style": "table-layout: fixed",
+               "id": 'allTablesToExport'+index,
+          "data-title":groupedCourse.code+'-'+groupedCourse.number});
+        $thead = $('<thead/>').html("<tr><th>Formative Actions</th><th>Section</th><th>Criteria</th><th>Activity</th></tr>");
+        $tbody = $('<tbody/>');
+        $table.append($thead);
+        $table.append($tbody);
+        divPanel.append($table);
+        $table = createDataTable($table);
+        
+          $.each(groupedCourse.sections, function(index2, sections){
+            courseHTML = sections.section;
+            $.each(sections.activities, function(index3, activities){
+              $table.row.add([
+                activities.description,
+                courseHTML,
+                "test",
+                activities.name
+              ])
+              
+            })
+            $table.draw();
+          }
+          );
+
+          divContent.append(divPanel);
+
+        })
+        $('#transformative-display').append(ul);
+        $('#transformative-display').append(divContent);
+        $("a[role='tab']").first().tab('show');
+        $('.no-outcome').hide();
+        
+
+    }
+    );
 
+
+  //})
+}
 $(document).ready(function()
 {
   // --------------------------------------------------------------------------
@@ -302,29 +397,7 @@ $(document).ready(function()
   // When export button is clicked, export all tables as PDF
  
   // When list item is clicked, load corresponding info
-  $('.list-group-item').on('click', function()
-  {
-    var id = $(this).data('outcome-id');
-    var semester = $('#semesters').val();
-    var programs = $('#program').val();
-
-    $.post(
-    "{{ URL::action('TransformativeActionsController@fetchCourses') }}",
-    { id: id, 
-        
-        programs:programs,
-        semesters:semesters,
 
-    
-    },
-    function(data)
-    {
-        
-    }
-    );
-
-
-  })
 });
     </script>
 @stop