bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Qualifikation #129

Browse Source 
#129 closed
This commit is contained in:
Andreas Stephanides
2014-03-25 19:41:48 +01:00
parent 1e342cb66a
commit 1d2d3e791b
6 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/studien_controller.rb
View File

@@ -41,6 +41,7 @@ class StudienController < ApplicationController
case params[:ansicht] case params[:ansicht]
when 'semesteransicht' when 'semesteransicht'
when 'infoansicht' when 'infoansicht'
when 'qualifikationsprofil'
else else
params[:ansicht]="modulgruppenansicht" params[:ansicht]="modulgruppenansicht"
end end

4
app/models/studium.rb
View File

@@ -27,7 +27,7 @@
# created_at :datetime not null # created_at :datetime not null
# updated_at :datetime not null # updated_at :datetime not null
class Studium < ActiveRecord::Base 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 :modulgruppen, inverse_of: :studium, :class_name => "Modulgruppe", :dependent => :destroy
has_many :semester, :dependent => :destroy has_many :semester, :dependent => :destroy
validates :abkuerzung, :length=>{:maximum=>5}, :format=>{:with=>/^[a-zA-z]{0,5}$/} 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 :name, :uniqueness => true, :presence=>true
validates :zahl, :presence=>true, :format=>{:with=>/^[0-9A-Z]{4,10}$/}, :uniqueness => true validates :zahl, :presence=>true, :format=>{:with=>/^[0-9A-Z]{4,10}$/}, :uniqueness => true
mount_uploader :picture, PictureUploader 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 def title_context
return self.abkuerzung.to_s.strip.empty? ? self.name : self.abkuerzung return self.abkuerzung.to_s.strip.empty? ? self.name : self.abkuerzung
end end

9
app/views/studien/_form.html.erb
View File

@@ -15,6 +15,15 @@
<div class="row-fluid"> <div class="row-fluid">
<%= f.input :desc, :as=>:tinymce_text , :wrapper_html=>{:class=>"span12"}%> <%= f.input :desc, :as=>:tinymce_text , :wrapper_html=>{:class=>"span12"}%>
</div> </div>
<div class="row-fluid">
<%= f.input :qualifikation, :as=>:tinymce_text , :wrapper_html=>{:class=>"span12"}%>
</div>
<div class="row-fluid">
<%= f.input :struktur, :as=>:tinymce_text , :wrapper_html=>{:class=>"span12"}%>
</div>
<div class="row-fluid">
<%= f.input :jobmoeglichkeiten, :as=>:tinymce_text , :wrapper_html=>{:class=>"span12"}%>
</div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">

1
app/views/studien/_infoansicht.html.erb
View File

@@ -2,6 +2,7 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<p><%= link_to "Qualifikationsprofil", studium_path( @studium, :ansicht=>"qualifikationsprofil")%> </p>
<%= raw(@studium.desc) %> <%= raw(@studium.desc) %>
</div> </div>
</div> </div>

9
app/views/studien/show.html.erb
View File

@@ -13,13 +13,18 @@
<%= render partial: 'modulgruppenansicht' %> <%= render partial: 'modulgruppenansicht' %>
<% else if params[:ansicht]=='infoansicht' %> <% else if params[:ansicht]=='infoansicht' %>
<%= render partial: 'infoansicht' %> <%= render partial: 'infoansicht' %>
<% else if params[:ansicht]== 'qualifikationsprofil' %>
<h2>Qualifikationsprofil</h2>
<p>
<%= raw(@studium.qualifikation) %>
</p>
<% else %> <% else %>
<%= render partial: 'semesteransicht' %> <%= render partial: 'semesteransicht' %>
<% end %>
<% end %>
<% end %> <% end %> <% end %>
<%= render :partial=>'layouts/pretty_toolbar', :object=>@toolbar_modulgruppen %><br> <%= render :partial=>'layouts/pretty_toolbar', :object=>@toolbar_modulgruppen %><br>
<%= render 'layouts/pretty_toolbar' %> <%= render 'layouts/pretty_toolbar' %>

7
db/migrate/20140324185709_add_info_to_studien.rb Normal file
View File

@@ -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