Cambios

app/controllers/AnnualPlansController.php

@@ -343,17 +343,15 @@ class AnnualPlansController extends \BaseController
       Log::info($outcomes->id);
       Log::info($annual_plan['first']['objectives'][$outcomes->id]);
       foreach ($annual_plan['first']['objectives'][$outcomes->id] as $objective) {
-        Log::info($objective->id);
-        Log::info($an_semesters->semester_start);
-        Log::info($an_semesters->program_id);
-        Log::info(DB::select("select id from typ_semester_objectives where objective_id = {$objective->id} and  typ_semester_outcome_id in (select id from typ_semester_outcome where outcome_id ={$outcomes->id} and semester_id ={$an_semesters->semester_start} and typ_program_id in(select id from typ_program where program_id ={$an_semesters->program_id})) "));
         $annual_plan['first']['typ_objective_id'][$objective->id] = DB::select("select id from typ_semester_objectives where objective_id = {$objective->id} and  typ_semester_outcome_id in (select id from typ_semester_outcome where outcome_id ={$outcomes->id} and semester_id ={$an_semesters->semester_start} and typ_program_id in(select id from typ_program where program_id ={$an_semesters->program_id})) ")[0];
-        $annual_plan['first']['courses'][$objective->id] = DB::select("select typ.id typ_id, typ.course_id, c.code, c.number from (select course_id, id from typ_semester_courses where typ_semester_objective_id = {$annual_plan['first']['typ_objective_id'][$objective->id]->id}) typ, courses c where c.id = typ.course_id");
+        $annual_plan['first']['courses'][$objective->id] = DB::select("select typ.id typ_course_id, typ.course_id, c.code, c.number from (select course_id, id from typ_semester_courses where typ_semester_objective_id = {$annual_plan['first']['typ_objective_id'][$objective->id]->id}) typ, courses c where c.id = typ.course_id");
         foreach ($annual_plan['first']['courses'][$objective->id] as $course) {
-          $annual_plan['first']['criteria'][$objective->id][$course->course_id] = DB::select("select * from criteria where id in(select criteria_id from annual_plan_objective where annual_plan_id = {$an_id} and typ_semester_course_id = {$course->typ_id} )");
+          $annual_plan['first']['criteria'][$objective->id][$course->typ_course_id] = DB::select("select * from criteria where id in(select criteria_id from annual_plan_objective where annual_plan_id = {$an_id} and typ_semester_course_id = {$course->typ_course_id} )");
+          $annual_plan['first']['trans_actions'][$objective->id][$course->typ_course_id] = DB::select("select * from transformative_actions where id in (select trans_id from annual_plan_transformative where typ_semester_course_id = {$course->typ_course_id})");
         }
+
         Log::info($objective->id);
-        $annual_plan['first']['trans_actions'][$objective->id] = DB::select("select * from transformative_actions where id in (select trans_id from annual_plan_transformative where typ_semester_objective_id ={$annual_plan['first']['typ_objective_id'][$objective->id]->id})");
+        /*$annual_plan['first']['trans_actions'][$objective->id] = DB::select("select * from transformative_actions where id in (select trans_id from annual_plan_transformative where typ_semester_objective_id ={$annual_plan['first']['typ_objective_id'][$objective->id]->id})");
         foreach ($annual_plan['first']['trans_actions'][$objective->id] as $trans) {
           Log::info($annual_plan['first']['typ_objective_id'][$objective->id]->id);
           Log::info($trans->id);
@@ -363,7 +361,7 @@ class AnnualPlansController extends \BaseController
             Log::info("entró");
             $annual_plan['fill_info'][$annual_plan['first']['typ_objective_id'][$objective->id]->id][$trans->id] =  $annual_plan['fill_info'][$annual_plan['first']['typ_objective_id'][$objective->id]->id][$trans->id][0];
           }
-        }
+        }*/
       }
     }
     foreach ($annual_plan['second']['outcomes'] as $outcomes) {
@@ -371,11 +369,12 @@ class AnnualPlansController extends \BaseController
       foreach ($annual_plan['second']['objectives'][$outcomes->id] as $objective) {
         $annual_plan['second']['typ_objective_id'][$objective->id] = DB::select("select id from typ_semester_objectives where objective_id = {$objective->id} and  typ_semester_outcome_id in (select id from typ_semester_outcome where outcome_id ={$outcomes->id} and semester_id ={$an_semesters->semester_end} and typ_program_id in(select id from typ_program where program_id ={$an_semesters->program_id})) ")[0];
 
-        $annual_plan['second']['courses'][$objective->id] = DB::select("select typ.id typ_id, typ.course_id, c.code, c.number from (select course_id, id from typ_semester_courses where typ_semester_objective_id = {$annual_plan['second']['typ_objective_id'][$objective->id]->id}) typ, courses c where c.id = typ.course_id");
+        $annual_plan['second']['courses'][$objective->id] = DB::select("select typ.id typ_course_id, typ.course_id, c.code, c.number from (select course_id, id from typ_semester_courses where typ_semester_objective_id = {$annual_plan['second']['typ_objective_id'][$objective->id]->id}) typ, courses c where c.id = typ.course_id");
         foreach ($annual_plan['second']['courses'][$objective->id] as $course) {
-          $annual_plan['second']['criteria'][$objective->id][$course->course_id] = DB::select("select * from criteria where id in(select criteria_id from annual_plan_objective where annual_plan_id = {$an_id} and typ_semester_course_id ={$course->typ_id})");
+          $annual_plan['second']['criteria'][$objective->id][$course->course_id] = DB::select("select * from criteria where id in(select criteria_id from annual_plan_objective where annual_plan_id = {$an_id} and typ_semester_course_id ={$course->typ_course_id})");
+          $annual_plan['second']['trans_actions'][$objective->id][$course->typ_course_id] = DB::select("select * from transformative_actions where id in (select trans_id from annual_plan_transformative where typ_semester_course_id = {$course->typ_course_id})");
         }
-
+        /*
         $annual_plan['second']['trans_actions'][$objective->id] = DB::select("select * from transformative_actions where id in (select trans_id from annual_plan_transformative where typ_semester_objective_id ={$annual_plan['second']['typ_objective_id'][$objective->id]->id})");
         Log::info($annual_plan['second']['typ_objective_id'][$objective->id]->id);
         foreach ($annual_plan['second']['trans_actions'][$objective->id] as $trans) {
@@ -386,7 +385,7 @@ class AnnualPlansController extends \BaseController
             Log::info("entró");
             $annual_plan['fill_info'][$annual_plan['second']['typ_objective_id'][$objective->id]->id][$trans->id] =  $annual_plan['fill_info'][$annual_plan['second']['typ_objective_id'][$objective->id]->id][$trans->id][0];
           }
-        }
+        }*/
       }
     }
 

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

@@ -210,7 +210,7 @@ $(document).ready(function()
           if(transformativeDefault!= undefined){
           optionsForTa+="<optgroup label = 'Custom'>";
             for(trans in transformativeDefault){
-            optionsForTa+= "<option value='"+transformativeDefault[trans].id+"'>"+transformativeDefault[trans].at_text+"</option> ";
+            optionsForTa+= "<option value='"+transformativeDefault[trans].ta_id+"'>"+transformativeDefault[trans].at_text+"</option> ";
             
           }
           }

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

@@ -151,16 +151,17 @@ $buttonAll = $('<button/>',{
   'id':"buttonForAll"
 
 }).html('Export whole year');
+/*
 $buttonForInform = $('<button/>', {
   'class':'btn btn-secondary',
   'type':'button',
   'data-toggle':'modal',
   'data-target':'#modal_inform'
   
-}).html('Report annual plan');
+}).html('Report annual plan');*/
 $('#here2').html($buttonAll);
-$('#here2').append("<br><br>");
-$('#here2').append($buttonForInform);
+$('#here2').append("<br><br>"); /*
+$('#here2').append($buttonForInform);*/
 
 
 
@@ -291,14 +292,22 @@ $('#here2').append($buttonForInform);
               var objHTML = '<strong> '+nextLetter+'. '+theObj.text+'</strong>';
               nextLetter = nextChar(nextLetter);
               var courseHTML = '';
+              var courseTAhtml ='';
 
               for(course in json.first.courses[theObj.id]){
 
                 var theCourse = json.first.courses[theObj.id][course];
                 courseHTML+= '&#8226; '+theCourse.code + " "+ theCourse.number +'\n\n\n<br>';
-                for(criterion in json.first.criteria[theObj.id][theCourse.course_id]){
-                  theCrit = json.first.criteria[theObj.id][theCourse.course_id][criterion];
+                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];
                   courseHTML += '\t&nbsp;&nbsp; '+(parseInt(criterion)+1)+". "+theCrit.name+'\n<br>';
+                  
+                }
+                for(trans in json.first.trans_actions[theObj.id][theCourse.typ_course_id]){
+                  theTA = json.first.trans_actions[theObj.id][theCourse.typ_course_id][trans]
+                  courseTAhtml +='\t&nbsp;&nbsp; '+(parseInt(trans)+1)+". "+theTA.at_text+'\n<br>'; 
                 }
               }
               //courseHTML += '</ul>';
@@ -309,7 +318,7 @@ $('#here2').append($buttonForInform);
              //   criteriaHTML += '&#8226; '+crit.name+'\n<br>';
               //}
 
-              var trans_html ='';
+              /*var trans_html ='';
               number = 1;
               amount_of_TA_per_objective[index_per_objective]= [];
               for(trans in json.first.trans_actions[theObj.id]){
@@ -344,20 +353,20 @@ $('#here2').append($buttonForInform);
 
               theTypId = json.first.typ_objective_id[theObj.id].id;
               
-              for(fill_info in json.fill_info[theTypId]){
+              /*for(fill_info in json.fill_info[theTypId]){
            theInfo = json.fill_info[theTypId][fill_info];
                 $('#hizo-trans-'+fill_info+'_typ-'+theTypId+'-'+((theInfo.cycle_of_life)-1)).prop("checked", true);
                 $('#logro-trans-'+fill_info+'_typ-'+theTypId+'-'+theInfo.accomplished).prop("checked", true);
                 continuedSem = 1;
                 if(!theInfo.semester_continue) continuedSem =0;
                 $('#continued-trans-'+fill_info+'_typ-'+theTypId+'-'+continuedSem).prop("checked", true);
-              }
-             
+              }*/
+             /*
               amount_of_TA_per_objective[index_per_objective].push(counter);
 
               counter+=1;
 
-              }
+              }*/
 
 
               //$('#theReport').append()
@@ -365,7 +374,7 @@ $('#here2').append($buttonForInform);
               $table.row.add([
                 objHTML,
                 courseHTML,
-                trans_html
+                courseTAhtml
               ]);
 
               index_per_objective +=1;
@@ -425,18 +434,27 @@ $('#here2').append($buttonForInform);
               var objHTML = '<strong> '+nextLetter+'. '+theObj.text+'</strong>';
               nextLetter = nextChar(nextLetter);
               var courseHTML = '';
+              var courseTAhtml ='';
 
               for(course in json.second.courses[theObj.id]){
 
                 var theCourse = json.second.courses[theObj.id][course];
                 courseHTML+= '&#8226'+theCourse.code + " "+ theCourse.number +'\n\n\n<br>';
-                for(criterion in json.second.criteria[theObj.id][theCourse.course_id]){
-                  theCrit = json.second.criteria[theObj.id][theCourse.course_id][criterion];
+                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];
                   courseHTML += '&nbsp;&nbsp; '+(parseInt(criterion)+1)+". "+theCrit.name+'\n<br>';
+
+
+                }
+
+                for(trans in json.second.trans_actions[theObj.id][theCourse.typ_course_id]){
+                  theTA = json.second.trans_actions[theObj.id][theCourse.typ_course_id][trans]
+                  courseTAhtml +='\t&nbsp;&nbsp; '+(parseInt(trans)+1)+". "+theTA.at_text+'\n<br>'; 
                 }
               }
               //courseHTML += '</ul>';
-              var criteriaHTML = '';
+              /*var criteriaHTML = '';
 
               for(criterion in json.second.criteria[theObj.id]){
                 crit = json.second.criteria[theObj.id][criterion];
@@ -475,7 +493,7 @@ $('#here2').append($buttonForInform);
               $('#theReport').append(form);
 
               theTypId = json.second.typ_objective_id[theObj.id].id;
-              
+              /*
               for(fill_info in json.fill_info[theTypId]){
                 theInfo = json.fill_info[theTypId][fill_info];
                 $('#hizo-trans-'+fill_info+'_typ-'+theTypId+'-'+((theInfo.cycle_of_life)-1)).prop("checked", true);
@@ -489,14 +507,14 @@ $('#here2').append($buttonForInform);
               amount_of_TA_per_objective[index_per_objective].push(counter);
 
               counter+=1;
-              }
+              }*/
               index_per_objective +=1;
               
               $table.row.add([
                 objHTML,
                 courseHTML,
                 
-                trans_html
+                courseTAhtml
               ]);
              }