Hice un papelon

app/config/app.php

@@ -15,7 +15,7 @@ return array(
 
 	//'debug' => $_ENV['APP_DEBUG'] ?: false,
 
-	'debug' => false,
+	'debug' => true,
 	/*
 	|--------------------------------------------------------------------------
 	| Application URL
@@ -80,9 +80,9 @@ return array(
 	*/
 
 	// 'key' => 'YourSecretKey!!!',
-// 	'key' => 'JozBz0yQBrZ5kEcPvgxch3RR3E3INSGs',
-// 
-// 	'cipher' => MCRYPT_RIJNDAEL_256,
+	// 	'key' => 'JozBz0yQBrZ5kEcPvgxch3RR3E3INSGs',
+	// 
+	// 	'cipher' => MCRYPT_RIJNDAEL_256,
 	'key' => '+H!WZJxd5qwb!EHYR8^MLsX@^X6Y?e@+',
 
 	'cipher' => MCRYPT_RIJNDAEL_128,

app/controllers/ActivitiesController.php

@@ -814,8 +814,8 @@ 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);
+        //Log::info("EN mi cuarto o o o");
+        //Log::info($rubric_criterion);
 
         foreach ($rubric_criterion as $index => $crit) {
             $crit->scales = DB::table('scales')
@@ -1002,4 +1002,4 @@ class ActivitiesController extends \BaseController
 
         return View::make('local.professors.compare_activities', compact('activity_1', 'activity_2', 'activity_criterion_1', 'activity_criterion_2', 'title', 'outcomes', 'outcomes_achieved_1', 'outcomes_attempted_1', 'outcomes_achieved_2', 'outcomes_attempted_2', 'course', 'student_count', 'active_semesters'));
     }
-}
+}

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'));
@@ -172,4 +172,4 @@ class AuthController extends \BaseController
 		Session::flush();
 		return Redirect::action('AuthController@showLogin');
 	}
-}
+}

app/controllers/Objective2Controller.php

@@ -44,6 +44,7 @@ class Objective2Controller extends \BaseController
 					->lists('id');
 				break;
 			case 3:
+			case 4:
 				$programs = DB::table('program_user')
 					->where("user_id", Auth::user()->id)
 					->lists('program_id');
@@ -656,4 +657,4 @@ class Objective2Controller extends \BaseController
 	{
 		//
 	}
-}
+}

app/controllers/OutcomesController.php

@@ -647,13 +647,7 @@ class OutcomesController extends \BaseController
             ->get();
         $outcome = $outcome_info[0];
 
-        $diferent_levels = DB::table('criterion_objective_outcome')
-            ->join('criteria', 'criteria.id', '=', 'criterion_objective_outcome.criterion_id')
-            ->where('criterion_objective_outcome.outcome_id', $id)
-            ->distinct('criteria.num_scales')
-            ->select('criteria.num_scales as levels')
-            ->orderBy('criteria.num_scales', 'asc')
-            ->get();
+
 
         $criteria_array = array();
 
@@ -678,6 +672,17 @@ class OutcomesController extends \BaseController
                 break;
         }
 
+        $diferent_levels = DB::table('criterion_objective_outcome')
+            ->join('criteria', 'criteria.id', '=', 'criterion_objective_outcome.criterion_id')
+            // GASP, añadí programa, para que solo muestre niveles de criterios del programa
+            ->join('program_criterion', 'criteria.id', '=', 'program_criterion.criterion_id')
+            ->whereIn('program_id', $program_ids)
+            ->where('criterion_objective_outcome.outcome_id', $id)
+            ->distinct('criteria.num_scales')
+            ->select('criteria.num_scales as levels')
+            ->orderBy('criteria.num_scales', 'asc')
+            ->get();
+
         $outcome->criteria = array();
         foreach ($diferent_levels as $level) {
             $level = $level->levels;

app/views/global/view-learning-outcomes-criteria.blade.php

@@ -57,7 +57,7 @@
         @endforeach
       </div>
     </div>
-
+ 
     <div class="col-md-9">
       <div id="outcome-display" class="panel panel-default">
         <div class="panel-heading">

app/views/local/managers/pCoords/overview.blade.php

@@ -32,7 +32,7 @@
                     <div class="col-md-12 graph" id="graph{{ $index }}"></div>
                 </div>
 
-                <!-- =================== sub tabs =================== -->
+                <!-- ===== sub tabs ===== -->
                 <div>
                     <!-- Sub nav tabs -->
                     <ul id="programSubTabs{{ $index }}" class="nav nav-tabs" role="tablist">
@@ -231,7 +231,7 @@
                         </div>
                     </div>
                 </div>
-                <!-- =================== end sub tabs =================== -->
+                <!-- ===== end sub tabs ===== -->
             </div>
         @endforeach
     </div>

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

@@ -169,7 +169,7 @@
 </div>
 	</div>
 </div>
- <!-- =================== tabs =================== -->
+ <!-- ===== tabs ===== -->
 <div class="row">
     <!-- Nav tabs -->
    <!-- Tab panes -->
@@ -291,7 +291,7 @@
         </div>
     </div>
 </div>
-<!-- =================== end tabs =================== -->
+<!-- ===== end tabs ===== -->
 
 @stop
 
@@ -444,7 +444,7 @@ $('#graph').highcharts({
 $('#graph2').highcharts({
     chart: {
         type: 'bar'
-    },
+    }, 
     title: {
         text: 'Performance of {{ $school->name }} Students by Combined Learning Outcome'
     },

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

@@ -10,7 +10,8 @@
             {{-- <li>{{ HTML::linkAction('CriteriaController@index', 'Learning Outcomes and Criteria') }}</li> --}}
             {{-- <li>{{ HTML::linkAction('TransformativeActionsController@editTA', 'Transformative Actions') }}</li> --}}
             <li class="dropdown">
-                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Learning
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
+                    aria-expanded="false">Learning
                     and Criterias<span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
                     <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
@@ -30,12 +31,14 @@
                     </ul>
                 </li>
             @endif
-            <li> {{ HTML::linkAction('ProfessorsController@program', 'Program') }}</li>
+            @if (count(Auth::user()->programs))
+                <li> {{ HTML::linkAction('ProfessorsController@program', 'Program') }}</li>
+            @endif
             <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReport', 'Results') }}</li>
             <li>{{ HTML::linkAction('TemplatesController@ProfIndex', 'Rubric List') }}</li>
             <li class="dropdown">
-                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Help<span
-                        class="caret"></span></a>
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
+                    aria-expanded="false">Help<span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
                     <li>{{ HTML::linkAction('FeedbackController@create', 'Feedback') }}</li>
                     <!-- <li><a href="{{ asset('files/OLAS-intro.pdf') }}">Introduction to OLAS</a></li> -->

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

@@ -430,17 +430,18 @@
     },
 
     tooltip: {
-    headerFormat: '<span style="font-size:10px">{point.key}</span>
-    <table>',
-        pointFormat: '<tr>
-            <td style="color:{series.color};padding:0">{series.name}: </td>' +
-            '<td style="padding:0"><b>{point.y:.2f}%</b></td>
-        </tr>'+
+
+    headerFormat: '<span style="font-size:10px">{point.key}</span><table>',
+    pointFormat: '<tr><td style="color:{series.color};padding:0">{series.name}: </td>' +
+            '<td style="padding:0"><b>{point.y:.2f}%</b></td></tr>'+
         '{point.outcomes}',
-        //'<tr>
-            <td style="color:{series.color};padding:0">Learning Outcomes:</td>'+
+        //'<tr><td style="color:{series.color};padding:0">Learning Outcomes:</td>'+
+
+            // '<td style="padding:0">{point.outcomes}, <br>Outcome2</td></tr>',
+
             // '<td style="padding:0">{point.outcomes}, <br>Outcome2</td>
-        </tr>',
+        //'</tr>',
+
         footerFormat: '</table>',
     shared: true,
     useHTML: true
@@ -490,6 +491,7 @@
     });
 
     $('#graph').highcharts({
+
     chart: {
     type: 'bar',
     },
@@ -499,7 +501,22 @@
     xAxis: {
     categories: [
     @foreach ($outcomes as $outcome)
-        "{{ $outcome->name }}",
+        @if(is_array($outcomes_attempted) &&
+        array_key_exists($outcome->id, $outcomes_attempted) &&
+        $outcomes_attempted[$outcome->id] != 0)
+            <?php
+            $attempted = $outcomes_attempted[$outcome->id];
+            $achieved = $outcomes_achieved[$outcome->id];
+            ?>
+
+        @else
+            <?php
+            $attempted = 0;
+            $achieved = 0;
+            ?>
+        @endif
+        "{{ $outcome->name }}<br> (N = {{$attempted}} , {{$achieved}})",
+
     @endforeach
     ],
     labels: {
@@ -518,15 +535,27 @@
     max: 100,
     title: {
     text: 'Percentage'
-    }
+    }, 
+    
+			plotLines:[{
+		value:66.67,
+		color: '#000',
+		width:3,
+		zIndex:4,
+		label:{
+			text: 'Goal (66.67%)',
+			style: {
+				color: '#000',
+				fontSize: '14px',
+			}
+
+		}
+	}]
     },
     tooltip: {
-    headerFormat: '<span style="font-size:10px">{point.key}</span>
-    <table>',
-        pointFormat: '<tr>
-            <td style="color:{series.color};padding:0">{series.name}: </td>' +
-            '<td style="padding:0"><b>{point.y:.2f}</b></td>
-        </tr>',
+    headerFormat: '<span style="font-size:10px">{point.key}</span><table>',
+        pointFormat: '<tr><td style="color:{series.color};padding:0">{series.name}: </td>' +
+            '<td style="padding:0"><b>{point.y:.2f}</b></td></tr>',
         footerFormat: '</table>',
     shared: true,
     useHTML: true
@@ -566,7 +595,7 @@
     @endforeach
     ],
     pointPadding: 0,
-    }, {
+    } {{--, {
     name: 'Expected Value',
     color: '#555555',
     dataLabels: {
@@ -590,9 +619,11 @@
     @endforeach
     ],
     pointPadding: 0,
-    }]
+    } --}}]
     });
 
+
+
     var chart = $('#graph').highcharts();
     var titletext = $('#graph').highcharts().options.title.text;
     var newtitletext = titletext.replace("&#039;", "\'");

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

@@ -259,7 +259,35 @@ $(function () {
         xAxis: {
             categories: [
                 @foreach($outcomes as $outcome)
-                    "{{{ $outcome->name }}}",
+
+                @if(
+                        is_array($outcomes_attempted)
+                        && array_key_exists($outcome->id, $outcomes_attempted)
+                        && $outcomes_attempted[$outcome->id]!=0)
+                    <?php
+                        $attempted = $outcomes_attempted[$outcome->id];
+                        
+                        if( isset($outcomes_achieved[$outcome->id]))
+                            $achieved =$outcomes_achieved[$outcome->id];
+
+                        else $achieved = 0;
+                    ?>
+                @else 
+
+                    <?php 
+                    
+                        $attempted =0;
+                        $achieved = 0;
+                        
+                    ?>
+
+                @endif
+            "{{{ $outcome->name }}} <br> (N = {{$attempted}} , {{$achieved}} ) ",
+
+                
+
+                    
+
                 @endforeach
             ],
             labels: {
@@ -278,7 +306,21 @@ $(function () {
             max: 100,
             title: {
                 text: 'Percentage'
-            }
+            },
+            plotLines:[{
+                value:66.67,
+                color: '#000',
+                width:3,
+                zIndex:4,
+                label:{
+                    text: 'Goal (66.67%)',
+                    style: {
+                        color: '#000',
+                        fontSize: '14px',
+                    }
+        
+                }
+            }]
         },
         tooltip: {
             headerFormat: '<span style="font-size:10px">{point.key}</span><table>',
@@ -328,35 +370,9 @@ $(function () {
 
             ],
             pointPadding: 0,
-        }, {
-            name: 'Expected Value',
-            color: '#555555',
-            dataLabels: {
-                enabled: true,
-                fontSize: 8,
-                color: '#fff',
-                align: 'right',
-                format: '{y:.1f}%',
-                style: {
-                    //fontWeight: 'bold'
-                },
-                y:-1
-            },
-            data: [
-                @foreach($outcomes as $index => $outcome)
-                    @if(
-                        is_array($outcomes_attempted)
-                        && array_key_exists($outcome->id, $outcomes_attempted)
-                        && $outcomes_attempted[$outcome->id]!=0)
-                        {{{ $outcome->expected_outcome }}},
-                    @else
-                        0,
-                    @endif
-                @endforeach
-            ],
-            pointPadding: 0,
 
         }]
+
     });
 
     // Include dummy graph for outcomes

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

@@ -118,7 +118,35 @@ function loadGraphs() {
                 categories: [
                     @foreach($outcomes as $outcome)
                     	@if($outcome->level==3 || ($grouped_course->program->is_graduate==0 && $outcome->level==1))
-                        "{{{ $outcome->name }}}",
+
+                            @if(
+                                is_array($grouped_outcomes_attempted_results[$index])
+                                && array_key_exists($outcome->id, $grouped_outcomes_attempted_results[$index])
+                                && $grouped_outcomes_attempted_results[$index][$outcome->id]!=0)
+                                <?php
+                                    $attempted = $grouped_outcomes_attempted_results[$index][$outcome->id];
+                                    
+                                    if( isset($grouped_outcomes_achieved_results[$index][$outcome->id]))
+                                        $achieved =$grouped_outcomes_achieved_results[$index][$outcome->id];
+
+                                    else $achieved = 0;
+                                ?>
+                            @else 
+
+                                <?php 
+                                
+                                    $attempted =0;
+                                    $achieved = 0;
+                                    
+                                ?>
+
+                            @endif
+                        "{{{ $outcome->name }}} <br> (N = {{$attempted}} , {{$achieved}} ) ",
+
+                        
+
+                        
+
                         @endif
                     @endforeach
                 ],
@@ -138,7 +166,24 @@ function loadGraphs() {
                 max: 100,
                 title: {
                     text: 'Percentage'
-                }
+                },
+
+                
+			plotLines:[{
+		value:66.67,
+		color: '#000',
+		width:3,
+		zIndex:4,
+		label:{
+			text: 'Goal (66.67%)',
+			style: {
+				color: '#000',
+				fontSize: '14px',
+			}
+
+		}
+	}]
+
             },
             tooltip: {
                 headerFormat: '<span style="font-size:10px">{point.key}</span><table>',
@@ -200,7 +245,11 @@ function loadGraphs() {
                     @endforeach
                 ],
                 pointPadding: 0,
-            }, {
+
+            } {{-- , {
+
+            } {{--, {
+>>>>>>> Stashed changes
                 name: 'Expected',
                 color: '#555555',
                     dataLabels: {
@@ -230,7 +279,11 @@ function loadGraphs() {
                 ],
                 pointPadding: 0,
 
-            }]
+
+            
+
+            } --}}]
+
         });
     @endforeach  
 }