arreglos sobre todo relacionados con rubricas, criterios y objetivos

app/config/app.php

 
 	//'debug' => $_ENV['APP_DEBUG'] ?: false,
 
-	'debug' => true,
-	//'debug' => false,
+// 	'debug' => true,
+	'debug' => false,
 	/*
 	|--------------------------------------------------------------------------
 	| Application URL

app/controllers/ActivitiesController.php

                     foreach ($student_data as $index => $student_dict) {
                         $student_id = $student_dict->studentId;
                         foreach ($student_dict->activity_crit_id as $act_crit_id => $score) {
-                            if (DB::table('assessments')->where('student_id', '=', $student_id)
+                     	 	  Log::info(json_encode($score));
+                          if (DB::table('assessments')->where('student_id', '=', $student_id)
                                 ->where('activity_criterion_id', '=', $act_crit_id)
                                 ->first()
                             ) {
                                     ->where('activity_criterion_id', '=', $act_crit_id)
                                     ->update(array('score' => $score));
                             } else {
-                                DB::insert("insert into assessments (`activity_criterion_id`, `student_id`, `score`) values ({$act_crit_id}, {$student_id}, {$score})");
+                            	if($score==null)
+                            	{
+	                                DB::insert("insert into assessments (`activity_criterion_id`, `student_id`) values ({$act_crit_id}, {$student_id})");
+    							}
+    							else
+    							{	
+    	                            DB::insert("insert into assessments (`activity_criterion_id`, `student_id`, `score`) values ({$act_crit_id}, {$student_id}, {$score})");
+                            	}
                             }
                         }
                         if (DB::table('activity_student')

app/controllers/AuthController.php

 
 		if (!$validator->fails()) {
 			//			TODO: Remove this for production environment
-			if (App::environment('local', 'staging')) {
-				return $this->processLogin();
-			}
+// 			if (App::environment('local', 'staging')) {
+// 				return $this->processLogin();
+// 			}
 			try {
 				// User input
 				$username = str_replace('@upr.edu', '', Input::get('email'));

app/controllers/CoursesController.php

             //             	->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();
-
+//             $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();
+//             $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();
+// print json_encode($assessments);exit();
             // Get rubric contents
-            $rubric_contents = json_decode($activity->rubric->contents);
-
+//             $rubric_contents = json_decode($activity->rubric->contents);
+			$rubric_contents = $activity->allActivityCriterionInfo();
             $criterion_list = array('#', 'Name', 'School', 'Major');
-
+			$students=$activity->assessed_students();
+// print json_encode($students);exit();
+			
             // Set criterion names
             foreach ($rubric_contents as $criterion) {
                 $criterion_list[] = $criterion->name;
             fputcsv($file, $criterion_list);
 
             // Set student info and scores for each criterion
-            foreach ($assessments as $assessment) {
-                $student = Student::find($assessment->student_id);
-                $scores = json_decode($assessment->scores, true);
-                fputcsv($file, array_merge(
-                    array($student->number, $student->name, $student->school_code, $student->conc_code),
+//             foreach ($assessments as $assessment) {
+//                 $student = Student::find($assessment->student_id);
+//                 $scores = json_decode($assessment->scores, true);
+//                 fputcsv($file, array_merge(
+//                     array($student->number, $student->name, $student->school_code, $student->conc_code),
+//                     $scores,
+//                     array($assessment->percentage, $assessment->comments)
+//                 ));
+//             }
+            foreach ($students as $student) {
+//                 $student = Student::find($assessment->student_id);
+//                 $scores = json_decode($assessment->scores, true);
+                $scores = $activity->student_scores($student->id);
+                $comm=$activity->student_comments($student->id);
+//                 print json_encode($activity->student_percentage($student->id));//exit();
+//                  var_dump($activity->student_percentage($student->id)[0]->percentage);//exit();
+				$resul= array_merge(
+                    array($student->id, $student->name, $student->school_code, $student->conc_code),
                     $scores,
-                    array($assessment->percentage, $assessment->comments)
-                ));
+                    array($activity->student_percentage($student->id))
+                    ,
+                    array($activity->student_comments($student->id)->comments)
+                );
+//                     print json_encode($resul);//exit();
+//                      var_dump($resul);//exit();
+            
+                fputcsv($file,$resul);
             }
             fputcsv($file, $empty_line);
         }
-
+// exit();
         // Table with all activities and grades
 
         // Set headers for table
             $assessed_activities = $course->assessedActivities;
             // Iterate over activities, get percentages and add them to the record array
             foreach ($assessed_activities as $activity) {
-                $percentage = DB::table('assessments')
-                    ->select('percentage')
-                    ->where('student_id', '=', $student->id)
-                    ->where('activity_id', '=', $activity->id)->first();
+//                 $percentage = DB::table('assessments')
+//                     ->select('percentage')
+//                     ->where('student_id', '=', $student->id)
+//                     ->where('activity_id', '=', $activity->id)->first();
 
-                $student_record[] = $percentage->percentage;
+                $student_record[] = $activity->student_percentage($student->id);
             }
 
             // Average

app/controllers/CriteriaController.php

             $parentesis = array('(', ')');
             if ($criterion->save()) {
                 $criterionId = $criterion->id;
-                DB::table('criterion_objective_outcome as cobo')
-                    ->join('program_criterion_objective_outcome as poco', 'poco.cri_obj_out_id', '=', 'cobo.id')
-                    ->where('cobo.criterion_id', $criterionId)
+                DB::table('criterion_objective_outcome')
+                    ->join('program_criterion_objective_outcome', 'program_criterion_objective_outcome.cri_obj_out_id', '=', 'criterion_objective_outcome.id')
+                    ->where('criterion_objective_outcome.criterion_id', $criterionId)
                     ->delete();
                 // DB::delete("delete from `criterion_objective_outcome` where `criterion_id` ={$criterionId}");
-                DB::delete("delete from `program_criterion` where `criterion_id` ={$criterionId}");
+//                 DB::delete("delete from `program_criterion` where `criterion_id` ={$criterionId}");
 
                 foreach ($clean_input['objective_id'] as $objective_id) {
 
     {
 
         $role = Auth::user()->role;
-
+// Log::info("fdsdff".json_encode($role));
         $criterion_id = Input::get('criterion_id');
 
         switch ($role) {
             case 2:
                 $program_ids = Program::where("school_id", Auth::user()->school_id)->lists('id');
                 break;
-
             case 3:
+                $program_ids = Auth::user()->programs->lists('id');
+                break;
             case 4:
                 $program_ids = Program::whereIn('id', Auth::user()->programs->lists('id'));
                 break;
         }
-        $outcomes_paired_ids = DB::table('criterion_objective_outcome as cobo')
-            ->join('program_criterion_objective_outcome as poco', 'poco.cri_obj_out_id', '=', 'cobo.id')
+
+       $outcomes_paired_ids = DB::table('criterion_objective_outcome')
+            ->join('program_criterion_objective_outcome', 'program_criterion_objective_outcome.cri_obj_out_id', '=', 'criterion_objective_outcome.id')
             ->whereIn("program_id", $program_ids)
             ->where('criterion_id', $criterion_id)
-            ->select('cobo.outcome_id')
+            ->select('criterion_objective_outcome.outcome_id')
             ->distinct()
-            ->lists('cobo.outcome_id');
+            ->lists('criterion_objective_outcome.outcome_id');
 
+// Log::info($outcomes_paired_ids);
 
         $json = [];
         $json['outcomes'] = $outcomes_paired_ids;

app/controllers/TemplatesController.php

 				break;
 		}
 
-
+Log::info(json_encode($user->programs->lists('id')));
 		return View::make('local.managers.admins.view_template', compact('template', 'title', 'can_edit'));
 	}
 
 				->lists('criteria.id');
 		}
 		// 			Log::info("aqui".(count($criteria)));
-					Log::info(json_encode(($criteria)));
+// 					Log::info(json_encode(($criteria)));
 
 
 
 					->where('school_id', $template->school_id)->lists('programs.id');
 			} else {
 				$program_ids = DB::table('programs')
-					->where('program_id', $template->program_id)->lists('programs.id');
+					->where('id', $template->program_id)->lists('programs.id');
 			}
 		} else {
 			$role = Auth::user()->role;
 
 		$template->num_scales = count($titles);
 		$template->max_score = $max_score;
+		$template->user_id = Auth::user()->id;
 
 		if ($template->save()) {
 
 			->join('template_criterion', 'template_criterion.criterion_id', '=', 'criteria.id')
 			->where("template_criterion.template_id", '=', Input::get('id'))
 			->get();
-		Log::info(json_encode($template_info['criterion']));
+		Log::info(json_encode($template_info['template']));
+		//Log::info(json_encode($template_info['criterion']));
 		// 				Log::info(($temp_crit->program_ids));
 		foreach ($template_info['criterion'] as $temp_crit) {
 			$temp_crit->scales = DB::table('scales')

app/models/Activity.php

     return $this->belongsTo('Course');
   }
 
+//   public function assessed_students()
+//   {
+//     return $this->belongsToMany('Student', 'assessments')->withPivot('scores', 'percentage')->withTimestamps();
+//   }
   public function assessed_students()
   {
-    return $this->belongsToMany('Student', 'assessments')->withPivot('scores', 'percentage')->withTimestamps();
+    return  DB::table('students')
+    	-> join('assessments','assessments.student_id','=','students.id')    
+    	-> join('activity_criterion','assessments.activity_criterion_id','=','activity_criterion.id')
+      ->where('activity_criterion.activity_id', '=', $this->id)
+      ->select('students.*')
+      ->distinct()
+      ->get();;
+  }
+  
+  public function student_scores($student_id)
+  {
+//       $assessments=DB::table('activity_criterion')
+//     	-> leftJoin('assessments','assessments.activity_criterion_id','=','activity_criterion.id')
+//       ->where('activity_criterion.activity_id', '=', $this->id)
+//       ->where('assessments.student_id', '=', $student_id)
+//       ->select('activity_criterion.id','score')
+//       ->orderBy('criterion_ids')
+//       ->get();
+//       $assessments=DB::table('assessments')
+//     	-> join('activity_criterion','assessments.activity_criterion_id','=','activity_criterion.id')
+//       ->where('activity_criterion.activity_id', '=', $this->id)
+//       ->where('assessments.student_id', '=', $student_id)
+//       ->select('activity_criterion.id','score')
+//       ->orderBy('criterion_id')
+//       ->get();
+    $activity_id=$this->id;
+    $assessments=DB::select(DB::raw("select id,  COALESCE(score,0) score from 
+    	(select activity_criterion_id, score from`assessments` where student_id= $student_id) a right OUTER join 
+    	(select id from `activity_criterion` where `activity_criterion`.`activity_id` = $activity_id) b on a.activity_criterion_id = b.id"));
+  
+    
+    $scores=array();
+    foreach($assessments as $assess)
+    {
+    	$scores[$assess->id]=$assess->score;
+    }
+    return  $scores;
+  }
+  
+  public function student_comments($student_id)
+  {
+      $comments=DB::table('activity_student')
+      ->where('activity_id', '=', $this->id)
+      ->where('student_id', '=', $student_id)
+      ->select('comments')
+      ->first();
+    
+    return  $comments;
+  }
+  
+   public function student_percentage($student_id)
+  {
+ //      $scores=DB::table('assessments')
+//     	-> join('activity_criterion','assessments.activity_criterion_id','=','activity_criterion.id')
+//       ->where('activity_criterion.activity_id', '=', $this->id)
+//       ->where('assessments.student_id', '=', $student_id)
+//       ->select('criterion_id','score')
+//       ->get();
+      //rubrics->expected_points
+    $activity_id=$this->id;
+ $percentage=DB::select(DB::raw("select COALESCE(ROUND(100*sum(score*weight)/sum(max_score*weight),2),0) percentage from (select activity_criterion_id, score from`assessments` where
+  student_id= $student_id) a right OUTER join 
+  (select id, weight, activity_id from `activity_criterion` where `activity_criterion`.`activity_id` = $activity_id) b on a.activity_criterion_id = b.id join 
+  rubric_activity on rubric_activity.activity_id=b.activity_id join rubrics on rubrics.id=rubric_activity.rubric_id"));
+    
+    return $percentage[0]->percentage;
   }
+ 
   public function amount_of_assessed_students()
   {
 
       ->where('activity_id', $this->id)
       ->select('activity_criterion.activity_id', 'activity_criterion.criterion_id', 'criteria.*')
       ->distinct()
+      ->orderBy('criteria.id')
       ->get();
 
 

app/models/User.php

 	// return the programs the user is a pcoord of
 	public function programs()
 	{
-		return $this->belongsToMany('Program')->select('programs.id', 'programs.name', 'programs.school_id', 'programs.is_graduate');
+// 		return $this->hasManyThrough('Program','Program_user')->select('programs.id', 'programs.name', 'programs.school_id', 'programs.is_graduate');
+// 		$sal= $this->belongsToMany('Program')->select('programs.id', 'programs.name', 'programs.school_id', 'programs.is_graduate');
+		$sal= $this->belongsToMany('Program')->select('programs.id', 'programs.name', 'programs.school_id', 'programs.is_graduate');
+		Log::info(json_encode($sal));
+		return $sal;
 	}
 }

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

             annual_plan_id:$(select).val()
         },
         function(semesters){
-            console.log(semesters);
+            //console.log(semesters);
 
             options_for_semesters = makeOptionsForSemesters(semesters);
             $("#select-semester-plans").html(options_for_semesters);
                 semester_id:$(semesters).val()
             },
             function(courses){
-                console.log(courses);
+                //console.log(courses);
                 options = makeOptionsForCourses(courses);
                 $("#select-courses-plans").html(options);
                 $('.selectpicker').selectpicker('refresh');
                 number_of_scales:$(number_of_scales).val()
             },
             function(criteria){
-                console.log(criteria);
+                //console.log(criteria);
                 options_criteria = makeOptionsForCriteria(criteria)
                 
                 $('#select-criteria-plans').html(options);
             annual_plan_id:annual_plan_id
         },
         function(outcomes){
-            console.log(outcomes);
+            //console.log(outcomes);
 
             options_for_select = makeOptionsForOutcomes(outcomes);
             $("#select-outcomes-plans").html(options_for_select);
 
 
 function fetchObjectives(select_outcome){
-    console.log($(select_outcome).find('option:selected').html())
+    //console.log($(select_outcome).find('option:selected').html())
     option_selected = $(select_outcome).find('option:selected');
-    console.log($(select_outcome).find('option:selected').data('objectives'))
-    console.log($(select_outcome).val())
-    console.log(option_selected.val())
+    //console.log($(select_outcome).find('option:selected').data('objectives'))
+    //console.log($(select_outcome).val())
+    //console.log(option_selected.val())
     $.post(
         "{{URL::action('AnnualPlansController@fetchObjectivesFromPlan')}}",
         {
     }
 
     function makeOptionsForObjectives(objectives){
-        console.log(objectives);
+        //console.log(objectives);
 
         option_selected = '';
         
     }
     else
     {
-        console.log('school', $('#select-school').find(':selected').data('school-id') );
-        console.log('program', $('#select-program').find(':selected').data('program-id') );
+        //console.log('school', $('#select-school').find(':selected').data('school-id') );
+        //console.log('program', $('#select-program').find(':selected').data('program-id') );
 
         // Update database
         $.post
         
 
             str +='<th><span class="glyphicon glyphicon-remove icon-btn" aria-hidden="true"></span></th></tr>';
-	console.log(str);
+	//console.log(str);
 
             $('table tbody').append(str);
 
 
                         copyrightNumber = Number.parseInt($(this).find('sup').text());
 
-                        console.log('a: '+copyrightNumber);
+                        //console.log('a: '+copyrightNumber);
 
                         criterion.children('td:nth-child(2)').find('sup').text(copyrightNumber);
                         found =true;
                 {
                     var copyrightNumber = $('#copyright-list li').length+1;
 
-                    console.log('b: '+copyrightNumber);
-                    console.log(criterion.children('td:nth-child(2)').find('sup').length);
+                    //console.log('b: '+copyrightNumber);
+                    //console.log(criterion.children('td:nth-child(2)').find('sup').length);
 
                     criterion.children('td:nth-child(2)').find('sup').text(copyrightNumber);
                     $('#copyright-list').append('<li><sup>'+copyrightNumber+' </sup><span>'+copyright+'<span></li>');
         function(data)
         {
             $('#select-criterion').empty();
-		console.log(data);
+		//console.log(data);
             // Append criteria
             data.forEach( function (arrayItem)
             {
 
                         copyrightNumber = Number.parseInt($(this).find('sup').text());
 
-                        console.log('a: '+copyrightNumber);
+                        //console.log('a: '+copyrightNumber);
 
                         criterion.children('td:nth-child(2)').find('sup').text(copyrightNumber);
                         found =true;
                 {
                     var copyrightNumber = $('#copyright-list li').length+1;
 
-                    console.log('b: '+copyrightNumber);
-                    console.log(criterion.children('td:nth-child(2)').find('sup').length);
+                    //console.log('b: '+copyrightNumber);
+                    //console.log(criterion.children('td:nth-child(2)').find('sup').length);
 
                     criterion.children('td:nth-child(2)').find('sup').text(copyrightNumber);
                     $('#copyright-list').append('<li><sup>'+copyrightNumber+' </sup><span>'+copyright+'<span></li>');
 // Fetch programs associated to a specific school
 function fetchPrograms(school)
 {
+	//console.log(school.find(':selected'));
     $.ajax({
         type: 'POST',
         url: "{{ URL::action('ProgramsController@fetch') }}",
             //Set the name of the rubric
             $('#rubric-name').val(data.template.name);
 
-console.log(data.template.school_id);
-console.log($('#select-school'));
+//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'));
+console.log("name"+data.template.name);
+console.log("school"+data.template.school_id);
+console.log("name"+data.template.name);
 
             // Fetch programs associated to that school
             fetchPrograms($('#select-school'));
+           // fetchPrograms(data.template.school_id);
 
             // Set program id to 0, then to the saved value if it exists
             $('#select-program option[data-program-id="0"]').prop('selected', true);
             $('#select-program option[data-program-id="'+data.template.program_id+'"]').prop('selected', true);
 
             // Set expected values
-            console.log(data.template.expected_percentage);
+         //   console.log(data.template.expected_percentage);
 
-            console.log(data.template.expected_points);
-            console.log(data.template.max_score);
+      //      console.log(data.template.expected_points);
+        //    console.log(data.template.max_score);
         
         $('#max_score').val(data.template.max_score);
           
             changeTable();
             // Set visibility
             var is_visible = data.template.is_visible;
-            if(is_visible)
+            console.log("is_visible",is_visible);
+            if(is_visible==1)
             {
+            	console.log("entro?")
                 $('#is_visible0').prop('checked', false);
                 $('#is_visible1').prop('checked', true);
             }
             else
             {
-                $('#is_visible1').prop('checked', false);
                 $('#is_visible0').prop('checked', true);
+                $('#is_visible1').prop('checked', false);
             }
 
 
             // Set the contents of the rubric
             var temp_criterion = data.criterion;
-               console.log(temp_criterion);
+       //        console.log(temp_criterion);
             for(temp_c in temp_criterion){
                 current_criterion = temp_criterion[temp_c]
-               console.log(current_criterion.program_ids);
+       //        console.log(current_criterion.program_ids);
                 objectives = JSON.stringify(current_criterion.objectives);
                 //var str = '<tr data-assoc-objectives= '+"'"+objectives+"'"+' data-program_ids = "'+current_criterion.program_ids+'" data-criterion-name = "'+current_criterion.name+'" data-criterion-id="'+temp_criterion[temp_c].criterion_id+'" data-criterion-copyright="'+temp_criterion[temp_c].copyright+'" data-criterion-notes="'+temp_criterion[temp_c].notes+'" data-outcomes = "'+temp_criterion[temp_c].outcomes+'"><th><span class="glyphicon glyphicon-move"></span></th><td>';
                 var str = "<tr  data-program_ids = '"+current_criterion.program_ids+"' data-criterion-name = '"+current_criterion.name+"' data-criterion-id='"+temp_criterion[temp_c].criterion_id+"' data-criterion-copyright='"+temp_criterion[temp_c].copyright+"' data-criterion-notes='"+temp_criterion[temp_c].notes+"' data-outcomes = '"+temp_criterion[temp_c].outcomes+"'><th><span class='glyphicon glyphicon-move'></span></th><td>";
-                console.log(str);
+           //     console.log(str);
 
                 var subcriteria ='';
                 if(current_criterion.subcriteria){
                 str+= '<td>'+current_criterion.outcomes+'</td>'
   
                 str+='<th><span class="glyphicon glyphicon-remove" aria-hidden="true"></span></th></tr>';
-                console.log(str);
+           //     console.log(str);
 
     $('table tbody').append(str);
 
         
             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()));
+            console.log("**"+programs.indexOf(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.indexOf(selected.data('template-program-id'))
                 && selected.data('admin')!=1
             )
         )
         $('#button-confirm-update-rubric').prop('disabled', true);
         $('#button-print-rubric').prop('disabled', true);
     }
-
     // Otherwise, load the selected template
     else
     {
         
         var template_program = selected.data('template-program-id');
 <!--         var dataset = selected.dataSet.templateProgramId; -->
+//            console.log("***"+({{ Auth::user()->role }}==3
+  //              && programs.indexOf(selected.data('template-program-id'))
+    //            && selected.data('admin')!=1
+      //      )+programs+template_program+{{ json_encode(Auth::user()->programs->lists('id')) }});
 
         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.indexOf(selected.data('template-program-id'))
                 && selected.data('admin')!=1
             )
         )
             console.log(program_ids);
 			
            // program_ids = $(this).data('program_ids')
-            if(!program_ids.includes(program_id) ){
+            if(!program_ids.indexOf(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/assessment.blade.php

             activity_criterion_id = $('.criterion-field').eq(index2).data('activity-criterion-id');
             score = scoreField.children('select').find(':selected').val();
             if(score != "N/A")
-            student_info[index].activity_crit_id[activity_criterion_id] = score;
+            {
+	            student_info[index].activity_crit_id[activity_criterion_id] = score;
+    		}
+    		else
+    		{
+    			student_info[index].activity_crit_id[activity_criterion_id] = null;
+    		}
             // Score in the cell
             //var score = scoreField.children('select').find(':selected').val();