forked from bofh/fetsite
Prüfungsinformationen und Typ zu lva hinzugefügt
This commit is contained in:
@@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
class Lva < ActiveRecord::Base
|
class Lva < ActiveRecord::Base
|
||||||
has_paper_trail # Versionsverfolgung
|
has_paper_trail # Versionsverfolgung
|
||||||
attr_accessible :desc, :ects, :lvanr, :name, :stunden, :modul_ids, :semester_ids, :pruefungsinformation, :lernaufwand
|
attr_accessible :desc, :ects, :lvanr, :name, :stunden, :modul_ids, :semester_ids, :pruefungsinformation, :lernaufwand, :typ
|
||||||
has_and_belongs_to_many :modul # Gehört zu einem Modul
|
has_and_belongs_to_many :modul # Gehört zu einem Modul
|
||||||
has_and_belongs_to_many :semester
|
has_and_belongs_to_many :semester
|
||||||
#Gehört zu einem Semester( derzeit nicht implementiert)
|
#Gehört zu einem Semester( derzeit nicht implementiert)
|
||||||
@@ -29,6 +29,7 @@ class Lva < ActiveRecord::Base
|
|||||||
validates_presence_of :ects # ECTS vorhanden?
|
validates_presence_of :ects # ECTS vorhanden?
|
||||||
validates :name, :presence=>true
|
validates :name, :presence=>true
|
||||||
validates :name, :uniqueness=>true# Name Eingetragen?
|
validates :name, :uniqueness=>true# Name Eingetragen?
|
||||||
|
validates :typ, :presence=>true
|
||||||
validates_presence_of :stunden # Stunden Eingetragen?
|
validates_presence_of :stunden # Stunden Eingetragen?
|
||||||
validates_presence_of :modul # Zugehöriges Modul eingetragen? (zumindest eines)
|
validates_presence_of :modul # Zugehöriges Modul eingetragen? (zumindest eines)
|
||||||
def add_semesters
|
def add_semesters
|
||||||
|
|||||||
@@ -8,8 +8,12 @@
|
|||||||
<div class="span9">
|
<div class="span9">
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<div class="row-fluid">
|
<div class="row-fluid">
|
||||||
|
<div class="span2">
|
||||||
<%= f.input :name, :wrapper_html=>{:class=>'span5'}%>
|
<%= f.input :typ %>
|
||||||
|
</div>
|
||||||
|
<%= f.input :name, :wrapper_html=>{:class=>'span10'}%>
|
||||||
|
</div>
|
||||||
|
<div class="row-fluid">
|
||||||
<div class="span7"%>
|
<div class="span7"%>
|
||||||
<div class="row-fluid">
|
<div class="row-fluid">
|
||||||
<%= f.input :lvanr, :wrapper_html=>{:class=>'span4'}%>
|
<%= f.input :lvanr, :wrapper_html=>{:class=>'span4'}%>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
<div class="row-fluid">
|
<div class="row-fluid">
|
||||||
<div class="span8">
|
<div class="span8">
|
||||||
<h1><%= @lva.name %></h1>
|
<h1><%=@lva.typ.to_s + ' ' + @lva.name %></h1>
|
||||||
<h2>Prüfungsinformation</h2>
|
<h2>Prüfungsinformation</h2>
|
||||||
<div class="lva-beschreibung">
|
<div class="lva-beschreibung">
|
||||||
<%= @lva.pruefungsinformation %>
|
<%= @lva.pruefungsinformation %>
|
||||||
|
|||||||
6
db/migrate/20130811191150_add_pruefungsinfos_to_lvas.rb
Normal file
6
db/migrate/20130811191150_add_pruefungsinfos_to_lvas.rb
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
class AddPruefungsinfosToLvas < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
add_column :lvas, :pruefungsinformation, :text
|
||||||
|
add_column :lvas, :lernaufwand, :text
|
||||||
|
end
|
||||||
|
end
|
||||||
5
db/migrate/20130812070544_add_typ_to_lvas.rb
Normal file
5
db/migrate/20130812070544_add_typ_to_lvas.rb
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
class AddTypToLvas < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
add_column :lvas, :typ, :string
|
||||||
|
end
|
||||||
|
end
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
#
|
#
|
||||||
# It's strongly recommended to check this file into your version control system.
|
# It's strongly recommended to check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema.define(:version => 20130811191150) do
|
ActiveRecord::Schema.define(:version => 20130812070544) do
|
||||||
|
|
||||||
create_table "attachments", :force => true do |t|
|
create_table "attachments", :force => true do |t|
|
||||||
t.string "name"
|
t.string "name"
|
||||||
@@ -96,6 +96,7 @@ ActiveRecord::Schema.define(:version => 20130811191150) do
|
|||||||
t.integer "semester_id"
|
t.integer "semester_id"
|
||||||
t.text "pruefungsinformation"
|
t.text "pruefungsinformation"
|
||||||
t.text "lernaufwand"
|
t.text "lernaufwand"
|
||||||
|
t.string "typ"
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "lvas_moduls", :id => false, :force => true do |t|
|
create_table "lvas_moduls", :id => false, :force => true do |t|
|
||||||
|
|||||||
Reference in New Issue
Block a user