Pal de cosas

app/controllers/AnnualPlansController.php

     $an_plan = DB::table("annual_plans")
       ->join('annual_cycle', 'annual_cycle.id', '=', 'annual_plans.annual_cycle_id')
       ->where('annual_plans.id', '=', Input::get('id'))
-      ->select('annual_plans.id as id', 'program_id', 'academic_year', 'semester_start', 'semester_end')
+      ->select('annual_plans.id as id', 'program_id', 'academic_year', 'semester_start', 'semester_end', 'is_submitted')
       ->first();
 
     $years = explode('-', $an_plan->academic_year);
 
     $json_to_send["outcomes"]["first"] = DB::table('outcomes')
       ->join('typ_semester_outcome', 'typ_semester_outcome.outcome_id', '=', 'outcomes.id')
+      ->join('typ_semester_objectives', 'typ_semester_outcome.id', '=', 'typ_semester_objectives.typ_semester_outcome_id')
+      ->join('typ_semester_courses', 'typ_semester_objectives.id', '=', 'typ_semester_courses.typ_semester_objective_id')
       ->where('semester_id', $an_plan->semester_start)
       ->where('typ_program_id', $current_typ_program->id)
+
       ->select('outcomes.*', 'typ_semester_outcome.id as typ_semester_outcome_id')
+      ->groupBy('typ_semester_outcome_id')
       ->get();
 
     //DB::select("select * from outcomes where id in (select outcome_id from typ_semester_outcome where semester_id = {$an_plan->semester_start} and typ_program_id = {$current_typ_program->id})");
     $json_to_send["allSemesterOrder"]["first"] = DB::select("select * from semesters where id = {$an_plan->semester_start}")[0];
     $json_to_send["outcomes"]["second"] = DB::table('outcomes')
       ->join('typ_semester_outcome', 'typ_semester_outcome.outcome_id', '=', 'outcomes.id')
+      ->join('typ_semester_objectives', 'typ_semester_outcome.id', '=', 'typ_semester_objectives.typ_semester_outcome_id')
+      ->join('typ_semester_courses', 'typ_semester_objectives.id', '=', 'typ_semester_courses.typ_semester_objective_id')
+
       ->where('semester_id', $an_plan->semester_end)
       ->where('typ_program_id', $current_typ_program->id)
       ->select('outcomes.*', 'typ_semester_outcome.id as typ_semester_outcome_id')
+      ->groupBy('typ_semester_outcome_id')
       ->get();
 
     //DB::select("select * from outcomes where id in (select outcome_id from typ_semester_outcome where semester_id ={$an_plan->semester_end} and typ_program_id  = {$current_typ_program->id})");
     $typ_info['transformative_actions_for_outcome'] = DB::table('transformative_actions')
       ->join('transformative_typ_outcome', 'transformative_typ_outcome.trans_id', '=', 'transformative_actions.id')
       ->where('transformative_typ_outcome.typ_semester_outcome_id', $typ_semester_outcome_id)
+
       ->get();
     $typ_info['categories'] = "<option value='0'>Nothing Selected</option>";
 
     $types = DB::table('transformative_actions')
-      ->select('type_of_TA')
+      ->select('type_of_TA', 'is_custom')
       ->where('type_of_TA', '<>', '')
-      ->distinct()
+      ->where(function ($query) use (&$program_id) {
+        $query->whereNull('program_id')
+          ->orWhere('program_id', $program_id);
+      })
+      ->where('by_professor', 0)
+      ->groupBy('type_of_TA')
       ->get();
+    $optGroupGeneral = "<optgroup label='General Transformative Actions'>";
+    $optGroupCustom = "<optgroup label ='Program Custom Actions'>";
     foreach ($types as $type) {
-      $typ_info['categories'] .= "<option value = '" . $type->type_of_TA . "'>" . $type->type_of_TA . "</option>";
+
+      if ($type->is_custom) {
+        $optGroupCustom .= "<option value = '" . $type->type_of_TA . "' data-is-custom = '1'>" . $type->type_of_TA . "</option>";
+      } else {
+        $optGroupGeneral .= "<option value = '" . $type->type_of_TA . "' data-is-custom = '0'>" . $type->type_of_TA . "</option>";
+      }
     }
+    $typ_info['categories'] .= $optGroupGeneral . '</optgroup>';
+    $typ_info['categories'] .= $optGroupCustom . '</optgroup>';
+
+
     $typ_info['categories'] .= '<option value ="new"> New Type of Transformative Action</option>';
     return json_encode($typ_info);
   }
     $semester_id = Input::get('semester_id');
     $annual_plan_id = Input::get('annual_plan_id');
     $outcome_id = Input::get('outcome_id');
+    $typ_semester_outcome_id = Input::get('typ_semester_outcome_id');
 
     $outcome = Outcome::where('id', $outcome_id)->first();
     $outcome->objectives = $outcome->fetchObjectivesReport($semester_id, $program_id);
       ->where('program_id', $program_id)
       ->where('semester_id', $semester_id)
       ->first();
+    $outcome->transforming_actions = DB::table('transformative_typ_outcome')
+      ->join('transformative_actions', 'transformative_actions.id', '=', 'transformative_typ_outcome.trans_id')
+      ->where('typ_semester_outcome_id', $typ_semester_outcome_id)
+      ->select('transformative_actions.*')
+      ->get();
 
     foreach ($outcome->objectives as $index => $objective) {
       $objective->courses = Objective::getPlanReport($objective);
     }
     return $courses;
   }
+
+  public function submitAnnualPlan()
+  {
+    $annual_plan_id = Input::get('annual_plan_id');
+    DB::table('annual_plans')->where('id', $annual_plan_id)->update(array(
+      'is_submitted' => 1,
+      'submitted_on' => date('Y-m-d H:i:s')
+    ));
+    return;
+  }
+
+  public function fetchTheAnnualPlan()
+  {
+    $outcome_id = Input::get('id');
+    $semester_id = Input::get('semester');
+    $typ_semester_outcome_id = Input::get('typ_semester_outcome_id');
+    $program_id = Input::get('program_id');
+
+    $outcome = Outcome::find($outcome_id);
+
+    //El nombre es annual_plan_objective, fue cambiado como mil veces por Arlene y su combo
+    // Así que está mal escrito. Sorry future programmer
+
+    $array_to_send = [];
+    $array_to_send['typ_objectives'] = DB::table('typ_semester_objectives')
+      ->join('objectives', 'objectives.id', '=', 'typ_semester_objectives.objective_id')
+      ->where('typ_semester_outcome_id', $typ_semester_outcome_id)
+      ->select('objectives.*', 'typ_semester_outcome_id', 'typ_semester_objectives.id as typ_semester_objective_id')
+      ->get();
+    $array_to_send['typ_courses'] = DB::table('typ_semester_objectives')
+      ->join('typ_semester_courses', 'typ_semester_courses.typ_semester_objective_id', '=', 'typ_semester_objectives.id')
+      ->join('courses', 'courses.id', '=', 'typ_semester_courses.course_id')
+      ->where('typ_semester_outcome_id', $typ_semester_outcome_id)
+      ->select('courses.*', 'typ_semester_objective_id', 'typ_semester_courses.id as typ_semester_course_id')
+      ->get();
+    $array_to_send['courses_criteria'] = DB::table('typ_semester_objectives')
+      ->join('typ_semester_courses', 'typ_semester_courses.typ_semester_objective_id', '=', 'typ_semester_objectives.id')
+      ->join('annual_plan_objective', 'annual_plan_objective.typ_semester_course_id', '=', 'typ_semester_courses.id')
+      ->join('criteria', 'criteria.id', '=', 'annual_plan_objective.criteria_id')
+      ->select('typ_semester_course_id', 'annual_plan_objective.*', 'criteria.*')
+      ->where('typ_semester_outcome_id', $typ_semester_outcome_id)
+      ->groupBy('typ_semester_course_id')
+      ->get();
+    $array_to_send['courses_transformative_actions'] = DB::table('typ_semester_objectives')
+      ->join('typ_semester_courses', 'typ_semester_courses.typ_semester_objective_id', '=', 'typ_semester_objectives.id')
+      ->join('annual_plan_transformative', 'annual_plan_transformative.typ_semester_course_id', '=', 'typ_semester_courses.id')
+      ->join('transformative_actions', 'transformative_actions.id', '=', 'annual_plan_transformative.trans_id')
+      ->select('typ_semester_course_id', 'annual_plan_transformative.*', 'transformative_actions.*')
+      ->where('typ_semester_outcome_id', $typ_semester_outcome_id)
+      ->groupBy('typ_semester_course_id')
+      ->get();
+    $array_to_send['transformative_outcome'] = DB::table('transformative_actions')
+      ->join('transformative_typ_outcome', 'transformative_actions.id', '=', 'transformative_typ_outcome.trans_id')
+      ->where('typ_semester_outcome_id', $typ_semester_outcome_id)
+      ->get();
+
+    $array_to_send['expected_target'] = DB::table('target_outcomes_program')
+      ->where('program_id', $program_id)
+      ->where('semester_id', $semester_id)
+      ->first();
+    return $array_to_send;
+  }
 }

app/controllers/TransformativeActionsController.php

     $types = DB::table('transformative_actions')
       ->select('type_of_TA')
       ->where('type_of_TA', '<>', '')
-      ->distinct()
+      ->groupBy('type_of_TA')
       ->get();
     // if user is program coordinator
 
     }
     return $grouped_courses;
   }
-}
+  public function createTAForOutcome()
+  {
+    $is_custom = Input::get('is_custom');
+    $category = Input::get('category');
+    $is_new = Input::get('is_new');
+    $name = Input::get('name');
+    $description = Input::get('description');
+    $edit_ta_id = Input::get('edit');
+    if ($is_new || $is_custom)
+      $program_id = Input::get('program_id');
+    else $program_id = NULL;
+    $typ_semester_outcome_id = Input::get('typ_semester_outcome_id');
+
+    if (!$edit_ta_id) {
+      $ta_id = DB::table('transformative_actions')->insertGetId(array(
+        'program_id' => $program_id,
+        'type_of_TA' => $category,
+        'at_text' => $name,
+        'description' => $description,
+        'user_id' => Auth::user()->id,
+        'created_at' => date('Y-m-d H:i:s'),
+        'updated_at' => date('Y-m-d H:i:s'),
+        'by_professor' => 0,
+        'is_custom' => $is_custom
+      ));
+      DB::table('transformative_typ_outcome')->insert(array(
+        'trans_id' => $ta_id,
+        'typ_semester_outcome_id' => $typ_semester_outcome_id,
+        'proposing_coordinator_id' => Auth::user()->id,
+
+      ));
+    } else {
+      DB::table('transformative_actions')
+        ->where('id', $edit_ta_id)
+        ->update(array(
+          'program_id' => $program_id,
+          'type_of_TA' => $category,
+          'at_text' => $name,
+          'description' => $description,
+          'user_id' => Auth::user()->id,
+          'created_at' => date('Y-m-d H:i:s'),
+          'updated_at' => date('Y-m-d H:i:s'),
+          'by_professor' => 0,
+          'is_custom' => $is_custom
+        ));
+      $ta_id = $edit_ta_id;
+    }
+    return $ta_id;
+  }
+  public function deleteTaFromOutcome()
+  {
+    DB::table('transformative_actions')
+      ->where('id', Input::get('trans_id'))
+      ->delete();
+    return;
+  }
+}

app/database/migrations/2022_02_04_040351_add_submit_in_typ_program.php

 	 */
 	public function up()
 	{
-		Schema::table('courses', function (Blueprint $table) {
+		Schema::table('typ_program', function (Blueprint $table) {
 			$table->boolean('is_submitted');
 		});
 	}
 	 */
 	public function down()
 	{
-		Schema::table('courses', function (Blueprint $table) {
+		Schema::table('typ_program', function (Blueprint $table) {
 			$table->dropColumn('is_submitted');
 		});
 	}

app/database/migrations/2022_02_10_194719_add_time_limit_annual_cycle.php

+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddTimeLimitAnnualCycle extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('annual_cycle', function (Blueprint $table) {
+			$table->timestamp('is_due_for')->nullable();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('annual_cycle', function (Blueprint $table) {
+			$table->dropColumn('is_due_for');
+		});
+	}
+}

app/database/migrations/2022_02_10_195154_add_time_limit_three_year_plan.php

+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddTimeLimitThreeYearPlan extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::table('three_year_plan', function (Blueprint $table) {
+			$table->timestamp('is_due_for')->nullable();
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::table('three_year_plan', function (Blueprint $table) {
+			$table->dropColumn('is_due_for');
+		});
+	}
+}

app/database/migrations/2022_02_13_122758_create_annual_report_comments.php

+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateAnnualReportComments extends Migration
+{
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('annual_report_comments', function (Blueprint $table) {
+			$table->increments('id');
+			$table->integer('user_id')->unsigned();
+			$table->integer('annual_plan_id')->unsigned();
+			$table->text('comments');
+			$table->foreign('user_id')
+				->references('id')
+				->on('users')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->foreign('annual_plan_id')
+				->references('id')
+				->on('annual_plans')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('annual_report_comments');
+	}
+}

app/database/migrations/2022_02_13_122842_add_results_to_transformative_status.php

+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddResultsToTransformativeStatus extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		//
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		//
+	}
+
+}

app/models/Objective.php

                 ->where('typ_semester_course_id', $course_code->typ_semester_course_id)
                 ->select('transformative_actions.*')
                 ->get();
+
             $course_code->students = Course::getStudentReportForOutcome($course_code);
             Log::info(array($course_code));
             $course_code->criteria = Course::getCriteriaPlanReport($course_code);

app/routes.php

     /**
      * Shared Routes
      */
+
+    // Annual Plan routes
+
+    Route::post('fetchAnnualPlan', array('uses' => 'AnnualPlansController@fetchTheAnnualPlan'));
+
+    Route::post('deleteTaFromOutcome', array('uses' => 'TransformativeActionsController@deleteTaFromOutcome'));
+    Route::post(
+        'postTransformativeToOutcome',
+        array(
+            'as' => 'postTransformativeToOutcome',
+            'uses' => 'TransformativeActionsController@createTAForOutcome'
+        )
+    );
     Route::post('fetchObjectiveInfo', array(
         'as' => 'fetchObjectiveInfo',
         'uses' => 'AnnualPlansController@fetchObjectiveInfo'
         'as' => 'fetchAnnualReport',
         'uses' => 'AnnualPlansController@fetchAnnualReport'
     ));
+
+    Route::post('submitAnnualPlan', array('uses' => 'AnnualPlansController@submitAnnualPlan'));
+
+
+    //other stuff
     Route::post('postActivityCriterionTrans/{activity_id}', array(
         'as' => 'postActivityCriterionTrans/{activity_id}',
         'uses' => 'TransformativeActionsController@postActivityCriterion'

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

           <li data-cycle-id="{{$typ->id}}" class="list-group-item">{{$typ->year_start}}-{{$typ->year_end}}</li>
         @endforeach
       </div>
-      <br>
+      <br> <!--<button type="button" class="btn btn-secondary" id = "three_year_button" data-toggle="modal" data-target="#three_year">Create Three Year Cycle</button>
+      -->
     </div>
-        <button type="button" class="btn btn-secondary" id = "three_year_button" data-toggle="modal" data-target="#three_year">Create Three Year Cycle</button>
-
+       
 <!-- Modal -->
 <div id="three_year" class="modal fade" role="dialog">
   <div class="modal-dialog">
 
   </div>
 </div>
-      </div>
+      
    
 
     <div class="col-md-9">

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

                 <option value='0'> Nothing Selected</option>
                 @foreach ($annual_plans as $an_plan)
                     <option value={{ $an_plan->annual_id }}>Plan {{ $an_plan->academic_year }}</option>
-
                 @endforeach
             </select>
             <br>
 
                     </div>
                     <!-- <div class="table-responsive">
-                    <table class="table table-striped table-condensed datatable" style="table-layout: fixed ; width : 100%">
-                      <thead><tr><th>Objectives for courses</th><th>Criteria per Course</th><th>Transformative Actions</th></tr></thead>
-                      <tbody>
-                      </tbody>
+                        <table class="table table-striped table-condensed datatable" style="table-layout: fixed ; width : 100%">
+                          <thead><tr><th>Objectives for courses</th><th>Criteria per Course</th><th>Transformative Actions</th></tr></thead>
+                          <tbody>
+                          </tbody>
 
-                    </table>
-                    
-                </div>-->
+                        </table>
+                        
+                    </div>-->
 
                 </div>
             </div>
 
         });
 
+        // Create everything 
+
         function fetchEverything(li) {
             var outcome_id = $(li).data('outcome-id');
             var name = $(li).data('outcome-name');
                         $('#allLists').empty();
                         $('#levelTabs').empty();
                         $('.no-outcome').hide();
-                        if(outcome.outcome_program_goal){
+                        if (outcome.outcome_program_goal) {
                             outcome.outcome_program_goal = outcome.outcome_program_goal.expected_target;
-                        }
-                        else{
-                            outcome.outcome_program_goal ='It has not been defined';
+                        } else {
+                            outcome.outcome_program_goal = 'It has not been defined';
                         }
                         var outcomeHTML = "<h4>Performance of Students by Learning Outcome</h4>" +
                             '<h5 style = "display: inline; margin:30px;">Target learning by learning outcome: </h5>' +
 
                                             }
                                             wholeDict[student.student_id][
-                                                "criteria_attempted"] += student
+                                                    "criteria_attempted"
+                                                ] += student
                                                 .criteria_attempted;
                                             wholeDict[student.student_id][
-                                                "criteria_achieved"] += student
+                                                    "criteria_achieved"
+                                                ] += student
                                                 .criteria_achieved;
 
                                         });
                                         div.append(
                                             '<p>The following results are from the courses in the selected semester with the focused criteria in the selected annual plan</p>'
-                                            );
+                                        );
                                         table = $('<table/>', {
                                             'class': 'table table-striped table-condensed datatable'
                                         }).html('<thead><th>Criterion</th><th>' +
                                             'Number of Students Assessed </th>' +
                                             '<th>Number of students that achieved the target</th></thead>'
-                                            );
+                                        );
                                         tbody = $('<tbody/>')
                                         $.each(course_code.criteria, function(index, criterion) {
 
                         'class': 'list-group',
                         'id': 'list'
                     });
-                    if(json.outcomes.first){
-                    header5 = $('<h5/>', {
-                        'style': "padding-left: 10px"
-                    }).html("First Semester");
-                    div.append(header5);
-                    list = '';
-                    for (outcome in json.outcomes.first) {
-                        list +=
-                            "<li style='padding-left: 25px' onclick = 'fetchEverything(this)' data-annual-plan = '" +
-                            json.annual_plans.id + "' data-typ-semester-outcome-id ='"+json.outcomes.first[outcome].typ_semester_outcome_id+"' data-semester-id = '" + json.allSemesterOrder.first.id +
-                            "' data-outcome-id='" + json.outcomes.first[outcome].id + "' data-outcome-name ='" + json
-                            .outcomes.first[outcome].name + "' class='list-group-item' >" + json.outcomes.first[outcome]
-                            .name + " </li>";
+                    if (json.outcomes.first) {
+                        header5 = $('<h5/>', {
+                            'style': "padding-left: 10px"
+                        }).html("First Semester");
+                        div.append(header5);
+                        list = '';
+                        for (outcome in json.outcomes.first) {
+                            list +=
+                                "<li style='padding-left: 25px' onclick = 'fetchEverything(this)' data-annual-plan = '" +
+                                json.annual_plans.id + "' data-typ-semester-outcome-id ='" + json.outcomes.first[
+                                    outcome].typ_semester_outcome_id + "' data-semester-id = '" + json.allSemesterOrder
+                                .first.id +
+                                "' data-outcome-id='" + json.outcomes.first[outcome].id + "' data-outcome-name ='" +
+                                json
+                                .outcomes.first[outcome].name + "' class='list-group-item' >" + json.outcomes.first[
+                                    outcome]
+                                .name + " </li>";
 
+                        }
+                        div.append(list);
                     }
-                    div.append(list);
-                    }
-                    if(json.outcomes.second){
-                    header4 = $('<h5/>', {
-                        'style': "padding-left: 10px"
-                    }).html("Second Semester");
-                    div.append(header4);
-                    list = '';
-                    for (outcome in json.outcomes.second) {
-                        list +=
-                            "<li style='padding-left: 25px' onclick = 'fetchEverything(this)' data-annual-plan = '" +
-                            json.annual_plans.id + "' data-typ-semester-outcome-id ='"+json.outcomes.first[outcome].typ_semester_outcome_id+"'data-semester-id = '" + json.allSemesterOrder.second.id +
-                            "' data-outcome-id='" + json.outcomes.second[outcome].id + "' data-outcome-name ='" + json
-                            .outcomes.second[outcome].name + "' class='list-group-item' >" + json.outcomes.second[
-                                outcome].name + " </li>";
+                    if (json.outcomes.second) {
+                        header4 = $('<h5/>', {
+                            'style': "padding-left: 10px"
+                        }).html("Second Semester");
+                        div.append(header4);
+                        list = '';
+                        for (outcome in json.outcomes.second) {
+                            list +=
+                                "<li style='padding-left: 25px' onclick = 'fetchEverything(this)' data-annual-plan = '" +
+                                json.annual_plans.id + "' data-typ-semester-outcome-id ='" + json.outcomes.second[
+                                    outcome].typ_semester_outcome_id + "'data-semester-id = '" + json.allSemesterOrder
+                                .second.id +
+                                "' data-outcome-id='" + json.outcomes.second[outcome].id + "' data-outcome-name ='" +
+                                json
+                                .outcomes.second[outcome].name + "' class='list-group-item' >" + json.outcomes.second[
+                                    outcome].name + " </li>";
 
+                        }
+                        div.append(list);
                     }
-                    div.append(list);}
                     html = div[0].innerHTML;
 
                     $("#allOutcomes").html(div[0].innerHTML);