From d314a8126862e76d94c84a289a8883167b58a001 Mon Sep 17 00:00:00 2001
From: Thomas Blazek <wtblazek@gmail.com>
Date: Thu, 7 Nov 2013 09:52:45 +0100
Subject: [PATCH] introduced lva.full_name and rewrote displays

---
 app/models/lva.rb                     | 2 +-
 app/views/home/_beispiele.html.erb    | 2 +-
 app/views/lvas/_lva_semester.html.erb | 2 +-
 app/views/studien/verwalten.html.erb  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/lva.rb b/app/models/lva.rb
index cdd273b..08eea7f 100755
--- a/app/models/lva.rb
+++ b/app/models/lva.rb
@@ -52,7 +52,7 @@ class Lva < ActiveRecord::Base
   validates_presence_of :stunden # Stunden Eingetragen?
   validates_presence_of :modul # Zugehöriges Modul eingetragen?
   # (zumindest eines)
-  def typ_name
+  def full_name
     return self.typ + ' ' + self.name
     end
   def add_semesters
diff --git a/app/views/home/_beispiele.html.erb b/app/views/home/_beispiele.html.erb
index 8355b53..3f66738 100644
--- a/app/views/home/_beispiele.html.erb
+++ b/app/views/home/_beispiele.html.erb
@@ -18,7 +18,7 @@
      <%= link_to b, {:class=> :linkbox} do %>
        <div class="row-fluid">
      <div class="span8">
- <b><%=b.name%></b> (<%=b.lva.name%>)
+ <b><%=b.name%></b> (<%=b.lva.full_name%>)
 	  </div>
 	  <div class="span4">
 	    <%=b.updated_at.to_s%>
diff --git a/app/views/lvas/_lva_semester.html.erb b/app/views/lvas/_lva_semester.html.erb
index e1f8960..975ae0a 100755
--- a/app/views/lvas/_lva_semester.html.erb
+++ b/app/views/lvas/_lva_semester.html.erb
@@ -1,6 +1,6 @@
 
 <div class="lva-semester">
- <%=lva.lvanr.to_s %> <b><%= link_to lva.name, lva_path(lva)%></b>  <%= lva.ects %> ECTS / <%= lva.stunden %> Std<br>
+ <%=lva.lvanr.to_s %> <b><%= link_to lva.full_name, lva_path(lva)%></b>  <%= lva.ects %> ECTS / <%= lva.stunden %> Std<br>
 <!--  <div class="hidden-phone">
   Module: /<% lva.modul.each do |m| %> <%= link_to m.name + ' / ', modul_path(m) unless m.modulgruppen.map{|x| x.studium}.index(@studium).nil? && !@studium.nil? %><% end %>
 <br>
diff --git a/app/views/studien/verwalten.html.erb b/app/views/studien/verwalten.html.erb
index ba845fe..4b1a0da 100644
--- a/app/views/studien/verwalten.html.erb
+++ b/app/views/studien/verwalten.html.erb
@@ -127,7 +127,7 @@
 	    
 
 	    <% @lvas.each do |lva| %>
-	    <%= (lva.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe  %><%= link_to lva.name, lva %> |	      
+	    <%= (lva.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe  %><%= link_to lva.full_name, lva %> |	      
 	    <%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_lva_path(lva)%><br>
 	    
 	    <% end %>