+
<%= sem.name %>
+
+
+ <% sem.lvas.sort_by{|n| n[:name]}.each do |l| %>
+ - <%= render :partial=>'lvas/lva_semester', :locals =>{:lva => l}%>
+ <% end %>
+
+
+<% end %>
+
+<%= render :partial=>'layouts/pretty_toolbar', :locals=>{:elements=>@toolbar_elements} %>
diff --git a/app/views/studien/show.html.erb b/app/views/studien/show.html.erb
old mode 100755
new mode 100644
index 6c755c2..e813c9c
--- a/app/views/studien/show.html.erb
+++ b/app/views/studien/show.html.erb
@@ -1,33 +1,23 @@
+<%= render 'layouts/topbar'%>
-
-
<%= notice %>
-
- <%= link_to '
'.html_safe+ I18n.t("studien.allestudien"), studien_path,:raw=>true %>
-
-
<%= @studium.typ %> <%= @studium.name %> (<%= @studium.zahl %>)
-
- <%= raw(@studium.desc) %>
- <% @studienphasen.each do |sp| %>
- <% sp[:modulgruppen].each do |row| %>
-
- <% row.each do |modulgruppe| %>
-
- <%= render modulgruppe %>
-
- <% end %>
-
- <% end %>
+
+
<%= notice %>
+
<%= @studium.typ %> <%= @studium.name %> (<%= @studium.zahl %>)
+
+
+ <%= raw(@studium.desc) %>
+ <% @studienphasen.each do |sp| %>
+ <% sp[:modulgruppen].each do |row| %>
+
+ <% row.each do |modulgruppe| %>
+
+ <%= render modulgruppe %>
+
<% end %>
-
-
-
-
-<%= link_to ''.html_safe+I18n.t("studien.newmodulgroup"), new_studium_modulgruppe_path(@studium),:class=>"btn" %> |
-<%= link_to ''.html_safe+I18n.t("common.edit"), edit_studium_path(@studium) ,:class=>"btn"%>
-<%= link_to 'Destroy', @studium, method: :delete, data: { confirm: 'Are you sure?' } %>
-
+
+ <% end %>
+ <% end %>
+ <%= render :partial=>'layouts/pretty_toolbar', :object=>@toolbar_modulgruppen %>
+
+ <%= render 'layouts/pretty_toolbar' %>
-
-
-
-<%= toolbar_html(@toolbar_elements) %>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 97cc3af..84fa7a6 100755
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -10,20 +10,26 @@ de:
list: "Studien der Fakultät Elektrotechnik"
anzeigen: "Studium anzeigen"
new: "Neues Studium"
- newmodulgroup: "Neue Modulgruppe"
allestudien: "Alle Studien"
+ loeschen: "Dieses Studium löschen"
+ edit: "Studium bearbeiten"
modul:
- edit:
- title: "Bearbeite Modul"
- show:
- title: "Auflistung aller Module"
- link: "Alle Module auflisten"
-
+ edit: "Modul bearbeiten"
+ list: "Alle Module"
+ add: "Neues Modul"
+ keine:
+ beschreibung: "Keine Beschreibung vorhanden"
+ lva:
+ add: "Lva hinzufügen"
+ list: "Alle Lvas"
+ semester:
+ ohne: "Ohne Semesterzuordnung"
modulgruppe:
typ: "Typ"
addmodul: "Neues Modul hinzufügen"
studium: "Studium"
new: "Neue Modulgruppe"
+ list: "Alle Modulgruppen auflisten"
show:
title: "Auflistung aller Modulgruppen"
link: "Modulgruppen auflisten"
@@ -85,4 +91,17 @@ de:
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."
+ studium:
+ attributes:
+ zahl:
+ blank: "Geben Sie die Studienkennzahl an"
+ invalid: "Die eingegebene Form stimmt nicht (beginnend mit 033 oder 066, dann 3 Stellen)"
+ taken: "Die Kennzahl wird bereits verwendet"
+ name:
+ blank: "Geben Sie den Namen des Studiums ein"
+ taken: "Der Name ist bereits vergeben"
+ typ:
+ inclusion: 'Wählen Sie "Bachelor" oder "Master" aus'
+
+
diff --git a/config/routes.rb b/config/routes.rb
index 4e4ed7d..2603420 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,42 +1,41 @@
Fetsite::Application.routes.draw do
+
+ devise_for :users
+ resources :home, :only=>[:index]
+ #get 'home',:controller=>home,:action=>:index,:as=>"home_index"
+ scope '(:locale)/admin' do
+ resources :users
+ get 'config',:controller=>:config,:action=>:index , :as => 'config'
+ get 'config/get_git_update',:controller=>:config,:action=>:get_git_update, :as=>'config_getgitupdate'
+ get 'config/get_git_update',:controller=>:config,:action=>:get_git_update
+ end
+ devise_for :users
-
-
- devise_for :users
- resources :home, :only=>[:index]
- #get 'home',:controller=>home,:action=>:index,:as=>"home_index"
- scope '(:locale)/admin' do
- resources :users
- get 'config',:controller=>:config,:action=>:index , :as => 'config'
- get 'config/get_git_update',:controller=>:config,:action=>:get_git_update, :as=>'config_getgitupdate'
- get 'config/get_git_update',:controller=>:config,:action=>:get_git_update
-
-
-end
-
-devise_for :users
-
-resources :pages, :except => [:index] do
- member do
- post 'preview'
- end
-end
-get 'pages', :to =>'pages#show'
-scope '(:locale)' do
+ resources :pages, :except => [:index] do
+ member do
+ post 'preview'
+ end
+ end
+ get 'pages', :to =>'pages#show'
+ scope '(:locale)' do
+
resources :studien, :only=>[:show,:new,:edit,:update,:destroy]
resources :modulgruppen,:only =>[:create,:index]
+
resources :studien,:except=>[:show,:new,:edit,:update,:destroy], :shallow=>true do
resources :modulgruppen, :path => "(:locale)/modulgruppen"
+
end
+ get 'studien/:id/semesteransicht', :controller=>:studien, :action=>:semesteransicht, :as=>'studium_semesteransicht'
resources :semesters
resources :moduls
resources :lvas
resources :neuigkeiten
get 'rubriken/verwalten', :controller=>:rubriken, :action=>:alle_verwalten, :as=>'alle_verwalten_rubrik'
-
+
resources :rubriken do
- resources :neuigkeiten, :only=>[:new, :show]
+ resources :neuigkeiten, :only=>[:new, :show]
end
put 'rubriken/(:id)/addmoderator',:controller=>:rubriken,:action=>:addmoderator
get 'rubriken/:id/verwalten',:controller=>:rubriken,:action=>:verwalten, :as=>'verwalten_rubrik'
@@ -44,7 +43,7 @@ scope '(:locale)' do
get 'home/dev', :controller=>:home, :action=>:dev, :as=>'home_dev'
resources :beispiele
- end
+ end
# The priority is based upon order of creation:
# first created -> highest priority.
@@ -96,7 +95,7 @@ scope '(:locale)' do
# You can have the root of your site routed with "root"
# just remember to delete public/index.html.
- root :to => 'home#index'
+ root :to => 'home#index'
# See how all your routes lay out with "rake routes"
diff --git a/db/migrate/20130729085446_create_lva_semester_join_table.rb b/db/migrate/20130729085446_create_lva_semester_join_table.rb
new file mode 100644
index 0000000..cd29e07
--- /dev/null
+++ b/db/migrate/20130729085446_create_lva_semester_join_table.rb
@@ -0,0 +1,14 @@
+class CreateLvaSemesterJoinTable < ActiveRecord::Migration
+ def self.up
+ create_table :lvas_semesters, :id=>false do |t|
+ t.integer :lva_id
+ t.integer :semester_id
+ end
+ add_index :lvas_semesters, [:lva_id, :semester_id]
+ add_index :lvas_semesters, :semester_id
+ end
+
+ def self.down
+ drop_table :lvas_semesters
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index e41f87b..6a96d37 100755
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,17 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20130214233723) do
-
- create_table "beispiel_translations", :force => true do |t|
- t.string "locale"
- t.text "desc"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
- t.integer "beispiele_id"
- end
-
- add_index "beispiel_translations", ["locale"], :name => "index_beispiel_translations_on_locale"
+ActiveRecord::Schema.define(:version => 20130729085446) do
create_table "beispiele", :force => true do |t|
t.string "name"
@@ -60,6 +50,11 @@ ActiveRecord::Schema.define(:version => 20130214233723) do
t.integer "modul_id"
end
+ create_table "lvas_semesters", :force => true do |t|
+ t.integer "lva_id"
+ t.integer "semester_id"
+ end
+
create_table "modul_translations", :force => true do |t|
t.integer "modul_id"
t.string "locale"
diff --git a/spec/factories/beispiele.rb b/spec/factories/beispiele.rb
new file mode 100644
index 0000000..f9cfcdf
--- /dev/null
+++ b/spec/factories/beispiele.rb
@@ -0,0 +1,6 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+ factory :beispiel do
+ end
+end
diff --git a/spec/factories/lvas.rb b/spec/factories/lvas.rb
new file mode 100644
index 0000000..7a0091b
--- /dev/null
+++ b/spec/factories/lvas.rb
@@ -0,0 +1,6 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+ factory :lva do
+ end
+end
diff --git a/spec/factories/modulgruppen.rb b/spec/factories/modulgruppen.rb
new file mode 100644
index 0000000..90946d0
--- /dev/null
+++ b/spec/factories/modulgruppen.rb
@@ -0,0 +1,15 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+ factory :modulgruppe do
+ typ "Pflicht"
+ phase 1
+ name "Pflichtmodule 1"
+ desc "ASDFASDF"
+ factory :other_modulgruppe do
+ name "PFlichtmodule 2"
+ desc "sdafaswdfsfr"
+ end
+ end
+
+end
diff --git a/spec/factories/moduls.rb b/spec/factories/moduls.rb
new file mode 100644
index 0000000..ef48c30
--- /dev/null
+++ b/spec/factories/moduls.rb
@@ -0,0 +1,6 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+ factory :modul do
+ end
+end
diff --git a/spec/factories/studien.rb b/spec/factories/studien.rb
new file mode 100644
index 0000000..5677904
--- /dev/null
+++ b/spec/factories/studien.rb
@@ -0,0 +1,19 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+
+FactoryGirl.define do
+ factory :studium do
+ zahl "066506"
+ name "Automatisierung"
+ desc "TEST DESC"
+ typ "Master"
+
+ factory :other_studium do
+ name "Telecommunication"
+ desc "frueher Telekommungikation"
+ zahl "066507"
+ typ "Master"
+ end
+ end
+
+end
diff --git a/spec/factories/studium_factory.rb b/spec/factories/studium_factory.rb
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/spec/factories/studium_factory.rb
@@ -0,0 +1 @@
+
diff --git a/spec/models/beispiel_spec.rb b/spec/models/beispiel_spec.rb
new file mode 100644
index 0000000..cfaeb19
--- /dev/null
+++ b/spec/models/beispiel_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Beispiel do
+ pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/lva_spec.rb b/spec/models/lva_spec.rb
new file mode 100644
index 0000000..4209553
--- /dev/null
+++ b/spec/models/lva_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Lva do
+ pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/modul_spec.rb b/spec/models/modul_spec.rb
new file mode 100644
index 0000000..c4af626
--- /dev/null
+++ b/spec/models/modul_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Modul do
+ pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/modulgruppe_spec.rb b/spec/models/modulgruppe_spec.rb
new file mode 100644
index 0000000..3a863e3
--- /dev/null
+++ b/spec/models/modulgruppe_spec.rb
@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe Modulgruppe do
+ it "should not be valid without studium" do
+ mg=FactoryGirl.build(:modulgruppe)
+ mg.should_not be_valid
+ mg.should have(1).errors_on(:studium_id)
+ end
+ it "should be valid with studium" do
+ s=FactoryGirl.create(:studium)
+ mg=FactoryGirl.build(:modulgruppe)
+ mg.studium=s
+ mg.should be_valid
+ end
+ it "should not be valid without name" do
+ s=FactoryGirl.create(:studium)
+ mg=FactoryGirl.build(:modulgruppe)
+ mg.studium=s
+ mg.name=nil
+ mg.should_not be_valid
+ mg.should have_at_least(1).errors_on(:name)
+ end
+ xit "should not be valid with dubble name" do
+ s=FactoryGirl.create(:studium)
+ mg=FactoryGirl.build(:modulgruppe, name: "Gruppe 1", desc: "132")
+ mg.studium=s
+ mg.save
+ mg=FactoryGirl.build(:modulgruppe, name: "Gruppe 2", desc: "133")
+ mg.studium=s
+ mg.should_not be_valid
+ mg.should have_at_least(1).errors_on(:name)
+ end
+
+ it "should be valid with same name on different studien" do
+ s=FactoryGirl.create(:studium)
+ s2=FactoryGirl.create(:other_studium)
+ mg=FactoryGirl.build(:modulgruppe, name: "Gruppe")
+ mg.studium=s
+ mg.save
+ mg=FactoryGirl.build(:other_modulgruppe, name: "Gruppe")
+ mg.studium=s2
+ mg.should be_valid
+
+ end
+
+end
diff --git a/spec/models/studium_spec.rb b/spec/models/studium_spec.rb
new file mode 100644
index 0000000..0297604
--- /dev/null
+++ b/spec/models/studium_spec.rb
@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Studium do
+ [:name, :zahl].each do |attr|
+ it "should not be valid without #{attr}" do
+ s = FactoryGirl.build(:studium, attr=>nil)
+ s.should_not be_valid
+ end
+ end
+ it "should create studium with valid data" do
+ s=FactoryGirl.build(:studium)
+ lambda {
+ s.save!}.should change {Studium.count()}.by(1)
+ end
+ it "should not accept double entrys" do
+ FactoryGirl.create(:studium)
+ s=FactoryGirl.build(:studium)
+ s.should_not be_valid
+ s.should have_at_least(1).error_on(:name)
+ s.should have_at_least(1).error_on(:zahl)
+ end
+ it "should expect zahl to be 000.000" do
+ s=FactoryGirl.build(:studium, :zahl=>"000000")
+ s.should_not be_valid
+ s.should have_at_least(1).error_on(:zahl)
+ end
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
new file mode 100644
index 0000000..d2cbea7
--- /dev/null
+++ b/spec/spec_helper.rb
@@ -0,0 +1,38 @@
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+ENV["RAILS_ENV"] ||= 'test'
+require File.expand_path("../../config/environment", __FILE__)
+require 'rspec/rails'
+require 'rspec/autorun'
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+
+RSpec.configure do |config|
+ # ## Mock Framework
+ #
+ # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+ #
+ # config.mock_with :mocha
+ # config.mock_with :flexmock
+ # config.mock_with :rr
+
+ # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+ config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+ # If you're not using ActiveRecord, or you'd prefer not to run each of your
+ # examples within a transaction, remove the following line or assign false
+ # instead of true.
+ config.use_transactional_fixtures = true
+
+ # If true, the base class of anonymous controllers will be inferred
+ # automatically. This will be the default behavior in future versions of
+ # rspec-rails.
+ config.infer_base_class_for_anonymous_controllers = false
+
+ # Run specs in random order to surface order dependencies. If you find an
+ # order dependency and want to debug it, you can fix the order by providing
+ # the seed, which is printed after each run.
+ # --seed 1234
+ config.order = "random"
+end