Arreglos y migrations

app/controllers/ActivitiesController.php

@@ -204,6 +204,7 @@ class ActivitiesController extends \BaseController
             ->addSelect('activity_criterion.activity_id', 'activity_criterion.weight', 'activity_criterion.id as activity_criterion_id')
             ->addSelect('rubric_criterion.rubric_id', 'rubric_criterion.id as rubric_criterion_id')
             ->get();
+        Log::info("EN mi cuarto o o o");
         Log::info($rubric_criterion);
         foreach ($rubric_criterion as $index => $singleCR) {
             $singleCR->scales = json_encode(DB::table('scales')
@@ -232,12 +233,12 @@ class ActivitiesController extends \BaseController
         $scores_array = array();
 
         foreach ($assessments as $index => $assessment) {
-            $scores_array[$assessment->student_id][] = $assessment->score;
+            $scores_array[$assessment->student_id][$assessment->activity_criterion_id] = $assessment->score;
             $scores_array[$assessment->student_id]['comments'] = DB::table('activity_student')->where('student_id', '=', $assessment->student_id)
                 ->where("activity_id", '=', $activity->id)
                 ->select('comments')->first()->comments;
         }
-
+        Log::info($assessments);
         Log::info($scores_array);
 
 
@@ -774,11 +775,12 @@ class ActivitiesController extends \BaseController
         // Get rubric contents
         $rubric = Rubric::find($activity->rubric[0]->id);
 
+
         $rubric->titles = DB::table('titles')
             ->join('rubric_title', 'rubric_title.title_id', '=', 'titles.id')
             ->where('rubric_id', $rubric->id)
-            ->get();
-
+            ->orderBy("position", 'ASC')
+            ->lists('text');
         //$rubric_contents = Rubric::select('contents')->where('id', '=', $activity->rubric_id)->get();
         //$rubric_contents = json_decode($rubric_contents['0']->contents);
 
@@ -792,6 +794,8 @@ class ActivitiesController extends \BaseController
             ->addSelect('activity_criterion.activity_id', 'activity_criterion.weight', 'activity_criterion.id as activity_criterion_id')
             ->addSelect('rubric_criterion.rubric_id', 'rubric_criterion.id as rubric_criterion_id')
             ->get();
+        Log::info("EN mi cuarto o o o");
+        Log::info($rubric_criterion);
 
         foreach ($rubric_criterion as $index => $crit) {
             $crit->scales = DB::table('scales')
@@ -815,7 +819,7 @@ class ActivitiesController extends \BaseController
         $scores_array = array();
 
         foreach ($assessments as $index => $assessment) {
-            $scores_array[$assessment->student_id][] = $assessment->score;
+            $scores_array[$assessment->student_id][$assessment->activity_criterion_id][] = $assessment->score;
             $scores_array[$assessment->student_id]['comments'] = DB::table('activity_student')->where('student_id', '=', $assessment->student_id)
                 ->where("activity_id", '=', $activity->id)
                 ->select('comments')->first()->comments;
@@ -853,6 +857,12 @@ class ActivitiesController extends \BaseController
             ->addSelect('activity_criterion.activity_id', 'activity_criterion.weight', 'activity_criterion.id as activity_criterion_id')
             ->addSelect('rubric_criterion.rubric_id', 'rubric_criterion.id as rubric_criterion_id')
             ->get();
+        $rubric->titles = DB::table('titles')
+            ->join('rubric_title', 'rubric_title.titles_id', '=', 'titles.id')
+            ->where('rubric_id', $rubric->id)
+            ->orderBy("position", 'ASC')
+            ->lists('text');
+
 
         foreach ($rubric_contents as $index => $crit) {
             $crit->scales = DB::table('scales')

app/controllers/RubricsController.php

@@ -443,6 +443,7 @@ class RubricsController extends \BaseController
 
     public function fetchRubricCriterion()
     {
+        Log::info(Input::all());
         $rubric = DB::table("criterion_scale")
             ->join('scales', 'scales.id', '=', 'criterion_scale.scale_id')
             ->where("criterion_id", '=', Input::get('criterion_id'))

app/controllers/TemplatesController.php

@@ -389,6 +389,30 @@ class TemplatesController extends \BaseController
 	{
 		try {
 			$template = Template::find($id);
+			$template->titles = DB::table('titles')
+				->join('template_title', 'template_title.title_id', '=', 'titles.id')
+				->where("template_id", $template->id)
+				->orderBy('position', 'ASC')
+				->lists('text');
+			$template_criterion = DB::table('template_criterion')
+				->join('criteria', 'criteria.id', '=', 'template_criterion.criterion_id')
+				->where('template_id', $template->id)
+				->orderBy('position', 'ASC')
+				->get();
+
+			foreach ($template_criterion as $single_crit) {
+				$single_crit->scales = DB::table('criterion_scale')
+					->join('scales', 'criterion_scale.scale_id', '=', 'scales.id')
+					->where('criterion_id', $single_crit->id)
+					->orderBy('position')
+					->lists('description');
+				$single_crit->outcomes = DB::table('outcomes')
+					->join('criterion_objective_outcome', 'criterion_objective_outcome.outcome_id', '=', 'outcomes.id')
+					->where('criterion_id', $single_crit->id)
+					->select('name')
+					->distinct()
+					->lists('name');
+			}
 
 			$title = $template->name;
 
@@ -402,7 +426,7 @@ class TemplatesController extends \BaseController
 			else
 				$program = 'All Programs';
 
-			return View::make('local.managers.shared.print_rubric', compact('title', 'template', 'school', 'program'));
+			return View::make('local.managers.shared.print_rubric', compact('title', 'template_criterion', 'template', 'school', 'program'));
 		} catch (Exception $e) {
 			Session::flash('status', 'danger');
 			Session::flash('message', $e->getMessage());

app/database/migrations/2021_08_27_142254_add_level_modality_gender_student.php

@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
+
+class AddLevelModalityGenderStudent extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('students', function (Blueprint $table) {
+
+			$table->integer('level')->unsigned();
+			$table->char("modality", 1);
+			$table->char('gender', 4);
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('students', function (Blueprint $table) {
+
+			$table->dropColumn("level");
+			$table->dropColumn('modality');
+			$table->dropColumn('gender');
+		});
+	}
+}

app/database/migrations/2021_08_27_142509_add_degree_to_programs.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
+
+class AddDegreeToPrograms extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('programs', function (Blueprint $table) {
+
+			$table->char('degree', 3);
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('programs', function (Blueprint $table) {
+
+			$table->dropColumn("degree");
+		});
+	}
+}

app/database/migrations/2021_08_27_142937_add_modality_to_course.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\Schema;
+
+class AddModalityToCourse extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('courses', function (Blueprint $table) {
+			$table->char('modality', 1);
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('courses', function (Blueprint $table) {
+			$table->dropColumn('modality');
+		});
+	}
+}

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

@@ -121,17 +121,16 @@ echo
     <tr>
       <th></th>
       <th>Criterion</th>
-      <th>Beginning (1-2)</th>
-      <th>In Progress (3-4)</th>
-      <th>Good (5-6)</th>
-      <th>Excellent (7-8)</th>
+      @foreach($template->titles as $i=>$title)
+      <th>{{$title}} ({{1+($i*($template->max_score/$template->num_scales))}}-{{(1+$i)*($template->max_score/$template->num_scales)}})</th>
+      @endforeach
       <th>Learning Outcome</th>
       <th>Copyright</th>
       <th>Notes</th>
     </tr>
   </thead>
   <tbody>
-  @foreach(json_decode($template->contents) as $index => $criterion)
+  @foreach($template_criterion as $index => $criterion)
     <tr>
       <td>{{ $index + 1 }}.</td>
       <td>
@@ -139,17 +138,24 @@ echo
 
         @if(property_exists($criterion, 'subcriteria'))
           <ul class="list-unstyled">
-            @foreach($criterion->subcriteria as $subcriterion)
+            @foreach(json_decode($criterion->subcriteria) as $subcriterion)
                 <li>{{ $subcriterion }}</li>
             @endforeach
           </ol>
         @endif
       </td>
-      <td>{{{ $criterion->description12 }}}</td>
-      <td>{{{ $criterion->description34 }}}</td>
-      <td>{{{ $criterion->description56 }}}</td>
-      <td>{{{ $criterion->description78 }}}</td>
-      <td>{{{ Outcome::where('id', $criterion->outcome_id)->first()->name }}}</td>
+      @foreach($criterion->scales as $index=>$description)
+      <td>{{{ $description }}}</td>
+      @endforeach
+      
+      <td>
+        <ol>
+        @foreach($criterion->outcomes as $outcome)
+        <li>{{$outcome}}</li>
+
+        @endforeach
+        </ol>
+      </td>
       <td>
       @if($criterion->copyright)
         {{{ $criterion->copyright }}}
@@ -166,7 +172,7 @@ echo
 </table>
 
 
-<?
+<?php
 
 echo '</body>';
 echo '</html>';

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

@@ -316,7 +316,22 @@
     </div>
 </div>
 <script>
-    // --------------------------------------------------------------------------
+  
+    </script>
+@stop
+
+@section('included-js')
+
+<!-- jQuery Sortable Tables -->
+<script src="{{ asset('vendor/jQuerySortable/jquery-sortable-min.js') }}"></script>
+
+<!-- X-Editable js -->
+<script src="{{ asset('vendor/xeditable/bootstrap-editable.min.js') }}"></script>
+
+@stop
+
+@section('javascript')
+// --------------------------------------------------------------------------
 // Functions
 // --------------------------------------------------------------------------
 
@@ -742,6 +757,7 @@ function loadTemplate()
             $('#expected_percentage').val(data.template.expected_percentage);
             
             $('#expected_points').val(data.template.expected_points);
+            
             $('#number_of_scales').val(data.template.num_scales);
             refreshSelects();
             changeTable();
@@ -913,6 +929,9 @@ function loadTemplate()
         // Enable print button
         $('#button-print-rubric').prop('disabled', false);
 
+        fetchCriteria($('#select-outcome'), $('#select-objective'));
+
+
         }, 
         'json',
     );
@@ -1118,6 +1137,10 @@ $('#max_score').on('change', function(){
 })
 $('#number_of_scales').on('change', function(){
     changeTable();
+    $('#rubric-container').hide();
+    $('#rubric-name').val('');
+    $('tbody').empty();
+
 })
 // When a learning outcome changes, update its criteria
 /*$('#select-outcome, input[name=criteria-filter]').on('change', function()
@@ -1311,21 +1334,6 @@ $('#button-print-rubric').on('click', function(e)
 
 });
 
-    </script>
-@stop
-
-@section('included-js')
-
-<!-- jQuery Sortable Tables -->
-<script src="{{ asset('vendor/jQuerySortable/jquery-sortable-min.js') }}"></script>
-
-<!-- X-Editable js -->
-<script src="{{ asset('vendor/xeditable/bootstrap-editable.min.js') }}"></script>
-
-@stop
-
-@section('javascript')
-
 // --------------------------------------------------------------------------
 // Page load
 // --------------------------------------------------------------------------

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

@@ -144,10 +144,8 @@
                                 
                                 @for ($j=0; $j<=$rubric->max_score; $j++)
                                     <!-- If the decoded scores with index as the assessment id and second index as criterion id equals the loop index, mark it as selected -->
-                                    <?php
-                                    Log::info($scores_array);
-                                    ?>
-                                    @if(array_key_exists($student->id, $scores_array) && $j ==  $scores_array[$student->id][$i])
+
+                                    @if(array_key_exists($student->id, $scores_array) && isset($scores_array[$student->id][$rubric_criterion[$i]->activity_criterion_id]) && $j ==  $scores_array[$student->id][$rubric_criterion[$i]->activity_criterion_id])
                                         <option value="{{$j}}" selected="selected">{{ $j }}</option>
                                     @else
                                         <option value="{{$j}}">{{ $j }}</option>
@@ -155,7 +153,7 @@
                                 @endfor
 
                                 <!-- N/A option -->
-                                @if( !array_key_exists($student->id, $scores_array)|| isset($scores_array[$student->id][$i]))
+                                @if( !array_key_exists($student->id, $scores_array)|| !isset($scores_array[$student->id][$rubric_criterion[$i]->activity_criterion_id]))
                                     <option value="N/A" selected="selected">N/A</option>
                                 @else
                                     <option value="N/A">N/A</option>

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

@@ -131,18 +131,18 @@ echo
             <!-- If the activity was assessed, load the assessment.-->
             @if(sizeof($assessments)!=0)
                 <!-- For each assessment -->
-                @foreach ($assessments as $assessment)
+                @foreach ($students as $student)
                     <tr class="student-row">
                         <!-- Fetch student name -->
-                        <td class="student-field" data-student-id="{{ $assessment->student_id }}">
-                            {{{ Student::find($assessment->student_id)->name }}}
+                        <td class="student-field" data-student-id="{{ $student->id }}">
+                            {{{ $student->name }}}
                         </td>
 
                         <!-- For each criterion in the rubric, there's a score field -->
                         @for ($i = 0; $i<sizeof($rubric_contents); $i++)
                             <td class="score-field">
-                                @if(array_key_exists($assessment->student_id, $scores_array)&& isset($scores_array[$assessment->student_id][$i]))
-                                {{ $scores_array[$assessment->student_id][$i] }}
+                                @if(array_key_exists($student->id, $scores_array)&& isset($scores_array[$student->id][$i]))
+                                {{ $scores_array[$student->id][$i] }}
                                 @else
                                 N/A
                                 @endif

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

@@ -24,10 +24,10 @@
             <div class="modal-body">
                 <table class="table table-bordered">
                     <thead>
-                        <th>Beginning (1-2)</th>
-                        <th>In Progress (3-4)</th>
-                        <th>Good (5-6)</th>
-                        <th>Excellent (7-8)</th>
+                        @foreach($rubric->titles as $i=>$title)
+                        <th>{{$title}} ({{1+($i*($rubric->max_score/$rubric->num_scales))}}-{{(1+$i)*($rubric->max_score/$rubric->num_scales)}})</th>
+                        @endforeach
+                        
                         <th>Notes</th>
                     </thead>
                     <tbody>
@@ -297,23 +297,24 @@ $('.criterion-field').on('click', function()
 {
     $.ajax({
         type: 'POST',
-        url: "{{ URL::action('CriteriaController@fetchCriterionWithTrashed') }}",
-        data: { id: $(this).data('criterion-id') },
+        url: "{{ URL::action('RubricsController@fetchRubricCriterion') }}",
+        data: { criterion_id: $(this).data('criterion-id') },
         success: function(data)
         {
-            $('.modal-title').html(data.name);
-
+            data = JSON.parse(data);
+            $('.modal-title').html(data.criteria.name);
+            descriptions = '';
             $('.modal-body tbody tr').empty();
+            for(i =0; i<{{$rubric->num_scales}}; i++){
+                descriptions += '<td>'+data[i].description+'</td>'
+            }
             $('.modal-body tbody tr').append
             (
-                '<td>'+data.description12+'</td>'
-                +'<td>'+data.description34+'</td>'
-                +'<td>'+data.description56+'</td>'
-                +'<td>'+data.description78+'</td>'
+                descriptions
             );
 
-            if(data.notes!=null)
-                $('.modal-body tbody tr').append('<td>'+data.notes+'</td>');
+            if(data.criteria.notes!=null)
+                $('.modal-body tbody tr').append('<td>'+data.criteria.notes+'</td>');
             else
                 $('.modal-body tbody tr').append('<td></td>');