From 63bce09e41163f61fc76d1c8a7e9b5dd07810952 Mon Sep 17 00:00:00 2001
From: Thomas Blazek <wtblazek@gmail.com>
Date: Wed, 24 Jul 2013 22:53:16 +0200
Subject: [PATCH] =?UTF-8?q?Anzeige=20der=20Module=20ge=C3=A4ndert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Neues Design, dass mMn durchaus brauchbar ist.
---
 app/views/moduls/index.html.erb | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/views/moduls/index.html.erb b/app/views/moduls/index.html.erb
index 6f22799..766c7bf 100755
--- a/app/views/moduls/index.html.erb
+++ b/app/views/moduls/index.html.erb
@@ -1,9 +1,8 @@
-<h1>Alle Module der Elektrotechnik</h1>
+<h1><%= I18n.t("modul.show.title") %></h1>
 
 <table class="table" >
   <tr>
-    <th>Studium</th>
-    <th>Modulgruppe</th>
+    <th>Modulgruppe (Studium)</th>
     <th>Name</th>
     <th>Desc</th>
     <th></th>
@@ -13,10 +12,17 @@
 
 <% @moduls.each do |modul| %>
   <tr>
-    <td><%= %></td>
-    <td><%= if !modul.modulgruppen.first.nil? 
-modul.modulgruppen.first[:name] 
-end %> </td>
+  <td>  
+    <%modul.modulgruppen.each do |m|%> 
+    
+    
+    <%=m.name unless m.nil? %> (<%=m.studium.name unless m.studium.nil? %>)
+    <!-- Modulgruppenname falls existiert    (Studium falls existiert) -->
+    <br>
+    <% end %>
+
+   </td>
+ 
     <td><%= modul.name %></td>
     <td><%= modul.desc %></td>
     <td><%= link_to 'Show', modul_path(modul) %></td>