From c6e75842537280e6d31832e51e9a40635d995ca5 Mon Sep 17 00:00:00 2001
From: Thomas Blazek <wtblazek@gmail.com>
Date: Thu, 25 Jul 2013 20:10:25 +0200
Subject: [PATCH] =?UTF-8?q?Layout=20=C3=A4nderungen=20f=C3=BCr=20Modul=20u?=
 =?UTF-8?q?nd=20Modulgruppenindex?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Tabellenformatierung durch render-div kombination ersetzt, modul/lang-
version für Modulanzeige mit Modulgruppen eingefügt
---
 app/views/modulgruppen/index.html.erb | 22 +-----------------
 app/views/moduls/_lang.html.erb       | 32 ++++++++++++++++++++++++++
 app/views/moduls/index.html.erb       | 33 ++-------------------------
 3 files changed, 35 insertions(+), 52 deletions(-)
 create mode 100755 app/views/moduls/_lang.html.erb

diff --git a/app/views/modulgruppen/index.html.erb b/app/views/modulgruppen/index.html.erb
index 871c406..fb37c87 100755
--- a/app/views/modulgruppen/index.html.erb
+++ b/app/views/modulgruppen/index.html.erb
@@ -1,29 +1,9 @@
 <h1><%= I18n.t("modulgruppe.show.title")%></h1>
 
-<table>
-  <tr>
-    <th>Type</th>
-    <th>Phase</th>
-    <th>Studium</th>
-    <th>Name</th>
-    <th></th>
-    <th></th>
-    <th></th>
-  </tr>
 
 <% @modulgruppen.sort_by{|n| n[:name]}.each do |modulgruppe| %>
-  <tr>
-    <td><%= modulgruppe.typ %></td>
-    <td><%= modulgruppe.phase %></td>
-    <td><%= modulgruppe.studium.name unless modulgruppe.studium.nil? %></td>
-    <td><%= modulgruppe.name %></td>
-    <td><%= link_to 'Show', modulgruppe %></td>
-    <td><%= link_to 'Edit', edit_modulgruppe_path(modulgruppe) %></td>
-    <td><%= link_to 'Destroy', modulgruppe, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-  </tr>
+ <%= render modulgruppe%>
 <% end %>
-</table>
-
 <br>
 <% if !@studium.nil? %>
 <%= link_to 'New Modulgruppe', new_studium_modulgruppe_path(@studium) %>
diff --git a/app/views/moduls/_lang.html.erb b/app/views/moduls/_lang.html.erb
new file mode 100755
index 0000000..1dbb929
--- /dev/null
+++ b/app/views/moduls/_lang.html.erb
@@ -0,0 +1,32 @@
+<div style="border: solid 1px; padding:2px"><p>
+  <b><%= 
+if modul.name.nil? 
+name=""
+else
+name=modul.name
+end
+link_to "Modul "+name , modul_path(modul) %> </b>
+</p>
+<p>
+  <%= raw(modul.desc) %>
+</p>
+LVAs: 
+
+<ul>
+
+<% modul.lvas.each do |lv| %>
+<li>
+<%= link_to  lv.name.to_s, lva_path(lv.id)  %>
+</li>
+<% end %>
+
+</ul>
+
+Modulgruppen:
+<ul>
+<% modul.modulgruppen.each do |mg| %>
+<li> <%=mg.name%> (<%= mg.studium.name unless mg.studium.nil?%>)</li>
+<%end%>
+</ul>
+<% # @toolbar_elements << {:icon=>:pencil,:text=>I18n.t("common.edit"),:path=> edit_modul_path(modul)} %>
+</div>
diff --git a/app/views/moduls/index.html.erb b/app/views/moduls/index.html.erb
index 933d4a7..98ade7d 100755
--- a/app/views/moduls/index.html.erb
+++ b/app/views/moduls/index.html.erb
@@ -1,36 +1,7 @@
+
 <h1><%= I18n.t("modul.show.title") %></h1>
 
-<table class="table" >
-  <tr>
-    <th>Modulgruppe (Studium)</th>
-    <th>Name</th>
-    <th>Desc</th>
-    <th></th>
-    <th></th>
-    <th></th>
-  </tr>
-
-<% @moduls.sort_by{|n| n[:name]}.each do |modul| %>
-  <tr>
-  <td>  
-    <%modul.modulgruppen.sort_by{|n| n[:name]}.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>
-    <td><%= link_to 'Edit', edit_modul_path(modul) %></td>
-    <td><%= link_to 'Destroy', [modul], method: :delete, data: { confirm: 'Are you sure?' } %></td>
-  </tr>
-<% end %>
-</table>
+<%= render :partial=>'moduls/lang', :collection=>@moduls, :as=>:modul%>
 
 <br />
 <% #if !@studium.nil? %>