Merge branch 'dev' into feature/work-periods

Author: narekcat

.gitignore

@@ -53,6 +53,9 @@ web_modules/
 # Optional eslint cache
 .eslintcache
 
+# Optional eslint options
+.eslintrc.y*ml
+
 # Microbundle cache
 .rpt2_cache/
 .rts2_cache_cjs/

config/default.js

@@ -113,7 +113,7 @@ module.exports = {
   // the delete resource booking entity Kafka message topic
   TAAS_RESOURCE_BOOKING_DELETE_TOPIC: process.env.TAAS_RESOURCE_BOOKING_DELETE_TOPIC || 'taas.resourcebooking.delete',
   // topics for work period service
-  // the create rwork period entity Kafka message topic
+  // the create work period entity Kafka message topic
   TAAS_WORK_PERIOD_CREATE_TOPIC: process.env.TAAS_WORK_PERIOD_CREATE_TOPIC || 'taas.workperiod.create',
   // the update work period entity Kafka message topic
   TAAS_WORK_PERIOD_UPDATE_TOPIC: process.env.TAAS_WORK_PERIOD_UPDATE_TOPIC || 'taas.workperiod.update',
@@ -143,6 +143,8 @@ module.exports = {
   ROLE_ID_SUBMITTER: process.env.ROLE_ID_SUBMITTER || '732339e7-8e30-49d7-9198-cccf9451e221',
   TYPE_ID_TASK: process.env.TYPE_ID_TASK || 'ecd58c69-238f-43a4-a4bb-d172719b9f31',
   DEFAULT_TIMELINE_TEMPLATE_ID: process.env.DEFAULT_TIMELINE_TEMPLATE_ID || '53a307ce-b4b3-4d6f-b9a1-3741a58f77e6',
-  DEFAULT_TRACK_ID: process.env.DEFAULT_TRACK_ID || '9b6fc876-f4d9-4ccb-9dfd-419247628825'
+  DEFAULT_TRACK_ID: process.env.DEFAULT_TRACK_ID || '9b6fc876-f4d9-4ccb-9dfd-419247628825',
 
+  // default time zone for Work Periods
+  WORK_PERIOD_TIME_ZONE: process.env.WORK_PERIOD_TIME_ZONE || 'America/New_York'
 }

config/test.js

@@ -4,5 +4,6 @@ module.exports = {
   AUTH0_AUDIENCE: 'http://example.com',
   AUTH0_AUDIENCE_UBAHN: 'http://example.com',
   AUTH0_CLIENT_ID: 'fake_id',
-  AUTH0_CLIENT_SECRET: 'fake_secret'
+  AUTH0_CLIENT_SECRET: 'fake_secret',
+  WORK_PERIOD_TIME_ZONE: 'America/New_York'
 }