From 05ed9da9c42ae6f1655fb64fbab4e300c7e88beb Mon Sep 17 00:00:00 2001
From: Thomas Blazek <wtblazek@gmail.com>
Date: Sun, 4 Aug 2013 15:20:20 +0200
Subject: [PATCH] List views

---
 app/controllers/beispiele_controller.rb |  2 ++
 app/controllers/moduls_controller.rb    | 11 ++++++-
 app/views/beispiele/index.html.erb      |  2 +-
 app/views/lvas/_lva_semester.html.erb   |  7 +++--
 app/views/lvas/show.html.erb            | 40 ++++++++++++++-----------
 app/views/moduls/show.html.erb          |  1 +
 6 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/app/controllers/beispiele_controller.rb b/app/controllers/beispiele_controller.rb
index d0a8146..8e8d5fb 100755
--- a/app/controllers/beispiele_controller.rb
+++ b/app/controllers/beispiele_controller.rb
@@ -2,6 +2,7 @@ class BeispieleController < ApplicationController
   # GET /beispiele
   # GET /beispiele.json
   def index
+    @lva = params([:lva])
     @beispiele = Beispiel.all
 
     respond_to do |format|
@@ -13,6 +14,7 @@ class BeispieleController < ApplicationController
   # GET /beispiele/1
   # GET /beispiele/1.json
   def show
+    @lva = lva unless lva.nil?
     @beispiel = Beispiel.find(params[:id])
 
     respond_to do |format|
diff --git a/app/controllers/moduls_controller.rb b/app/controllers/moduls_controller.rb
index 49c0168..c1ae1f1 100755
--- a/app/controllers/moduls_controller.rb
+++ b/app/controllers/moduls_controller.rb
@@ -37,7 +37,7 @@ class ModulsController < ApplicationController
     @modul = Modul.new
     modulgruppe=Modulgruppe.find_by_id(params[:modulgruppen_id])
     if !modulgruppe.nil?
-      @modul.modulgruppen<<modulgruppe 
+      @modul.modulgruppen<<modulgruppe #
     end
     respond_to do |format|
       format.html # new.html.erb
@@ -61,6 +61,9 @@ class ModulsController < ApplicationController
     
     respond_to do |format|
       if @modul.save
+        for i in @modul.lvas
+          i.add_semesters
+          end
         format.html { redirect_to modulgruppe_path(@modul.modulgruppen.first), notice: 'Modul was successfully created.' }
         format.json { render json: @modul, status: :created, location: @modul }
       else
@@ -78,6 +81,9 @@ class ModulsController < ApplicationController
 
     respond_to do |format|
       if @modul.update_attributes(params[:modul])
+        for i in @modul.lvas
+          i.add_semesters
+          end
         format.html { redirect_to url_for(@modul), notice: 'Modul was successfully updated.' }
         format.json { head :no_content }
       else
@@ -93,6 +99,9 @@ class ModulsController < ApplicationController
     
     @modul = Modul.find(params[:id])
     modulgruppe=@modul.modulgruppen.first
+    for i in @modul.lvas
+          i.add_semesters
+          end
     @modul.destroy
 
 
diff --git a/app/views/beispiele/index.html.erb b/app/views/beispiele/index.html.erb
index 7f175a8..89bee7d 100755
--- a/app/views/beispiele/index.html.erb
+++ b/app/views/beispiele/index.html.erb
@@ -1,4 +1,4 @@
-<h1>Listing beispiele</h1>
+<h1><%= I18n.t("beispiele.list")</h1>
 <ul>
 <% @beispiele.each do |beispiel| %>
 <li>
diff --git a/app/views/lvas/_lva_semester.html.erb b/app/views/lvas/_lva_semester.html.erb
index 8545843..3c04128 100755
--- a/app/views/lvas/_lva_semester.html.erb
+++ b/app/views/lvas/_lva_semester.html.erb
@@ -1,7 +1,10 @@
 
 <p class="lva_semester">
-  <%= link_to lva.name, lva_path(lva)%><br><%="LVa-Nr " + lva.lvanr.to_s %>
-  <%= lva.ects %> ECTS / <%= lva.stunden %> Std <%=  " / " + lva.beispiele.count.to_s + " Beispiele"%> <br>
+  <b><%= link_to lva.name, lva_path(lva)%></b>
+  (|<% 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>
+  <%="LVa-Nr " + lva.lvanr.to_s %>
+  <%= lva.ects %> ECTS / <%= lva.stunden %> Std <% " / " + lva.beispiele.count.to_s + " Beispiele"%> <br>
   <%= link_to "Edit", edit_lva_path(lva) %> | <%= link_to "Beispiel hinzufügen", new_beispiel_path(:lva_id=>lva.id) %>
 </p class="lva_semester"> 
 <% #toolbar_html(@toolbar_elements) %>
diff --git a/app/views/lvas/show.html.erb b/app/views/lvas/show.html.erb
index 9dd333c..df3bb49 100755
--- a/app/views/lvas/show.html.erb
+++ b/app/views/lvas/show.html.erb
@@ -1,28 +1,34 @@
-<% @lva.modul.each do |modul| %>
-<% modul.modulgruppen.each do |g| %>
-<ul class="breadcrumb">
-<li><%= link_to g.studium.name , studium_semesteransicht_path(g.studium)%>
-<span class="divider">/</span></li>
-<li><%= link_to g.name , modulgruppe_path(g)%><span class="divider">/</span></li>
-<li><%= link_to modul.name , modul_path(modul)%></li>
-<% end %>
-</ul>
-<% end %>
-
+<%= render 'layouts/link_all'%>
 <p id="notice"><%= notice %></p>
 <p>
 
-	<h2><%= @lva.lvanr %><%= @lva.name %> <%= @lva.ects %> ECTS/ <%= @lva.stunden %> Std</h2>
-	
+  <h2><%= @lva.lvanr %><%= @lva.name %> <%= @lva.ects %> ECTS/ <%= @lva.stunden %> Std</h2>
+  
 </p>
-<p>
+
+  <p><h4>Beschreibung</h4>
   <%= @lva.desc %>
 </p>
+<h4>Beispiele</h4>
 <ul>
-<% @lva.beispiele.each do |b|%>
+  <% @lva.beispiele.each do |b|%>
 
-<li><%= render b%></li>
+    <li><%= render b%></li>
 
-<% end %>
+  <% end %>
+</ul>
+<h4>Module</h4>
+<ul>
+  <% @lva.modul.each do |modul| %>
+    <li><b><%= link_to modul.name , modul_path(modul)%></b>
+	<ul>
+      <% modul.modulgruppen.each do |g| %>
+
+	<li><%= link_to g.studium.name , studium_semesteransicht_path(g.studium)%> (<%=link_to g.name, modulgruppe_path(g)%>)</li>
+      <% end %>
+      </ul>
+    </li>
+    
+  <% end %>
 </ul>
 <%= render 'layouts/pretty_toolbar' %>
diff --git a/app/views/moduls/show.html.erb b/app/views/moduls/show.html.erb
index 45f598a..cfaff5b 100755
--- a/app/views/moduls/show.html.erb
+++ b/app/views/moduls/show.html.erb
@@ -15,6 +15,7 @@
       <li>Modulgruppe Fehlt
     <%end %>
      <span class="divider">/</span> </li>
+     <br>
     <%end%>
    
 </ul>