Anted de fetch

app/controllers/AnnualPlansController.php

@@ -1,9 +1,10 @@
 <?php
 
 use Barryvdh\DomPDF\PDF as PDF;
+use Response;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Input;
-
+use Illuminate\Support\Facades\View;
 
 class AnnualPlansController extends \BaseController
 {
@@ -1082,16 +1083,42 @@ class AnnualPlansController extends \BaseController
       ->where('id', $path_id)
       ->first();
 
-    Log::info("ERES TU? creo que no");
+    //Log::info("ERES TU? creo que no");
+
+    $path = storage_path($queryToPath->path_to_pdf);
+
+    if ($download != "download") {
+      return Response::make(file_get_contents($queryToPath->path_to_pdf), 200, [
+        'Content-type' => 'application/pdf',
+        'Content-Disposition' => 'inline; filename="' . $queryToPath->path_to_pdf . '"'
+
+      ]);
+    } else {
+
+
+      return Response::download(
+        file_get_contents($queryToPath->path_to_pdf),
+        200,
+        [
+          'Content-type' => 'application/pdf',
+          'Content-Disposition' => 'inline; filename="' . $queryToPath->path_to_pdf . '"'
 
+        ]
+      );
+    }
+    /*
+[
+      'Content-type' => 'application/pdf',
+      'Content-Disposition' => 'inline; filename="' . $queryToPath->path_to_pdf . '"'
+    ]
+    */
     $annualPlan = AnnualPlan::findOrFail($queryToPath->annual_plan_id);
 
     Log::info("ERES TU?");
 
-
+    //return View::make('local.managers.shared.print_annual_report', compact('annualPlan'));
     $pdf = $pdf->loadView('local.managers.shared.print_annual_report', compact('annualPlan'))
       ->setOrientation("landscape")
-
       ->setPaper('legal', 'landscape');
     if ($download == "download")
       return $pdf->download(basename($queryToPath->path_to_pdf));

app/controllers/CoursesController.php

@@ -91,10 +91,77 @@ CoursesController extends \BaseController
             ->get();
     }
 
-    public function create()
+    private function cleanInput()
     {
+        //$clean_input = array();
 
         $all_input = Input::all();
+
+        $all_input["name"] = trim(preg_replace('/\t+/', '', Input::get('name')));
+
+
+
+
+        return $all_input;
+    }
+
+    private function makeValidator($clean_input)
+    {
+
+
+        return Validator::make(
+            array(
+                'course_name' => $clean_input['name'],
+                'course_code' => $clean_input['code'],
+                'course_number'  => $clean_input['number'],
+                'course_section' => $clean_input['section'],
+                'program_id' => $clean_input['program'],
+                'professor_id' => $clean_input['professor_id'],
+                'semester_id' => $clean_input['semester_id'],
+
+            ),
+            array(
+                'course_name' => 'required|string',
+                'course_code' => 'required|string',
+                'course_number' => "required|string",
+                'course_section' => 'required|string',
+                'program_id' => 'required|integer',
+                "professor_id" => 'required|integer',
+                "semester_id" => "required|integer"
+
+            )
+
+        );
+    }
+
+
+    public function create()
+    {
+
+        //$all_input = Input::all();
+
+        // limpiar el input
+
+        $all_input = $this->cleanInput();
+
+        $validator = $this->makeValidator($all_input);
+
+        /** If validation fails */
+        if ($validator->fails()) {
+            /** Prepare error message */
+            $message = '<p>Error(s) creating a new Course:</p><ul>';
+
+            foreach ($validator->messages()->all('<li>:message</li>') as $validationError) {
+                $message .= $validationError;
+            }
+
+            $message .= '</ul>';
+
+            /** Send error message and old data */
+            Session::flash('status', 'danger');
+            Session::flash('message', $message);
+            return Redirect::to('editCourses')->withInput();
+        }
         $name = $all_input['name'];
         $code = $all_input['code'];
         $number = $all_input['number'];

app/controllers/Objective2Controller.php

@@ -49,6 +49,7 @@ class Objective2Controller extends \BaseController
 					->where("user_id", Auth::user()->id)
 					->lists('program_id');
 		}
+		Log::info("bad?");
 		$objectives = $outcome->objectivesFromProgram($programs)->get();
 
 		return $objectives;
@@ -168,6 +169,45 @@ class Objective2Controller extends \BaseController
 		return Objective::find(Input::get('id'));
 	}
 
+	public function fetchProgramCriteria()
+	{
+		$outcome_id = Input::get("outcome_id");
+		$objective = Objective::findOrFail(Input::get('objective_id'));
+
+
+
+
+		$user_objective_programs_query = DB::table('objective_program');
+
+		//Si es admin o school, puede ver todos los criterios de los programas pareados
+		//Si es program_coordinator depende.
+		if (Auth::user()->role == 3) {
+			$user_objective_programs_query = $user_objective_programs_query
+				->join("program_user", 'program_user.program_id', '=', 'objective_program.program_id')
+				->where('user_id', Auth::user()->id);
+		} elseif (Auth::user()->role == 2) {
+			$user_objective_programs_query = $user_objective_programs_query
+				->join('programs', 'programs.id', '=', 'objective_program.program_id')
+				->where("programs.school_id", Auth::user()->school->id);
+		}
+		$program_ids = $user_objective_programs_query->where('objective_id', $objective->id)
+			->select('objective_program.program_id')
+			->lists('objective_program.program_id');
+
+		Log::info("PRogram");
+		//Log::info();
+
+		//$array_to_send = [];
+		//$array_to_send["programs"] = Program::whereIn('id', $program_ids)->with('criteria')->get();
+		//$array_to_send['selected_criteria'] = $objective->pairedCriteria();
+
+		//Program
+		return Program::whereIn('id', $program_ids)
+			->select(DB::raw("programs.*, {$outcome_id} as outcome_id"))
+
+			->get();
+	}
+
 	public function fetchObjectiveWithTrashed()
 	{
 		$json = array();

app/database/migrations/2022_08_30_195747_create_program_criterion_objective_outcome_id.php

@@ -0,0 +1,44 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateProgramCriterionObjectiveOutcomeId extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('program_criterion_objective_outcome', function (Blueprint $table) {
+
+			$table->increments('id');
+			$table->integer('program_id')->unsigned();
+			$table->integer('cri_obj_out_id')->unsigned();
+			$table->foreign('cri_obj_out_id')
+				->references('id')
+				->on('criterion_objective_outcome')
+				->onUpdate('cascade')
+				->onDelete('cascade');
+
+			$table->foreign('program_id')
+				->references('id')
+				->on('programs')
+				->onUpdate('cascade')
+				->onDelete('cascade');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop("program_criterion_objective_outcome");
+	}
+}

app/models/Criterion.php

@@ -27,7 +27,7 @@ class Criterion extends Eloquent
 
 
 
-	public function objectives()
+	public function getObjectivesAttribute()
 	{
 		return $this->belongsToMany('Objective');
 	}
@@ -38,6 +38,15 @@ class Criterion extends Eloquent
 		return $this->belongsToMany('Rubric', 'rubric_criterion');
 	}
 
+
+	public function scopeFromProgram($query, $programs)
+	{
+
+		return $query->join('program_criterion', 'program_criterion.criterion_id', '=', 'criteria.id')
+			->whereIn("program_id", "programs")
+			->select('criteria.*');
+	}
+
 	/**
 	 * Return the program that the criterion belongs to
 	 *
@@ -48,6 +57,13 @@ class Criterion extends Eloquent
 		return $this->belongsToMany('Program', 'program_criterion');
 	}
 
+	//public getPairedObjectivesAttribute(){
+
+	//	if(isset($this->from_objective)){
+	//		return DB::table()
+	//	}
+	//}
+
 
 	public function program()
 	{

app/models/Objective.php

@@ -33,6 +33,11 @@ class Objective extends Eloquent
     }
 
 
+    //public function pairedCriteria(){
+
+    //    return Criterion::
+    //}
+
 
     public function getGroupedAnnualCourseAttribute()
     {

app/models/Program.php

@@ -1,7 +1,17 @@
 <?php
 
 class Program extends Eloquent
+
+
 {
+	//use SoftDeletingTrait;
+	//protected $dates = ['deleted_at'];
+
+	//     protected $table = 'new_criteria';
+	protected $table = 'programs';
+
+
+	protected $appends = ["criteria"];
 	public function school()
 	{
 		return $this->belongsTo('School');
@@ -27,6 +37,21 @@ class Program extends Eloquent
 		return $this->hasMany('Student');
 	}
 
+	public function getCriteriaAttribute()
+	{
+
+		if ($this->outcome_id) {
+			return Criterion::join('criterion_objective_outcome as cobo', 'cobo.criterion_id', '=', 'criteria.id')
+				->join('program_criterion_objective_outcome', 'program_criterion_objective_outcome.cri_obj_out_id', '=', 'cobo.id')
+				->where('program_id', $this->id)
+				->where('outcome_id', $this->outcome_id)
+				->get();
+		}
+		return Criterion::join('criterion_objective_outcome as cobo', 'cobo.criterion_id', '=', 'criteria.id')
+			->join('program_criterion_objective_outcome', 'program_criterion_objective_outcome.cri_obj_out_id', '=', 'cobo.id')
+			->where('program_id', $this->id)
+			->get();
+	}
 	public function templates()
 	{
 		return $this->hasMany('Template');
@@ -110,7 +135,19 @@ class Program extends Eloquent
 	 */
 	public function criteria()
 	{
-		return $this->hasMany('Criterion');
+
+		Log::info("AQUI");
+		$lmao = Criterion::join('criterion_objective_outcome', 'criteria.id', '=', 'criterion_objective_outcome.criterion_id')
+			->join('program_criterion_objective_outcome', 'cri_obj_out_id', '=', 'criterion_objective_outcome.id')
+			->where('program_id', $this->id);
+		//->get();
+
+
+		return $lmao;
+		$l = Criterion::join('criterion_objective_outcome', 'criteria.id', '=', 'criterion_objective_outcome.criterion_id')
+			->join('program_criterion_objective_outcome', 'cri_obj_out_id', '=', 'criterion_objective_outcome.id')
+			->where('program_id', $this->id)->get();
+		//get();
 	}
 
 	// 	public function attempted_outcome($outcome_id, $semester)

app/routes.php

@@ -363,6 +363,9 @@ Route::group(array('before' => 'auth|has_access'), function () {
     // Show professor overview to users with courses
     Route::get('professor', 'ProfessorsController@overview');
 
+    // view objectives and criteria, edit criteria
+    Route::post('fetchCriteriaFromProgram', 'Objective2Controller@fetchProgramCriteria');
+
     // Assessment reports for users' courses
 
     Route::get('my-assessment-reports', 'OutcomesController@professorAssessmentReport');
@@ -376,6 +379,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
     Route::post('transformativeAction/filterTA', array('before' => 'csrf', 'uses' => 'TransformativeActionsController@filterTA'));
     Route::post('transformativeAction/objectivesFromOutcome', array('before' => 'csrf', 'uses' => 'TransformativeActionsController@objectivesFromOutcome'));
 
+
     /**
      * Administrator Routes
      */
@@ -652,7 +656,7 @@ Route::group(array('before' => 'auth|has_access'), function () {
         Route::get('learning-outcomes-criteria', 'CriteriaController@index');
         Route::get('learning-objectives-criteria', 'Objective2Controller@viewObjectives');
         Route::get('export_grades/{id}', 'CoursesController@exportGrades');
-        Route::get('learning-objectives-criteria', 'Objective2Controller@viewObjectives');
+        Route::get('template/{template}', 'TemplatesController@show');
         Route::get('compare_activities/{activity_1}/{activity_2}', 'ActivitiesController@compareActivities');
         // Assessment reports
         //Route::get('professor-assessment-report/{outcome_id}', 'OutcomesController@professorAssessmentReport');

app/views/global/view-objectives-criteria.blade.php

@@ -63,6 +63,7 @@
                             <thead id="theHead">
                                 <th>Objective</th>
                                 <th>Program</th>
+                                <th>Match to Criteria</th>
                             </thead>
                             <tfoot>
 
@@ -83,6 +84,41 @@
         </div>
 
     </div>
+
+    <div id="match_criteria" class="modal fade" tabindex="-1" data-objective-id="0">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id = 'match_criteria_title'></h5>
+                    <button type="button" class="close" data-dismiss="modal">&times;</button>
+                </div>
+                <div class="modal-body" id = "match_criteria_body">
+                    <p>The following criteria appear based on objective's programs and your available programs</p>
+
+                    <div class ='form-group col-md-12'>
+                        <select id="match_criteria_program" class ='form-control selectpicker select_program' onchange="changeCriteriaDisplayed('#match_criteria_program')">
+                            
+                        </select>
+                    </div>
+                    <hr>
+
+                    <div id="program_objectives">
+
+                    </div>
+
+                
+
+
+
+
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal" onclick="$('#match_criteria').data('objective-id', '0');">Cancel</button>
+                    <button type="button" class="btn btn-primary" onclick = 'matchCriteriaToObjective("#match_criteria")'>Save</button>
+                </div>
+            </div>
+        </div>
+    </div>
     <script>
         $(document).ready(function() {
             // --------------------------------------------------------------------------
@@ -100,6 +136,8 @@
             /*
 
               */
+
+            
             function fetchObjectives(li) {
                 {
 
@@ -130,8 +168,12 @@
 
                             $.each(json, function(ind2, objective) {
                                 tr = $("<tr>");
-                                td_text = $("<td>").html(objective.text);
 
+                                //objectives
+                                td_text = $("<td>",{
+                                    'id':"objective-"+objective.id
+                                }).html(objective.text);
+                                 //programs
                                 td_programs = $("<td>");
                                 ol = $("<ol>");
 
@@ -140,10 +182,29 @@
                                     li.appendTo(ol);
                                 })
                                 ol.appendTo(td_programs);
+
+                                //link to criteria matching
+                                link_td = $("<td>");
+                                
+                                a = $('<a>',{
+                                    'onclick':'fetchCriteria(this)',
+                                    'data-objective-id': objective.id,
+                                    'data-outcome-id':id
+
+                                    
+                                }).html("Change Associated Criteria");
+
+                                link_td.append(a)
+
+                                
                                 tr.append(td_text);
                                 tr.append(td_programs);
+                                tr.append(link_td)
                                 tr.appendTo($('#table_objectives'))
 
+
+                                
+
                             })
                         },
                         'json'
@@ -161,6 +222,190 @@
             })
         });
 
+
+        function createSelectForModal(options){
+            
+            div_master = $('<div>',{
+                'class':'removable_div'
+            })
+            div_select = $("<div>",{
+                'class':'form-group col-md-11',
+
+            })
+            select = $('<select>',{
+                'class':'selectpicker form-control criteria_select',
+                'name':'criteria[]'
+
+            }).html(options);
+            div_rem_button = $('<div>',
+                {
+                    'class':'col-md-1 remove-btn'
+                    
+                })
+            rem_button = $('<button>',{
+                'type':'button',
+                'class':'btn btn-primary',
+                'onclick':'$(this).parent().parent().remove()'
+            }).html("<span class='glyphicon glyphicon-remove'></span>")
+
+            div_select.append(select);
+            div_rem_button.append(rem_button);
+            div_master.append(div_select);
+            div_master.append(div_rem_button);
+
+            return div_master;
+
+        }
+
+        function fetchCriteria(a){
+            objective_id = $(a).data('objective-id');
+            objective_text = $("#objective-"+objective_id).html()
+            outcome_id = $(a).data('outcome-id')
+
+            $.post(
+                "{{URL::action('Objective2Controller@fetchProgramCriteria')}}",
+                {
+                    objective_id:objective_id,
+                    outcome_id:outcome_id
+                },
+                function(programs){
+                    //modal, and its subvariants
+                    mc = "#match_criteria";
+
+                    $(mc).data('objective-id', objective_id)
+
+                    title_h = $('<h5>',{
+                        'class':'modal-title'
+                    }).html("Match "+ objective_text +" to Criteria")
+                    $(mc+"_title").html(title_h)
+
+                    $('.removable_div').remove();
+
+                    //select= $(".select_criteria").html(" ");
+                    program_select = $("#match_criteria_program").html(" ");
+                    
+                    $.each(programs, function(ind, program){
+
+                        prog_div = $("<div>",{
+                            "id":"program-"+program.id,
+                            "class": "program_divs removable_div",
+                            "style":"display: none"
+                        })
+                        program_option = $('<option>',{
+                            "value":program.id
+                        }).html(program.name)
+
+                        program_select.append(program_option);
+                        
+
+                        criteria = program.criteria
+                        options_html = '<option value="0">Nothing Selected</option>';
+
+                        more_than_one = false;
+                        selected_options  = [];
+
+                        $.each(criteria, function(ind, cri){
+
+                            if(cri.objective_id == objective_id && cri.outcome_id == outcome_id){
+                                option = $("<option>",{
+                                'value':cri.criterion_id,
+                                'data-program-id':program.id,
+                                'data-outcome-id':outcome_id,
+                                
+                            }).html(cri.name)
+                           // option.prop('selected', true);
+
+                            
+                            selected_options.push(cri.criterion_id);
+                            
+                            
+                            
+                            
+
+                            }
+                            else if (cri.outcome_id == outcome_id){
+                            option = $("<option>",{
+                                'value':cri.criterion_id,
+                                'data-program-id':program.id,
+                                'data-outcome-id':outcome_id,
+                                
+                            }).html(cri.name)
+                        }
+                  
+
+                            options_html += option.prop('outerHTML');
+                            //$(select).selectpicker('refresh');
+
+                            //if(criteria)
+
+                        
+                        })
+
+
+                        //create multiple selects. 
+
+                        // el query es , Si no esta en program id, objetivo es 0. 
+                        //Si program id 
+
+
+
+                        
+                        $('#program_objectives').append(prog_div);
+                        select = createSelectForModal(options_html)
+
+                        select.find('.remove_btn').hide()
+                        prog_div.append(select);
+                        $('select.criteria_select').selectpicker('refresh');
+
+                        $.each(selected_options, function(ind, cri_id){
+
+                            the_picker = select.find('select.criteria_select').first();
+                            the_picker.val(cri_id);
+
+                            select = createSelectForModal(options_html)
+                            prog_div.append(select)
+                           // $('.criteria_select').selectpicker('refresh');
+                        })
+
+                        //prog_div.append(select)
+
+                       // $('#program_objectives').append(prog_div);
+
+                        $('select.criteria_select').selectpicker('refresh');
+
+                        prog_div.append(createAddCriteriaButton("program-"+program.id))
+
+                    
+                    })
+
+                    program_select.selectpicker('refresh');
+                    program_select.trigger('change');
+
+                    $(mc).modal('show');
+
+
+                    
+
+                    
+
+                    
+
+                }
+            )
+        }
+
+        function createAddCriteriaButton(program_div_id){
+
+
+            button = $("<button>", {
+                'class':'add_criteria btn btn-secondary',
+                'type':'button',
+                'onclick':'addSelect('+program_div_id+')'
+                
+            }).html("+ Add Criteria");
+
+        }
+
         $('.view-scales').on('click', function() {
             var number_of_scales = this.value;
 
@@ -168,6 +413,17 @@
             $('.table-responsive-0').show();
             $('.table-' + number_of_scales).show();
         })
+
+        function changeCriteriaDisplayed(select){
+
+            select = $(select)
+
+            program_id = select.val();
+
+            $('.program_divs').hide();
+            $("#program-"+program_id).show();
+        }
+
     </script>
 @stop
 

script.php

@@ -4,7 +4,7 @@
 $servername = "127.0.0.1";
 $username = "root";
 $password = "";
-$database = "trabajoolas5";
+$database = "trabajoolasdatos";
 
 // Create connection
 $conn = mysqli_connect($servername, $username, $password, $database);
@@ -17,33 +17,27 @@ echo "Connected successfully\n";
 
 $allrubrics = mysqli_query($conn, 'select id, contents from `rubrics`');
 
-while ($row = mysqli_fetch_array($allrubrics)) {
 
-    foreach (json_decode($row['contents']) as $criterion) {
+$all_criterion_objectiveOutcome = mysqli_query($conn, 'select * from criterion_objective_outcome');
 
-        $outcome_id = $criterion->outcome_id;
-        $querySelect = "select * from rubric_outcome where rubric_id ={$row['id']} and outcome_id = {$outcome_id}";
-        $makeQuery = mysqli_query($conn, $querySelect);
-        if (!mysqli_num_rows($makeQuery)) {
+while ($row = mysqli_fetch_array($all_criterion_objectiveOutcome)) {
+    $id = $row['id'];
+
+    $criterion_id = $row['criterion_id'];
 
-            $query2 = "insert into `rubric_outcome` (`rubric_id`, `outcome_id`) values ({$row['id']}, {$outcome_id});";
-            $makeQuery = mysqli_query($conn, $query2);
-            if (!$makeQuery) {
-                die("Connection failed: " . mysqli_error($conn) . $query2);
-            }
-        }
 
 
+    $program_ids = mysqli_query($conn, "select * from program_criterion where criterion_id = {$criterion_id}");
+
+    while ($prog_id = mysqli_fetch_array($program_ids)) {
+
+        if ($prog_id['program_id'] != null) {
+            $query = "insert into `program_criterion_objective_outcome` (`program_id`,`cri_obj_out_id`) values ({$prog_id['program_id']},{$id})";
+            $makeQuery = mysqli_query($conn, $query);
 
-        $criteria_id = $criterion->id;
-        $querySelect = "select * from rubric_criterion where rubric_id ={$row['id']} and criterion_id = {$criteria_id}";
-        $makeQuery = mysqli_query($conn, $querySelect);
-        if (!mysqli_num_rows($makeQuery)) {
-            $query2 = "insert into `rubric_criterion` (`rubric_id`, `criterion_id`) values ({$row['id']}, {$criteria_id});";
-            $makeQuery = mysqli_query($conn, $query2);
             if (!$makeQuery) {
-                echo "Connection failed: " . mysqli_error($conn) . $query2;
+                die("Connection failed: " . mysqli_error($conn) . $query);
             }
         }
     }
-}
+}