-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make person controller work without time again, start writing initial…
…izer that will enable the ptime connection when wanted, fix docker compose
- Loading branch information
1 parent
9f018bc
commit 5a81213
Showing
5 changed files
with
25 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
PeopleController.include Ptime::PtimeConnection if Skills.ptime_available? |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |