Merge remote-tracking branch 'origin/3.2.5' into 3.2.5

database/migrations/2019_12_21_165529_create_o_c_o_m_s_table.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateOCOMSTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('o_c_o_m_s', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('ocom');
+            $table->string('objectif_competence');
+            $table->string('nbPeriode');
+            $table->string('objectif_rendement');
+            $table->string('oren');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('o_c_o_m_s');
+    }
+}

database/migrations/2019_12_22_145445_create_event_types_table.php

@@ -0,0 +1,44 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateEventTypesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('event_types', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->string('name');
+            $table->text('admin_desc');
+            $table->string('calendar_color')->default('blue');
+            $table->string('calendar_icon')->default('<i class="fa fa-question-circle"></i>');
+            $table->string('begin_time')->default('12:00');
+            $table->string('end_time')->default('13:00');
+            $table->string('location')->default('Escadron');
+            $table->boolean('is_mandatory')->default(false);
+            $table->boolean('use_weekly_msg')->default(false);
+            $table->string('weekly_msg_publication_time')->default('-5day');
+            $table->boolean('use_schedule')->default(false);
+            $table->text('schedule_model');
+            $table->boolean('is_promoted')->default(false);
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('event_types');
+    }
+}