Merge branch 'Merge_gabriel_mayo' of https://git.ccom.uprrp.edu/CDCC/OLAS into Merge_gabriel_mayo

app/controllers/CoursesController.php

@@ -334,7 +334,14 @@ CoursesController extends \BaseController
             fputcsv($file, array($activity_name));
 
             // Get assessments
-            $assessments = DB::table('assessments')->join('students', 'assessments.student_id', '=', 'students.id')->where('activity_id', '=', $activity->id)->orderBy('assessments.id', 'asc')->get();
+//             $assessments = DB::table('assessments')
+//             	->join('students', 'assessments.student_id', '=', 'students.id')
+//             	->where('activity_id', '=', $activity->id)->orderBy('assessments.id', 'asc')->get();
+
+            $assessments = DB::table('assessments')
+            	->join('students', 'assessments.student_id', '=', 'students.id')
+            	->join('activity_criterion', 'assessments.activity_criterion_id', '=', 'activity_criterion.id')
+            	->where('activity_criterion.activity_id', '=', $activity->id)->orderBy('assessments.id', 'asc')->get();
 
             // Get rubric contents
             $rubric_contents = json_decode($activity->rubric->contents);

app/controllers/Objective2Controller.php

@@ -269,7 +269,7 @@ class Objective2Controller extends \BaseController
 			else {
 				Session::flash('status', 'danger');
 				Session::flash('message', '<p>Error creating objective. Please try again later.</p>');
-				return Redirect::to('objective')->withInput();
+				return Redirect::to('objectives')->withInput();
 				/*$role = Auth::user()['role'];
 				switch ($role) {
 					case 1:

app/controllers/ProgramsController.php

@@ -12,6 +12,7 @@ class ProgramsController extends \BaseController
 
     $program = Program::find($id);
     Log::info(debug_backtrace()[1]['function']);
+    Log::info($program);
     $title = $program->school->name . ': ' . $program->name;
     $program_courses = $program->courses;
     //     $outcomes = Outcome::orderBy('name', 'asc')->get();

app/controllers/SchoolCoordinatorsController.php

@@ -25,7 +25,198 @@ class SchoolCoordinatorsController extends \BaseController
         //             ->lists('id');
     }
 
-    public function overview()
+    public function overview_test()
+    {
+        ini_set('memory_limit', '256M');
+        DB::connection()->disableQueryLog();
+        //         $school = School::find($id);
+        $school = Auth::user()->school;
+        $id = $school->id;
+
+        $title = $school->name;
+        $schools = School::all();
+
+        $semesters = Semester::whereIn('id', Session::get('semesters_ids'))->get();
+
+        $outcomes_grad = Outcome::active_by_semesters($semesters, 1);
+        $outcomes_undergrad = Outcome::active_by_semesters($semesters, 0);
+
+        /**
+         * List of grouped courses (grouped sections)
+         */
+
+        $program_ids = $school->programs->lists('id');
+
+        $undergrad_programs = DB::table('programs')
+            ->select('id', 'name', 'school_id', 'is_graduate')
+            ->where('is_graduate', '=', 0)
+            ->where('school_id', '=', $id)
+            ->orderBy('name', 'ASC')
+            ->get();
+
+        $grad_programs = DB::table('programs')
+            ->select('id', 'name', 'school_id', 'is_graduate')
+            ->where('is_graduate', '=', 1)
+            ->where('school_id', '=', $id)
+            ->orderBy('name', 'ASC')
+            ->get();
+
+
+        $grad_grouped_courses = Course::
+            //             select(DB::raw('courses.name, courses.code, courses.number, max(courses.outcomes_attempted) as outcomes_attempted, courses.semester_id, courses.program_id'))
+            select(DB::raw('courses.name, courses.code, courses.number, courses.semester_id, courses.program_id'))
+            ->with('semester')
+            ->with('program')
+            ->whereIn('courses.program_id', $program_ids)
+            ->whereIn('courses.semester_id', Session::get('semesters_ids'))
+            ->leftJoin('programs', 'courses.program_id', '=', 'programs.id')
+            ->where('programs.is_graduate', '=', 1)
+            ->groupBy(array('courses.code', 'courses.number', 'courses.semester_id'))
+            ->orderBy('courses.code')
+            ->orderBy('courses.number')
+            ->orderBy('courses.semester_id')
+            ->get();
+
+        $undergrad_grouped_courses = Course::
+            //             select(DB::raw('courses.name, courses.code, courses.number, max(courses.outcomes_attempted) as outcomes_attempted, courses.semester_id, courses.program_id'))
+            select(DB::raw('courses.name, courses.code, courses.number, courses.semester_id, courses.program_id'))
+            ->with('semester')
+            ->with('program')
+            ->whereIn('courses.program_id', $program_ids)
+            ->whereIn('courses.semester_id', Session::get('semesters_ids'))
+            ->leftJoin('programs', 'courses.program_id', '=', 'programs.id')
+            ->where('programs.is_graduate', '=', 0)
+            ->groupBy(array('courses.code', 'courses.number', 'courses.semester_id'))
+            ->orderBy('courses.code')
+            ->orderBy('courses.number')
+            ->orderBy('courses.semester_id')
+            ->get();
+
+        foreach ($undergrad_grouped_courses as $key => $courses) {
+            $undergrad_grouped_courses[$key]->outcomes_attempted = NULL;
+            $coursesT = Course::where('courses.code', $courses->code)->where('courses.number', $courses->number)->where('courses.semester_id', $courses->semester_id)->get();
+            foreach ($coursesT as $course) {
+                if ($course->isAssessed()) {
+                    $undergrad_grouped_courses[$key]->outcomes_attempted = true;
+                }
+            }
+        }
+
+        foreach ($grad_grouped_courses as $key => $courses) {
+            $grad_grouped_courses[$key]->outcomes_attempted = NULL;
+            $coursesT = Course::where('courses.code', $courses->code)->where('courses.number', $courses->number)->where('courses.semester_id', $courses->semester_id)->get();
+            foreach ($coursesT as $course) {
+                if ($course->isAssessed()) {
+                    $grad_grouped_courses[$key]->outcomes_attempted = true;
+                }
+            }
+        }
+
+        // Fetch programs with participation
+        $participating_programs = $this->participatingPrograms($school);
+
+
+        /**
+         * Calculate how many sections are doing assessment
+         */
+
+        $undergrad_assessed_sections_count = 0;
+        $undergrad_school_sections_count = 0;
+
+        $grad_assessed_sections_count = 0;
+        $grad_school_sections_count = 0;
+
+        foreach ($school->programs as $program) {
+            foreach ($program->courses as $course) {
+
+                if (!$course->program->is_graduate) {
+                    $undergrad_school_sections_count += 1;
+                    if ($course->isAssessed()) $undergrad_assessed_sections_count += 1;
+                } else {
+                    $grad_school_sections_count += 1;
+                    if ($course->isAssessed()) $grad_assessed_sections_count += 1;
+                }
+            }
+        }
+
+        /**
+         * Calculate how many programs achieved and attempted each outcome in this school
+         */
+
+        // For each outcome 
+        foreach ($outcomes_undergrad as $outcome) {
+            //         	$attempted_outcomes_per_undergrad_program[$outcome->id]=0;
+            //         	$achieved_outcomes_per_undergrad_program[$outcome->id]=0;
+            $attemptedUndergradProgramsPerOutcome[$outcome->id] = 0;
+            $achievedUndergradProgramsPerOutcome[$outcome->id] = 0;
+            $programs_attempted_in_school[$outcome->id] = $outcome->programs_attempted_in_school($semesters, $school->id);
+            //         	var_dump($programs_attempted_in_school);exit();
+            foreach ($programs_attempted_in_school[$outcome->id] as $program_id) {
+                //         		var_dump($program_id->id);exit();
+                $program = DB::table('programs')->where('id', '=', $program_id->id)->first();
+
+                if (!$program->is_graduate) {
+                    $attemptedUndergradProgramsPerOutcome[$outcome->id]++;
+                    $programC = Program::where('id', '=', $program_id->id)->first();
+                    //         			var_dump($programC);exit();
+                    if ($programC->achieved_outcome($outcome->id, $semesters)) {
+                        $achievedUndergradProgramsPerOutcome[$outcome->id]++;
+                    }
+                }
+            }
+            $undergrad_outcomes_attempted[$outcome->id] = $outcome->attempted_by_school($semesters, $school->id, 0);
+            $undergrad_outcomes_achieved[$outcome->id] = $outcome->achieved_by_school($semesters, $school->id, 0);
+
+            // For each program with courses that do assessment
+            $programs_with_courses = Program::with(array('courses' => function ($query) {
+                //                 $query->whereNotNull('outcomes_attempted');
+                $query->whereIn('semester_id', Session::get('semesters_ids'));
+            }))->where('is_graduate', 0)->where('school_id', $school->id)->orderBy('name', 'asc')->get();
+        }
+
+        /**
+         * Calculate how many programs achieved and attempted each outcome in this school
+         */
+
+        // For each outcome 
+        foreach ($outcomes_grad as $outcome) {
+            //         	$attempted_outcomes_per_grad_program[$outcome->id]=0;
+            $achieved_outcomes_per_grad_program[$outcome->id] = 0;
+            $attemptedGradProgramsPerOutcome[$outcome->id] = 0;
+            $achievedGradProgramsPerOutcome[$outcome->id] = 0;
+            $grad_outcomes_attempted[$outcome->id] = $outcome->attempted_by_school($semesters, $school->id, 1);
+            $grad_outcomes_achieved[$outcome->id] = $outcome->achieved_by_school($semesters, $school->id, 1);
+            // For each program with courses that do assessment
+            foreach ($programs_attempted_in_school[$outcome->id] as $program_id) {
+                //         		var_dump($program_id->id);exit();
+                $program = DB::table('programs')
+                    ->where('id', '=', $program_id->id)
+                    ->first();
+                //         		$program=Program::where('id', $program_id->id);
+                //         		var_dump($program);exit();
+                if ($program->is_graduate) {
+                    $attemptedGradProgramsPerOutcome[$outcome->id]++;
+                    $programC = Program::where('id', '=', $program_id->id)->first();
+                    //         			var_dump($programC);exit();
+                    if ($programC->achieved_outcome($outcome->id, $semesters)) {
+                        $achievedGradProgramsPerOutcome[$outcome->id]++;
+                    }
+                }
+            }
+            $programs_with_courses = Program::with(array('courses' => function ($query) {
+                //                 $query->whereNotNull('outcomes_attempted');
+                $query->whereIn('semester_id', Session::get('semesters_ids'));
+            }))->where('is_graduate', 1)->where('school_id', $school->id)->orderBy('name', 'asc')->get();
+        }
+        if ($school->id == 13) {
+            //             return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
+            return View::make('local.managers.shared.school-uhs', compact('title', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
+        } else {
+            //             return View::make('local.managers.shared.school', compact('title', 'outcomes', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs', 'participating_undergrad_programs', 'participating_grad_programs'));
+            return View::make('local.managers.shared.schoolTest', compact('title', 'outcomes_grad', 'outcomes_undergrad', 'undergrad_programs', 'grad_programs', 'undergrad_outcomes_attempted', 'grad_outcomes_attempted', 'undergrad_outcomes_achieved', 'grad_outcomes_achieved', 'schools', 'school', 'undergrad_assessed_sections_count', 'grad_assessed_sections_count', 'undergrad_school_sections_count', 'grad_school_sections_count', 'achievedUndergradProgramsPerOutcome', 'achievedGradProgramsPerOutcome', 'attemptedUndergradProgramsPerOutcome', 'attemptedGradProgramsPerOutcome', 'grad_grouped_courses', 'undergrad_grouped_courses', 'participating_programs'));
+        }
+    }
+     public function overview()
     {
         ini_set('memory_limit', '256M');
         DB::connection()->disableQueryLog();

app/controllers/TemplatesController.php

@@ -203,12 +203,15 @@ class TemplatesController extends \BaseController
 			$templates = Template::orderBy('name', 'ASC')->get();
 			$programs = Program::orderBy('name', 'ASC')->get();
 			$criteria = Criterion::orderBy('name', 'ASC')->get();
+			$school_id_user=NULL;
 		} else {
 			if ($role == 2) {
 				$programs = Auth::user()->school->programs;
+				$school_id_user=Auth::user()->school_id;
 			}
 			if ($role == 3) {
 				$programs = Auth::user()->programs()->get();
+				$school_id_user=Auth::user()->programs[0]->school->id;
 			}
 			$program_ids = array();
 			foreach ($programs as $program) {
@@ -220,7 +223,8 @@ class TemplatesController extends \BaseController
 					$q->whereIn('program_id', $program_ids);
 				}
 			)->orderBy('name', 'ASC')->get();
-			$templates = Template::where('school_id', '=', Auth::user()->programs[0]->school->id)->orWhere('school_id', '=', NULL)
+			}
+			$templates = Template::where('school_id', '=', $school_id_user)->orWhere('school_id', '=', NULL)
 				->orderBy('name', 'ASC')->get();
 			$criteria_ids = array();
 			foreach ($criteria as $criterion) {
@@ -234,12 +238,15 @@ class TemplatesController extends \BaseController
 			foreach ($templates_fuera as $tf) {
 				$templates_fuera_ids[] = $tf->id;
 			}
+// 			Log::info(json_encode($templates_fuera_ids));
+// exit();
 			$templates_dentro = Template::whereNotIn('id', $templates_fuera_ids)
 				->orderBy('name', 'ASC')->get();
 
-			// 			var_dump(json_encode($templates_dentro));
-		}
+// 			if(!isset($templates_dentro))$templates_dentro=
 
+			// 			var_dump(json_encode($templates_dentro));
+// 		}
 
 
 		return View::make('local.managers.shared.rubrics_new', compact('title', 'templates_dentro', 'templates_fuera', 'outcomes', 'criteria', 'schools', 'programs', 'criteria_ids'));

app/routes.php

@@ -410,6 +410,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
      * School Coordinator Routes
      */
     Route::group(array('before' => 'scoord'), function () {
+        Route::get('school-coordinator-test', 'SchoolCoordinatorsController@overview_test');
         Route::get('school-coordinator', 'SchoolCoordinatorsController@overview');
         Route::get('school/{id}', 'SchoolsController@show');
         Route::get('program/{id}', 'ProgramsController@show');

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

@@ -130,13 +130,13 @@
                                     <br>
                                     <h4>Performance of Students by Learning Outcome Criteria</h4>
                                     <h5 style="display: inline; margin:30px;">Target by criterion: </h5>
-                                    <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_points }} or
+                                    <p style="display: inline; margin:-30px"> <i>{{ $activity->rubric[0]->expected_points }} or
                                             more</i>
                                     </p>
                                     <br>
                                     <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
                                         target by criterion: </h5>
-                                    <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_percentage }} %</i>
+                                    <p style="display: inline; margin:-30px"> <i>{{ $activity->rubric[0]->expected_percentage }} %</i>
                                     </p>
 
                                     <br>
@@ -206,33 +206,41 @@
 
                                     </table>
                                     <br>
-                                    <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
+<!--                                     <h5 style="display: inline; margin:30px;">Formative Actions: </h5> -->
+                                    <h5>Formative Actions: </h5>
                                     <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
                                     @if ($formative_actions)
-                                        <p style="display: inline;">
+                                        <p style="display: inline; margin:30px;">
+										@if ($formative_actions[0]->at_text!=$formative_actions[0]->description)
+
                                             <u>{{ $formative_actions[0]->at_text }}:
                                             </u>
+                                    @endif
 
                                             <i>{{ $formative_actions[0]->description }}
                                             </i>
                                         </p>
                                         <br>
-                                        <h5 style="display: inline; margin:30px;">Formative Action's Associated
+<!--                                         <h5 style="display: inline; margin:30px;"> -->
+                                        <h5>
+                                        Formative Action's Associated
                                             Criteria: </h5>
-                                        <ul style="margin:30px;">
+                                        <ul>
                                             @foreach ($formative_actions as $criteria)
                                                 <li> <i>{{ $criteria->name }} </i></li>
                                             @endforeach
                                         </ul>
                                     @endif
 
-                                    <h5 style="display: inline; margin:30px;">Assessment Comments: </h5>
+<!--                                     <h5 style="display: inline; margin:30px;"> -->
+                                    <h5>
+                                    Assessment Comments: </h5>
                                     @if ($activity->assessment_comments != null)
-                                        <p style="display: inline;">{{ $activity->assessment_comments }}</p>
+                                        <p style="display: inline; margin:30px;">{{ $activity->assessment_comments }}</p>
                                     @endif
-                                    <br>
+<!--                                     <br> -->
                                     <hr>
-                                    <br>
+<!--                                     <br> -->
 
                                     <h4>Performance of Students by Learning Outcome</h4>
                                     <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
@@ -242,12 +250,12 @@
                                     <br>
                                     <br>
                                     <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
-                                    <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
+                                    <p style="display: inline; margin:-30px;"> <i>>= 66.67% of the attempts</i>
                                     </p>
                                     <br>
                                     <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
                                         target by learning outcome: </h5>
-                                    <p style="display: inline;"> <i>
+                                    <p style="display: inline; margin:-30px;"> <i>
                                             <?php
                                             $expected = DB::table('target_outcomes_program')
                                                 ->where('program_id', $course->program_id)

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

@@ -623,7 +623,7 @@ function addCriterion()
             }
             objectives = JSON.stringify(objectives);
             var str ='<tr data-criterion-name ="'+data.criterion.name+'" data-program-ids = "['+program_ids+']" data-assoc-objectives = '+"'"+objectives+"'"+' data-criterion-id="'+data.criterion.id+'" data-criterion-copyright="'+copyright+'" data-criterion-notes="'+notes+'" data-outcomes = "'+data.outcomes+'"><th><span class="glyphicon glyphicon-move"></span></th><td>';
-
+//	console.log(str);
             var subcriteria = '';
             if(data.criterion.subcriteria){
 
@@ -657,6 +657,7 @@ function addCriterion()
         
 
             str +='<th><span class="glyphicon glyphicon-remove icon-btn" aria-hidden="true"></span></th></tr>';
+	console.log(str);
 
             $('table tbody').append(str);
 
@@ -890,9 +891,12 @@ function loadTemplate()
             //Set the name of the rubric
             $('#rubric-name').val(data.template.name);
 
+console.log(data.template.school_id);
+console.log($('#select-school'));
             // Set school id to 0, then to the saved value if it exists
             $('#select-school option[data-school-id="0"]').prop('selected', true);
             $('#select-school option[data-school-id="'+data.template.school_id+'"]').prop('selected', true);
+console.log($('#select-school'));
 
             // Fetch programs associated to that school
             fetchPrograms($('#select-school'));
@@ -1069,12 +1073,14 @@ function loadTemplate()
             var programs = {{ json_encode(Auth::user()->programs->lists('id')) }};
         
             var template_program = selected.data('template-program-id');
+         //   console.log(selected.data('template-program-id'));
+          //  console.log(programs.includes(selected.data('template-program-id').toString()));
         
         if(
             {{ Auth::user()->role }}==1
             || ({{ Auth::user()->role }}==2 && selected.data('admin')!=1)
             || ({{ Auth::user()->role }}==3
-                && programs.includes(selected.data('template-program-id'))
+                && programs.includes(selected.data('template-program-id').toString())
 
                 && selected.data('admin')!=1
             )
@@ -1130,6 +1136,7 @@ function toggleProgramSelect(school)
     }
     else
     {
+    	console.log(school);
         fetchPrograms(school);
         $('#select-program').prop('disabled', false);
     }
@@ -1417,8 +1424,25 @@ $('.save').on('click', function(e)
         {
             htmlString = '';
             console.log($(this));
-
-            program_ids = $(this).data('program_ids')
+			if(typeof $(this).data('program_ids')!== 'undefined')
+			{
+				program_ids = $(this).data('program_ids');
+            console.log("ids"+program_ids);
+            console.log("ids"+$(this).data('program_ids'));
+			}
+			else if(typeof $(this).data('program-ids')!== 'undefined')
+			{
+				program_ids = $(this).data('program-ids')
+            console.log("Ids"+program_ids);
+			}
+			else
+			{
+				program_ids = [];
+            console.log(" "+program_ids);
+			}
+            console.log(program_ids);
+			
+           // program_ids = $(this).data('program_ids')
             if(!program_ids.includes(program_id) ){
                 title = "<h6>The following criteria and objectives will be matched with this program</h6>"
                 htmlString += "<ol style='list-style-position: inside'>"

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

@@ -199,6 +199,7 @@
             @if($course->outcomes_attempted!=NULL)
                 {{ HTML::linkAction('CoursesController@exportGrades', 'Export grades to CSV file', array('id'=>$course->id), array('class'=>'btn btn-default btn-sm pull-right')) }}
             @endif
+                {{ HTML::linkAction('CoursesController@exportGrades', 'Export grades to CSV file', array('id'=>$course->id), array('class'=>'btn btn-default btn-sm pull-right')) }}
 
 
             <table class="table table-striped table-condensed">

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

@@ -132,12 +132,12 @@
                                 <br>
                                 <h4>Performance of Students by Learning Outcome Criteria</h4>
                                 <h5 style="display: inline; margin:30px;">Target by criterion: </h5>
-                                <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_points }} or more</i>
+                                <p style="display: inline; margin:-30px;"> <i>{{ $activity->rubric[0]->expected_points }} or more</i>
                                 </p>
                                 <br>
                                 <h5 style="display: inline; margin:30px;">Expected percent of students achieving the target
                                     by criterion: </h5>
-                                <p style="display: inline;"> <i>{{ $activity->rubric[0]->expected_percentage }} %</i>
+                                <p style="display: inline; margin:-30px;"> <i>{{ $activity->rubric[0]->expected_percentage }} %</i>
                                 </p>
 
                                 <br>
@@ -213,19 +213,24 @@
 
                                 </table>
                                 <br>
-                                <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
+<!--                                 <h5 style="display: inline; margin:30px;">Formative Actions: </h5> -->
+                                <h5>Formative Actions: </h5>
                                 <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
                                 @if ($formative_actions)
-                                    <p style="display: inline;"> <u>{{ $formative_actions[0]->at_text }}:
+                                    <p style="display: inline; margin:30px;">
+                                     <u>{{ $formative_actions[0]->at_text }}:
                                         </u>
 
                                         <i>{{ $formative_actions[0]->description }}
                                         </i>
                                     </p>
 
-                                    <h5 style="display: inline; margin:30px;">Formative Action's Associated
+<!--                                     <h5 style="display: inline; margin:30px;"> -->
+                                    <h5>
+                                    Formative Action's Associated
                                         Criteria: </h5>
-                                    <ul style="margin:30px;">
+<!--                                     <ul style="margin:30px;"> -->
+                                    <ul>
                                         @foreach ($formative_actions as $criteria)
                                             <li> <i>{{ $criteria->name }} </i></li>
                                         @endforeach
@@ -233,29 +238,35 @@
                                 @endif
 
 
-                                <h5 style="display: inline; margin:30px;">Assessment Comments: </h5>
+<!--                                 <h5 style="display: inline; margin:30px;"> -->
+                                <h5>
+                                Assessment Comments: </h5>
                                 @if ($activity->assessment_comments != null)
-                                    <p style="display: inline;">{{ $activity->assessment_comments }}</p>
+                                    <p style="display: inline; margin:30px;">
+                                    {{ $activity->assessment_comments }}
+                                    </p>
                                 @endif
-                                <br>
+<!--                                 <br> -->
                                 <hr>
-                                <br>
+<!--                                 <br> -->
 
                                 <h4>Performance of Students by Learning Outcome</h4>
                                 <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5><br>
-                                <p style="display: inline;">{{ $activity->name }}
+<!--                                 <p style="display: inline;"> -->
+                                {{ $activity->name }}
                                     <strong>({{ $activity->date }})</strong>
-                                </p>
+<!--                                 </p> -->
                                 <br>
                                 <br>
                                 <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
-                                <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
+                                <p style="display: inline; margin:-30px;"> <i>>= 66.67% of the attempts</i>
                                 </p>
                                 <br>
                                 <h5 style="display: inline; margin:30px;">Expected percent of students achieving the
                                     target
                                     by learning outcome: </h5>
-                                <p style="display: inline;"> <i>
+ 								<p style="display: inline; margin:-30px;"> 
+                                 <i>
                                         <?php
                                         $expected = DB::table('target_outcomes_program')
                                             ->where('program_id', $course->program_id)
@@ -441,7 +452,8 @@
 
                                 </table>
                                 <br>
-                                <h5 style="display: inline; margin:30px;">Formative Actions: </h5>
+<!--                                 <h5 style="display: inline; margin:30px;">Formative Actions: </h5> -->
+                                <h5>Formative Actions: </h5>
                                 <?php $formative_actions = $activity->formativeActionsWithCriteria(); ?>
                                 @if ($formative_actions)
                                     <p style="display: inline;"> <u>{{ $formative_actions[0]->at_text }}:
@@ -453,7 +465,8 @@
                                     <br>
                                     <h5 style="display: inline; margin:30px;">Formative Action's Associated
                                         Criteria: </h5>
-                                    <ul style="margin:30px;">
+<!--                                     <ul style="margin:30px;"> -->
+                                    <ul>
                                         @foreach ($formative_actions as $criteria)
                                             <li> <i>{{ $criteria->name }} </i></li>
                                         @endforeach
@@ -461,13 +474,14 @@
                                 @endif
 
 
-                                <h5 style="display: inline; margin:30px;">Assessment Comments: </h5>
+<!--                                 <h5 style="display: inline; margin:30px;">Assessment Comments: </h5> -->
+                                <h5>Assessment Comments: </h5>
                                 @if ($activity->assessment_comments != null)
                                     <p style="display: inline;">{{ $activity->assessment_comments }}</p>
                                 @endif
-                                <br>
+<!--                                 <br> -->
                                 <hr>
-                                <br>
+<!--                                 <br> -->
 
                                 <h4>Performance of Students by Learning Outcome</h4>
                                 <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5><br>
@@ -475,9 +489,11 @@
                                     <strong>({{ $activity->date }})</strong>
                                 </p>
                                 <br><br>
+<!--                                 <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5> -->
                                 <h5 style="display: inline; margin:30px;">Target by learning outcome: </h5>
-                                <p style="display: inline;"> <i>>= 66.67% of the attempts</i>
-                                </p>
+<!--                                 <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

public/exports/olas_student_grades_CCOM40300U1C11_1648825808.csv

@@ -0,0 +1,3 @@
+"CCOM40300U1 (C11)"
+" "
+"Trabajo en Equipo"

public/exports/olas_student_grades_CCOM40300U1C11_1648826163.csv

@@ -0,0 +1,3 @@
+"CCOM40300U1 (C11)"
+" "
+"Trabajo en Equipo"

public/exports/olas_student_grades_CCOM40300U1C11_1648826166.csv

@@ -0,0 +1,3 @@
+"CCOM40300U1 (C11)"
+" "
+"Trabajo en Equipo"