varios arreglos y bug

app/controllers/ActivitiesController.php

@@ -790,7 +790,6 @@ class ActivitiesController extends \BaseController
         if ($course->user_id != Auth::id())
             App::abort('403', 'Access Forbidden');
 
-        $title = 'Assessment Sheet';
         $students = $course->students;
 
         // Get rubric contents
@@ -845,6 +844,7 @@ class ActivitiesController extends \BaseController
                 ->where("activity_id", '=', $activity->id)
                 ->select('comments')->first()->comments;
         }
+        $title = 'Assessment Sheet';
 
         return View::make('local.professors.view_assessment', compact('activity', 'title', 'students', 'course', 'rubric_criterion', 'assessments', 'scores_array', 'rubric'));
     }

app/routes.php

@@ -348,7 +348,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
     Route::get('learning-outcomes-criteria', 'CriteriaController@index');
     Route::post('fetchOutcome', array('before' => 'csrf', 'uses' => 'OutcomesController@fetchOutcome'));
     // Show users all objectives and criteria
-    Route::get('learning-objectives-criteria', 'objective2Controller@viewObjectives');
+    Route::get('learning-objectives-criteria', 'Objective2Controller@viewObjectives');
     Route::post('fetchObjectiveForCriteria', array('before' => 'csrf', 'uses' => 'ObjectivesController@fetchObjectiveForCriteria'));
 
     // Show professor overview to users with courses
@@ -641,9 +641,9 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::post('updateRubric', array('before' => 'csrf', 'uses' => 'RubricsController@update'));
         Route::post('deleteRubric', array('before' => 'csrf', 'uses' => 'RubricsController@destroy'));
         Route::get('learning-outcomes-criteria', 'CriteriaController@index');
-        Route::get('learning-objectives-criteria', 'objective2Controller@viewObjectives');
+        Route::get('learning-objectives-criteria', 'Objective2Controller@viewObjectives');
         Route::get('export_grades/{id}', 'CoursesController@exportGrades');
-        Route::get('learning-objectives-criteria', 'objective2Controller@viewObjectives');
+        Route::get('learning-objectives-criteria', 'Objective2Controller@viewObjectives');
         Route::get('compare_activities/{activity_1}/{activity_2}', 'ActivitiesController@compareActivities');
         // Assessment reports
         //Route::get('professor-assessment-report/{outcome_id}', 'OutcomesController@professorAssessmentReport');

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

@@ -24,7 +24,7 @@
                     and Criterias<span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
                     <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
-                    <li>{{ HTML::linkAction('objective2Controller@viewObjectives', 'Objectives and Criteria') }}
+                    <li>{{ HTML::linkAction('Objective2Controller@viewObjectives', 'Objectives and Criteria') }}
                     </li>
                 </ul>
             </li>

app/views/local/managers/admins/_new_navigation.blade.php

@@ -12,7 +12,7 @@
                     aria-expanded="false">Objectives<span class="caret"></span></a>
                 <ul class="dropdown-menu dropdown-menu-left" role="menu">
                     <li>{{ HTML::linkAction('Objective2Controller@edit', 'Create/Edit Objectives') }}</li>
-                    <li>{{ HTML::linkAction('objective2Controller@viewObjectives', 'View Objectives and Criteria') }}
+                    <li>{{ HTML::linkAction('Objective2Controller@viewObjectives', 'View Objectives and Criteria') }}
                     </li>
                 </ul>
             </li>

app/views/local/managers/admins/users.blade.php

@@ -336,7 +336,7 @@
     var user= element.closest('tr');
     $('#id').val(user.find('.user-name').data('user-id'));
     $('#name').text(user.find('.user-name').text());
-    <!--         $('#email').text(user.find('.user-email').text()); -->
+    /*         $('#email').text(user.find('.user-email').text()); */
     $('#email').val(user.find('.user-email').text());
     $('#has_access').val(user.find('.user-has-access').data('value'));
 
@@ -379,14 +379,14 @@
     // Remove all but first program
     modal.find('.program').not(':first').parent().remove();
 
-    <!-- Select Admin role and "All" school and program -->
+    /* Select Admin role and "All" school and program */
     $('#new_role option[value="1"]').prop('selected', true);
     $('#new_school option[value="0"]').prop('selected', true);
     modal.find('.program option[value="0"]').prop('selected', true);
 
     fetchPrograms(modal);
 
-    <!-- Disable school and program -->
+    /* Disable school and program */
     $('#new_school').prop('disabled', true);
     modal.find('.program').prop('disabled', true);
 
@@ -408,7 +408,7 @@
     var modal = $(this).closest('.modal');
     switch($(this).find(':selected').val())
     {
-    <!-- If admin, set both to All and disable selection on both-->
+    /* If admin, set both to All and disable selection on both*/
     case '1':
 
     modal.find('.school option[value="0"]').prop('selected', true);
@@ -427,9 +427,9 @@
     modal.find('.add-program').hide();
 
     break;
-    <!-- If scoord, set program to all and disable it -->
+    /* If scoord, set program to all and disable it */
     case '2':
-    <!-- Disable "All" option in schools and program -->
+    /* Disable "All" option in schools and program */
     modal.find('.school option[value="0"]').attr('disabled', true);
 
     if(modal.find('.school').find(':selected').val() == 0)
@@ -452,13 +452,13 @@
     modal.find('.add-program').hide();
 
     break;
-    <!-- If pcoord or professor, enable everything -->
+    /* If pcoord or professor, enable everything */
     case '3':
     case '4':
-    <!-- Disable "All" option in school -->
+    /* Disable "All" option in school */
     modal.find('.school option[value="0"]').attr('disabled', true);
 
-    <!-- Enable School and select an available  option for school-->
+    /* Enable School and select an available  option for school*/
     modal.find('.school').prop('disabled', false);
 
     if(modal.find('.school').find(':selected').val() == 0)
@@ -466,24 +466,24 @@
     modal.find('.school option:enabled:first').prop('selected', true);
     }
 
-    <!-- Enable program-->
+    /* Enable program*/
     modal.find('.program').prop('disabled', false);
 
     // If it only has one child (most likely when changing from admin or scoord)
     if(modal.find('.programs').children().length == 1)
     {
-    <!-- Fetch programs for the available school -->
+    /* Fetch programs for the available school */
     fetchPrograms(modal);
 
-    <!-- Disable "All" option in schools and program -->
+    /* Disable "All" option in schools and program */
     modal.find('.program option[value="0"]').attr('disabled', true);
 
-    <!-- Select available option -->
+    /* Select available option */
     modal.find('.program option:enabled:first').prop('selected', true);
     }
     else
     {
-    <!-- Disable "All" option in schools and program -->
+    /* Disable "All" option in schools and program */
     modal.find('.program option[value="0"]').attr('disabled', true);
     }
 
@@ -572,36 +572,34 @@
     case 1:
     fetchPrograms(modal);
 
-    <!-- Select "All" in school and program -->
+    /* Select "All" in school and program */
     $('.school option[value="0"]').prop('selected', true);
     modal.find('.program option[value="0"]').prop('selected', true);
 
-    <!-- Disable school and program -->
+    /* Disable school and program */
     $('.school').prop('disabled', true);
     modal.find('.program').prop('disabled', true);
 
     break;
     case 2:
 
-    <!-- Find and select user's school -->
+    /* Find and select user's school */
     var school_id = user.find('.user-school').data('school-id');
     $('.school option[value="'+school_id+'"]').prop('selected', true);
 
-    <!-- Fetch programs -->
+    /* Fetch programs */
     fetchPrograms(modal);
 
-    <!-- Disable "All" option in school and select the next one-->
+    /* Disable "All" option in school and select the next one*/
     $('.school option[value="0"]').attr('disabled', true);
 
-    <!-- Disable all options in program -->
+    /* Disable all options in program */
     modal.find('.program').prop('disabled', true);
 
-    <!--  -->
-
     break;
     case 3:
     case 4:
-    <!-- Make sure school and program are not disabled -->
+    /* Make sure school and program are not disabled */
     $('.school').prop('disabled', false);
     modal.find('.program').prop('disabled', false);
 
@@ -635,9 +633,14 @@
 
     });
 
-    for(var i =0; i < program_ids.length; i++) { var program_id=program_ids[i]; modal.find('.program:eq('+i+')
-        option[value="'+program_id+'" ]').prop('selected', true); } modal.find('.add-program').show(); <!-- Disable "All"
-        option in school and program-->
+    for(var i =0; i < program_ids.length; i++) 
+    { 
+    	var program_id=program_ids[i]; 
+    	modal.find('.program:eq('+i+') option[value="'+program_id+'" ]').prop('selected', true); 
+    } 
+    modal.find('.add-program').show(); 
+    /* Disable "All"
+        option in school and program*/
         $('.school option[value="0"]').attr('disabled', true);
         modal.find('.program option[value="0"]').attr('disabled', true);
 

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

@@ -34,7 +34,7 @@
                     and Criterias<span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
                     <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
-                    <li>{{ HTML::linkAction('objective2Controller@viewObjectives', 'Objectives and Criteria') }}
+                    <li>{{ HTML::linkAction('Objective2Controller@viewObjectives', 'Objectives and Criteria') }}
                     </li>
                 </ul>
             </li>

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

@@ -11,7 +11,7 @@
                     aria-expanded="false">Objectives<span class="caret"></span></a>
                 <ul class="dropdown-menu dropdown-menu-left" role="menu">
                     <li>{{ HTML::linkAction('Objective2Controller@edit', 'Create/Edit Objectives') }}</li>
-                    <li>{{ HTML::linkAction('objective2Controller@viewObjectives', 'View Objectives and Criteria') }}
+                    <li>{{ HTML::linkAction('Objective2Controller@viewObjectives', 'View Objectives and Criteria') }}
                     </li>
                 </ul>
             </li>

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

@@ -10,7 +10,7 @@
                     and Criterias<span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
                     <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
-                    <li>{{ HTML::linkAction('objective2Controller@viewObjectives', 'Objectives and Criteria') }}
+                    <li>{{ HTML::linkAction('Objective2Controller@viewObjectives', 'Objectives and Criteria') }}
                     </li>
                 </ul>
             </li>

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

@@ -11,7 +11,7 @@
                     aria-expanded="false">Objectives<span class="caret"></span></a>
                 <ul class="dropdown-menu dropdown-menu-left" role="menu">
                     <li>{{ HTML::linkAction('Objective2Controller@edit', 'Create/Edit Objectives') }}</li>
-                    <li>{{ HTML::linkAction('objective2Controller@viewObjectives', 'View Objectives and Criteria') }}
+                    <li>{{ HTML::linkAction('Objective2Controller@viewObjectives', 'View Objectives and Criteria') }}
                     </li>
                 </ul>
             </li>

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

@@ -14,7 +14,7 @@
                     and Criterias<span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu">
                     <li>{{ HTML::linkAction('CriteriaController@index', 'Outcomes and Criteria') }}</li>
-                    <li>{{ HTML::linkAction('objective2Controller@viewObjectives', 'Objectives and Criteria') }}
+                    <li>{{ HTML::linkAction('Objective2Controller@viewObjectives', 'Objectives and Criteria') }}
                     </li>
                 </ul>
             </li>

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

@@ -24,8 +24,8 @@
             <div class="modal-body">
                 <table class="table table-bordered">
                     <thead>
-                        @foreach($rubric->titles as $i=>$title)
-                        <th>{{$title}} ({{1+($i*($rubric->max_score/$rubric->num_scales))}}-{{(1+$i)*($rubric->max_score/$rubric->num_scales)}})</th>
+                        @foreach($rubric->titles as $i=>$title2)
+                        <th>{{$title2}} ({{1+($i*($rubric->max_score/$rubric->num_scales))}}-{{(1+$i)*($rubric->max_score/$rubric->num_scales)}})</th>
                         @endforeach
                         
                         <th>Notes</th>