Merge remote-tracking branch 'hausdorff/master'

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|

app/controllers/lvas_controller.rb

@@ -4,6 +4,9 @@ class LvasController < ApplicationController
   def index
     @lvas = Lva.all
     @toolbar_elements=[{:hicon=>'icon-plus-sign',:text =>I18n.t('lva.add'),:path => new_lva_path}]
+    @tb=[{:hicon=>'icon-list', :text=>I18n.t("studien.allestudien"),:path=>studien_path},
+         {:hicon=>'icon-list', :text=>I18n.t("modul.list"),:path=>moduls_path},
+         {:hicon=>'icon-list', :text=>I18n.t("lva.list"),:path=>lvas_path}]
   end
 
   # GET /lvas/1
@@ -20,7 +23,7 @@ class LvasController < ApplicationController
   def new
     @lva = Lva.new
     modul=Modul.find_by_id(params[:modul_id])
-    @lva.modul<<modul unless modul.nil?
+    @lva.modul<<modul unless modul.nil? #
     
   end
 
@@ -33,10 +36,10 @@ class LvasController < ApplicationController
   # POST /lvas.json
   def create
     @lva = Lva.new(params[:lva])
-    @lva.add_semesters
+ 
     respond_to do |format|
       if @lva.save
-        
+         @lva.add_semesters
         format.html { redirect_to @lva, notice: 'Lva was successfully created.' }
         
       else
@@ -53,7 +56,7 @@ class LvasController < ApplicationController
     
     respond_to do |format|
       if @lva.update_attributes(params[:lva])
-        Lva.add_semesters(@lva)
+        @lva.add_semesters
         format.html { redirect_to @lva, notice: 'Lva was successfully updated.' }
  
       else

app/controllers/modulgruppen_controller.rb

@@ -56,7 +56,6 @@ class ModulgruppenController < ApplicationController
     else
       @studium=Studium.find_by_id(params[:modulgruppe][:studium_id]) 
     end
- @modulgruppe.studium_id = params[:studium_id]
     respond_to do |format|
          
       if @modulgruppe.save

app/controllers/moduls_controller.rb

@@ -8,12 +8,16 @@ class ModulsController < ApplicationController
         @studium=Studium.find_by_id(params[:studium_id])
       end
       @toolbar_elements = [{:hicon=>'icon-plus-sign', :text=>I18n.t("modul.add"), :path=>new_modul_path}]
+      @topbar_elements=[{:hicon=>'icon-list', :text=>I18n.t("studien.allestudien"),:path=>studien_path}]
+      @topbar_elements<<{:hicon=>'icon-list', :text=>I18n.t("modul.list"),:path=>moduls_path}
+      @topbar_elements<<{:hicon=>'icon-list', :text=>I18n.t("lva.list"),:path=>lvas_path}
 
       respond_to do |format|
         format.html # index.html.erb
         format.json { render json: @moduls }
       end
     end
+    
   end
 
   # GET /moduls/1
@@ -24,11 +28,24 @@ class ModulsController < ApplicationController
     @toolbar_elements << {:hicon=>'icon-pencil', :text=>I18n.t("modul.edit"), :path=>edit_modul_path(@modul)}
     @toolbar_elements << {:hicon=>'icon-remove-circle', :text=>I18n.t("common.delete"),:path=>@modul , :method=>:delete , :data=>{:confirm =>'Are you sure'}}
 
+    
+    @topbar_elements = [{:hicon=>'icon-list', :text=>I18n.t("modul.list"),:path=>moduls_path}]
+          
+      @topbar_elements <<{:newline=>true}
+    for i in @modul.modulgruppen
+      if  !i.studium.nil?
+      name =i.studium.name
+      id = i.studium.id
+        else
+         s.name = 'Kein Studium vorhanden'
+        s.id = nil
+        end
+      @topbar_elements <<{:text=> i.name + ' ('+i.studium.name + ')', :path=>studium_modulgruppen_path(i)}
+      end
     respond_to do |format|
       format.html # show.html.erb
       format.json { render json: @modul }
     end
-  
   end
 
   # GET /moduls/new
@@ -37,7 +54,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 +78,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 +98,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 +116,9 @@ class ModulsController < ApplicationController
     
     @modul = Modul.find(params[:id])
     modulgruppe=@modul.modulgruppen.first
+    for i in @modul.lvas
+      i.add_semesters
+    end
     @modul.destroy
 
 

app/controllers/studien_controller.rb

@@ -1,14 +1,17 @@
 class StudienController < ApplicationController
-  before_filter {@toolbar_elements =[]} 
+before_filter {@toolbar_elements =[]} 
 
 
-  def index
+def index
   @studien = Studium.all
+  @topbar_elements=[{:hicon=>'icon-list', :text=>I18n.t("studien.allestudien"),:path=>studien_path}]
+  @topbar_elements<<{:hicon=>'icon-list', :text=>I18n.t("modul.list"),:path=>moduls_path}
+  @topbar_elements<<{:hicon=>'icon-list', :text=>I18n.t("lva.list"),:path=>lvas_path}
   @toolbar_elements<<{:icon =>:plus, :hicon=>'icon-plus-sign', :text=> I18n.t('studien.new') ,:path=>new_studium_path }
   # @toolbar_elements<<{:text=> I18n.t('modulgruppe.show.link') ,:path=>modulgruppen_path }
-  end
+end
 
-  def show
+def show
   @studium= Studium.find(params[:id])
   @text = 'Zu Semesteransicht wechseln'
   @path = studium_semesteransicht_path(@studium)
@@ -26,14 +29,25 @@ class StudienController < ApplicationController
     modulgruppen =[]
     modulgruppen_phase.each_slice(opts[:slice]) do |s| 
       modulgruppen<<s #
+
       end
       @studienphasen << {:modulgruppen=>modulgruppen, :phase => ph}.merge(opts)
     end
-    @toolbar_elements=[{:icon=>:plus, :hicon =>'icon-plus-sign' ,:text=> I18n.t('studien.new') , :path => new_studium_path(@studium) }]
+    
-    @toolbar_elements<<{:icon=>:pencil, :hicon=>'icon-pencil',:text =>I18n.t('common.edit'),:path => edit_studium_path(@studium)}
+    @toolbar_elements=[{:icon=>:plus, :hicon =>'icon-plus-sign' ,:text=> I18n.t('studien.new') , :path => new_studium_path(@studium) },
-    @toolbar_elements<<{:hicon=>'icon-remove-circle', :text=> I18n.t('common.delete'),:path => studium_path(@studium), :method=> :delete,:confirm=>"Sure?" }
+                       {:icon=>:pencil, :hicon=>'icon-pencil',:text =>I18n.t('common.edit'),:path => edit_studium_path(@studium)},
-    @toolbar_modulgruppen =[ {:hicon=>'icon-plus-sign', :text=> I18n.t('modulgruppe.new'), :path=>new_studium_modulgruppe_path(@studium)}]
+                       {:hicon=>'icon-remove-circle', :text=> I18n.t('common.delete'),:path => studium_path(@studium), :method=> :delete,:confirm=>"Sure?" }]
-    @toolbar_modulgruppen << {:hicon=>'icon-list', :text => I18n.t('modulgruppe.list'), :path=>modulgruppen_path}
+
+    @toolbar_modulgruppen =[ {:hicon=>'icon-plus-sign', :text=> I18n.t('modulgruppe.new'), :path=>new_studium_modulgruppe_path(@studium)},
+                             {:hicon=>'icon-list', :text => I18n.t('modulgruppe.list'), :path=>modulgruppen_path}]
+    
+    @topbar_elements = [ {:hicon=>'icon-list', :text=>I18n.t("studien.allestudien"), :path=>studien_path},
+                         {:text=>'Zur Semesteransicht wechseln', :path=>studium_semesteransicht_path(@studium)},
+                         {:newline=>true}]
+    for i in Studium.all
+      @topbar_elements << {:text=>i.name, :path=>studium_path(i)}
+    end
+    
   end
 
   def new
@@ -79,9 +93,18 @@ class StudienController < ApplicationController
     end
     @text = 'Zu Modulgruppenansicht wechseln'
     @path = studium_path(@studium)
-    @toolbar_elements=[{:icon=>:plus, :hicon =>'icon-plus-sign' ,:text=> I18n.t('studien.new') , :path => new_studium_path(@studium) }]
+    @topbar_elements = [ {:hicon=>'icon-list', :text=>I18n.t("studien.allestudien"), :path=>studien_path},
-    @toolbar_elements<<{:icon=>:pencil, :hicon=>'icon-pencil',:text =>I18n.t('common.edit'),:path => edit_studium_path(@studium)}
+                         {:text=>'Zur Modulgruppenansicht wechseln', :path=>studium_path(@studium)},
-    @toolbar_elements<<{:hicon=>'icon-remove-circle', :text=> I18n.t('common.delete'),:path => studium_path(@studium), :method=> :delete,:confirm=>"Sure?" }
+                         {:newline=>true}]
+    for i in Studium.all
+      @topbar_elements << {:text=>i.name, :path=>studium_semesteransicht_path(i)}
+    end
+    
+
+    
+    @toolbar_elements = [ {:icon=>:plus, :hicon =>'icon-plus-sign' ,:text=> I18n.t('studien.new') , :path => new_studium_path(@studium) },
+                          {:icon=>:pencil, :hicon=>'icon-pencil',:text =>I18n.t('common.edit'),:path => edit_studium_path(@studium)},
+                          {:hicon=>'icon-remove-circle', :text=> I18n.t('common.delete'),:path => studium_path(@studium), :method=> :delete,:confirm=>"Sure?" }]
   end
 
   def destroy

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>

app/views/layouts/_topbar.html.erb

@@ -0,0 +1,11 @@
+<% topbar = !topbar.nil? ? topbar : @topbar_elements %>
+<ul class="breadcrumb">
+  <% topbar.each do |tb| %>
+    <% if tb[:newline]%>
+      <br>
+    <% else %>
+      <li>
+	<%= link_to_unless_current '<i class="'.html_safe + tb[:hicon].to_s.html_safe + '"></i>'.html_safe+ tb[:text], tb[:path] %><span class="divider">/</span></li>
+    <% end %>
+  <% end %>
+</ul>

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 %>
+  <b><%= link_to lva.name, lva_path(lva)%></b>
-  <%= lva.ects %> ECTS / <%= lva.stunden %> Std <%=  " / " + lva.beispiele.count.to_s + " Beispiele"%> <br>
+  (|<% 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) %>

app/views/lvas/index.html.erb

@@ -1,4 +1,4 @@
-<%= render 'layouts/link_all' %>
+<%= render :partial=>'layouts/topbar', :object=>@tb %>
 <h1><%= I18n.t("lva.list")%></h1>
 <ul>
 <% @lvas.each do |l| %>

app/views/lvas/show.html.erb

@@ -1,28 +1,34 @@
-<% @lva.modul.each do |modul| %>
+<%= render 'layouts/link_all'%>
-<% modul.modulgruppen.each do |g| %>
-<ul class="breadcrumb">
-<li><%= link_to g.studium.name , studium_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 %>
-
 <p id="notice"><%= notice %></p>
 <p>
 
   <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' %>

app/views/moduls/index.html.erb

@@ -1,4 +1,4 @@
-<%= render 'layouts/link_all' %>
+<%= render 'layouts/topbar' %>
 <h1><%= I18n.t("modul.list") %></h1>
 
 <%= render :partial=>'moduls/lang', :collection=>@moduls, :as=>:modul%>

app/views/moduls/show.html.erb

@@ -1,23 +1,4 @@
-
+<%= render 'layouts/topbar'%>
-<ul class="breadcrumb">
-  <% @modul.modulgruppen.each do |g| %>
-    <% if !g.nil? %>
-      <li>
-	<% if !g.studium.nil? %>
-	  <%= link_to g.studium.name  , studium_path(g.studium) %> 
-	  
-	<% else %>
-	  <li>Studium fehlt!
-	<% end %>
-	<span class="divider">/</span></li>
-      <li><%= link_to g.name , modulgruppe_path(g)%>
-      <% else %>
-      <li>Modulgruppe Fehlt
-    <%end %>
-     <span class="divider">/</span> </li>
-    <%end%>
-   
-</ul>
 
 <p id="notice"><%= notice %></p>
 <%= render @modul %>

app/views/studien/_navigation.html.erb

@@ -8,9 +8,9 @@
   <% Studium.all.each do |s| %>
     <li>
       <% if @sem=='true' %>
-	<%= link_to s.name, studium_semesteransicht_path(s) %>
+	<%= link_to_unless_current s.name, studium_semesteransicht_path(s) %>
       <% else %>
-	<%= link_to s.name, studium_path(s) %>
+	<%= link_to_unless_current s.name, studium_path(s) %>
       <% end %>
       <span class="divider">/</span></li>
 </li>

app/views/studien/index.html.erb

@@ -1,4 +1,4 @@
-<%= render 'layouts/link_all' %>
+<%= render 'layouts/topbar' %>
 <h1><%= I18n.t("studien.list") %></h1>
 
 

app/views/studien/semesteransicht.html.erb

@@ -1,4 +1,4 @@
-<%= render :partial=>'studien/navigation'%>
+<%= render :partial=>'layouts/topbar'%>
 
 <h1><%= @studium.typ %> <%= @studium.name %>  (<%= @studium.zahl %>)</h1>
 <%= raw(@studium.desc) %>

app/views/studien/show.html.erb

@@ -1,9 +1,10 @@
-<%= render :partial=>'studien/navigation'%>
+<%= render 'layouts/topbar'%>
 <div class="container-fluid">
   <div class="row-fluid">
     <p id="notice"><%= notice %></p>
     <h1><%= @studium.typ %> <%= @studium.name %>  (<%= @studium.zahl %>)</h1>
   </div>
+  <div>
   <%= raw(@studium.desc) %>
   <% @studienphasen.each do |sp| %>
     <% sp[:modulgruppen].each do |row| %>
@@ -16,6 +17,7 @@
       </div>
     <% end %>
   <% end %>
-  <%= render 'layouts/pretty_toolbar' %><br>
    <%= render :partial=>'layouts/pretty_toolbar', :object=>@toolbar_modulgruppen %>
+   </div>
+  <%= render 'layouts/pretty_toolbar' %>
 </div>

db/migrate/20130729085446_create_lva_semester_join_table.rb

@@ -4,18 +4,11 @@ class CreateLvaSemesterJoinTable < ActiveRecord::Migration
       t.integer  :lva_id
       t.integer  :semester_id
     end
-    add_index :lva_semesters, [:lva_id, :semester_id]
+    add_index :lvas_semesters, [:lva_id, :semester_id]
-    add_index :lva_semesters, :semester_id
+    add_index :lvas_semesters, :semester_id
-  end
-  def change
-    create_table :lvas_semesters, :id=>false do |t|
-      t.integer  :lva_id
-      t.integer  :semester_id
-    end
-    add_index :lva_semesters, [:lva_id, :semester_id]
-    add_index :lva_semesters, :semester_id
   end
+
   def self.down
-    drop_table :lva_semesters
+    drop_table :lvas_semesters
   end
 end