diff --git a/app/models/lva.rb b/app/models/lva.rb index 86d1c5c..300e0e2 100755 --- a/app/models/lva.rb +++ b/app/models/lva.rb @@ -17,7 +17,7 @@ class Lva < ActiveRecord::Base has_paper_trail # Versionsverfolgung - attr_accessible :desc, :ects, :lvanr, :name, :stunden, :modul_ids, :semester_ids + attr_accessible :desc, :ects, :lvanr, :name, :stunden, :modul_ids, :semester_ids, :pruefungsinformation, :lernaufwand has_and_belongs_to_many :modul # Gehört zu einem Modul has_and_belongs_to_many :semester #Gehört zu einem Semester( derzeit nicht implementiert) diff --git a/app/views/lvas/_form.html.erb b/app/views/lvas/_form.html.erb index d43f386..be3ef9d 100755 --- a/app/views/lvas/_form.html.erb +++ b/app/views/lvas/_form.html.erb @@ -23,6 +23,8 @@
<%= f.input :desc %> + <%= f.input :pruefungsinformation %> + <%= f.input :lernaufwand %>
diff --git a/app/views/lvas/show.html.erb b/app/views/lvas/show.html.erb index b2d9e89..d5e5950 100755 --- a/app/views/lvas/show.html.erb +++ b/app/views/lvas/show.html.erb @@ -5,7 +5,14 @@

<%= @lva.name %>

- +

Prüfungsinformation

+
+ <%= @lva.pruefungsinformation %> +
+

Lernaufwand

+
+ <%= @lva.lernaufwand %> +

Beschreibung

<%= @lva.desc %> diff --git a/db/schema.rb b/db/schema.rb index 4dbfdf9..c8266dc 100755 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20130810214456) do +ActiveRecord::Schema.define(:version => 20130811191150) do create_table "attachments", :force => true do |t| t.string "name" @@ -90,10 +90,12 @@ ActiveRecord::Schema.define(:version => 20130810214456) do t.decimal "ects" t.string "lvanr" t.decimal "stunden" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false t.integer "modul_id" t.integer "semester_id" + t.text "pruefungsinformation" + t.text "lernaufwand" end create_table "lvas_moduls", :id => false, :force => true do |t|