diff --git a/app/controllers/studien_controller.rb b/app/controllers/studien_controller.rb index 53cd602..35f80d3 100755 --- a/app/controllers/studien_controller.rb +++ b/app/controllers/studien_controller.rb @@ -41,6 +41,7 @@ class StudienController < ApplicationController case params[:ansicht] when 'semesteransicht' when 'infoansicht' + when 'qualifikationsprofil' else params[:ansicht]="modulgruppenansicht" end diff --git a/app/models/studium.rb b/app/models/studium.rb index 22dd5ab..a2813df 100755 --- a/app/models/studium.rb +++ b/app/models/studium.rb @@ -27,7 +27,7 @@ # created_at :datetime not null # updated_at :datetime not null class Studium < ActiveRecord::Base - attr_accessible :desc, :name,:abkuerzung, :typ, :zahl, :semester, :picture, :picture_cache + attr_accessible :desc, :name,:abkuerzung, :typ, :zahl, :semester, :picture, :picture_cache, :qualifikation,:struktur, :jobmoeglichkeiten has_many :modulgruppen, inverse_of: :studium, :class_name => "Modulgruppe", :dependent => :destroy has_many :semester, :dependent => :destroy validates :abkuerzung, :length=>{:maximum=>5}, :format=>{:with=>/^[a-zA-z]{0,5}$/} @@ -35,7 +35,7 @@ class Studium < ActiveRecord::Base validates :name, :uniqueness => true, :presence=>true validates :zahl, :presence=>true, :format=>{:with=>/^[0-9A-Z]{4,10}$/}, :uniqueness => true mount_uploader :picture, PictureUploader - translates :desc,:shortdesc, :versioning =>true,:fallbacks_for_empty_translations => true + translates :desc,:shortdesc, :qualifikation,:struktur, :jobmoeglichkeiten, :versioning =>true,:fallbacks_for_empty_translations => true def title_context return self.abkuerzung.to_s.strip.empty? ? self.name : self.abkuerzung end diff --git a/app/views/studien/_form.html.erb b/app/views/studien/_form.html.erb index bd49e55..d9ad5a0 100755 --- a/app/views/studien/_form.html.erb +++ b/app/views/studien/_form.html.erb @@ -15,6 +15,15 @@
<%= f.input :desc, :as=>:tinymce_text , :wrapper_html=>{:class=>"span12"}%>
+
+ <%= f.input :qualifikation, :as=>:tinymce_text , :wrapper_html=>{:class=>"span12"}%> +
+
+ <%= f.input :struktur, :as=>:tinymce_text , :wrapper_html=>{:class=>"span12"}%> +
+
+ <%= f.input :jobmoeglichkeiten, :as=>:tinymce_text , :wrapper_html=>{:class=>"span12"}%> +
diff --git a/app/views/studien/_infoansicht.html.erb b/app/views/studien/_infoansicht.html.erb index 30ea4c5..c427778 100644 --- a/app/views/studien/_infoansicht.html.erb +++ b/app/views/studien/_infoansicht.html.erb @@ -2,6 +2,7 @@
+

<%= link_to "Qualifikationsprofil", studium_path( @studium, :ansicht=>"qualifikationsprofil")%>

<%= raw(@studium.desc) %>
diff --git a/app/views/studien/show.html.erb b/app/views/studien/show.html.erb index b109933..5ec47b1 100644 --- a/app/views/studien/show.html.erb +++ b/app/views/studien/show.html.erb @@ -13,13 +13,18 @@ <%= render partial: 'modulgruppenansicht' %> <% else if params[:ansicht]=='infoansicht' %> <%= render partial: 'infoansicht' %> + <% else if params[:ansicht]== 'qualifikationsprofil' %> +

Qualifikationsprofil

+

+<%= raw(@studium.qualifikation) %> +

<% else %> <%= render partial: 'semesteransicht' %> - <% end %> + - <% end %> + <% end %> <% end %> <% end %> <%= render :partial=>'layouts/pretty_toolbar', :object=>@toolbar_modulgruppen %>
<%= render 'layouts/pretty_toolbar' %> diff --git a/db/migrate/20140324185709_add_info_to_studien.rb b/db/migrate/20140324185709_add_info_to_studien.rb new file mode 100644 index 0000000..f310a20 --- /dev/null +++ b/db/migrate/20140324185709_add_info_to_studien.rb @@ -0,0 +1,7 @@ +class AddInfoToStudien < ActiveRecord::Migration + def change + add_column :studium_translations, :qualifikation, :text + add_column :studium_translations, :struktur, :text + add_column :studium_translations, :jobmoeglichkeiten, :text20 + end +end