diff --git a/app/models/fragment/documentation_quality.rb b/app/models/fragment/documentation_quality.rb index 6c328a9..5114c53 100644 --- a/app/models/fragment/documentation_quality.rb +++ b/app/models/fragment/documentation_quality.rb @@ -25,7 +25,7 @@ end def metadata_format - Fragment::MetadataFormat.where(id: data['metadata_format']['dbId']).first + Fragment::MetadataFormat.where(id: data['metadata_format']['dbid']).first end diff --git a/app/models/fragment/funder.rb b/app/models/fragment/funder.rb index a19d0a4..b8558d1 100644 --- a/app/models/fragment/funder.rb +++ b/app/models/fragment/funder.rb @@ -21,7 +21,7 @@ class Fragment::Funder < MadmpFragment def fundings - Fragment::Funding.where("(data->>'funder'->>'dbId')::int = ?", id) + Fragment::Funding.where("(data->>'funder'->>'dbid')::int = ?", id) end def self.sti_name diff --git a/app/models/fragment/funding.rb b/app/models/fragment/funding.rb index 5dcef3f..2168b22 100644 --- a/app/models/fragment/funding.rb +++ b/app/models/fragment/funding.rb @@ -25,7 +25,7 @@ end def funder - Fragment::Funder.where(id: data['funder']['dbId']).first + Fragment::Funder.where(id: data['funder']['dbid']).first end diff --git a/app/models/fragment/legal_issue.rb b/app/models/fragment/legal_issue.rb index 3bc9648..fdbf228 100644 --- a/app/models/fragment/legal_issue.rb +++ b/app/models/fragment/legal_issue.rb @@ -21,7 +21,7 @@ class Fragment::LegalIssue < MadmpFragment def legal_advisor - Fragment::Person.where(id: data['legal_advisor']['dbId']).first + Fragment::Person.where(id: data['legal_advisor']['dbid']).first end def research_output diff --git a/app/models/fragment/meta.rb b/app/models/fragment/meta.rb index 9729ac1..913be48 100644 --- a/app/models/fragment/meta.rb +++ b/app/models/fragment/meta.rb @@ -23,7 +23,7 @@ def contact contact = nil unless data["contact"].nil? - contact = Fragment::Person.where(id: data['contact']['dbId']).first + contact = Fragment::Person.where(id: data['contact']['dbid']).first end contact end diff --git a/app/models/fragment/metadata_standard.rb b/app/models/fragment/metadata_standard.rb index 7ee2966..8c89b1a 100644 --- a/app/models/fragment/metadata_standard.rb +++ b/app/models/fragment/metadata_standard.rb @@ -21,7 +21,7 @@ class Fragment::MetadataStandard < MadmpFragment def documentation - Fragment::Documentation.where("(data->>'metadata_format'->>'dbId')::int = ?", id) + Fragment::Documentation.where("(data->>'metadata_format'->>'dbid')::int = ?", id) end diff --git a/app/models/fragment/person.rb b/app/models/fragment/person.rb index bf98275..395f144 100644 --- a/app/models/fragment/person.rb +++ b/app/models/fragment/person.rb @@ -22,27 +22,27 @@ def documentations - Fragment::Documentation.where("(data->>'documentation_administrator'->>'dbId')::int = ?", id) + Fragment::Documentation.where("(data->>'documentation_administrator'->>'dbid')::int = ?", id) end def legal_issues - Fragment::LegalIssue.where("(data->>'legal_advisor'->>'dbId')::int = ?", id) + Fragment::LegalIssue.where("(data->>'legal_advisor'->>'dbid')::int = ?", id) end def metas - Fragment::Meta.where("(data->>'contact'->>'dbId')::int = ?", id) + Fragment::Meta.where("(data->>'contact'->>'dbid')::int = ?", id) end def projects - Fragment::Project.where("(data->>'principal_investigator'->>'dbId')::int = ?", id) + Fragment::Project.where("(data->>'principal_investigator'->>'dbid')::int = ?", id) end def research_outputs - Fragment::ResearchOutput.where("(data->>'contact'->>'dbId')::int = ?", id) + Fragment::ResearchOutput.where("(data->>'contact'->>'dbid')::int = ?", id) end def staff_members - Fragment::StaffMember.where("(data->>'agent'->>'dbId')::int = ?", id) + Fragment::StaffMember.where("(data->>'agent'->>'dbid')::int = ?", id) end diff --git a/app/models/fragment/project.rb b/app/models/fragment/project.rb index bdea74b..c912c42 100644 --- a/app/models/fragment/project.rb +++ b/app/models/fragment/project.rb @@ -23,7 +23,7 @@ def principalInvestigator principalInvestigator = nil unless data["principalInvestigator"].nil? - principalInvestigator = Fragment::Person.where(id: data['principalInvestigator']['dbId']).first + principalInvestigator = Fragment::Person.where(id: data['principalInvestigator']['dbid']).first end principalInvestigator end diff --git a/app/models/fragment/research_output.rb b/app/models/fragment/research_output.rb index b1a08c6..629ae53 100644 --- a/app/models/fragment/research_output.rb +++ b/app/models/fragment/research_output.rb @@ -21,7 +21,7 @@ class Fragment::ResearchOutput < MadmpFragment def contact - Fragment::Person.where(id: data['contact']['dbId']).first + Fragment::Person.where(id: data['contact']['dbid']).first end diff --git a/app/models/fragment/technical_resource.rb b/app/models/fragment/technical_resource.rb index da1e683..87d2244 100644 --- a/app/models/fragment/technical_resource.rb +++ b/app/models/fragment/technical_resource.rb @@ -21,7 +21,7 @@ class Fragment::TechnicalResource < MadmpFragment def technical_resource_usages - Fragment::TechnicalResourceUsage.where("(data->>'technical_resource'->>'dbId')::int = ?", id) + Fragment::TechnicalResourceUsage.where("(data->>'technical_resource'->>'dbid')::int = ?", id) end diff --git a/app/models/fragment/technical_resource_usage.rb b/app/models/fragment/technical_resource_usage.rb index 6896f82..161dde9 100644 --- a/app/models/fragment/technical_resource_usage.rb +++ b/app/models/fragment/technical_resource_usage.rb @@ -25,7 +25,7 @@ end def technical_resource - Fragment::RechnicalResource.where(id: data['technical_resource']['dbId']).first + Fragment::RechnicalResource.where(id: data['technical_resource']['dbid']).first end diff --git a/app/views/branded/shared/dynamic_form/_form.html.erb b/app/views/branded/shared/dynamic_form/_form.html.erb index 6d42b1e..9a46544 100644 --- a/app/views/branded/shared/dynamic_form/_form.html.erb +++ b/app/views/branded/shared/dynamic_form/_form.html.erb @@ -80,7 +80,7 @@ sub_schema = @schemas.find_by(id: prop["schema_id"]) sub_fragment = dmp_fragments[sub_schema.id].first unless dmp_fragments.empty? # TODO : SINGLE SUB FRAGMENT SAVING - #sub_fragment = dmp_fragments[sub_schema.id].find { |f| f.id == value["dbId"] } unless value.nil? + #sub_fragment = dmp_fragments[sub_schema.id].find { |f| f.id == value["dbid"] } unless value.nil? %> <%= render(partial: 'shared/dynamic_form/form', locals: { f: f, diff --git a/app/views/branded/shared/fragments/_display.html.erb b/app/views/branded/shared/fragments/_display.html.erb index 541a815..4301106 100644 --- a/app/views/branded/shared/fragments/_display.html.erb +++ b/app/views/branded/shared/fragments/_display.html.erb @@ -47,7 +47,7 @@ <% unless classname == "research_output" || value.nil? %> <% sub_schema = sub_schemas[prop["schema_id"]] - sub_fragment = dmp_fragments[sub_schema.id].find { |f| f.id == value["dbId"] } + sub_fragment = dmp_fragments[sub_schema.id].find { |f| f.id == value["dbid"] } %>

<%= field_name.capitalize %>

diff --git a/lib/dmpopidor/models/plan.rb b/lib/dmpopidor/models/plan.rb index 389a7be..064300e 100644 --- a/lib/dmpopidor/models/plan.rb +++ b/lib/dmpopidor/models/plan.rb @@ -7,16 +7,10 @@ # CHANGE : Fix to creator display def owner usr_id = ::Role.where(plan_id: id, active: true) - .creator + .administrator .order(:created_at) .pluck(:user_id).first - if usr_id.nil? - usr_id = ::Role.where(plan_id: id, active: true) - .administrator - .order(:created_at) - .pluck(:user_id).first - end - ::User.find(usr_id) + usr_id.present? ? ::User.find(usr_id) : nil end # CHANGES : ADDED RESEARCH OUTPUT SUPPORT @@ -239,10 +233,10 @@ principal_investigator_fragment = create_or_update_person_fragment(project.delete(:principalInvestigator)) meta[:contact] = { - "dbId" => contact_fragment ? contact_fragment.id : nil + "dbid" => contact_fragment ? contact_fragment.id : nil } project[:principalInvestigator] = { - "dbId" => principal_investigator_fragment ? principal_investigator_fragment.id : nil + "dbid" => principal_investigator_fragment ? principal_investigator_fragment.id : nil } dmp_fragment.meta.update(