Merge branch 'master' into config

Author: jirutka

app/representers/semesters_representer.rb

@@ -22,6 +22,7 @@ class SemestersRepresenter < Roar::Decorator
 
   collection :semester_periods, as: :periods do
     property :type
+    property :name
     property :irregular
     property :starts_at
     property :ends_at

db/migrate/1499120813_add_name_to_semester_periods.rb

@@ -0,0 +1,7 @@
+Sequel.migration do
+  change do
+    alter_table(:semester_periods) do
+      add_column :name, 'hstore'
+    end
+  end
+end

db/schema.sql

@@ -769,7 +769,8 @@ CREATE TABLE semester_periods (
     created_at timestamp without time zone NOT NULL,
     updated_at timestamp without time zone NOT NULL,
     first_day_override integer,
-    irregular boolean DEFAULT false NOT NULL
+    irregular boolean DEFAULT false NOT NULL,
+    name hstore
 );
 
 
@@ -1234,3 +1235,4 @@ INSERT INTO "schema_migrations" ("filename") VALUES ('1469463514_convert_text_to
 INSERT INTO "schema_migrations" ("filename") VALUES ('1469465920_convert_schedule_exception_type_to_enum.rb');
 INSERT INTO "schema_migrations" ("filename") VALUES ('1469470701_convert_parities_to_enum.rb');
 INSERT INTO "schema_migrations" ("filename") VALUES ('1493051746_convert_semester_period_type_to_enum.rb');
+INSERT INTO "schema_migrations" ("filename") VALUES ('1499120813_add_name_to_semester_periods.rb');

docs/Sirius.raml

@@ -489,6 +489,10 @@ resourceTypes:
                         },
                         {
                           "type": "holiday",
+                          "name": {
+                            "cs": "Vánoční prázdniny",
+                            "en": "Christmas Holidays"
+                          },
                           "irregular": false,
                           "starts_at": "2015-12-23",
                           "ends_at": "2016-01-03"
@@ -524,28 +528,30 @@ resourceTypes:
                   {
                     "id": 1,
                     "type": "CANCEL",
-                    "name": "Den české státnosti",
+                    "name": "Výuka zrušena z důvodu nemoci",
                     "scope": {
-                      "starts_at": "2014-09-28T00:00:00.000+02:00",
-                      "ends_at": "2014-09-29T00:00:00.000+02:00",
-                      "faculty": null,
-                      "semester": null,
-                      "courses": null,
+                      "starts_at": "2014-10-07T00:00:00.000+02:00",
+                      "ends_at": "2014-10-08T00:00:00.000+02:00",
+                      "faculty": 18000,
+                      "semester": "B141",
+                      "courses": [ "MI-RUB" ],
                       "timetable_slots": null
                     }
                   },
                   {
-                    "id": 11,
-                    "type": "CANCEL"
-                    "name": "Děkanský den FIT",
-                    "note": "Výuka odpadá",
+                    "id": 7,
+                    "type": "ROOM_CHANGE",
+                    "name": "MI-MPI - přednáška 24. 9. 2014 přesunuta do T9:105",
                     "scope": {
-                      "starts_at": "2015-04-30T00:00:00Z",
-                      "ends_at": "2015-05-01T00:00:00Z",
+                      "starts_at": "2014-09-24T00:00:00.000+02:00",
+                      "ends_at": "2014-09-25T00:00:00.000+02:00",
                       "faculty": 18000,
-                      "semester": "B142",
+                      "semester": "B141",
                       "courses": null,
-                      "timetable_slots": null
+                      "timetable_slots": [ 392651000 ]
+                    },
+                    "options": {
+                      "room_id": "T9:105"
                     }
                   }
                 ],

spec/api/faculties_endpoints_spec.rb

@@ -282,6 +282,9 @@ def period_for_json(period)
         ends_at: period.ends_at,
         irregular: period.irregular
       }
+      if period.name
+        ret[:name] = period.name
+      end
       if period.first_week_parity
         ret[:first_week_parity] = period.first_week_parity
       end

spec/api/semesters_endpoints_spec.rb

@@ -44,6 +44,9 @@ def period_for_json(period)
         ends_at: period.ends_at,
         irregular: period.irregular
       }
+      if period.name
+        ret[:name] = period.name
+      end
       if period.first_week_parity
         ret[:first_week_parity] = period.first_week_parity
       end

spec/fabricators/semester_period_fabricator.rb

@@ -19,6 +19,7 @@
 
 Fabricator(:holiday_semester_period, from: :semester_period) do
   type 'holiday'
+  name { {cs: 'Vánoční prázdniny', en: 'Christmas Holidays'} }
   first_week_parity nil
   starts_at '2014-12-21'
   ends_at '2015-01-04'