ANtes de terminar assessment

app/controllers/ActivitiesController.php

@@ -171,6 +171,12 @@ class ActivitiesController extends \BaseController
             ->join("criterion_rubric", "criterion_rubric.criterion_id", "=", "criteria.id")
             ->where('criterion_rubric.rubric_id', '=', $rubric->id)->get();
         Log::info($criterion_rubric);
+        foreach ($criterion_rubric as $index => $singleCR) {
+            $singleCR->scales = json_encode(DB::table('scales')->join('rubric_criteria_scale', 'rubric_criteria_scale.scale_id', '=', 'scales.id')
+                ->where('rubric_criteria_scale.rubric_criterion_id', '=', $singleCR->id)
+                ->orderBy('position')
+                ->lists('description'));
+        }
         $criterion_rubric_ids = DB::table('criterion_rubric')->where('rubric_id', '=', $rubric->id)->lists('id');
         Log::info($rubric);
         Log::info($criterion_rubric);
@@ -190,7 +196,8 @@ class ActivitiesController extends \BaseController
         foreach ($assessments as $index => $assessment) {
             $scores_array[$assessment->id] = json_decode($assessment->scores, true);
         }
-        Log::info($rubric);
+        Log::info(sizeof($criterion_rubric));
+
 
         return View::make('local.professors.assessment', compact('activity', 'title', 'students', 'course', 'criterion_rubric', 'assessments', 'scores_array', 'rubric', 'scales'));
     }
@@ -684,7 +691,7 @@ class ActivitiesController extends \BaseController
         $rubric_contents = Rubric::select('contents')->where('id', '=', $activity->rubric_id)->get();
         $rubric_contents = json_decode($rubric_contents['0']->contents);
 
-        $rubric = Rubric::find($activity->rubric_id);
+        $rubric = Rubric::find($activity->rubric[0]->id);
 
         // Get results
         $assessments = DB::table('assessments')->where('activity_id', '=', $activity->id)->orderBy('id', 'asc')->get();

app/controllers/RubricsController.php

@@ -33,6 +33,9 @@ class RubricsController extends \BaseController
         $outcomes = Outcome::orderBy('name', 'ASC')->get();
         $criteria = Criterion::orderBy('name', 'ASC')->get();
         $rubric = $activity->rubric;
+        Log::info($rubric);
+        Log::info($activity->rubric_id);
+        Log::info($activity->rubric[0]->id);
 
         return View::make('local.professors.rubrics', compact('title', 'templates', 'outcomes', 'criteria', 'rubrics', 'activity', 'rubric'));
     }
@@ -166,94 +169,160 @@ class RubricsController extends \BaseController
      */
     public function update()
     {
+        Log::info('entré???');
         $rubric = Rubric::find(Input::get('id'));
+
+        $scales = Input::get('scales');
+        $criteria = Input::get('criteria');
+
+        // Process rubric
         $rubric->name = Input::get('name');
 
         $rubric->expected_percentage = Input::get('expected_percentage');
         $rubric->expected_points = Input::get('expected_points');
 
+        $rubric->num_scales = count($scales[0]);
+        $rubric->max_score = Input::get('max_score');
+        $division = $rubric->max_score / count($scales[0]);
+
         DB::beginTransaction();
 
-        try {
-            // Get associated activity
-            $activity = Activity::where('rubric_id', '=', $rubric->id)->first();
 
-            // If the associated activity has been assessed, delete the records
+        // Get associated activity
+        //$activity = Activity::where('rubric_id', '=', $rubric->id)->first();
+
+        $activity_id = DB::table('activities')
+            ->join('rubric_activity', 'rubric_activity.activity_id', '=', 'activities.id')
+            ->where('rubric_id', '=', $rubric->id)
+            ->first();
+
+        $activity = Activity::where('id', '=', $activity_id->activity_id)->first();
+
+
+
+        // If the associated activity has been assessed, delete the records
+        if ($activity->outcomes_attempted != NULL) {
+            DB::table('assessments')->where('activity_id', '=', $activity->id)->delete();
+            $activity->criteria_achieved_percentage = NULL;
+            $activity->criteria_achieved = NULL;
+            $activity->outcomes_achieved = NULL;
+            $activity->outcomes_attempted = NULL;
+        }
+        Log::info('entré3???');
+
+        $rubric->save();
+        Log::info("????");
+        $activity->save();
+        Log::info("????22");
+        // Get all the course's activities
+        Log::info($activity->course);
+        $course = Course::find($activity->course->id);
+        $activities = $course->activities;
+
+        // Check if any assessed activities remain
+        $remainingAssessed = false;
+        foreach ($course->activities as $activity) {
             if ($activity->outcomes_attempted != NULL) {
-                DB::table('assessments')->where('activity_id', '=', $activity->id)->delete();
-                $activity->criteria_achieved_percentage = NULL;
-                $activity->criteria_achieved = NULL;
-                $activity->outcomes_achieved = NULL;
-                $activity->outcomes_attempted = NULL;
+                $remainingAssessed = true;
+                break;
             }
+        }
+        Log::info('entré4???');
 
-            $rubric->save();
-            $activity->save();
-
-            // Get all the course's activities
-            $course = Course::find($activity->course->id);
-            $activities = $course->activities;
+        //If there are still evaluated activities in the course, recalculate course outcomes
+        if (!$activities->isEmpty() && $remainingAssessed) {
+            // Variables to hold recalculated outcomes for the course
+            $course_outcomes_attempted = array_fill(1, Outcome::all()->count(), 0);
+            $course_outcomes_achieved = array_fill(1, Outcome::all()->count(), 0);
 
-            // Check if any assessed activities remain
-            $remainingAssessed = false;
-            foreach ($course->activities as $activity) {
+            // For each activity
+            foreach ($activities as $activity) {
+                // If activity has been assessed
                 if ($activity->outcomes_attempted != NULL) {
-                    $remainingAssessed = true;
-                    break;
+                    // Get the achieved criteria
+                    $criteria_achievement = json_decode($activity->criteria_achieved, true);
+                    foreach ($criteria_achievement as $criterion_id => $criterion_achieved) {
+                        // Find corresponding learning outcome;
+                        $criterion = Criterion::find($criterion_id);
+                        $outcome = Outcome::find($criterion->outcome_id);
+
+                        // If criterion is achieved (1), add 1 to both arrays
+                        if ($criterion_achieved === 1) {
+                            $course_outcomes_attempted[$outcome->id] += 1;
+                            $course_outcomes_achieved[$outcome->id] += 1;
+                        }
+                        // Else, only add to the attempted outcomes arrays
+                        elseif ($criterion_achieved === 0) {
+                            $course_outcomes_attempted[$outcome->id] += 1;
+                        }
+                    }
                 }
             }
+            Log::info('entré5???');
+            // Update course
+            $course->outcomes_achieved = json_encode($course_outcomes_achieved);
+            $course->outcomes_attempted = json_encode($course_outcomes_attempted);
+        } else {
+            // Update course
+            $course->outcomes_achieved = NULL;
+            $course->outcomes_attempted = NULL;
+        }
 
-            //If there are still evaluated activities in the course, recalculate course outcomes
-            if (!$activities->isEmpty() && $remainingAssessed) {
-                // Variables to hold recalculated outcomes for the course
-                $course_outcomes_attempted = array_fill(1, Outcome::all()->count(), 0);
-                $course_outcomes_achieved = array_fill(1, Outcome::all()->count(), 0);
-
-                // For each activity
-                foreach ($activities as $activity) {
-                    // If activity has been assessed
-                    if ($activity->outcomes_attempted != NULL) {
-                        // Get the achieved criteria
-                        $criteria_achievement = json_decode($activity->criteria_achieved, true);
-                        foreach ($criteria_achievement as $criterion_id => $criterion_achieved) {
-                            // Find corresponding learning outcome;
-                            $criterion = Criterion::find($criterion_id);
-                            $outcome = Outcome::find($criterion->outcome_id);
-
-                            // If criterion is achieved (1), add 1 to both arrays
-                            if ($criterion_achieved === 1) {
-                                $course_outcomes_attempted[$outcome->id] += 1;
-                                $course_outcomes_achieved[$outcome->id] += 1;
-                            }
-                            // Else, only add to the attempted outcomes arrays
-                            elseif ($criterion_achieved === 0) {
-                                $course_outcomes_attempted[$outcome->id] += 1;
-                            }
+        $course->save();
+        Log::info('entré6???');
+        DB::delete("delete from criterion_rubric where rubric_id ={$rubric->id}");
+        foreach ($criteria as $index => $criterion_id) {
+            if (
+
+                DB::insert("insert into criterion_rubric (`rubric_id`, `criterion_id`) values ({$rubric->id}, {$criterion_id}) ")
+            ) {
+                Log::info("AHH");
+                $rubric_criterion_id =  DB::table('criterion_rubric')
+                    ->where('rubric_id', '=', $rubric->id)
+                    ->where('criterion_id', '=', $criterion_id)
+                    ->first();
+
+                foreach ($scales[$index] as $in => $scale) {
+                    Log::info("AH2");
+                    $new_scale =  Scale::where('description', '=', $scale)
+                        ->where('max_score', '=', ($division * ($in + 1)))
+                        ->where("min_score", '=', (1 + ($division * $in)))->first();
+
+                    if ($new_scale) {
+                        DB::insert("insert into `rubric_criteria_scale` (`rubric_criterion_id`, `scale_id`, `position`) values ({$rubric_criterion_id->id},{$new_scale->id}, {$in})");
+                        DB::commit();
+                    } else {
+                        $new_scale = new Scale;
+                        $new_scale->description = $scales[$index][$in];
+                        $new_scale->min_score = 1 + ($division * $in);
+                        $new_scale->max_score = ($division * ($in + 1));
+                        if ($new_scale->save()) {
+                            DB::insert("insert into `rubric_criteria_scale` (`rubric_criterion_id`, `scale_id`, `position`) values ({$rubric_criterion_id->id},{$new_scale->id}, {$in})");
+                            DB::commit();
+                        } else {
+                            DB::rollBack();
+                            Session::flash('status', 'danger');
+                            Session::flash('message', 'Rubric could not be created.');
+                            return action('ActivitiesController@show', array($activity->id));
                         }
                     }
                 }
-
-                // Update course
-                $course->outcomes_achieved = json_encode($course_outcomes_achieved);
-                $course->outcomes_attempted = json_encode($course_outcomes_attempted);
             } else {
-                // Update course
-                $course->outcomes_achieved = NULL;
-                $course->outcomes_attempted = NULL;
+                DB::rollBack();
+                Session::flash('status', 'danger');
+                Session::flash('message', 'Rubric could not be created.');
+                return action('ActivitiesController@show', array($activity->id));
             }
+        }
+        Log::info('entré7???');
 
-            $course->save();
-            DB::commit();
+        DB::commit();
 
-            Session::flash('status', 'success');
-            Session::flash('message', 'Rubric updated.');
 
-            return action('ActivitiesController@show', array($activity->id));
-        } catch (Exception $e) {
-            DB::rollBack();
-            Session::flash('status', 'danger');
-            Session::flash('message', 'Error: The rubric could not be updated. Try again later.');
-        }
+        Session::flash('status', 'success');
+        Session::flash('message', 'Rubric updated.');
+
+        return action('ActivitiesController@show', array($activity->id));
     }
 
     /**
@@ -293,8 +362,27 @@ class RubricsController extends \BaseController
         Log::info($activity->rubric[0]->id);
 
         $rubric = Rubric::where('id', '=', $activity->rubric[0]->id)->firstOrFail();
+        $criterion_rubric = DB::table('criteria')
+            ->join('criterion_rubric', 'criterion_rubric.criterion_id', '=', 'criteria.id')
+            ->where('criterion_rubric.rubric_id', '=', $activity->rubric[0]->id)
+            ->get();
+
+        foreach ($criterion_rubric as $single_cr) {
+            $single_cr->scales = json_encode(DB::table('scales')
+                ->join('rubric_criteria_scale', 'rubric_criteria_scale.scale_id', '=', 'scales.id')
+                ->where('rubric_criteria_scale.rubric_criterion_id', '=', $single_cr->id)
+                ->orderBy('position')
+                ->lists('description'));
+            $single_cr->outcomes = json_encode(DB::table('outcomes')
+                ->join('criterion_objective_outcome', 'outcomes.id', '=', 'criterion_objective_outcome.outcome_id')
+                ->where('criterion_objective_outcome.criterion_id', '=', $single_cr->criterion_id)->lists('name'));
+        }
+
+
+        Log::info($criterion_rubric);
+
         $title = $activity->name . ': ' . $rubric->name;
-        return View::make('local.professors.viewrubric', compact('rubric', 'activity', 'title', 'course'));
+        return View::make('local.professors.viewrubric', compact('rubric', 'activity', 'criterion_rubric', 'title', 'course'));
     }
 
     /**

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

@@ -24,10 +24,16 @@
             <div class="modal-body">
                 <table class="table table-bordered">
                     <thead id = "criteria-header">;
-                        
+                        @for($i=0; $i<$rubric->num_scales; $i++)
+                        <th>Scale {{$i+1}} ({{1+($i*($rubric->max_score/$rubric->num_scales))}} - {{(1+$i)*($rubric->max_score/$rubric->num_scales)}})</th>
+                        @endfor
+                        <th>Notes</th>
                     </thead>
                     <tbody>
-                        <tr></tr>
+                        <tr>
+                            
+                            
+                        </tr>
                     </tbody>
                 </table>
             </div>
@@ -94,6 +100,21 @@
 
         <table data-rubric-id="{{{ $rubric->id }}}" id="assessment-table" class="table table-striped table-condensed table-bordered">
             <thead>
+                <tr>
+                    <th>
+                    </th>
+                    @foreach ($criterion_rubric as $index => $criterion)
+                    <th  data-criterion-id="{{{ $criterion->criterion_id }}}" ><div class="th-box">
+                        <!--<div class="form-group row">
+                            <div class="col-xs-1">
+                                <label for="weight-{{$index}}">Weight</label>
+                            <input class="form-control" id="weight-{{$index}}" name='weight[]' type="text">
+                            </div>
+                        </div>-->
+                        Weight<input class="form-control" id="weight-{{$index}}" name='weight[]' type="text" style = "width: 50%">
+                        </div></th>
+                @endforeach
+                </tr>
                     <tr>
                         <th>
                             <div class="th-box">
@@ -101,9 +122,10 @@
                             </div>
                         </th>
                         @foreach ($criterion_rubric as $criterion)
-                            <th class="criterion-field" data-criterion-id="{{{ $criterion->id }}}" ><div class="th-box">{{ $criterion->name}}</div></th>
+                            <th class="criterion-field" data-criterion-id="{{{ $criterion->criterion_id }}}" ><div class="th-box">{{ $criterion->name}}</div></th>
                         @endforeach
                         <th>Student Percentage</th>
+                        <th>Student % per Weight</th>
                         <th>Comments</th>
                     </tr>
             </thead>
@@ -155,14 +177,15 @@
                         @for ($i = 0; $i<sizeof($criterion_rubric); $i++)
                             <td class="score-field">
                                 <select name="" id="" class="form-control" data-toggle="tooltip" data-placement="right" title="{{{ $student->name }}}">
-                                    @for($i=0; $i<$rubric->max_score; $i++)
-                                    <option value ='{{$i}}'>{{$i}}</option>
+                                    @for($j=0; $j<=$rubric->max_score; $j++)
+                                    <option value ='{{$j}}'>{{$j}}</option>
                                     @endfor
                                     <option selected="selected" value="N/A">N/A</option>
                                 </select>
                             </td>
                         @endfor
                         <td class="percentage"></td>
+                        <td class="percentage-per-w"></td>
                         <td class="comments"><textarea class="comments full-textarea" placeholder="Max. 255 characters" maxLength="255" ></textarea></td>
                      </tr>
                 @endforeach
@@ -189,43 +212,8 @@
         </div>
     </div>
 </div>
-<script>
-    function changeTable(){
-    
- 
-    amount_of_scales = parseInt($('#num_of_scales').val());
-    counter2 = 0;
-    maximum = parseInt($('#max').val());
-    
-   
-    newScaleHeaders = '';
-    counter = 0;
-    division = maximum/amount_of_scales;
-    if(amount_of_scales==1){
-        newScaleHeaders+= "<th>Score (1 - "+maximum+")</th>";
-    }
-    else if(maximum!= amount_of_scales){
-    while(counter <amount_of_scales){
-        
-        minimumScore = 1+(counter*division);
-        maximumScore = (1+counter)*division;
-        newScaleHeaders+= "<th>Scale "+ (counter +1) + " ("+minimumScore+" - "+maximumScore+")</th>";
-        counter++;
-    }
-    }else{
-        while(counter <amount_of_scales){
-        
 
-        newScaleHeaders+= "<th>Scale "+ (counter +1) + " </th>";
-        counter++;
-    }
-    }
-    newScaleHeaders += '<th>Notes</th>';
-    
-    $("#criterion-header").html(newScaleHeaders);
     
-}
-    </script>
 @stop
 
 @section('included-js')

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

@@ -42,8 +42,8 @@
 
 
     <div class="well">
-      @if($activity->rubric_id!=NULL)
-        <span id="assigned_rubric" class="hidden" data-assigned-rubric="{{{ $activity->rubric_id }}}"></span>
+      @if(count($activity->rubric)!=0)
+        <span id="assigned_rubric" class="hidden" data-assigned-rubric="{{{ $activity->rubric[0]->id }}}"></span>
       @endif
       <input id="activity_id" type="hidden" value="{{{ $activity->id}}}">
 
@@ -51,7 +51,7 @@
         <label>Select a Rubric:</label>
         <select id="select-template" class="form-control selectpicker">
           @foreach ($templates as $template)
-            @if($activity->rubric_id!=NULL && $template->name == Rubric::find($activity->rubric_id)->name)
+            @if(count($activity->rubric)!=0 && $template->name == Rubric::find($activity->rubric[0]->id)->name)
               <option data-template-id="{{ $template->id }}" class="template" selected="selected">{{ $template->name }}</option>
             @else
               <option data-template-id="{{ $template->id }}" class="template">{{ $template->name }}</option>
@@ -541,7 +541,7 @@ $('#button-save-rubric').on('click', function(e)
       {
         name: $('#select-template').find(':selected').text(),
         activity_id: parseInt($('#activity_id').val()),
-        contents: " ",
+        
         expected_percentage: $('#expected_percentage').text(),
         expected_points: $('#expected_points').text(),
         criteria: criteria,
@@ -566,9 +566,13 @@ $('#button-save-rubric').on('click', function(e)
       {
         id: $('#assigned_rubric').data('assigned-rubric'),
         name: $('#select-template').find(':selected').text(),
-        contents: JSON.stringify(criteriaArray),
+        activity_id: parseInt($('#activity_id').val()),
+        
         expected_percentage: $('#expected_percentage').text(),
-        expected_points: $('#expected_points').text()
+        expected_points: $('#expected_points').text(),
+        criteria: criteria,
+        scales: scales,
+        max_score:max_score
       },
       function(data)
       {

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

@@ -32,15 +32,14 @@
           <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>
+            @for($i = 0; $i<$rubric->num_scales; $i++)
+            <th>Scale {{$i+1}} ({{1+($i*($rubric->max_score/$rubric->num_scales))}} - {{(1+$i)*($rubric->max_score/$rubric->num_scales)}})</th>
+            @endfor
             <th>Learning Outcome</th>
           </tr>
         </thead>
         <tbody>
-        @foreach(json_decode($rubric->contents) as $index => $criterion)
+        @foreach($criterion_rubric as $index => $criterion)
           <tr data-criterion-copyright="{{ $criterion->copyright }}" data-criterion-notes="{{ $criterion->notes }}">
             <td>{{ $index + 1 }}.</td>
             @if(isset($criterion->notes))
@@ -49,7 +48,7 @@
               <sup></sup>
               @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
                 </ul>
@@ -67,11 +66,17 @@
               @endif
             </td>
             @endif
-            <td>{{ nl2br($criterion->description12) }}</td>
-            <td>{{ nl2br($criterion->description34) }}</td>
-            <td>{{ nl2br($criterion->description56) }}</td>
-            <td>{{ nl2br($criterion->description78) }}</td>
-            <td>{{ Outcome::where('id', $criterion->outcome_id)->first()->name }}</td>
+            @foreach(json_decode($criterion->scales) as $scale)
+            <td>{{ nl2br($scale) }}</td>
+
+            @endforeach
+
+            <td>
+            
+            @foreach (json_decode($criterion->outcomes) as $index => $outcome)
+            {{$index+1}}. {{$outcome}}<br>                 
+            @endforeach  
+            </td>
           </tr>
         @endforeach
         </tbody>