Semester "ohne zuordnung"

This commit is contained in:
Thomas Blazek
2013-07-29 18:42:44 +02:00
parent d9618d5bba
commit 5f45487d00
2 changed files with 18 additions and 9 deletions

View File

@@ -18,7 +18,6 @@ class Semester < ActiveRecord::Base
belongs_to :studium, :foreign_key => "studium_id" belongs_to :studium, :foreign_key => "studium_id"
validates :name, :presence => true validates :name, :presence => true
validates :nummer, :presence => true validates :nummer, :presence => true
validates :ssws, :presence => true
class << self class << self
def batch_add(name, type, target) def batch_add(name, type, target)
if type == "Bachelor" if type == "Bachelor"
@@ -38,6 +37,12 @@ class Semester < ActiveRecord::Base
semester.save semester.save
target << semester target << semester
end end
semester = Semester.new()
semester.name = "Ohne Zuordnung"
semester.nummer = 0
semester.ssws = "WS"
semester.save
target << semester
end end
def batch_destroy(studium) def batch_destroy(studium)

View File

@@ -1,12 +1,16 @@
<h1><%= @studium.typ %> <%= @studium.name %> (<%= @studium.zahl %>)</h1> <h1><%= @studium.typ %> <%= @studium.name %> (<%= @studium.zahl %>)</h1>
</div>
<%= raw(@studium.desc) %>
<% @studium.semester.each do |sem| %>
<div class="row-fluid">
<h2><%= sem.nummer.to_s + ". Semester" %></h2>
<div class="span<%= sem[:width]%> min-width:13em;">
<%= render :partial=>'lvas/lva_semester', :collection=>sem.lvas, :as=>:lva%>
</div> </div>
<%= raw(@studium.desc) %>
<% @studium.semester.each do |sem| %>
<div class="row-fluid">
<% if sem.nummer > 0 %>
<h2><%= sem.nummer.to_s + ". Semester" %></h2>
<% else %>
<h2> Ohne Zuordnung </h2>
<% end %>
<div class="span<%= sem[:width]%> min-width:13em;">
<%= render :partial=>'lvas/lva_semester', :collection=>sem.lvas, :as=>:lva%>
</div>
<% end %> <% end %>
</div> </div>