From 9c1eff6bec64b6ba9be5a65ac6889282322d5d39 Mon Sep 17 00:00:00 2001
From: Thomas Blazek <wtblazek@gmail.com>
Date: Mon, 19 Aug 2013 17:59:29 +0200
Subject: [PATCH] Form kosmetik

---
 app/controllers/studien_controller.rb | 21 +++++++++++++++++++--
 app/models/semester.rb                | 12 +++++++++---
 app/views/lecturers/_form.html.erb    |  2 +-
 app/views/lvas/_form.html.erb         |  2 +-
 app/views/studien/verwalten.html.erb  |  8 ++++++++
 config/locales/de.yml                 |  1 +
 6 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/app/controllers/studien_controller.rb b/app/controllers/studien_controller.rb
index f5b9d63..22fae68 100755
--- a/app/controllers/studien_controller.rb
+++ b/app/controllers/studien_controller.rb
@@ -92,14 +92,16 @@ class StudienController < ApplicationController
   end
 
   def verwalten
-    @new_params={:std_verw=>params[:std_verw], :mg_verw=>params[:mg_verw], :m_verw=>params[:m_verw], :lva_verw=>params[:lva_verw], :b_verw=>params[:b_verw]}
+    @new_params={:std_verw=>params[:std_verw], :mg_verw=>params[:mg_verw], :m_verw=>params[:m_verw], :lva_verw=>params[:lva_verw], :b_verw=>params[:b_verw], :lec_verw=>params[:lec_verw]}
     if @new_params.values.compact.empty?
       @studien=Studium.all
       @modulgruppen=Modulgruppe.all
       @module=Modul.all
       @lvas=Lva.all
       @beispiele=Beispiel.all
+      @lecturers=Lecturer.all
     else
+
       if !@new_params[:std_verw].nil?
         @studien = [Studium.find(@new_params[:std_verw])]
       else
@@ -144,7 +146,7 @@ class StudienController < ApplicationController
         @beispiele = [Beispiel.find(@new_params[:b_verw])]
         temp = @lvas.map{|x| x.beispiele}.flatten.uniq #Force Force Lvas
         @lvas=@lvas.select{|k| temp.include?(k)}
-        temp = @module.map{|x| x.lvas}.flatten.uniq #Force Module
+        temp = @lva.map{|x| x.moduls}.flatten.uniq #Force Module
         @module=@module.select{|k| temp.include?(k)}
         temp = @module.map{|x| x.modulgruppen}.flatten.uniq # Force Modulgruppen
         @modulgruppen = @modulgruppen.select{|k| temp.include?(k)}
@@ -157,6 +159,21 @@ class StudienController < ApplicationController
         temp = @lvas.map{|x| x.beispiele}.flatten.uniq # Force beispiel
         @beispiele=@beispiele.select{|k| temp.include?(k)}
       end
+      if !@new_params[:lec_verw].nil?
+          @lecturers=[Lecturer.find(@new_params[:lec_verw])]
+        temp = @lecturers.map{|x| x.lva}.flatten.uniq #Force Force Lvas
+        @lvas=@lvas.select{|k| temp.include?(k)}
+        temp = @lva.map{|x| x.moduls}.flatten.uniq #Force Force Lvas
+        @module=@module.select{|k| temp.include?(k)}
+                temp = @module.map{|x| x.modulgruppen}.flatten.uniq # Force Modulgruppen
+        @modulgruppen = @modulgruppen.select{|k| temp.include?(k)}
+         temp = @modulgruppen.map{|x| x.studium}.flatten.uniq # Force Studien
+        @studien=@studien.select{|k| temp.include?(k)}
+        temp = @lvas.map{|x| x.beispiele}.flatten.uniq # Force beispiel
+        @beispiele=@beispiele.select{|k| temp.include?(k)}
+        else
+        @lecturers = @lvas.map{|k| k.lecturers}.flatten.uniq
+        end
     end
 
     @messages = []
diff --git a/app/models/semester.rb b/app/models/semester.rb
index 7b6c364..2adb3aa 100755
--- a/app/models/semester.rb
+++ b/app/models/semester.rb
@@ -21,9 +21,15 @@ class Semester < ActiveRecord::Base
   def name
     if self.nummer == 0
       return I18n.t("ohnezuordnung") + " (" + self.studium.name + ")"
-      else
+    else
       return self.nummer.to_s + ". " + self.studium.name
-      end
     end
-    
+  end
+  def name_kurz
+    if self.nummer == 0
+      return I18n.t("ohnezuordnung") + " (" + self.studium.abkuerzung + ")"
+    else
+      return self.nummer.to_s + ". " + self.studium.abkuerzung
+    end
+  end  
 end
diff --git a/app/views/lecturers/_form.html.erb b/app/views/lecturers/_form.html.erb
index baf4f49..d9f1416 100644
--- a/app/views/lecturers/_form.html.erb
+++ b/app/views/lecturers/_form.html.erb
@@ -3,7 +3,7 @@
     <%= f.input :name %>
     <%= f.input :email %>
     <%= f.input :oid %>
-    <%= f.input :picture %>
+    <%= f.input :picture, :as=>:file %>
     <%= f.input :lvas %>
   <% end %>
 
diff --git a/app/views/lvas/_form.html.erb b/app/views/lvas/_form.html.erb
index ec38a70..4fe897b 100755
--- a/app/views/lvas/_form.html.erb
+++ b/app/views/lvas/_form.html.erb
@@ -40,7 +40,7 @@
       <div class="span3">
 	
 	<%= f.input :semester, :as=>:check_boxes%>
-	
+	<%= f.input :lecturers, :as=>:check_boxes%>
       </div>
     <% end %>
     <%= f.actions do %>
diff --git a/app/views/studien/verwalten.html.erb b/app/views/studien/verwalten.html.erb
index c1008e8..3c6e4b4 100644
--- a/app/views/studien/verwalten.html.erb
+++ b/app/views/studien/verwalten.html.erb
@@ -28,6 +28,14 @@
 	  </div>
 	  <%= link_to 'Neues Studium', new_studium_path, :class=>'btn'%>
 	</div>
+	  </div>
+	  <h2>Vortragende </h2>
+	<div class="verwalten-block">
+
+	  <% @lecturers.each do |lec| %>
+	  	<%= (lec.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe  %> <%= link_to lec.name, lec %> | <%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_lecturer_path(lec)%> ||
+	  
+	  <% end %>
 	
       </div>
       <div class="row-fluid">
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 2784350..c3564ad 100755
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1,6 +1,7 @@
 # Sample localization file for English. Add more files in this directory for other locales.
 # See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 de:
+  ohnezuordnung: "Ohne Zuordnung"
   hello: "Hallo Welt"
   common:
     edit: "Bearbeiten"