Los bugs marcados en verde

app/controllers/AnnualPlansController.php

@@ -256,7 +256,28 @@ class AnnualPlansController extends \BaseController
     //  $typ_info['criteria'][$objective->id] = DB::select("select * from criteria where id in (select criterion_id from criterion_objective_outcome where outcome_id = ? and objective_id = {$objective->id})", array(Input::get('id')));
     //}
     $annual_plan = DB::select("select annual_plans.id from annual_plans, annual_cycle where annual_plans.annual_cycle_id = annual_cycle.id and (semester_start = {$semester->id} or semester_end ={$semester->id}) and program_id ={$program_id}")[0];
-    $typ_info['expected_target'] = DB::select("select * from target_outcomes_program where program_id = {$program_id} and semester_id = {$semester->id}");
+    //$typ_info['expected_target'] = DB::select("select * from target_outcomes_program where program_id = {$program_id} and semester_id = {$semester->id}");
+    $typ_info['expected_target'] = DB::table('target_outcomes_program')
+      ->where('program_id', $program_id)
+      ->where('semester_id', $semester->id)
+      ->first();
+    if (!$typ_info['expected_target']) {
+      DB::beginTransaction();
+
+      DB::table('target_outcomes_program')->insert(
+        array(
+          'program_id' => $program_id,
+          'semester_id' => $semester->id,
+          'expected_target' => 70.00
+        )
+      );
+      DB::commit();
+      $typ_info['expected_target'] = DB::table('target_outcomes_program')
+        ->where('program_id', $program_id)
+        ->where('semester_id', $semester->id)
+        ->first();
+    }
+
     $typ_info['objectives'] = DB::select("select * from objectives where id in (select objective_id from typ_semester_objectives where typ_semester_outcome_id in(select id from typ_semester_outcome where outcome_id = ? and semester_id = {$semester->id} and typ_program_id in (select id from typ_program where program_id ={$program_id})))", array(Input::get('id')));
     $typ_info['transformative_actions'] = DB::select("select * from transformative_actions where by_professor =0 and is_custom=0");
     foreach ($typ_info['objectives'] as $objective) {

app/controllers/TemplatesController.php

@@ -6,6 +6,38 @@ class TemplatesController extends \BaseController
 	/**
 	 * List all templates, grouped by program
 	 */
+	public function ProfIndex()
+	{
+		$title = 'Rubric List';
+
+
+		$role = Auth::user()->role;
+		$program_id = DB::table("program_user")
+			->where('user_id', Auth::user()->id)
+			->lists('program_id')[0];
+		$school_id = DB::table('programs')
+			->where('id', $program_id)
+			->lists('school_id')[0];
+
+
+		$templates = Template::orderBy('name')
+			->whereNull("school_id")
+			->orWhere(function ($query) use (&$school_id) {
+				$query->where('school_id', $school_id)
+					->whereNull('program_id');
+			})
+			->orWhere(function ($query) use (&$program_id, &$school_id) {
+				$query->where('school_id', $school_id)
+					->where('program_id', $program_id);
+			})
+
+
+			->get();
+
+
+
+		return View::make('local.managers.shared.rubric_list', compact('title', 'global_templates', 'schools', 'templates', 'role'));
+	}
 	public function index()
 	{
 		$title = 'Rubric List';
@@ -29,6 +61,7 @@ class TemplatesController extends \BaseController
 					->get();
 				break;
 			case 3:
+			case 4:
 				$program_id = DB::table("program_user")
 					->where('user_id', Auth::user()->id)
 					->lists('program_id')[0];
@@ -39,13 +72,19 @@ class TemplatesController extends \BaseController
 
 				$templates = Template::orderBy('name')
 					->whereNull("school_id")
-					->orWhere('school_id', $school_id)
-					->orWhere('program_id', $program_id)
+					->orWhere(function ($query) use (&$school_id) {
+						$query->where('school_id', $school_id)
+							->whereNull('program_id');
+					})
+					->orWhere(function ($query) use (&$program_id, &$school_id) {
+						$query->where('school_id', $school_id)
+							->where('program_id', $program_id);
+					})
 
 					->get();
 				break;
 		}
-		$templates = Template::orderBy('name')->get();
+		//$templates = Template::orderBy('name')->get();
 
 		return View::make('local.managers.shared.rubric_list', compact('title', 'global_templates', 'schools', 'templates', 'role'));
 	}
@@ -498,4 +537,4 @@ class TemplatesController extends \BaseController
 			return Redirect::back();
 		}
 	}
-}
+}

app/routes.php

@@ -528,6 +528,9 @@ Route::group(array('before' => 'auth|has_access'), function () {
      * Professor Routes
      */
     Route::group(array('prefix' => 'professor', 'before' => 'prof'), function () {
+
+
+        Route::get('templateForProfessor', 'TemplatesController@ProfIndex');
         Route::post('program', array('before' => 'csrf', 'uses' => 'ProfessorsController@program'));
         Route::get('activities/{activity_id}/rubrics', 'RubricsController@newRubric');
         Route::get('activities/{activity_id}/other_method', 'RubricsController@newOtherMethod');

app/views/global/view-three-year-plan.blade.php

@@ -104,7 +104,7 @@
         @endforeach
       </div>
       <br>
-      <div>
+    </div>
         <button type="button" class="btn btn-secondary" id = "three_year_button" data-toggle="modal" data-target="#three_year">Create Three Year Cycle</button>
 
 <!-- Modal -->
@@ -139,7 +139,7 @@
   </div>
 </div>
       </div>
-    </div>
+   
 
     <div class="col-md-9">
       <div class="btn-group pull-right">

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

@@ -58,14 +58,14 @@
                                     <?php
                                     
                                     /*$sections_evaluating = Course::has('activities')
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ->whereNotNull('outcomes_attempted')
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ->with(array('activities'=>function($query) use(&$outcome){
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            $query->whereNotNull('outcomes_attempted');
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ->where('code', $course->code)->where('number',$course->number)
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ->whereIn('semester_id', Session::get('semesters_ids'))
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ->get();*/
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->whereNotNull('outcomes_attempted')
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->with(array('activities'=>function($query) use(&$outcome){
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    $query->whereNotNull('outcomes_attempted');
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->where('code', $course->code)->where('number',$course->number)
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->whereIn('semester_id', Session::get('semesters_ids'))
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ->get();*/
                                     
                                     $sections_evaluating = Course::has('activities')
                                     
@@ -165,36 +165,7 @@
                                             </p>
 
                                             <br>
-                                            <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
-                                            <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
-                                            @if ($formative_actions)
-                                                <p style="display: inline;">
-                                                    <strong>{{ $formative_actions[0]->at_text }}:
-                                                    </strong>
-
-                                                    <i>{{ $formative_actions[0]->description }}
-                                                    </i>
-                                                </p>
-                                                <br>
-                                                <h5>Formative Action's Associated
-                                                    Criteria: </h5>
-                                                <ul>
-                                                    @foreach ($formative_actions as $criteria)
-                                                        <li> <i>{{ $criteria->name }} <i></li>
-
-                                                    @endforeach
-                                                </ul>
 
-                                            @else
-                                                <p style="display: inline;"> <strong>Has no Formative Action yet </strong>
-
-                                            @endif
-                                            @if ($activity->assessment_comments != null)
-
-                                                <h5 style="display: inline; margin:30px;">Assessment Comments</h5>
-                                                <p style="display: inline;">{{ $activity->assessment_comments }}</p>
-                                            @endif
-                                            <br>
                                             <table class='table table-striped table-condensed datatable'>
                                                 <thead>
                                                     <tr>
@@ -211,7 +182,7 @@
                                                             %
                                                         </th>
                                                         <th>
-                                                            Outcomes
+                                                            Learning Outcomes
                                                         </th>
                                                     </tr>
                                                 </thead>
@@ -253,7 +224,7 @@
 
                                                                 @foreach (Criterion::outcomes($ac_criterion->criterion_id) as $index6 => $outcome)
 
-                                                                    {{ $index6 + 1 }}. <?php echo $outcome->name . "\n\n\n <br>"; ?>
+                                                                    <?php echo $outcome->name . "\n\n\n <br>"; ?>
 
 
 
@@ -266,15 +237,54 @@
                                                 </tbody>
 
                                             </table>
+                                            <br>
+                                            <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
+                                            <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
+                                            @if ($formative_actions)
+                                                <p style="display: inline;">
+                                                    <u>{{ $formative_actions[0]->at_text }}:
+                                                    </u>
+
+                                                    <i>{{ $formative_actions[0]->description }}
+                                                    </i>
+                                                </p>
+                                                <br>
+                                                <h5 style="display: inline; margin:30px;">Formative Action's Associated
+                                                    Criteria: </h5>
+                                                <ul style="margin:30px;">
+                                                    @foreach ($formative_actions as $criteria)
+                                                        <li> <i>{{ $criteria->name }} <i></li>
+
+                                                    @endforeach
+                                                </ul>
+
+
+
+                                            @endif
+                                            <br>
+                                            <h5 style="display: inline; margin:30px;">Assessment Comments: </h5>
+                                            @if ($activity->assessment_comments != null)
+
+
+                                                <p style="display: inline;">{{ $activity->assessment_comments }}</p>
+                                            @endif
+                                            <br>
                                             <hr>
                                             <br>
 
                                             <h4>Performance of Students by Learning Outcome</h4>
+                                            <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
+                                            <p style="display: inline;">{{ $activity->name }}
+                                                <strong>({{ $activity->date }})</strong>
+                                            </p>
+                                            <br>
+
                                             <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
                                             <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                                             </p>
                                             <br>
-                                            <h5 style="display: inline; margin:30px;">Expected percent of students achieving
+                                            <h5 style="display: inline; margin:30px;">Expected percent of students
+                                                achieving
                                                 the
                                                 target by outcome: </h5>
                                             <p style="display: inline;"> <i>
@@ -295,7 +305,7 @@
                                                 <thead>
                                                     <tr>
                                                         <th>
-                                                            Outcome
+                                                            Learning Outcome
                                                         </th>
                                                         <th>
                                                             Number of Students Assessed
@@ -322,11 +332,13 @@
                                                                 {{ $outcome->achieved }}
                                                             </td>
                                                             @if ($outcome->percentage >= $expected)
-                                                                <td class="col-md-1 success">{{ $outcome->percentage }}%
+                                                                <td class="col-md-1 success">
+                                                                    {{ $outcome->percentage }}%
                                                                 </td>
 
                                                             @else
-                                                                <td class="col-md-1 danger">{{ $outcome->percentage }}%
+                                                                <td class="col-md-1 danger">
+                                                                    {{ $outcome->percentage }}%
                                                                 </td>
 
                                                             @endif

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

@@ -44,14 +44,14 @@
                         <?php
                         
                         /*$sections_evaluating = Course::has('activities')
-                                                                                                                                        ->whereNotNull('outcomes_attempted')
-                                                                                                                                        ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
-                                                                                                                                        ->with(array('activities'=>function($query) use(&$outcome){
-                                                                                                                                            $query->whereNotNull('outcomes_attempted');
-                                                                                                                                            $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
-                                                                                                                                        ->where('code', $course->code)->where('number',$course->number)
-                                                                                                                                        ->whereIn('semester_id', Session::get('semesters_ids'))
-                                                                                                                                        ->get();*/
+                                                                                                                                                                                                                                                                                        ->whereNotNull('outcomes_attempted')
+                                                                                                                                                                                                                                                                                        ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
+                                                                                                                                                                                                                                                                                        ->with(array('activities'=>function($query) use(&$outcome){
+                                                                                                                                                                                                                                                                                            $query->whereNotNull('outcomes_attempted');
+                                                                                                                                                                                                                                                                                            $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
+                                                                                                                                                                                                                                                                                        ->where('code', $course->code)->where('number',$course->number)
+                                                                                                                                                                                                                                                                                        ->whereIn('semester_id', Session::get('semesters_ids'))
+                                                                                                                                                                                                                                                                                        ->get();*/
                         
                         $sections_evaluating = Course::has('activities')
                         
@@ -144,36 +144,7 @@
                                     </p>
 
                                     <br>
-                                    <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
-                                    <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
-                                    @if ($formative_actions)
-                                        <p style="display: inline;"> <strong>{{ $formative_actions[0]->at_text }}:
-                                            </strong>
-
-                                            <i>{{ $formative_actions[0]->description }}
-                                            </i>
-                                        </p>
-                                        <br>
-                                        <h5>Formative Action's Associated
-                                            Criteria: </h5>
-                                        <ul>
-                                            @foreach ($formative_actions as $criteria)
-                                                <li> <i>{{ $criteria->name }} <i></li>
-
-                                            @endforeach
-                                        </ul>
 
-                                    @else
-                                        <p style="display: inline;"> <strong>Has no Formative Action yet </strong>
-
-                                    @endif
-
-                                    @if ($activity->assessment_comments != null)
-
-                                        <h5 style="display: inline; margin:30px;">Assessment Comments</h5>
-                                        <p style="display: inline;">{{ $activity->assessment_comments }}</p>
-                                    @endif
-                                    <br>
                                     <table class='table table-striped table-condensed datatable'>
                                         <thead>
                                             <tr>
@@ -190,7 +161,7 @@
                                                     %
                                                 </th>
                                                 <th>
-                                                    Outcomes
+                                                    Learning Outcomes
                                                 </th>
                                             </tr>
                                         </thead>
@@ -232,7 +203,7 @@
 
                                                         @foreach (Criterion::outcomes($ac_criterion->criterion_id) as $index6 => $outcome)
 
-                                                            {{ $index6 + 1 }}. <?php echo $outcome->name . "\n\n\n <br>"; ?>
+                                                            <?php echo $outcome->name . "\n\n\n <br>"; ?>
 
 
 
@@ -245,10 +216,46 @@
                                         </tbody>
 
                                     </table>
+                                    <br>
+                                    <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
+                                    <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
+                                    @if ($formative_actions)
+                                        <p style="display: inline;">
+                                            <u>{{ $formative_actions[0]->at_text }}:
+                                            </u>
+
+                                            <i>{{ $formative_actions[0]->description }}
+                                            </i>
+                                        </p>
+                                        <br>
+                                        <h5 style="display: inline; margin:30px;">Formative Action's Associated
+                                            Criteria: </h5>
+                                        <ul style="margin:30px;">
+                                            @foreach ($formative_actions as $criteria)
+                                                <li> <i>{{ $criteria->name }} <i></li>
+
+                                            @endforeach
+                                        </ul>
+
+
+                                    @endif
+                                    <br>
+                                    <h5 style="display: inline; margin:30px;">Assessment Comments: </h5>
+                                    @if ($activity->assessment_comments != null)
+
+
+                                        <p style="display: inline;">{{ $activity->assessment_comments }}</p>
+                                    @endif
+                                    <br>
                                     <hr>
                                     <br>
 
                                     <h4>Performance of Students by Learning Outcome</h4>
+                                    <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
+                                    <p style="display: inline;">{{ $activity->name }}
+                                        <strong>({{ $activity->date }})</strong>
+                                    </p>
+                                    <br>
                                     <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
                                     <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                                     </p>
@@ -274,7 +281,7 @@
                                         <thead>
                                             <tr>
                                                 <th>
-                                                    Outcome
+                                                    Learning Outcome
                                                 </th>
                                                 <th>
                                                     Number of Students Assessed

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

@@ -56,14 +56,14 @@
                                 <?php
                                 
                                 /*$sections_evaluating = Course::has('activities')
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereNotNull('outcomes_attempted')
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->with(array('activities'=>function($query) use(&$outcome){
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        $query->whereNotNull('outcomes_attempted');
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->where('code', $course->code)->where('number',$course->number)
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereIn('semester_id', Session::get('semesters_ids'))
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->get();*/
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereNotNull('outcomes_attempted')
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->with(array('activities'=>function($query) use(&$outcome){
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        $query->whereNotNull('outcomes_attempted');
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->where('code', $course->code)->where('number',$course->number)
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->whereIn('semester_id', Session::get('semesters_ids'))
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ->get();*/
                                 
                                 $sections_evaluating = Course::has('activities')
                                 
@@ -159,35 +159,7 @@
                                                 %</i>
                                         </p>
 
-                                        <br>
-                                        <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
-                                        <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
-                                        @if ($formative_actions)
-                                            <p style="display: inline;"> <strong>{{ $formative_actions[0]->at_text }}:
-                                                </strong>
-
-                                                <i>{{ $formative_actions[0]->description }}
-                                                </i>
-                                            </p>
-                                            <br>
-                                            <h5>Formative Action's Associated
-                                                Criteria: </h5>
-                                            <ul>
-                                                @foreach ($formative_actions as $criteria)
-                                                    <li> <i>{{ $criteria->name }} <i></li>
-
-                                                @endforeach
-                                            </ul>
-
-                                        @else
-                                            <p style="display: inline;"> <strong>Has no Formative Action yet </strong>
 
-                                        @endif
-                                        @if ($activity->assessment_comments != null)
-
-                                            <h5 style="display: inline; margin:30px;">Assessment Comments</h5>
-                                            <p style="display: inline;">{{ $activity->assessment_comments }}</p>
-                                        @endif
                                         <br>
                                         <table class='table table-striped table-condensed datatable'>
                                             <thead>
@@ -205,7 +177,7 @@
                                                         %
                                                     </th>
                                                     <th>
-                                                        Outcomes
+                                                        Learning Outcomes
                                                     </th>
                                                 </tr>
                                             </thead>
@@ -247,7 +219,7 @@
 
                                                             @foreach (Criterion::outcomes($ac_criterion->criterion_id) as $index6 => $outcome)
 
-                                                                {{ $index6 + 1 }}. <?php echo $outcome->name . "\n\n\n <br>"; ?>
+                                                                <?php echo $outcome->name . "\n\n\n <br>"; ?>
 
 
 
@@ -260,10 +232,48 @@
                                             </tbody>
 
                                         </table>
+
+                                        <br>
+                                        <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
+                                        <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
+                                        @if ($formative_actions)
+                                            <p style="display: inline;"> <u>{{ $formative_actions[0]->at_text }}:
+                                                </u>
+
+                                                <i>{{ $formative_actions[0]->description }}
+                                                </i>
+                                            </p>
+                                            <br>
+                                            <h5 style="display: inline; margin:30px;">Formative Action's Associated
+                                                Criteria: </h5>
+                                            <ul style="margin:30px;">
+                                                @foreach ($formative_actions as $criteria)
+                                                    <li> <i>{{ $criteria->name }} <i></li>
+
+                                                @endforeach
+                                            </ul>
+
+
+
+                                        @endif
+                                        <br>
+                                        <h5 style="display: inline; margin:30px;">Assessment Comments: </h5>
+                                        @if ($activity->assessment_comments != null)
+
+
+                                            <p style="display: inline;">{{ $activity->assessment_comments }}</p>
+                                        @endif
                                         <hr>
                                         <br>
 
+
+
                                         <h4>Performance of Students by Learning Outcome</h4>
+                                        <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
+                                        <p style="display: inline;">{{ $activity->name }}
+                                            <strong>({{ $activity->date }})</strong>
+                                        </p>
+                                        <br>
                                         <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
                                         <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                                         </p>
@@ -288,7 +298,7 @@
                                             <thead>
                                                 <tr>
                                                     <th>
-                                                        Outcome
+                                                        Learning Outcome
                                                     </th>
                                                     <th>
                                                         Number of Students Assessed

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

@@ -1,14 +1,16 @@
 @extends('layouts.master')
 
 @section('navigation')
-@if($role==1)
-@include('local.managers.admins._navigation')
-@elseif($role==2)
-@include('local.managers.sCoords._navigation')
-@elseif($role==3)
-@include('local.managers.pCoords._navigation')
-@endif
-   
+    @if ($role == 1)
+        @include('local.managers.admins._navigation')
+    @elseif($role == 2)
+        @include('local.managers.sCoords._navigation')
+    @elseif($role == 3)
+        @include('local.managers.pCoords._navigation')
+    @elseif($role == 4)
+        @include('local.professors._navigation')
+    @endif
+
 @stop
 
 @section('main')
@@ -24,17 +26,20 @@
             </thead>
             <tfoot>
                 <tr class="column-search">
-                    <td><input class="column-search-bar form-control" type="text" placeholder="Buscar" aria-label="search rubric name"/></td>
-                    <td><select class="column-search-select form-control" aria-label="select associated school"><option value=""></option></select></td>
+                    <td><input class="column-search-bar form-control" type="text" placeholder="Buscar"
+                            aria-label="search rubric name" /></td>
+                    <td><select class="column-search-select form-control" aria-label="select associated school">
+                            <option value=""></option>
+                        </select></td>
                 </tr>
             </tfoot>
             <tbody>
-                @foreach($templates as $template)
+                @foreach ($templates as $template)
                     <tr>
-                        <td>{{ HTML::linkAction('TemplatesController@show', $template->name, array($template->id)) }}</td>
+                        <td>{{ HTML::linkAction('TemplatesController@show', $template->name, [$template->id]) }}</td>
                         <td>
-                            @if($template->school)
-                                {{$template->school->name}}
+                            @if ($template->school)
+                                {{ $template->school->name }}
                             @else
                                 All (global)
                             @endif
@@ -48,7 +53,7 @@
 
 @section('included-js')
 
-<!-- Datatables -->
-@include('global._datatables_js')
+    <!-- Datatables -->
+    @include('global._datatables_js')
 
-@stop
+@stop

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

@@ -1,49 +1,57 @@
 <div class="navbar navbar-inverse navbar-static-top">
-  <div class="container-fluid">
-    <!--<div class="navbar-header">
-      {{ HTML::linkAction('ProfessorsController@overview', 'Online Learning Assessment System · Professor', array() ,array('class'=>'navbar-brand')) }}
+    <div class="container-fluid">
+        <!--<div class="navbar-header">
+      {{ HTML::linkAction('ProfessorsController@overview', 'Online Learning Assessment System · Professor', [], ['class' => 'navbar-brand']) }}
       <span></span>
     </div>-->
-    <ul class="nav navbar-nav navbar-right">
-      <li>{{ HTML::linkAction('ProfessorsController@overview', 'My Courses') }}</li>
-      {{-- la linea siguiente comentada es lo que habia originalmente. tanto la linea como este comentario se pueden borrar --}}
-      {{-- <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 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('CriteriaController@objectivesIndex', 'Objectives and Criteria') }}</li>
+        <ul class="nav navbar-nav navbar-right">
+            <li>{{ HTML::linkAction('ProfessorsController@overview', 'My Courses') }}</li>
+            {{-- la linea siguiente comentada es lo que habia originalmente. tanto la linea como este comentario se pueden borrar --}}
+            {{-- <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
+                    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('CriteriaController@objectivesIndex', 'Objectives and Criteria') }}</li>
+                </ul>
+            </li>
+            @if (count(Auth::user()->courses))
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
+                        aria-expanded="false">Sections<span class="caret"></span></a>
+                    <ul class="dropdown-menu" role="menu">
+                        @foreach ($courses as $course)
+                            <li> {{ HTML::linkAction('CoursesController@show', $course->code . $course->number . '-' . $course->section . ' (' . $course->semester->code . ')', ['id' => $course->id]) }}
+                            </li>
+                        @endforeach
+                    </ul>
+                </li>
+            @endif
+            <li> {{ HTML::linkAction('ProfessorsController@program', 'Program') }}</li>
+            <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReport', 'Reports') }}</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>
+                <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> -->
+                    <li><a href="{{ asset('files/intro-avaluo.pdf') }}">Introduction to Assessment</a></li>
+                    <li><a
+                            href="http://oeae.uprrp.edu/wp-content/uploads/2019/01/Brochure-de-OLAS-rev.-agosto-2018.pdf">Brochure</a>
+                    </li>
+                </ul>
+            </li>
+            <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
+                    aria-expanded="false">Account<span class="caret"></span></a>
+                <ul class="dropdown-menu" role="menu">
+                    <li>{{ HTML::linkAction('UsersController@edit', 'Profile') }}</li>
+                    <li>{{ HTML::linkAction('AuthController@logout', 'Log out (' . Auth::user()->email . ')') }}</li>
+                </ul>
+            </li>
         </ul>
-      </li>
-      @if(count(Auth::user()->courses))
-      <li class="dropdown">
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Sections<span class="caret"></span></a>
-        <ul class="dropdown-menu" role="menu">
-          @foreach ($courses as $course)
-          <li> {{ HTML::linkAction('CoursesController@show', $course->code.$course->number.'-'.$course->section.' ('.$course->semester->code.')', array('id'=>$course->id)) }}</li>
-          @endforeach
-        </ul>
-      </li>
-      @endif
-      <li> {{ HTML::linkAction('ProfessorsController@program', 'Program') }}</li>
-      <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReport', 'Reports') }}</li>
-      <li class="dropdown">
-        <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> -->
-          <li><a href="{{ asset('files/intro-avaluo.pdf') }}">Introduction to Assessment</a></li>
-          <li><a href="http://oeae.uprrp.edu/wp-content/uploads/2019/01/Brochure-de-OLAS-rev.-agosto-2018.pdf">Brochure</a></li>
-        </ul>
-      </li>
-      <li class="dropdown">
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Account<span class="caret"></span></a>
-        <ul class="dropdown-menu" role="menu">
-          <li>{{ HTML::linkAction('UsersController@edit', 'Profile') }}</li>
-          <li>{{ HTML::linkAction('AuthController@logout', 'Log out ('.Auth::user()->email.')') }}</li>
-        </ul>
-      </li>
-    </ul>
-  </div>
-</div>
+    </div>
+</div>

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

@@ -63,7 +63,7 @@
                     <li>If a student dropped the class, select "N/A" (Not Applicable) for all columns in that student's row.</li>
                     <li>Cells with "N/A" <strong>will not</strong> be used to determine whether a criterion is achieved. Only scores from 0 to {{$rubric->max_score}} will be considered for this purpose.</li>
                     <li>For this activity, <strong>at least one score must be from 1-{{$rubric->max_score}}.</strong> Otherwise, the 'Publish Assessment' and 'Save as Draft' buttons will be <strong>disabled</strong>. If you want to delete previously saved scores, go back to the activity and click the "Delete Assessment" button.</li>
-
+                    <li>If some criterion has more weight on the student's final percentage, you can add it in the 'Weight' box above the criterion but be sure that the sum of criteria weights is equal to 100 (or aproximates it).
                 </ul>
             </div>
 
@@ -84,7 +84,7 @@
                     <li>Si un estudiante se dio de baja, seleccione "N/A" (No Aplica) en todas las columnas de la fila de ese estudiante.</li>
                     <li>Las celdas con "N/A" <strong>no</strong> serán utilizadas para determinar si un criterio se alcanzó o no. Solamente las puntuaciones del 0 al {{$rubric->max_score}} serán consideradas.</li>
                     <li>Para esta actividad, <strong>al menos una puntuación deber ser del 1 al {{$rubric->max_score}}.</strong> De otra manera, el botón para guardar <strong>se desactivará</strong>. Si quiere borrar los resultados del avalúo, vuelva a la actividad y oprima el botón que dice "Delete Assessment".</li>
-
+                    <li>Si algún criterio tiene más peso en el porcentaje final del estudiante, puedes añadirlo en la caja de "Weight" arriba del criterio deseado, pero debe asegurarse que la suma de los criterios sea igual a cien, o se aproxime. 
 
                 </ul>
             </div>

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

@@ -185,7 +185,7 @@
                                 %
                             </th>
                             <th>
-                                Outcomes
+                                Learning Outcomes
                             </th>
                         </tr>
                     </thead>
@@ -240,10 +240,40 @@
                     </tbody>
 
                 </table>
+
+                <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
+                <?php $formative_actions = $activity_1->formativeActionsWithCriteria(); ?>
+                @if ($formative_actions)
+                    <p style="display: inline;"> <u>{{ $formative_actions[0]->at_text }}:
+                        </u>
+
+                        <i>{{ $formative_actions[0]->description }}
+                        </i>
+                    </p>
+                    <br>
+                    <h5 style="display: inline; margin:30px;">Formative Action's Associated
+                        Criteria: </h5>
+                    <ul style=" margin:30px;">
+                        @foreach ($formative_actions as $criteria)
+                            <li> <i>{{ $criteria->name }} <i></li>
+
+                        @endforeach
+                    </ul>
+                @endif
+                <br>
+
+                <h5 style="display: inline; margin:30px;">Assessment Comments: </h5>
+                @if ($activity_1->assessment_comments != null)
+
+
+                    <p style="display: inline;">{{ $activity_1->assessment_comments }}</p>
+                @endif
                 <hr>
                 <br>
 
                 <h4>Performance of Students by Learning Outcome</h4>
+
+                <h5 style="text-align: center;">{{ $activity_1->name }} </h5>
                 <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
                 <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                 </p>
@@ -270,7 +300,7 @@
                     <thead>
                         <tr>
                             <th>
-                                Outcome
+                                Learning Outcome
                             </th>
                             <th>
                                 Number of Students Assessed
@@ -370,6 +400,7 @@
                 <br>
                 <br>
                 <h4>Performance of Students by Learning Outcome Criteria</h4>
+                <h5 style="text-align: center;">{{ $activity_2->name }} </h5>
                 <h5 style="display: inline; margin:30px;">Target by criterion: </h5>
                 <p style="display: inline;"> <i>{{ $activity_2->rubric[0]->expected_points }} or more</i>
                 </p>
@@ -395,7 +426,7 @@
                                 %
                             </th>
                             <th>
-                                Outcomes
+                                Learning Outcomes
                             </th>
                         </tr>
                     </thead>
@@ -437,7 +468,7 @@
 
                                     @foreach (Criterion::outcomes($ac_criterion->criterion_id) as $index6 => $outcome)
 
-                                        {{ $index6 + 1 }}. <?php echo $outcome->name . "\n\n\n <br>"; ?>
+                                        <?php echo $outcome->name . "\n\n\n <br>"; ?>
 
 
 
@@ -450,6 +481,33 @@
                     </tbody>
 
                 </table>
+
+                <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
+                <?php $formative_actions = $activity_2->formativeActionsWithCriteria(); ?>
+                @if ($formative_actions)
+                    <p style="display: inline;"> <u>{{ $formative_actions[0]->at_text }}:
+                        </u>
+
+                        <i>{{ $formative_actions[0]->description }}
+                        </i>
+                    </p>
+                    <br>
+                    <h5 style="display: inline; margin:30px;">Formative Action's Associated
+                        Criteria: </h5>
+                    <ul style=" margin:30px;">
+                        @foreach ($formative_actions as $criteria)
+                            <li> <i>{{ $criteria->name }} <i></li>
+
+                        @endforeach
+                    </ul>
+                @endif
+                <br>
+                <h5 style="display: inline; margin:30px;">Assessment Comments: </h5>
+                @if ($activity_2->assessment_comments != null)
+
+
+                    <p style="display: inline;">{{ $activity_2->assessment_comments }}</p>
+                @endif
                 <hr>
                 <br>
 
@@ -478,7 +536,7 @@
                     <thead>
                         <tr>
                             <th>
-                                Outcome
+                                Learning Outcome
                             </th>
                             <th>
                                 Number of Students Assessed

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

@@ -49,14 +49,14 @@
                     <?php
                     
                     /*$sections_evaluating = Course::has('activities')
-                                                                                       ->whereNotNull('outcomes_attempted')
-                                                                                       ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
-                                                                                       ->with(array('activities'=>function($query) use(&$outcome){
-                                                                                           $query->whereNotNull('outcomes_attempted');
-                                                                                           $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
-                                                                                       ->where('code', $course->code)->where('number',$course->number)
-                                                                                       ->whereIn('semester_id', Session::get('semesters_ids'))
-                                                                                       ->get();*/
+                                                                                                                                                                                                                                                                                                                                       ->whereNotNull('outcomes_attempted')
+                                                                                                                                                                                                                                                                                                                                       ->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'')
+                                                                                                                                                                                                                                                                                                                                       ->with(array('activities'=>function($query) use(&$outcome){
+                                                                                                                                                                                                                                                                                                                                           $query->whereNotNull('outcomes_attempted');
+                                                                                                                                                                                                                                                                                                                                           $query->whereRaw('outcomes_attempted not like \'%"'.$outcome->id.'":0%\'');} ))
+                                                                                                                                                                                                                                                                                                                                       ->where('code', $course->code)->where('number',$course->number)
+                                                                                                                                                                                                                                                                                                                                       ->whereIn('semester_id', Session::get('semesters_ids'))
+                                                                                                                                                                                                                                                                                                                                       ->get();*/
                     
                     $sections_evaluating = Course::has('activities')
                     
@@ -152,35 +152,7 @@
                                 </p>
 
                                 <br>
-                                <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
-                                <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
-                                @if ($formative_actions)
-                                    <p style="display: inline;"> <strong>{{ $formative_actions[0]->at_text }}:
-                                        </strong>
-
-                                        <i>{{ $formative_actions[0]->description }}
-                                        </i>
-                                    </p>
-                                    <br>
-                                    <h5>Formative Action's Associated
-                                        Criteria: </h5>
-                                    <ul>
-                                        @foreach ($formative_actions as $criteria)
-                                            <li> <i>{{ $criteria->name }} <i></li>
 
-                                        @endforeach
-                                    </ul>
-
-                                @else
-                                    <p style="display: inline;"> <strong>Has no Formative Action yet </strong>
-
-                                @endif
-                                @if ($activity->assessment_comments != null)
-
-                                    <h5 style="display: inline; margin:30px;">Assessment Comments</h5>
-                                    <p style="display: inline;">{{ $activity->assessment_comments }}</p>
-                                @endif
-                                <br>
 
                                 <table class='table table-striped table-condensed datatable'>
                                     <thead>
@@ -198,7 +170,7 @@
                                                 %
                                             </th>
                                             <th>
-                                                Outcomes
+                                                Learning Outcomes
                                             </th>
                                         </tr>
                                     </thead>
@@ -248,7 +220,7 @@
 
                                                     @foreach (Criterion::outcomes($ac_criterion->criterion_id) as $index6 => $outcome)
 
-                                                        {{ $index6 + 1 }}. <?php echo $outcome->name . "\n\n\n <br>"; ?>
+                                                        <?php echo $outcome->name . "\n\n\n <br>"; ?>
 
 
 
@@ -261,15 +233,49 @@
                                     </tbody>
 
                                 </table>
+                                <br>
+                                <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
+                                <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
+                                @if ($formative_actions)
+                                    <p style="display: inline;"> <u>{{ $formative_actions[0]->at_text }}:
+                                        </u>
+
+                                        <i>{{ $formative_actions[0]->description }}
+                                        </i>
+                                    </p>
+                                    <br>
+                                    <h5 style="display: inline; margin:30px;">Formative Action's Associated
+                                        Criteria: </h5>
+                                    <ul style="margin:30px;">
+                                        @foreach ($formative_actions as $criteria)
+                                            <li> <i>{{ $criteria->name }} <i></li>
+
+                                        @endforeach
+                                    </ul>
+                                @endif
+                                <br>
+
+                                <h5 style="display: inline; margin:30px;">Assessment Comments: </h5>
+                                @if ($activity->assessment_comments != null)
+
+
+                                    <p style="display: inline;">{{ $activity->assessment_comments }}</p>
+                                @endif
+                                <br>
                                 <hr>
                                 <br>
 
                                 <h4>Performance of Students by Learning Outcome</h4>
+                                <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5><br>
+                                <p style="display: inline;">{{ $activity->name }}
+                                    <strong>({{ $activity->date }})</strong>
+                                </p>
                                 <h5 style="display: inline; margin:30px;">Target by outcome: </h5>
                                 <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
                                 </p>
                                 <br>
-                                <h5 style="display: inline; margin:30px;">Expected percent of students achieving the target
+                                <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
+                                    target
                                     by outcome: </h5>
                                 <p style="display: inline;"> <i>
                                         <?php
@@ -290,7 +296,7 @@
                                     <thead>
                                         <tr>
                                             <th>
-                                                Outcome
+                                                Learning Outcome
                                             </th>
                                             <th>
                                                 Number of Students Assessed
@@ -342,8 +348,9 @@
 
 
 
-                            @endforeach
 
+
+                            @endforeach
                         @endforeach
                     </div>