andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/andreassteph/fetsite

Browse Source 
Beispiel.lva bei neues Beispiel resolved
Conflicts:
	app/controllers/beispiele_controller.rb
This commit is contained in:
Andreas Stephanides
2013-08-05 14:55:55 +02:00
parent 988efd9e6a e9799d75d6
commit b990151bde
57 changed files with 776 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/views/beispiele/_beispiel_list.html.erb Normal file
View File

@@ -0,0 +1,19 @@
<div class="beispiel">
<p>
<b>
<%=link_to beispiel.name, beispiel.beispieldatei.url%>
</b>
<p>
Beschreibung:
<p>
<%= beispiel.desc %>
</p>
<p>
LVA: <%=link_to beispiel.lva.name, lva_path(beispiel.lva.id)%>
</p>
<%= link_to 'Show', beispiel %>
<%= link_to 'Edit', edit_beispiel_path(beispiel) %>
<%= link_to 'Destroy', beispiel, method: :delete, data: { confirm: 'Are you sure?' } %>
</div class="beispiel">

2
app/views/beispiele/_form.html.erb
View File

@@ -4,7 +4,7 @@
<%= f.input :desc %>
<%= f.file_field :beispieldatei %>
<%= f.hidden_field :beispieldatei_cache %>
<%= f.input :lva, :as=>:radio, :collection => Lva.all%>
<%= f.input :lva, :as=>:select, :collection => Lva.all%>
<% end %>
<%= f.actions do %>

27
app/views/beispiele/index.html.erb
View File

@@ -1,25 +1,10 @@
<h1>Listing beispiele</h1>
<table>
<tr>
<th>Name</th>
<th>Desc</th>
<th></th>
<th></th>
<th></th>
</tr>
<h1><%= I18n.t("beispiele.list")</h1>
<ul>
<% @beispiele.each do |beispiel| %>
<tr>
<td><%= beispiel.name %></td>
<td><%= beispiel.desc %></td>
<td><%= link_to 'Show', beispiel %></td>
<td><%= link_to 'Edit', edit_beispiel_path(beispiel) %></td>
<td><%= link_to 'Destroy', beispiel, method: :delete, data: { confirm: 'Are you sure?' } %></td>
</tr>
<li>
<%= render :partial=> "beispiele/beispiel_list", :object => beispiel, :as=>:beispiel%>
<% end %>
</table>
<br />
</li>
</ul>
<%= link_to 'New Beispiel', new_beispiel_path %>

11
app/views/layouts/_link_all.html.erb Executable file
View File

@@ -0,0 +1,11 @@
<ul class="breadcrumb">
<li> <%= link_to_unless_current '<i class="icon-list"></i>'.html_safe+ I18n.t("studien.allestudien"), studien_path,:raw=>true %>
<span class="divider">/</span></li>
<li> <%= link_to_unless_current '<i class="icon-list"></i>'.html_safe+ I18n.t("modul.list"), moduls_path,:raw=>true %>
<span class="divider">/</span></li>
<li> <%= link_to_unless_current '<i class="icon-list"></i>'.html_safe+ I18n.t("lva.list"), lvas_path,:raw=>true %>
<span class="divider">/</span></li>
</ul>

7
app/views/layouts/_pretty_toolbar.html.erb Normal file
View File

@@ -0,0 +1,7 @@
<% toolbar_elements = !pretty_toolbar.nil? ? pretty_toolbar : @toolbar_elements %>
<span class="label"><%= I18n.t("common.actions")%></span>
<div class="btn-group">
<% toolbar_elements.each do |t| %>
<%= link_to '<i class="'.html_safe+ t[:hicon].to_s.html_safe + '"></i>'.html_safe+t[:text], t[:path], :method=>t[:method], :confirm=>t[:confirm].to_s, :data=>t[:data], :class=>"btn" %>
<% end %>
</div>

11
app/views/layouts/_topbar.html.erb Executable file
View File

@@ -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].html_safe, tb[:path] %><span class="divider">/</span></li>
<% end %>
<% end %>
</ul>

1
app/views/lvas/_form.html.erb
View File

@@ -1,5 +1,6 @@
<%= semantic_form_for @lva do |f| %>
<%= f.inputs do %>
<%= f.input :semester, :collection=>Semester.all.sort_by{|n| [:name]}%>
<%= f.input :modul %>
<%= f.input :name %>
<%= f.input :ects %>

28
app/views/lvas/_lva.html.erb Executable file
View File

@@ -0,0 +1,28 @@
<% @lva.modul.each do |modul| %>
<% 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>
<%= @lva.lvanr %>
<b><%= @lva.name %> <%= @lva.ects %> ECTS/ <%= @lva.stunden %> Std</b>
</p>
<p>
<%= @lva.desc %>
</p>
<ul>
<% @lva.beispiele.each do |b|%>
<li><%= render b%></li>
<% end %>
</ul>
<%= toolbar_html(@toolbar_elements) %>

10
app/views/lvas/_lva_semester.html.erb Executable file
View File

@@ -0,0 +1,10 @@
<p class="lva_semester">
<b><%= link_to lva.name, lva_path(lva)%></b><br>
Module: /<% 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) %>

39
app/views/lvas/index.html.erb
View File

@@ -1,31 +1,8 @@
<h1>Listing lvas</h1>
<table>
<tr>
<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 %>
</table>
<br />
<%= link_to 'New Lva', new_lva_path %>
<%= render :partial=>'layouts/topbar', :object=>@tb %>
<h1><%= I18n.t("lva.list")%></h1>
<ul>
<% @lvas.each do |l| %>
<li><%= render :partial => 'lvas/lva_semester', :locals=> {:lva => l} %>
<%end%>
</ul>
<%= render 'layouts/pretty_toolbar' %>

44
app/views/lvas/show.html.erb
View File

@@ -1,30 +1,36 @@
<% @lva.modul.each do |modul| %>
<% 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 %>
<%= render 'layouts/topbar'%>
<p id="notice"><%= notice %></p>
<p>
<%= @lva.lvanr %>
<b><%= @lva.name %> <%= @lva.ects %> ECTS/ <%= @lva.stunden %> Std</b>
<h2><%= @lva.lvanr %><%= @lva.name %> <%= @lva.ects %> ECTS/ <%= @lva.stunden %> Std</h2>
</p>
<p>
<p><h4>Beschreibung</h4>
<%= @lva.desc %>
<%= link_to "Beispiel neu" , new_beispiel_path(:lva_id=>@lva.id) %>
</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>
<%= toolbar_html(@toolbar_elements) %>
<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' %>

22
app/views/modulgruppen/index.html.erb
View File

@@ -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) %>

3
app/views/moduls/_form.html.erb
View File

@@ -1,7 +1,8 @@
<%= semantic_form_for @modul do |f| %>
<%= f.inputs do %>
<%= f.input :modulgruppen,:as => :select, :collection => Hash[Modulgruppe.all.map{|m| [m.studium.name + " " + m.name,m.id]}] %>
<% # f.input :modulgruppen,:as => :select, :collection => Hash[Modulgruppe.all.map{|m| [m.studium.name + " " + m.name,m.id]}] %>
<%= f.input :modulgruppen %>
<%= f.input :name ,:hint=>true%>
<%= f.input :desc, :as=>:tinymce_text %>
<%= f.input :depend %>

32
app/views/moduls/_lang.html.erb Executable file
View File

@@ -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>

41
app/views/moduls/index.html.erb
View File

@@ -1,39 +1,8 @@
<h1><%= I18n.t("modul.show.title") %></h1>
<%= render 'layouts/topbar' %>
<h1><%= I18n.t("modul.list") %></h1>
<table class="table" >
<tr>
<th>Modulgruppe (Studium)</th>
<th>Name</th>
<th>Desc</th>
<th></th>
<th></th>
<th></th>
</tr>
<%= render :partial=>'moduls/lang', :collection=>@moduls, :as=>:modul%>
<% @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>
<br />
<% #if !@studium.nil? %>
<%= link_to 'New Modul', new_modul_path() %>
<% #end%>
<br>
<%= render 'layouts/pretty_toolbar'%>

19
app/views/moduls/show.html.erb
View File

@@ -1,16 +1,9 @@
<% @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)%></li>
<%end%>
</ul>
<%= render 'layouts/topbar'%>
<%= render 'layouts/topbar', :topbar=>@tb%>
<p id="notice"><%= notice %></p>
<%= render @modul %>
<%= link_to 'Add LVA', new_lva_path(:modul_id =>@modul.id) %>
<%= link_to '<i class="icon-pencil"></i>'.html_safe+ I18n.t("common.edit") , edit_modul_path(@modul) %>
<%= link_to "Loeschen", [@modul],:method=>:delete ,:data => {:confirm =>"Are you sure" } %>
<%= render 'layouts/pretty_toolbar' %>
<% # link_to 'Add LVA', %>
<% # link_to '<i class="icon-pencil"></i>'.html_safe+ I18n.t("common.edit") , edit_modul_path(@modul) %>
<% # link_to "Loeschen", [@modul],:method=>:delete ,:data => {:confirm =>"Are you sure" } %>

4
app/views/semesters/_form.html.erb
View File

@@ -2,8 +2,8 @@
<%= f.inputs do %>
<%= f.input :name %>
<%= f.input :nummer %>
<%= f.input :ws %>
<%= f.input :ss %>
<%= f.input :ssws %>
<%= f.input :lvas %>
<% end %>
<%= f.actions do %>

4
app/views/semesters/index.html.erb
View File

@@ -15,8 +15,8 @@
<tr>
<td><%= semester.name %></td>
<td><%= semester.nummer %></td>
<td><%= semester.ws %></td>
<td><%= semester.ss %></td>
<td><%= semester.ssws %></td>
<td><% %></td>
<td><%= link_to 'Show', semester %></td>
<td><%= link_to 'Edit', edit_semester_path(semester) %></td>
<td><%= link_to 'Destroy', semester, method: :delete, data: { confirm: 'Are you sure?' } %></td>

15
app/views/semesters/show.html.erb
View File

@@ -1,25 +1,20 @@
<p id="notice"><%= notice %></p>
<p>
<b>Name:</b>
<%= @semester.name %>
<b>Name:</b> <%= @semester.name %>
</p>
<p>
<b>Nummer:</b>
<%= @semester.nummer %>
<b>Nummer:</b> <%= @semester.nummer %>
</p>
<p>
<b>Ws:</b>
<%= @semester.ws %>
<b>WS/SS?:</b> <%= @semester.ssws %>
</p>
<p>
<b>Ss:</b>
<%= @semester.ss %>
<%= render :partial =>'lvas/lva_semester', :collection=>@semester.lvas, :as=>:lva%>
</p>
<%= link_to 'Edit', edit_semester_path(@semester) %> |
<%= link_to 'Back', semesters_path %>

20
app/views/studien/_navigation.html.erb Executable file
View File

@@ -0,0 +1,20 @@
<ul class="breadcrumb">
<li> <%= link_to '<i class="icon-list"></i>'.html_safe+ I18n.t("studien.allestudien"), studien_path,:raw=>true %>
<span class="divider">/</span></li>
<li> <%= link_to @text, @path%>
<span class="divider">/</span></li>
<br>
<% Studium.all.each do |s| %>
<li>
<% if @sem=='true' %>
<%= link_to_unless_current s.name, studium_semesteransicht_path(s) %>
<% else %>
<%= link_to_unless_current s.name, studium_path(s) %>
<% end %>
<span class="divider">/</span></li>
</li>
<% end %>
</ul>

9
app/views/studien/_studium.html.erb Normal file
View File

@@ -0,0 +1,9 @@
<div class="studium">
<h2><%= link_to studium.name + " " + studium.zahl.to_s, studium_semesteransicht_path(studium)%></h2>
<ul>
<li><b><%= studium.typ%> </b></li>
<li><b>Beschreibung:</b><br>
<%= !(studium.desc.to_s == "") ? studium.desc.html_safe : I18n.t("keine.beschreibung")%></li>
<li><%=link_to "Link zur Modulgruppenansicht",studium_path(studium) %> </li>
</ul>
</div>

4
app/views/studien/edit.html.erb
View File

@@ -1,6 +1,6 @@
<h1>Editing studium</h1>
<h1><%= I18n.t("studien.edit")%></h1>
<%= render 'form' %>
<%= link_to 'Show', @studium %> |
<%= link_to 'Back', studien_path %>
<%= link_to 'Back', studien_path %>

15
app/views/studien/index.html.erb
View File

@@ -1,15 +1,14 @@
<%= render 'layouts/topbar' %>
<h1><%= I18n.t("studien.list") %></h1>
<% @studien.sort_by{|z| z[:zahl]}.each do |studium| %>
<h2><%= link_to studium.zahl + " "+ studium.typ+" " + studium.name, studium_path(studium) %></h2>
<ul>
<li><%= render studium%></li>
</ul>
<% end %>
<br />
<% link_to I18n.t("studien.new"), new_studium_path %>
<% link_to I18n.t("modulgruppe.show"), modulgruppen_path %>
<%= toolbar_html(@toolbar_elements) %>
<br>
<%= render :partial=>'layouts/pretty_toolbar'%>
<% #toolbar_html(@toolbar_elements) %>

17
app/views/studien/semesteransicht.html.erb Normal file
View File

@@ -0,0 +1,17 @@
<%= render :partial=>'layouts/topbar'%>
<h1><%= @studium.typ %> <%= @studium.name %> (<%= @studium.zahl %>)</h1>
<%= raw(@studium.desc) %>
<% @studium.semester.each do |sem| %>
<div class="row-fluid">
<h2><%= sem.name %></h2>
<div class="span<%= sem[:width]%> min-width:13em;">
<ul>
<% sem.lvas.sort_by{|n| n[:name]}.each do |l| %>
<li><%= render :partial=>'lvas/lva_semester', :locals =>{:lva => l}%>
<% end %>
</ul>
</div>
<% end %>
<%= render :partial=>'layouts/pretty_toolbar', :locals=>{:elements=>@toolbar_elements} %>

50
app/views/studien/show.html.erb Executable file → Normal file
View File

@@ -1,33 +1,23 @@
<%= render 'layouts/topbar'%>
<div class="container-fluid">
<div class="row-fluid">
<p id="notice"><%= notice %></p>
<%= link_to '<i class="icon-list"></i>'.html_safe+ I18n.t("studien.allestudien"), studien_path,:raw=>true %>
<h1><%= @studium.typ %> <%= @studium.name %> (<%= @studium.zahl %>)</h1>
</div>
<%= raw(@studium.desc) %>
<% @studienphasen.each do |sp| %>
<% sp[:modulgruppen].each do |row| %>
<div class="row-fluid">
<% row.each do |modulgruppe| %>
<div class="span<%= sp[:width]%> min-width:13em;">
<%= render modulgruppe %>
</div>
<% end %>
</div>
<% end %>
<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| %>
<div class="row-fluid">
<% row.each do |modulgruppe| %>
<div class="span<%= sp[:width]%> min-width:13em;">
<%= render modulgruppe %>
</div>
<% end %>
<div class="row-fluid">
<span class="span12">
<%= link_to '<i class="icon-plus-sign"></i>'.html_safe+I18n.t("studien.newmodulgroup"), new_studium_modulgruppe_path(@studium),:class=>"btn" %> |
<%= link_to '<i class="icon-pencil"></i>'.html_safe+I18n.t("common.edit"), edit_studium_path(@studium) ,:class=>"btn"%>
<%= link_to 'Destroy', @studium, method: :delete, data: { confirm: 'Are you sure?' } %>
</span>
</div>
<% end %>
<% end %>
<%= render :partial=>'layouts/pretty_toolbar', :object=>@toolbar_modulgruppen %>
</div>
<%= render 'layouts/pretty_toolbar' %>
</div>
</div>
<%= toolbar_html(@toolbar_elements) %>