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

Merge branch 'formulare'

Browse Source
This commit is contained in:
Thomas Blazek
2013-08-09 19:09:38 +02:00
parent 3638134394 a8c6ecd08c
commit 7242cab6c6
9 changed files with 182 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/assets/stylesheets/formtastic-changes.css.scss Normal file
View File

@@ -0,0 +1,20 @@
form.formtastic .stringish input {
width:90%;
}
form.formtastic textarea {
width:90%;
height:20em;
}
div.form-group {
border-width: 1px;
border-style: none;
padding: 10px;
// border-radius: 10px;
}
div.verwalten-block {
border-width: 1px;
border-style: solid;
padding: 5px;
}

7
app/controllers/modulgruppen_controller.rb
View File

@@ -51,15 +51,10 @@ class ModulgruppenController < ApplicationController
def create
@modulgruppe = Modulgruppe.new(params[:modulgruppe])
if !params[:studium_id].nil?
@studium=Studium.find_by_id(params[:studium_id])
else
@studium=Studium.find_by_id(params[:modulgruppe][:studium_id])
end
respond_to do |format|
if @modulgruppe.save
format.html { redirect_to @studium, notice: 'Modulgruppe was successfully created.' }
format.html { redirect_to @modulgruppe.studium, notice: 'Modulgruppe was successfully created.' }
else
format.html { render action: "new" }

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

@@ -1,13 +1,32 @@
<%= semantic_form_for @beispiel, :html => { :multipart => true } do |f| %>
<%= f.inputs do %>
<%= f.input :name %>
<%= f.input :desc %>
<%= f.file_field :beispieldatei %>
<%= f.hidden_field :beispieldatei_cache %>
<%= f.input :lva, :as=>:select, :collection => Lva.all%>
<% end %>
<div class="container-fluid">
<div class="span9">
<%= semantic_form_for @beispiel, :html => { :multipart => true } do |f| %>
<%= f.inputs do %>
<div class="row-fluid">
<div class="span4">
<%= f.file_field :beispieldatei %>
<%= f.hidden_field :beispieldatei_cache %>
</div>
<div class="span3">
<%= f.input :lva, :as=>:select, :collection => Lva.all%>
</div>
<div class="span5">
<%= f.input :name %>
</div>
</div>
<div class="row-fluid">
<%= f.input :desc %>
</div>
<% end %>
<%= f.actions do %>
<%= f.action :submit, :as => :input %>
<%= f.action :submit, :as => :input %>
<% end %>
<% end %>
<% end %>
</div>
</div>

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

@@ -1,15 +1,44 @@
<%= 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 %>
<%= f.input :stunden %>
<%= f.input :desc %>
<%= f.input :lvanr %>
<% end %>
<%= f.actions do %>
<%= f.action :submit, :as => :input %>
<% end %>
<%= semantic_form_for @lva do |f| %>
<div class="row-fluid">
<%= f.inputs do %>
<div class="span9">
<div class="row-fluid">
<div class="span9">
<div class="form-group">
<div class="row-fluid">
<%= f.input :name, :wrapper_html=>{:class=>'span5'}%>
<div class="span7"%>
<div class="row-fluid">
<%= f.input :lvanr, :wrapper_html=>{:class=>'span4'}%>
<%= f.input :ects, :wrapper_html=>{:class=>'span4'} %>
<%= f.input :stunden, :wrapper_html=>{:class=>'span4'} %>
</div>
</div>
</div>
</div>
<div class="form-group">
<div class="row-fluid">
<%= f.input :desc %>
</div></div>
</div>
<div class="span3">
<h1> BILD </h1>
<%= f.input :modul,:label=>'<b>Modul</b>'.html_safe, :as=>:check_boxes%>
</div>
</div>
</div>
<div class="span3">
<%= f.input :semester, :label=>'<b>Semester</b>'.html_safe, :as=>:check_boxes%>
</div>
<% end %>
<%= f.actions do %>
<%= f.action :submit, :as => :input %>
<% end %>
<% end %>

24
app/views/modulgruppen/_form.html.erb
View File

@@ -1,13 +1,25 @@
<%= semantic_form_for @modulgruppe do |f| %>
<%= f.inputs do %>
<%= f.input :studium_id, :as =>:select, :collection => Studium.all %>
<%= f.input :typ ,:as => :radio, :collection=>["Pflicht","Vertiefungspflicht","Wahl"]%>
<%= f.input :phase,:as => :radio,:collection=>1..3 %>
<%= f.input :name %>
<%= f.input :desc,:input_html=>{:rows=> 3 }%>
<% end %>
<div class="span8">
<div class="row-fluid">
<%= f.input :name, :wrapper_html=>{:class=>"span12"}%>
<div class="row-fluid">
<%= f.input :studium_id, :as =>:select, :collection => Studium.all, :wrapper_html=>{:class=>"span4"} %>
<%= f.input :typ, :collection=>["Pflicht","Vertiefungspflicht","Wahl"], :wrapper_html=>{:class=>"span4"}%>
<%= f.input :phase, :as=>:select, :collection=>1..3, :wrapper_html=>{:class=>"span4"} %>
</div>
</div>
<div class="row-fluid">
<%= f.input :desc %>
</div>
<% end %>
</div>
<%= f.actions do %>
<%= f.action :submit, :as => :input %>
<% end %>
<% end %>

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

@@ -1,15 +1,30 @@
<div class="container-fluid">
<%= semantic_form_for @modul do |f| %>
<%= 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 %>
<%= f.input :name ,:hint=>true%>
<%= f.input :desc, :as=>:tinymce_text %>
<%= f.input :depend %>
<div class="row-fluid">
<div class="span9">
<%= f.input :name ,:hint=>true%>
<div class="row-fluid">
<div class="span8">
<%= f.input :desc, :as=>:tinymce_text %>
</div>
<div class="span4">
<%= f.input :depend %>
</div>
</div>
</div>
<div class="span3">
<%= f.input :modulgruppen,:as => :check_boxes, :collection => Hash[Modulgruppe.all.map{|m| [m.studium.name + " " + m.name,m.id]}.sort] %>
</div>
</div>
<% end %>
<%= f.actions do %>
<%= f.action :submit, :as => :input %>
<%= f.action :submit, :as => :input %>
<% end %>
<% end %>
<% end %>
</div>
<%= tinymce %>

29
app/views/studien/_form.html.erb
View File

@@ -1,13 +1,28 @@
<div class="container-fluid">
<%= tinymce_assets %>
<%= semantic_form_for @studium do |f| %>
<%= semantic_form_for @studium do |f| %>
<div class="span9">
<%= f.inputs do %>
<%= f.input :zahl %>
<%= f.input :name,:append=>"NAME" %>
<div class="row-fluid">
<div class="span6">
<%= f.input :name,:append=>"NAME" %>
</div>
<div class="span3">
<%= f.input :zahl %>
</div>
<div class="span3">
<%= f.input :typ, :as=>:select, :include_blank=>false, :collection=>["Bachelor","Master"]%>
</div>
</div>
<div class="row-fluid">
<%= f.input :desc, :as=>:tinymce_text %>
<%= f.input :typ, :as=>:radio, :collection=>["Bachelor","Master"]%>
</div>
<% end %>
<%= tinymce %>
<%= tinymce %>
<%= f.actions do %>
<%= f.action :submit, :as => :input %>
<%= f.action :submit, :as => :input %>
<% end %>
<% end %>
</div>
<% end %>
</div>

44
app/views/studien/verwalten.html.erb
View File

@@ -1,8 +1,7 @@
<div class="container-fluid">
<%= render 'studien/tabs'%>
<div class="row-fluid">
<div class="span<%= @messages.empty? ? 10 : 7 %>">
<div class="container-fluid">
<div class="span<%= @messages.empty? ? 10 : 8 %>">
<div class="row-fluid">
<div class="span9">
<h1><%= I18n.t("studien.verwaltung") %></h1>
@@ -11,7 +10,7 @@
</div>
<div class="span3">
<div class="modulgruppe_phase_2">
<div class="verwalten-block">
<h2>Studien <%= link_to "new", new_studium_path %></h2>
<% @studien.each do |s| %>
<%= link_to s.name, s %> <%= (s.valid?) ? "Gültig" : "Problemfall" %> <br>
@@ -23,7 +22,7 @@
<div class="row-fluid">
<div class="span3">
<div class="modulgruppe_phase_2">
<div class="verwalten-block">
<h2>Modulgruppen <%= link_to 'new', new_studium_modulgruppe_path(Studium.first) unless Studium.first.nil? %></h2>
<% @modulgruppen.each do |mg| %>
<%= link_to mg.name, mg %> | <%= (mg.valid?) ? "Gültig" : "Problemfall" %><br>
@@ -31,7 +30,7 @@
</div>
</div>
<div class="span3">
<div class="modulgruppe_phase_2">
<div class="verwalten-block">
<h2>Module <%= link_to "new", new_modul_path %></h2>
<% @module.each do |m| %>
<%= link_to m.name, m %>
@@ -40,7 +39,7 @@
</div>
</div>
<div class="span3">
<div class="modulgruppe_phase_2">
<div class="verwalten-block">
<h2>LVas <%= link_to "new", new_lva_path %></h2>
<% @lvas.each do |lva| %>
<%= link_to lva.name, lva %> |
@@ -50,7 +49,7 @@
</div>
</div>
<div class="span3">
<div class="modulgruppe_phase_2">
<div class="verwalten-block">
<h2>Beispiele <%= link_to "new", new_beispiel_path %></h2>
<% @beispiele.each do |b| %>
<%= link_to b.name, b %>
@@ -62,28 +61,23 @@
</div>
</div>
</div>
<div class="span<%= @messages.empty? ? 2 : 5 %>">
<div class="row-fluid">
<h2>Error Log</h2>
<div class="span<%= @messages.empty? ? 2 : 4 %>">
<h2>Error Log</h2>
<ul>
<li><b>Red</b>: Error, Solve immediately</li>
<li><b>Black</b>: Warning, should be solved</li>
<li><b>Green</b>: Everything is fine</li>
</ul>
<div class="verwalten-block">
<ul>
<li><b>Red</b>: Error, Solve immediately</li>
<li><b>Black</b>: Warning, should be solved</li>
<li><b>Green</b>: Everything is fine</li>
</ul>
<div class="modulgruppe_phase_1">
<ul>
<% @messages.flatten.each do |m| %><br>
<li><%= m.html_safe %></li>
<% end %>
</ul>
<b><font color="green"><%= I18n.t("verwalten.fehler.keine").html_safe if @messages.empty?%></font></b>
</div>
<% @messages.flatten.each do |m| %><br>
<li><%= m.html_safe %></li>
<% end %>
</ul>
<b><font color="green"><%= I18n.t("verwalten.fehler.keine").html_safe if @messages.empty?%></font></b>
</div>
</div>
</div>
</div>
</div>

10
config/locales/de.yml
View File

@@ -91,7 +91,10 @@ de:
stunden:
blank: "Geben Sie die Stunden der LVA an"
lvanr:
invalid: "Geben Sie eine LVA-Nummer in richtigem Format an. Wenn die LVA noch keine Nummer hat, so geben sie 000 an."
invalid: "Geben Sie eine Nummer im Format 000.000 an."
blank: "Geben sie eine Lva-Nr an"
taken: "Die Lva-Nummer ist bereits vergeben"
studium:
attributes:
zahl:
@@ -118,4 +121,7 @@ de:
verwalten:
fehler:
keine: "Keine Fehlermeldungen oder Warnungen"
support:
array:
two_words_connector: ', '