Resultados de programas por estudiantes y varios bugs de 3 year plan y anual

app/controllers/CriteriaController.php

@@ -75,11 +75,9 @@ class CriteriaController extends \BaseController
         }
         $json_to_send['outcomes'] = $outcomeStr;
 
-
-
-
         return json_encode($json_to_send);
     }
+    
     public function fetchCriterion()
     {
         $json_to_send = array();

app/controllers/Objective2Controller.php

@@ -122,6 +122,7 @@ class Objective2Controller extends \BaseController
 
 		$json['assoc_criteria'] = DB::select("select name from criteria where id in(select criterion_id from criterion_objective_outcome where objective_id =?)", array(Input::get('id')));
 		Log::info('is here');
+// 		Log::info(json_encode($json));
 		return json_encode($json);
 	}
 	public function fetchAllobjectives()
@@ -131,11 +132,12 @@ class Objective2Controller extends \BaseController
 		$json = array();
 
 
-		$json['objective'] = DB::select("SELECT * FROM `objectives` where id in (select objective_id from objective_outcome where outcome_id ={$outcome_id}) and id in (select objective_id from objective_program where program_id = {$program_id})");
+		$json['objective'] = DB::select("SELECT * FROM `objectives` where id in (select objective_id from objective_outcome where outcome_id ={$outcome_id}) and id in (select objective_id from objective_program where program_id = {$program_id} and objective_id <> 0)");
 		Log::info('En mi sueño');
 		Log::info($json);
 		return json_encode($json);
 	}
+	
 	public function delete()
 	{
 		DB::delete("delete from objectives where id = ?", array(Input::get('deleteObj')));
@@ -339,6 +341,7 @@ class Objective2Controller extends \BaseController
 		$objectives_from_school = DB::table('programs')
 			->join('objective_program', 'objective_program.program_id', '=', 'programs.id')
 			->where('programs.school_id', $userSchool)
+			->where('objective_program.objective_id', "<>" , 0)
 			->lists('objective_id');
 		$objectives = Objective::withTrashed()->orderBy('text', 'ASC')->whereIn('id', $objectives_from_school)->get();
 		$programs = Program::where("school_id", "=", $userSchool)->orderBy('name', 'ASC')->get();

app/controllers/ProgramsController.php

@@ -263,6 +263,7 @@ class ProgramsController extends \BaseController
 		$schools = School::all();
 		$outcomeCount = Outcome::all()->count();
 		
+// 		var_dump(json_encode($outcomes));
 		$role=Auth::user()->role;
 
 		$programs_ids=array($program->id);
@@ -845,7 +846,7 @@ class ProgramsController extends \BaseController
    */
   public function fetch()
   {
-    //Log::info('id:' . Input::get('id'));
+    Log::info('id:' . Input::get('id'));
     return School::find(Input::get('id'))->programs;
   }
 }

app/controllers/ThreeYearPlanController.php

@@ -365,6 +365,7 @@ class ThreeYearPlanController extends \BaseController
             ->join('objective_program', 'objective_program.objective_id', '=', 'objectives.id')
             ->where('objective_program.program_id', $program_id)
             ->where('objective_outcome.outcome_id', $outcome_id)
+            ->where('objective_outcome.objective_id', "<>",0)
             ->select('objectives.id', 'objectives.text', 'outcomes.name as outcome_name')
             ->orderBy('objectives.text', 'asc')
             ->get();
@@ -445,8 +446,8 @@ class ThreeYearPlanController extends \BaseController
           foreach ($result_objectives as $objectives_) {
             $result_courses = DB::table('courses')
               ->where('courses.program_id', $program_id)
-              ->select('courses.id as course_id', 'courses.name', 'courses.code', 'courses.program_id')
-              ->orderBy('courses.name', 'asc')
+              ->select('courses.id as course_id', 'courses.name', 'courses.code', 'courses.number', 'courses.program_id')
+              ->orderBy('courses.number', 'asc')
               ->groupBy('courses.name', 'courses.code')
               ->get();
             #los cursos resultantes creo que deberian ser: todos los que se estan dando en mi programa

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

@@ -739,7 +739,7 @@ $('.go-to-temp').on('click', function(){
 
                       var option_value = outcome_id+'-'+semester_id+'-'+objective_id+'-'+course_id;
 
-                      var option_name = '['+course.code+'] '+course.name;
+                      var option_name = '['+course.code+course.number+'] '+course.name;
 
                       var new_option = new_select.find('.default-option').clone(true);
                       new_option.html(option_name);

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

@@ -19,7 +19,7 @@
                 <ul class="dropdown-menu" role="menu">
                     <li>{{ HTML::linkAction('Objective2Controller@editSchool', 'Objectives') }}</li>
                     <li>{{ HTML::linkAction('CriteriaController@editSchool', 'Criteria') }}</li>
-                    <li>{{ HTML::linkAction('TemplatesController@newTemplate', 'Rubrics') }}</li>
+                    <li>{{ HTML::linkAction('TemplatesController@newTemplate_new', 'Rubrics') }}</li>
                     <li>{{ HTML::linkAction('TemplatesController@index', 'Rubric List') }}</li>
 
                     <li>{{ HTML::linkAction('TransformativeActionsController@editTA', 'Transformative Actions') }}

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

@@ -335,20 +335,25 @@
                     id: id
                 },
                 function(json) {
-
-                    var text = json.objective[0].text;
+// console.log(json.objective.length);
+					if((json.objective.length))
+                    {
+                    	var text = json.objective[0].text;
 
 
                     // Display info
                     $('#objective-text').val(text);
-
+					}
 
                     // Select associated outcome
                     for (var i = counterAssoc; i != 1; i--) {
                         deleteLastAssoc(i);
 
                     }
-                    $('#assoc_outcome0').val(json.outcome[0].outcome_id);
+					if((json.objective.length))
+                    {
+	                    $('#assoc_outcome0').val(json.outcome[0].outcome_id);
+    				}
                     $('#assoc_outcome0').selectpicker('refresh');
                     counterAssoc = 1;
                     for (var i = 1; i < json.outcome.length; i++) {
@@ -399,9 +404,11 @@
                         $('#assoc_program_id_' + prog).prop("checked", true);
                     }
 
+		// 			if((json.objective.length))
+//                     {
 
                     // Select status
-                    if (json.objective[0].deleted_at)
+                    if (json.objective.length && json.objective[0].deleted_at)
                         $('#status').val(0);
                     else
                         $('#status').val(1);
@@ -413,10 +420,11 @@
                         modal =
                             '<button type="button" class="btn btn-primary btn-block" data-toggle="modal" data-target="#delete">' +
                             'Delete' +
-                            '</button>' +
-                            '<input type="hidden" value =' + json.objective[0].id + ' name="deleteObj">' +
+                            '</button>';
+                    if(json.objective.lenght)
+                            modal +='<input type="hidden" value =' + json.objective[0].id + ' name="deleteObj">';
 
-                            '<div class="modal fade" id="delete" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">' +
+                            modal +='<div class="modal fade" id="delete" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">' +
                             '<div class="modal-dialog" role="document">' +
                             '<div class="modal-content">' +
                             ' <div class="modal-header">' +
@@ -448,10 +456,11 @@
                         modal =
                             '<button type="button" class="btn btn-primary btn-block" data-toggle="modal" data-target="#delete">' +
                             'Delete' +
-                            '</button>' +
-                            '<input type="hidden" value =' + json.objective[0].id + ' name="deleteObj">' +
+                            '</button>';
+                        if(json.objective.length)
+                         modal += '<input type="hidden" value =' + json.objective[0].id + ' name="deleteObj">' ;
 
-                            '<div class="modal fade" id="delete" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">' +
+                        modal += '<div class="modal fade" id="delete" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">' +
                             '<div class="modal-dialog" role="document">' +
                             '<div class="modal-content">' +
                             ' <div class="modal-header">' +
@@ -599,7 +608,7 @@
 
     $('#outcome-display').parent().hide();
 
-    fetchObjectiveForEditing();
+<!--     fetchObjectiveForEditing(); -->
     // setCriterionStatus();
 
     fetchAllObjectives("select-program", "assoc_outcomes_fetch")

app/views/local/managers/shared/annual-plans.blade.php

@@ -300,9 +300,9 @@
                         });
 
 
-                        courseshtml = ' • [' + course.code + '] ' +
+                        courseshtml = ' • [' + course.code +  course.number + '] ' +
                             course.name + '<br>'
-                        courseTAhtml = ' &#8226; [' + course.code + '] ' +
+                        courseTAhtml = ' &#8226; [' + course.code + course.number + '] ' +
                             course.name + '<br>';
                         div_for_course_criteria.append(courseshtml);
                         div_for_course_transformative.append(courseTAhtml);
@@ -530,10 +530,10 @@
                             for (course in courses[objectives[objective].id]) {
 
                                 courseshtml += ' &#8226; ' + courses[objectives[objective].id][course]
-                                    .code + ' ' +
+                                    .code + courses[objectives[objective].id][course].number + ' ' +
                                     courses[objectives[objective].id][course].name + '<br>'
                                 courseTAhtml += ' &#8226; ' + courses[objectives[objective].id][course]
-                                    .code + ' ' +
+                                    .code + courses[objectives[objective].id][course].number + ' ' +
                                     courses[objectives[objective].id][course].name + '<br>'
 
                                 $divForEach = $('<div/>', {
@@ -1250,7 +1250,7 @@
                         'id': 'list'
                     });
                     var onclick = "";
-                    if (json.annual_plans.is_submitted)
+                    if (json.annual_plans.is_submitted==1)
                         onclick = "fetchEverythingSubmitted(this)";
                     else onclick = "fetchEverything(this)";
                     if (json.outcomes.first) {

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

@@ -299,7 +299,9 @@ $('#graph').highcharts({
             @foreach($outcomes as $outcome)
              @if(isset($outcomes_attempted[$outcome->id]))
                 "{{{ $outcome->name }}}<br>(N = {{{ $outcomes_attempted[$outcome->id] }}}, {{{ $outcomes_achieved[$outcome->id] }}})",
-            @endif
+             	@else
+                    "{{{ $outcome->name }}}<br>(N = 0, 0)",         	
+           @endif
             @endforeach
         ],
         labels: {

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

@@ -620,7 +620,6 @@ function addCriterion()
                 notes = data.criterion.notes;
             }
             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>';
 
             var subcriteria = '';
@@ -1411,7 +1410,8 @@ $('.save').on('click', function(e)
         $('tbody tr').each(function( index )
         {
             htmlString = '';
-            
+            console.log($(this));
+
             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>"

app/views/local/managers/shared/view-annual-plans.blade.php

@@ -300,8 +300,10 @@ $('#here2').append($buttonForInform);*/
                 courseHTML+= '&#8226; '+theCourse.code + " "+ theCourse.number +'\n\n\n<br>';
                 courseTAhtml += '&#8226; '+theCourse.code + " "+ theCourse.number +'\n\n\n<br>';
 
-                for(criterion in json.first.criteria[theObj.id][theCourse.typ_course_id]){
-                  theCrit = json.first.criteria[theObj.id][theCourse.typ_course_id][criterion];
+//                 for(criterion in json.first.criteria[theObj.id][theCourse.typ_course_id]){
+                for(criterion in json.first.criteria[theObj.id][theCourse.course_id]){
+//                   theCrit = json.first.criteria[theObj.id][theCourse.typ_course_id][criterion];
+                  theCrit = json.first.criteria[theObj.id][theCourse.course_id][criterion];
                   courseHTML += '\t&nbsp;&nbsp; '+(parseInt(criterion)+1)+". "+theCrit.name+'\n\n<br>';
                   
                 }
@@ -441,8 +443,12 @@ $('#here2').append($buttonForInform);*/
                 var theCourse = json.second.courses[theObj.id][course];
                 courseHTML+= '&#8226'+theCourse.code + " "+ theCourse.number +'\n\n\n<br>';
                 courseTAhtml += '&#8226; '+theCourse.code + " "+ theCourse.number +'\n\n\n<br>';
-                for(criterion in json.second.criteria[theObj.id][theCourse.typ_course_id]){
-                  theCrit = json.second.criteria[theObj.id][theCourse.typ_course_id][criterion];
+                console.log(theCourse);
+                console.log(json.second.criteria[theObj.id][theCourse.course_id]);
+//                 for(criterion in json.second.criteria[theObj.id][theCourse.typ_course_id]){
+                for(criterion in json.second.criteria[theObj.id][theCourse.course_id]){
+                  theCrit = json.second.criteria[theObj.id][theCourse.course_id][criterion];
+//                   theCrit = json.second.criteria[theObj.id][theCourse.typ_course_id][criterion];
                   courseHTML += '&nbsp;&nbsp; '+(parseInt(criterion)+1)+". "+theCrit.name+'\n\n<br>';