This commit is contained in:
Thomas Blazek
2013-07-30 14:42:37 +02:00
parent 9d1b915cd4
commit bbaa9b89dd
3 changed files with 11 additions and 34 deletions

View File

@@ -5,7 +5,7 @@ class StudienController < ApplicationController
def index def index
@studien = Studium.all @studien = Studium.all
@toolbar_elements<<{:icon =>:plus, :text=> I18n.t('studien.new') ,:path=>new_studium_path } @toolbar_elements<<{:icon =>:plus, :text=> I18n.t('studien.new') ,:path=>new_studium_path }
@toolbar_elements<<{:text=> I18n.t('modulgruppe.show.link') ,:path=>modulgruppen_path } # @toolbar_elements<<{:text=> I18n.t('modulgruppe.show.link') ,:path=>modulgruppen_path }
@toolbar_elements<<{:text=> I18n.t('modul.show.link') ,:path=>moduls_path } @toolbar_elements<<{:text=> I18n.t('modul.show.link') ,:path=>moduls_path }
@toolbar_elements<<{:text=> 'Alle LVas auflisten', :path=>lvas_path} @toolbar_elements<<{:text=> 'Alle LVas auflisten', :path=>lvas_path}
end end

View File

@@ -1,6 +1,7 @@
<div class="lva_semester"> <p class="lva_semester">
<%= link_to lva.name + " / " + lva.lvanr.to_s, lva_path(lva) %> <%= 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"%> <%= lva.ects %> ECTS / <%= lva.stunden %> Std <%= " / " + lva.beispiele.count.to_s + " Beispiele"%> <br>
</div class="lva_semester"> <%= 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) %> <% #toolbar_html(@toolbar_elements) %>

View File

@@ -1,31 +1,7 @@
<h1>Listing lvas</h1> <h1>Listing lvas</h1>
<ul>
<table> <% @lvas.each do |l| %>
<tr> <li><%= render :partial => 'lvas/lva_semester', :locals=> {:lva => l} %>
<th>Name</th>
<th>Desc</th>
<th>Ects</th>
<th>Lvanr</th>
<th>Stunden</th>
<th></th>
<th></th>
<th></th>
</tr>
<% @lvas.each do |lva| %>
<tr>
<td><%= lva.name %></td>
<td><%= lva.desc %></td>
<td><%= lva.ects %></td>
<td><%= lva.lvanr %></td>
<td><%= lva.stunden %></td>
<td><%= link_to 'Show', lva %></td>
<td><%= link_to 'Edit', edit_lva_path(lva) %></td>
<td><%= link_to 'Destroy', lva, method: :delete, data: { confirm: 'Are you sure?' } %></td>
</tr>
<%end%> <%end%>
</table> </ul>
<br />
<%= link_to 'New Lva', new_lva_path %> <%= link_to 'New Lva', new_lva_path %>