vamos a alla

app/config/database.php

@@ -50,7 +50,7 @@ return array(
 
 			'driver'    => 'mysql',
 			'host'      =>  '127.0.0.1',
-			'database'  =>  'trabajoolas5',
+			'database'  =>  'trabajoolas6',
 			'username'  =>  'root',
 			'password'  =>  '',
 			'charset'   => 'utf8',

app/database/migrations/2021_06_14_000638_create_semesters_table.php → app/database/migrations/2021_06_01_000638_create_semesters_table.php

@@ -15,10 +15,11 @@ class CreateSemestersTable extends Migration
 	{
 		Schema::create('semesters', function (Blueprint $table) {
 			$table->increments('id');
+			$table->string('name', 25)->default('');
 			$table->char('code', 3);
 			$table->timestamp('start')->nullable();
 			$table->timestamp('end')->nullable();
-			$table->string('name', 25)->after('code')->default('');
+
 			$table->boolean('is_visible')->default(false);
 		});
 	}

app/database/migrations/2021_06_14_001334_create_users_table.php → app/database/migrations/2021_06_01_001334_create_users_table.php

@@ -16,22 +16,26 @@ class CreateUsersTable extends Migration
 		Schema::create('users', function (Blueprint $table) {
 
 			$table->increments('id');
+			$table->string('ssn', 9)->nullable()->unique();
 			$table->string('first_name', 20);
+			$table->string('number', 10)->nullable()->unique();
 			$table->string('surnames', 40);
 			$table->string('email', 50)->unique();
 			$table->string('alternate_email', 50)->unique()->nullable();
-
+			$table->string('office_phone', 20)->nullable();
+			$table->string('office_extension', 5)->nullable();
+			$table->string('cell_phone', 20)->nullable();
 			$table->integer('role');
 			$table->integer('school_id')->nullable();
 
 
-			$table->boolean('has_access')->after('program_id')->default(false);
-			$table->string('ssn', 9)->after('id')->nullable()->unique();
-			$table->string('number', 10)->after('ssn')->nullable()->unique();
-			$table->timestamp('last_login')->after('updated_at')->nullable();
-			$table->string('office_phone', 20)->after('alternate_email')->nullable();
-			$table->string('office_extension', 5)->after('office_phone')->nullable();
-			$table->string('cell_phone', 20)->after('office_extension')->nullable();
+			$table->boolean('has_access')->default(false);
+
+
+			$table->timestamp('last_login')->nullable();
+
+
+
 			$table->rememberToken();
 			$table->timestamps();
 		});

app/database/migrations/2021_06_13_235710_create_outcomes_table.php → app/database/migrations/2021_06_01_235710_create_outcomes_table.php

@@ -12,7 +12,7 @@ class CreateOutcomesTable extends Migration
 			$table->increments('id');
 			$table->string('name');
 			$table->text('definition');
-			$table->decimal('expected_outcome', 5, 2)->after('definition')->default('66.66');
+			$table->decimal('expected_outcome', 5, 2)->default('66.66');
 			$table->timestamps();
 			$table->softDeletes();
 			$table->integer('new_outcome_id')->unsigned()->nullable();

app/database/migrations/2021_06_13_235738_create_objective_table.php → app/database/migrations/2021_06_01_235738_create_objective_table.php

@@ -13,9 +13,9 @@ class CreateObjectiveTable extends Migration
 			$table->increments('id');
 
 			$table->string('text');
+			$table->boolean('active')->default(1);
 			$table->unique(array('text'));
 			$table->timestamps();
-			$table->boolean('active')->after('text')->default(1);
 		});
 	}
 

app/database/migrations/2021_06_14_000406_create_programs_table.php → app/database/migrations/2021_06_02_000406_create_programs_table.php

@@ -12,11 +12,11 @@ class CreateProgramsTable extends Migration
 			$table->engine = 'InnoDB';
 			$table->increments('id');
 			$table->string('name', 50);
+			$table->char('code', 4)->nullable();
 			$table->integer('school_id')->unsigned();
 			$table->boolean('restrict_rubrics')->default(false);
 			$table->timestamps();
 			$table->boolean('is_graduate')->default(false);
-			$table->char('code', 4)->after('name')->nullable();
 		});
 
 		Schema::table('programs', function (Blueprint $table) {

app/database/migrations/2021_06_14_000415_create_program_criterion_table.php → app/database/migrations/2021_06_02_000415_create_program_criterion_table.php

@@ -21,7 +21,7 @@ class CreateProgramCriterionTable extends Migration
 			$table
 				->foreign('criterion_id')
 				->references('id')
-				->on('new_criteria')
+				->on('criteria')
 				->onDelete('cascade')
 				->onUpdate('cascade');
 		});

app/database/migrations/2021_06_14_000647_create_students_table.php → app/database/migrations/2021_06_02_000647_create_students_table.php

@@ -18,12 +18,12 @@ class CreateStudentsTable extends Migration
 			$table->increments('id');
 			$table->char('number', 9);
 			$table->string('name', 100);
+			$table->char('school_code', 2)->nullable();
+			$table->char('conc_code', 4)->nullable();
+			$table->string('email', 40)->default('no.email.olas@upr.edu');
 			$table->integer('program_id')->unsigned()->nullable();
 
 			$table->timestamps();
-			$table->string('email', 40)->after('name')->default('no.email.olas@upr.edu');
-			$table->char('school_code', 2)->after('name')->nullable();
-			$table->char('conc_code', 4)->after('school_code')->nullable();
 		});
 
 		Schema::table('students', function (Blueprint $table) {

app/database/migrations/2021_06_14_003757_create_activities_table.php → app/database/migrations/2021_06_04_003757_create_activities_table.php

@@ -12,22 +12,23 @@ class CreateActivitiesTable extends Migration
 			$table->increments('id');
 			$table->string('name');
 			$table->string('description');
-			$table->integer('course_id')->unsigned();
+			$table->integer('course_id')->unsigned()->nullable();
 
 			$table->timestamps();
 			$table->text('criteria_achieved')->nullable();
+			$table->text('criteria_weights')->nullable();
 			$table->text('outcomes_achieved')->nullable();
 			$table->text('outcomes_attempted')->nullable();
 
 			$table->text('assessment_comments')->nullable();
 			$table->text('transforming_actions')->nullable();
 			$table->text('criteria_achieved_percentage')->nullable();
-			$table->text('criteria_weights')->after('criteria_achieved')->nullable();
-			$table->date('date')->after('rubric_id');
-			$table->boolean('draft')->after('date')->default(0);
+
+			$table->date('date');
+			$table->boolean('draft')->default(0);
 			$table->text('criteria_participant_count')->nullable();
 			$table->text('criteria_achiever_count')->nullable();
-			DB::statement('ALTER TABLE `activities` MODIFY `course_id` INTEGER UNSIGNED NULL;');
+
 			DB::statement('SET FOREIGN_KEY_CHECKS=1;');
 		});
 

app/database/migrations/2021_06_14_003810_create_activity_criterion_table.php → app/database/migrations/2021_06_04_003810_create_activity_criterion_table.php

@@ -30,11 +30,12 @@ class CreateActivityCriterionTable extends Migration
 				->onDelete('cascade')
 				->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->text('assessment_comments')->after('transformative_actions')->nullable();
+
 			$table->timestamps();
 		});
 	}

app/database/migrations/2021_06_13_235926_create_assigned_roles_table.php → app/database/migrations/2021_06_05_235926_create_assigned_roles_table.php

@@ -3,9 +3,10 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateAssignedRolesTable extends Migration {
+class CreateAssignedRolesTable extends Migration
+{
+
 
-	*/
     public function up()
     {
         // Creates the roles table
@@ -65,5 +66,4 @@ class CreateAssignedRolesTable extends Migration {
         Schema::drop('roles');
         Schema::drop('permissions');
     }
-
 }

app/database/migrations/2021_06_13_235954_create_course_student_table.php → app/database/migrations/2021_06_05_235954_create_course_student_table.php

@@ -43,5 +43,6 @@ class CreateCourseStudentTable extends Migration
 	 */
 	public function down()
 	{
+		Schema::drop('course_student');
 	}
 }

app/database/migrations/2021_06_14_000858_create_templates_table.php → app/database/migrations/2021_06_07_000858_create_templates_table.php

@@ -29,8 +29,8 @@ class CreateTemplatesTable extends Migration
 			$table->integer('program_id')->unsigned()->nullable();
 			$table->foreign('program_id')->references('id')->on('programs');
 			$table->boolean('is_visible')->default(false);
-			$table->integer('expected_percentage')->after('contents')->default(70);
-			$table->integer('expected_points')->after('expected_percentage')->default(5);
+			$table->integer('expected_percentage')->default(70);
+			$table->integer('expected_points')->default(5);
 			$table->integer('num_scales')->unsigned();
 			$table->integer('max_score')->unsigned();
 		});

app/database/migrations/2021_06_14_001028_create_templates_criterion_table.php → app/database/migrations/2021_06_07_001028_create_templates_criterion_table.php

@@ -14,7 +14,7 @@ class CreateTemplatesCriterionTable extends Migration
 			$table->integer('criterion_id')->unsigned();
 			$table->foreign('criterion_id')
 				->references('id')
-				->on('new_criteria')
+				->on('criteria')
 				->onDelete('cascade')
 				->onUpdate('cascade');
 			$table->foreign('template_id')

app/database/migrations/2021_06_13_235816_create_activity_criterion_table.php

@@ -1,46 +0,0 @@
-<?php
-
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Database\Migrations\Migration;
-
-class CreateActivityCriterionTable extends Migration
-{
-
-	public function up()
-	{
-		Schema::create('activity_criterion', function (Blueprint $table) {
-			$table->increments('id');
-			$table->integer('activity_id')->unsigned();
-			$table->integer('criterion_id')->unsigned();
-			$table
-				->foreign('activity_id')
-				->references('id')
-				->on('activities')
-				->onDelete('cascade')
-				->onUpdate('cascade');
-			$table
-				->foreign('criterion_id')
-				->references('id')
-				->on('criteria')
-				->onDelete('cascade')
-				->onUpdate('cascade');
-			$table->text('transformative_actions')->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();
-			$table->text('assessment_comments')->after('transformative_actions')->nullable();
-		});
-	}
-
-	/**
-	 * Reverse the migrations.
-	 *
-	 * @return void
-	 */
-	public function down()
-	{
-		Schema::drop('activity_criterion');
-	}
-}

app/database/migrations/2021_06_14_001247_create_typ_semester_courses_table.php → app/database/migrations/2021_06_14_001347_create_typ_semester_courses_table.php

@@ -36,10 +36,7 @@ class CreateTypSemesterCoursesTable extends Migration
 	 */
 	public function down()
 	{
-		Schema::table('typ_semester_courses', function (Blueprint $table) {
-			$table->dropForeign("typ_semester_courses_course_id_foreign");
-			$table->dropForeign("typ_semester_courses_typ_semester_outcome_id_foreign");
-		});
+
 		Schema::drop('typ_semester_courses');
 	}
 }

app/database/migrations/2021_06_13_235843_create_annual_plan_objective_table.php → app/database/migrations/2021_06_15_235843_create_annual_plan_objective_table.php

@@ -28,7 +28,7 @@ class CreateAnnualPlanObjectiveTable extends Migration
 			$table->integer('criteria_id')->unsigned();
 			$table->foreign('criteria_id')
 				->references('id')
-				->on('new_criteria')
+				->on('criteria')
 				->onUpdate('cascade')
 				->onDelete('cascade');