diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb index 88484af68..eb9e3641d 100644 --- a/app/controllers/people_controller.rb +++ b/app/controllers/people_controller.rb @@ -26,18 +26,14 @@ def show @person = Person.includes(projects: :project_technologies, person_roles: [:role, :person_role_level]).find(@person.id) - Ptime::PeopleEmployees.new.update_person_data(@person) super end def new - @person = Ptime::PeopleEmployees.new.create_or_find(params[:ptime_employee_id]) - redirect_to(@person) - - # %w[DE EN FR].each do |language| - # @person.language_skills.push(LanguageSkill.new({ language: language, level: 'A1' })) - # end - # super + %w[DE EN FR].each do |language| + @person.language_skills.push(LanguageSkill.new({ language: language, level: 'A1' })) + end + super end def create diff --git a/config/application.rb b/config/application.rb index d25c78c3a..2284f8e1a 100644 --- a/config/application.rb +++ b/config/application.rb @@ -14,7 +14,7 @@ module Skills def self.ptime_available? - ActiveModel::Type::Boolean.new.cast(ENV.fetch('PTIME_API_ACCESSIBLE', true)) + %w[true True 1].include?(ENV.fetch('PTIME_API_ACCESSIBLE', false)) end class Application < Rails::Application diff --git a/config/initializers/ptime_connector.rb b/config/initializers/ptime_connector.rb new file mode 100644 index 000000000..ee7a57e28 --- /dev/null +++ b/config/initializers/ptime_connector.rb @@ -0,0 +1 @@ +PeopleController.include Ptime::PtimeConnection if Skills.ptime_available? \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index c54c7c2ce..8568cb03a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -41,7 +41,7 @@ services: /bin/bash -c " curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && apt-get install -y nodejs && - npm install -g yarn && yarn add nodemon esbuild && bin/assets && + npm install -g yarn && bin/assets && sleep infinity" volumes: - ./:/myapp diff --git a/lib/ptime/ptime_connection.rb b/lib/ptime/ptime_connection.rb new file mode 100644 index 000000000..fc3ca37d3 --- /dev/null +++ b/lib/ptime/ptime_connection.rb @@ -0,0 +1,18 @@ +module Ptime + module PtimeConnection + def show + return export if format_odt? + + @person = Person.includes(projects: :project_technologies, + person_roles: [:role, :person_role_level]).find(@person.id) + + Ptime::PeopleEmployees.new.update_person_data(@person) + super + end + + def new + @person = Ptime::PeopleEmployees.new.create_or_find(params[:ptime_employee_id]) + redirect_to(@person) + end + end +end