From 9d1b915cd4018a63311b5547ab71b1ee159d5314 Mon Sep 17 00:00:00 2001
From: Thomas Blazek <wtblazek@gmail.com>
Date: Tue, 30 Jul 2013 14:28:28 +0200
Subject: [PATCH] =?UTF-8?q?Studien-views=20=C3=BCberarbeiten?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/lvas/_lva_semester.html.erb       |  4 ++--
 app/views/studien/_semesteransicht.html.erb |  6 +++++-
 app/views/studien/_studium.html.erb         | 10 ++++++++++
 app/views/studien/index.html.erb            |  9 +++------
 4 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 app/views/studien/_studium.html.erb

diff --git a/app/views/lvas/_lva_semester.html.erb b/app/views/lvas/_lva_semester.html.erb
index f0babee..96544d5 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">
-<li><b>  <%= link_to lva.name + " " + lva.lvanr.to_s, lva_path(lva) %> </b><br>
-<%= lva.ects %> ECTS/ <%= lva.stunden %> Std </li>
+  <%= link_to lva.name + " / " + lva.lvanr.to_s, lva_path(lva) %>
+<%= lva.ects %> ECTS/ <%= lva.stunden %> Std <%=  " / " + lva.beispiele.count.to_s + " Beispiele"%> 
 </div class="lva_semester"> 
 <% #toolbar_html(@toolbar_elements) %>
diff --git a/app/views/studien/_semesteransicht.html.erb b/app/views/studien/_semesteransicht.html.erb
index ef6f1a0..65af43a 100644
--- a/app/views/studien/_semesteransicht.html.erb
+++ b/app/views/studien/_semesteransicht.html.erb
@@ -10,7 +10,11 @@
     <h2> Ohne Zuordnung </h2>
     <% end %>
     <div class="span<%= sem[:width]%> min-width:13em;">
-      <ul><%= render :partial=>'lvas/lva_semester', :collection=>sem.lvas.sort_by{|n| n[:name]}, :as=>:lva%></ul>
+<ul>      
+<% sem.lvas.sort_by{|n| n[:name]}.each do |l| %>
+      <li><%= render :partial=>'lvas/lva_semester', :locals =>{:lva => l}%>
+<%end%>
+</ul>
     </div>
 <% end %>
 </div>
diff --git a/app/views/studien/_studium.html.erb b/app/views/studien/_studium.html.erb
new file mode 100644
index 0000000..91edd1b
--- /dev/null
+++ b/app/views/studien/_studium.html.erb
@@ -0,0 +1,10 @@
+<div class="studium">
+<b ><%= link_to studium.name + " " + studium.zahl.to_s, studium_path(studium)%></b>(<%=link_to "Modulgruppenansicht", studium_path(studium, :sem=>'false')%>)<br>
+<div>
+<b>Typ: </b><%= studium.typ%>
+</div>
+<p>
+<b>Beschreibung:</b><br>
+<%= studium.desc %>
+</p>
+</div>
diff --git a/app/views/studien/index.html.erb b/app/views/studien/index.html.erb
index 5a09d84..1cd2dcb 100755
--- a/app/views/studien/index.html.erb
+++ b/app/views/studien/index.html.erb
@@ -2,12 +2,9 @@
 
 
 <% @studien.sort_by{|z| z[:zahl]}.each do |studium| %>
-<div>
-
-  <h2><%= link_to studium.zahl + " "+ studium.typ+" " + studium.name, studium_path(studium, :sem=>"true") %></h2>
-  (<%= link_to "Modulansicht", studium_path(studium, :sem=>"false") %>)
-  
-</div>  
+<ul>
+<li><%= render studium%></li>
+</ul>
 <% end %>