Browse Source

vamos a alla

parent
commit
328cc54d7e
41 changed files with 39 additions and 80 deletions
  1. 1
    1
      app/config/database.php
  2. 0
    0
      app/database/migrations/2021_06_01_000123_create_password_reminders_table.php
  3. 0
    0
      app/database/migrations/2021_06_01_000131_create_password_resets_table.php
  4. 0
    0
      app/database/migrations/2021_06_01_000529_create_scales_table.php
  5. 0
    0
      app/database/migrations/2021_06_01_000628_create_schools_table.php
  6. 2
    1
      app/database/migrations/2021_06_01_000638_create_semesters_table.php
  7. 0
    0
      app/database/migrations/2021_06_01_001124_create_three_year_plan_table.php
  8. 12
    8
      app/database/migrations/2021_06_01_001334_create_users_table.php
  9. 0
    0
      app/database/migrations/2021_06_01_235626_create_criteria_table.php
  10. 1
    1
      app/database/migrations/2021_06_01_235710_create_outcomes_table.php
  11. 1
    1
      app/database/migrations/2021_06_01_235738_create_objective_table.php
  12. 1
    1
      app/database/migrations/2021_06_02_000406_create_programs_table.php
  13. 1
    1
      app/database/migrations/2021_06_02_000415_create_program_criterion_table.php
  14. 0
    0
      app/database/migrations/2021_06_02_000429_create_program_user_table.php
  15. 0
    0
      app/database/migrations/2021_06_02_000507_create_rubrics_table.php
  16. 3
    3
      app/database/migrations/2021_06_02_000647_create_students_table.php
  17. 0
    0
      app/database/migrations/2021_06_03_001143_create_transformative_actions_table.php
  18. 0
    0
      app/database/migrations/2021_06_03_235944_create_courses_table.php
  19. 6
    5
      app/database/migrations/2021_06_04_003757_create_activities_table.php
  20. 2
    1
      app/database/migrations/2021_06_04_003810_create_activity_criterion_table.php
  21. 0
    0
      app/database/migrations/2021_06_05_235538_create_assessments_table.php
  22. 0
    0
      app/database/migrations/2021_06_05_235636_create_criterion_rubric.php
  23. 0
    0
      app/database/migrations/2021_06_05_235727_create_rubric_activity_table.php
  24. 0
    0
      app/database/migrations/2021_06_05_235749_create_objective_outcome_table.php
  25. 0
    0
      app/database/migrations/2021_06_05_235803_create_objective_program_table.php
  26. 0
    0
      app/database/migrations/2021_06_05_235829_create_annual_plans_table.php
  27. 3
    3
      app/database/migrations/2021_06_05_235926_create_assigned_roles_table.php
  28. 1
    0
      app/database/migrations/2021_06_05_235954_create_course_student_table.php
  29. 0
    0
      app/database/migrations/2021_06_06_000025_create_criterion_objective_outcome_table.php
  30. 0
    0
      app/database/migrations/2021_06_06_000048_create_outcome_performance_table.php
  31. 0
    0
      app/database/migrations/2021_06_06_000518_create_rubric_criteria_scales_table.php
  32. 0
    0
      app/database/migrations/2021_06_06_001211_create_transformative_objective_program_table.php
  33. 2
    2
      app/database/migrations/2021_06_07_000858_create_templates_table.php
  34. 1
    1
      app/database/migrations/2021_06_07_001028_create_templates_criterion_table.php
  35. 0
    0
      app/database/migrations/2021_06_07_001036_create_templates_criterion_scale_table.php
  36. 0
    46
      app/database/migrations/2021_06_13_235816_create_activity_criterion_table.php
  37. 0
    0
      app/database/migrations/2021_06_14_001339_create_typ_semester_objective_table.php
  38. 1
    4
      app/database/migrations/2021_06_14_001347_create_typ_semester_courses_table.php
  39. 1
    1
      app/database/migrations/2021_06_15_235843_create_annual_plan_objective_table.php
  40. 0
    0
      app/database/migrations/2021_06_15_235856_create_annual_plan_transformative_table.php
  41. 0
    0
      app/database/migrations/2021_06_15_235911_create_annual_report_transformative_table.php

+ 1
- 1
app/config/database.php View File

50
 
50
 
51
 			'driver'    => 'mysql',
51
 			'driver'    => 'mysql',
52
 			'host'      =>  '127.0.0.1',
52
 			'host'      =>  '127.0.0.1',
53
-			'database'  =>  'trabajoolas5',
53
+			'database'  =>  'trabajoolas6',
54
 			'username'  =>  'root',
54
 			'username'  =>  'root',
55
 			'password'  =>  '',
55
 			'password'  =>  '',
56
 			'charset'   => 'utf8',
56
 			'charset'   => 'utf8',

app/database/migrations/2021_06_14_000123_create_password_reminders_table.php → app/database/migrations/2021_06_01_000123_create_password_reminders_table.php View File


app/database/migrations/2021_06_14_000131_create_password_resets_table.php → app/database/migrations/2021_06_01_000131_create_password_resets_table.php View File


app/database/migrations/2021_06_14_000529_create_scales_table.php → app/database/migrations/2021_06_01_000529_create_scales_table.php View File


app/database/migrations/2021_06_14_000628_create_schools_table.php → app/database/migrations/2021_06_01_000628_create_schools_table.php View File


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

15
 	{
15
 	{
16
 		Schema::create('semesters', function (Blueprint $table) {
16
 		Schema::create('semesters', function (Blueprint $table) {
17
 			$table->increments('id');
17
 			$table->increments('id');
18
+			$table->string('name', 25)->default('');
18
 			$table->char('code', 3);
19
 			$table->char('code', 3);
19
 			$table->timestamp('start')->nullable();
20
 			$table->timestamp('start')->nullable();
20
 			$table->timestamp('end')->nullable();
21
 			$table->timestamp('end')->nullable();
21
-			$table->string('name', 25)->after('code')->default('');
22
+
22
 			$table->boolean('is_visible')->default(false);
23
 			$table->boolean('is_visible')->default(false);
23
 		});
24
 		});
24
 	}
25
 	}

app/database/migrations/2021_06_14_001124_create_three_year_plan_table.php → app/database/migrations/2021_06_01_001124_create_three_year_plan_table.php View File


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

16
 		Schema::create('users', function (Blueprint $table) {
16
 		Schema::create('users', function (Blueprint $table) {
17
 
17
 
18
 			$table->increments('id');
18
 			$table->increments('id');
19
+			$table->string('ssn', 9)->nullable()->unique();
19
 			$table->string('first_name', 20);
20
 			$table->string('first_name', 20);
21
+			$table->string('number', 10)->nullable()->unique();
20
 			$table->string('surnames', 40);
22
 			$table->string('surnames', 40);
21
 			$table->string('email', 50)->unique();
23
 			$table->string('email', 50)->unique();
22
 			$table->string('alternate_email', 50)->unique()->nullable();
24
 			$table->string('alternate_email', 50)->unique()->nullable();
23
-
25
+			$table->string('office_phone', 20)->nullable();
26
+			$table->string('office_extension', 5)->nullable();
27
+			$table->string('cell_phone', 20)->nullable();
24
 			$table->integer('role');
28
 			$table->integer('role');
25
 			$table->integer('school_id')->nullable();
29
 			$table->integer('school_id')->nullable();
26
 
30
 
27
 
31
 
28
-			$table->boolean('has_access')->after('program_id')->default(false);
29
-			$table->string('ssn', 9)->after('id')->nullable()->unique();
30
-			$table->string('number', 10)->after('ssn')->nullable()->unique();
31
-			$table->timestamp('last_login')->after('updated_at')->nullable();
32
-			$table->string('office_phone', 20)->after('alternate_email')->nullable();
33
-			$table->string('office_extension', 5)->after('office_phone')->nullable();
34
-			$table->string('cell_phone', 20)->after('office_extension')->nullable();
32
+			$table->boolean('has_access')->default(false);
33
+
34
+
35
+			$table->timestamp('last_login')->nullable();
36
+
37
+
38
+
35
 			$table->rememberToken();
39
 			$table->rememberToken();
36
 			$table->timestamps();
40
 			$table->timestamps();
37
 		});
41
 		});

app/database/migrations/2021_06_13_235626_create_criteria_table.php → app/database/migrations/2021_06_01_235626_create_criteria_table.php View File


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

12
 			$table->increments('id');
12
 			$table->increments('id');
13
 			$table->string('name');
13
 			$table->string('name');
14
 			$table->text('definition');
14
 			$table->text('definition');
15
-			$table->decimal('expected_outcome', 5, 2)->after('definition')->default('66.66');
15
+			$table->decimal('expected_outcome', 5, 2)->default('66.66');
16
 			$table->timestamps();
16
 			$table->timestamps();
17
 			$table->softDeletes();
17
 			$table->softDeletes();
18
 			$table->integer('new_outcome_id')->unsigned()->nullable();
18
 			$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 View File

13
 			$table->increments('id');
13
 			$table->increments('id');
14
 
14
 
15
 			$table->string('text');
15
 			$table->string('text');
16
+			$table->boolean('active')->default(1);
16
 			$table->unique(array('text'));
17
 			$table->unique(array('text'));
17
 			$table->timestamps();
18
 			$table->timestamps();
18
-			$table->boolean('active')->after('text')->default(1);
19
 		});
19
 		});
20
 	}
20
 	}
21
 
21
 

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

12
 			$table->engine = 'InnoDB';
12
 			$table->engine = 'InnoDB';
13
 			$table->increments('id');
13
 			$table->increments('id');
14
 			$table->string('name', 50);
14
 			$table->string('name', 50);
15
+			$table->char('code', 4)->nullable();
15
 			$table->integer('school_id')->unsigned();
16
 			$table->integer('school_id')->unsigned();
16
 			$table->boolean('restrict_rubrics')->default(false);
17
 			$table->boolean('restrict_rubrics')->default(false);
17
 			$table->timestamps();
18
 			$table->timestamps();
18
 			$table->boolean('is_graduate')->default(false);
19
 			$table->boolean('is_graduate')->default(false);
19
-			$table->char('code', 4)->after('name')->nullable();
20
 		});
20
 		});
21
 
21
 
22
 		Schema::table('programs', function (Blueprint $table) {
22
 		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 View File

21
 			$table
21
 			$table
22
 				->foreign('criterion_id')
22
 				->foreign('criterion_id')
23
 				->references('id')
23
 				->references('id')
24
-				->on('new_criteria')
24
+				->on('criteria')
25
 				->onDelete('cascade')
25
 				->onDelete('cascade')
26
 				->onUpdate('cascade');
26
 				->onUpdate('cascade');
27
 		});
27
 		});

app/database/migrations/2021_06_14_000429_create_program_user_table.php → app/database/migrations/2021_06_02_000429_create_program_user_table.php View File


app/database/migrations/2021_06_14_000507_create_rubrics_table.php → app/database/migrations/2021_06_02_000507_create_rubrics_table.php View File


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

18
 			$table->increments('id');
18
 			$table->increments('id');
19
 			$table->char('number', 9);
19
 			$table->char('number', 9);
20
 			$table->string('name', 100);
20
 			$table->string('name', 100);
21
+			$table->char('school_code', 2)->nullable();
22
+			$table->char('conc_code', 4)->nullable();
23
+			$table->string('email', 40)->default('no.email.olas@upr.edu');
21
 			$table->integer('program_id')->unsigned()->nullable();
24
 			$table->integer('program_id')->unsigned()->nullable();
22
 
25
 
23
 			$table->timestamps();
26
 			$table->timestamps();
24
-			$table->string('email', 40)->after('name')->default('no.email.olas@upr.edu');
25
-			$table->char('school_code', 2)->after('name')->nullable();
26
-			$table->char('conc_code', 4)->after('school_code')->nullable();
27
 		});
27
 		});
28
 
28
 
29
 		Schema::table('students', function (Blueprint $table) {
29
 		Schema::table('students', function (Blueprint $table) {

app/database/migrations/2021_06_14_001143_create_transformative_actions_table.php → app/database/migrations/2021_06_03_001143_create_transformative_actions_table.php View File


app/database/migrations/2021_06_13_235944_create_courses_table.php → app/database/migrations/2021_06_03_235944_create_courses_table.php View File


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

12
 			$table->increments('id');
12
 			$table->increments('id');
13
 			$table->string('name');
13
 			$table->string('name');
14
 			$table->string('description');
14
 			$table->string('description');
15
-			$table->integer('course_id')->unsigned();
15
+			$table->integer('course_id')->unsigned()->nullable();
16
 
16
 
17
 			$table->timestamps();
17
 			$table->timestamps();
18
 			$table->text('criteria_achieved')->nullable();
18
 			$table->text('criteria_achieved')->nullable();
19
+			$table->text('criteria_weights')->nullable();
19
 			$table->text('outcomes_achieved')->nullable();
20
 			$table->text('outcomes_achieved')->nullable();
20
 			$table->text('outcomes_attempted')->nullable();
21
 			$table->text('outcomes_attempted')->nullable();
21
 
22
 
22
 			$table->text('assessment_comments')->nullable();
23
 			$table->text('assessment_comments')->nullable();
23
 			$table->text('transforming_actions')->nullable();
24
 			$table->text('transforming_actions')->nullable();
24
 			$table->text('criteria_achieved_percentage')->nullable();
25
 			$table->text('criteria_achieved_percentage')->nullable();
25
-			$table->text('criteria_weights')->after('criteria_achieved')->nullable();
26
-			$table->date('date')->after('rubric_id');
27
-			$table->boolean('draft')->after('date')->default(0);
26
+
27
+			$table->date('date');
28
+			$table->boolean('draft')->default(0);
28
 			$table->text('criteria_participant_count')->nullable();
29
 			$table->text('criteria_participant_count')->nullable();
29
 			$table->text('criteria_achiever_count')->nullable();
30
 			$table->text('criteria_achiever_count')->nullable();
30
-			DB::statement('ALTER TABLE `activities` MODIFY `course_id` INTEGER UNSIGNED NULL;');
31
+
31
 			DB::statement('SET FOREIGN_KEY_CHECKS=1;');
32
 			DB::statement('SET FOREIGN_KEY_CHECKS=1;');
32
 		});
33
 		});
33
 
34
 

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

30
 				->onDelete('cascade')
30
 				->onDelete('cascade')
31
 				->onUpdate('cascade');
31
 				->onUpdate('cascade');
32
 			$table->text('transformative_actions')->nullable();
32
 			$table->text('transformative_actions')->nullable();
33
+			$table->text('assessment_comments')->nullable();
33
 			$table->integer('expected_student_score')->nullable();
34
 			$table->integer('expected_student_score')->nullable();
34
 			$table->decimal('expected_percentage_students_achieving', 5, 2)->nullable();
35
 			$table->decimal('expected_percentage_students_achieving', 5, 2)->nullable();
35
 			$table->decimal('percentage_students_who_achieved', 5, 2)->nullable();
36
 			$table->decimal('percentage_students_who_achieved', 5, 2)->nullable();
36
 			$table->decimal('weight', 3, 2)->default(1.0);
37
 			$table->decimal('weight', 3, 2)->default(1.0);
37
-			$table->text('assessment_comments')->after('transformative_actions')->nullable();
38
+
38
 			$table->timestamps();
39
 			$table->timestamps();
39
 		});
40
 		});
40
 	}
41
 	}

app/database/migrations/2021_06_13_235538_create_assessments_table.php → app/database/migrations/2021_06_05_235538_create_assessments_table.php View File


app/database/migrations/2021_06_13_235636_create_criterion_rubric.php → app/database/migrations/2021_06_05_235636_create_criterion_rubric.php View File


app/database/migrations/2021_06_13_235727_create_rubric_activity_table.php → app/database/migrations/2021_06_05_235727_create_rubric_activity_table.php View File


app/database/migrations/2021_06_13_235749_create_objective_outcome_table.php → app/database/migrations/2021_06_05_235749_create_objective_outcome_table.php View File


app/database/migrations/2021_06_13_235803_create_objective_program_table.php → app/database/migrations/2021_06_05_235803_create_objective_program_table.php View File


app/database/migrations/2021_06_13_235829_create_annual_plans_table.php → app/database/migrations/2021_06_05_235829_create_annual_plans_table.php View File


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

3
 use Illuminate\Database\Schema\Blueprint;
3
 use Illuminate\Database\Schema\Blueprint;
4
 use Illuminate\Database\Migrations\Migration;
4
 use Illuminate\Database\Migrations\Migration;
5
 
5
 
6
-class CreateAssignedRolesTable extends Migration {
6
+class CreateAssignedRolesTable extends Migration
7
+{
8
+
7
 
9
 
8
-	*/
9
     public function up()
10
     public function up()
10
     {
11
     {
11
         // Creates the roles table
12
         // Creates the roles table
65
         Schema::drop('roles');
66
         Schema::drop('roles');
66
         Schema::drop('permissions');
67
         Schema::drop('permissions');
67
     }
68
     }
68
-
69
 }
69
 }

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

43
 	 */
43
 	 */
44
 	public function down()
44
 	public function down()
45
 	{
45
 	{
46
+		Schema::drop('course_student');
46
 	}
47
 	}
47
 }
48
 }

app/database/migrations/2021_06_14_000025_create_criterion_objective_outcome_table.php → app/database/migrations/2021_06_06_000025_create_criterion_objective_outcome_table.php View File


app/database/migrations/2021_06_14_000048_create_outcome_performance_table.php → app/database/migrations/2021_06_06_000048_create_outcome_performance_table.php View File


app/database/migrations/2021_06_14_000518_create_rubric_criteria_scales_table.php → app/database/migrations/2021_06_06_000518_create_rubric_criteria_scales_table.php View File


app/database/migrations/2021_06_14_001211_create_transformative_objective_program_table.php → app/database/migrations/2021_06_06_001211_create_transformative_objective_program_table.php View File


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

29
 			$table->integer('program_id')->unsigned()->nullable();
29
 			$table->integer('program_id')->unsigned()->nullable();
30
 			$table->foreign('program_id')->references('id')->on('programs');
30
 			$table->foreign('program_id')->references('id')->on('programs');
31
 			$table->boolean('is_visible')->default(false);
31
 			$table->boolean('is_visible')->default(false);
32
-			$table->integer('expected_percentage')->after('contents')->default(70);
33
-			$table->integer('expected_points')->after('expected_percentage')->default(5);
32
+			$table->integer('expected_percentage')->default(70);
33
+			$table->integer('expected_points')->default(5);
34
 			$table->integer('num_scales')->unsigned();
34
 			$table->integer('num_scales')->unsigned();
35
 			$table->integer('max_score')->unsigned();
35
 			$table->integer('max_score')->unsigned();
36
 		});
36
 		});

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

14
 			$table->integer('criterion_id')->unsigned();
14
 			$table->integer('criterion_id')->unsigned();
15
 			$table->foreign('criterion_id')
15
 			$table->foreign('criterion_id')
16
 				->references('id')
16
 				->references('id')
17
-				->on('new_criteria')
17
+				->on('criteria')
18
 				->onDelete('cascade')
18
 				->onDelete('cascade')
19
 				->onUpdate('cascade');
19
 				->onUpdate('cascade');
20
 			$table->foreign('template_id')
20
 			$table->foreign('template_id')

app/database/migrations/2021_06_14_001036_create_templates_criterion_scale_table.php → app/database/migrations/2021_06_07_001036_create_templates_criterion_scale_table.php View File


+ 0
- 46
app/database/migrations/2021_06_13_235816_create_activity_criterion_table.php View File

1
-<?php
2
-
3
-use Illuminate\Database\Schema\Blueprint;
4
-use Illuminate\Database\Migrations\Migration;
5
-
6
-class CreateActivityCriterionTable extends Migration
7
-{
8
-
9
-	public function up()
10
-	{
11
-		Schema::create('activity_criterion', function (Blueprint $table) {
12
-			$table->increments('id');
13
-			$table->integer('activity_id')->unsigned();
14
-			$table->integer('criterion_id')->unsigned();
15
-			$table
16
-				->foreign('activity_id')
17
-				->references('id')
18
-				->on('activities')
19
-				->onDelete('cascade')
20
-				->onUpdate('cascade');
21
-			$table
22
-				->foreign('criterion_id')
23
-				->references('id')
24
-				->on('criteria')
25
-				->onDelete('cascade')
26
-				->onUpdate('cascade');
27
-			$table->text('transformative_actions')->nullable();
28
-			$table->integer('expected_student_score')->nullable();
29
-			$table->decimal('expected_percentage_students_achieving', 5, 2)->nullable();
30
-			$table->decimal('percentage_students_who_achieved', 5, 2)->nullable();
31
-			$table->decimal('weight', 3, 2)->default(1.0);
32
-			$table->timestamps();
33
-			$table->text('assessment_comments')->after('transformative_actions')->nullable();
34
-		});
35
-	}
36
-
37
-	/**
38
-	 * Reverse the migrations.
39
-	 *
40
-	 * @return void
41
-	 */
42
-	public function down()
43
-	{
44
-		Schema::drop('activity_criterion');
45
-	}
46
-}

app/database/migrations/2021_06_14_001309_create_typ_semester_objective_table.php → app/database/migrations/2021_06_14_001339_create_typ_semester_objective_table.php View File


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 View File

36
 	 */
36
 	 */
37
 	public function down()
37
 	public function down()
38
 	{
38
 	{
39
-		Schema::table('typ_semester_courses', function (Blueprint $table) {
40
-			$table->dropForeign("typ_semester_courses_course_id_foreign");
41
-			$table->dropForeign("typ_semester_courses_typ_semester_outcome_id_foreign");
42
-		});
39
+
43
 		Schema::drop('typ_semester_courses');
40
 		Schema::drop('typ_semester_courses');
44
 	}
41
 	}
45
 }
42
 }

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 View File

28
 			$table->integer('criteria_id')->unsigned();
28
 			$table->integer('criteria_id')->unsigned();
29
 			$table->foreign('criteria_id')
29
 			$table->foreign('criteria_id')
30
 				->references('id')
30
 				->references('id')
31
-				->on('new_criteria')
31
+				->on('criteria')
32
 				->onUpdate('cascade')
32
 				->onUpdate('cascade')
33
 				->onDelete('cascade');
33
 				->onDelete('cascade');
34
 
34
 

app/database/migrations/2021_06_13_235856_create_annual_plan_transformative_table.php → app/database/migrations/2021_06_15_235856_create_annual_plan_transformative_table.php View File


app/database/migrations/2021_06_13_235911_create_annual_report_transformative_table.php → app/database/migrations/2021_06_15_235911_create_annual_report_transformative_table.php View File