vamos para alla

app/database/migrations/2021_06_02_115216_create_annual_cycle.php

@@ -0,0 +1,42 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateAnnualCycle extends Migration
+{
+
+	public function up()
+	{
+		Schema::create('annual_cycle', function (Blueprint $table) {
+
+			$table->increments('id');
+			$table->string('academic_year');
+			$table->integer('semester_start')->unsigned();
+			$table->integer('semester_end')->unsigned();
+			$table->foreign('semester_start')
+				->references('id')
+				->on('semesters')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->integer('user_id')->unsigned();
+			$table->foreign('semester_end')
+				->references('id')
+				->on('semesters')
+				->onDelete('cascade')
+				->onUpdate('cascade');
+			$table->timestamps();
+		});
+	}
+
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('annual_cycle');
+	}
+}

app/database/migrations/2021_06_04_003810_create_activity_criterion_table.php

@@ -31,9 +31,8 @@ class CreateActivityCriterionTable extends Migration
 				->onUpdate('cascade');
 			$table->text('transformative_actions')->nullable();
 			$table->text('assessment_comments')->nullable();
-			$table->integer('expected_student_score')->nullable();
-			$table->decimal('expected_percentage_students_achieving', 5, 2)->nullable();
-			$table->decimal('percentage_students_who_achieved', 5, 2)->nullable();
+
+
 			$table->decimal('weight', 3, 2)->default(1.0);
 
 			$table->timestamps();

app/database/migrations/2021_06_05_235829_create_annual_plans_table.php

@@ -11,19 +11,7 @@ class CreateAnnualPlansTable extends Migration
 		Schema::create('annual_plans', function (Blueprint $table) {
 
 			$table->increments('id');
-			$table->string('academic_year');
-			$table->integer('semester_start')->unsigned();
-			$table->foreign('semester_start')
-				->references('id')
-				->on('semesters')
-				->onDelete('cascade')
-				->onUpdate('cascade');
-			$table->integer('semester_end')->unsigned();
-			$table->foreign('semester_end')
-				->references('id')
-				->on('semesters')
-				->onDelete('cascade')
-				->onUpdate('cascade');
+			$table->integer('annual_cycle_id')->unsigned();
 			$table->integer('program_id')->unsigned();
 			$table
 				->foreign('program_id')

app/database/migrations/2021_06_06_000025_create_criterion_objective_outcome_table.php

@@ -11,7 +11,7 @@ class CreateCriterionObjectiveOutcomeTable extends Migration
 		Schema::create('criterion_objective_outcome', function (Blueprint $table) {
 			$table->increments('id');
 			$table->integer('criterion_id')->unsigned();
-			$table->integer('objective_id')->unsigned();
+			$table->integer('objective_id')->unsigned()->nullable();
 			$table->integer('outcome_id')->unsigned();
 			$table
 				->foreign('criterion_id')

app/database/migrations/2021_06_16_105139_create_activity_student.php

@@ -18,7 +18,7 @@ class CreateActivityStudent extends Migration
 			$table->text('comments')->nullable();
 			$table->integer('activity_id')->unsigned();
 			$table->integer('student_id')->unsigned();
-			$table->foreign('activity')
+			$table->foreign('activity_id')
 				->references('id')
 				->on('activities')
 				->onDelete('cascade')