Merge branch 'master' of github.com:fetsite/fetsite

app/models/lva.rb

@@ -45,7 +45,7 @@ class Lva < ActiveRecord::Base
   has_and_belongs_to_many :lecturers
   translates :desc,  :fallbacks_for_empty_translations => true
   
-  validates :lvanr,:format=>{ :with => /^[0-9][0-9][0-9]\.[0-9][0-9][0-9]$/}, :presence=>true, :uniqueness=>true # , :uniqueness=>true # LVA-Nummer muss das Format 000.000 besitzen (uniqueness?) oder 000 für nicht 
+  validates :lvanr,:format=>{ :with => /^[0-9][0-9][0-9]\.[0-9A][0-9][0-9]$/}, :presence=>true, :uniqueness=>true # , :uniqueness=>true # LVA-Nummer muss das Format 000.000 besitzen (uniqueness?) oder 000 für nicht 
   validates_presence_of :ects  # ECTS vorhanden?
   validates :name, :presence=>true, :uniqueness=>{:scope=>:typ}# Name Eingetragen?
   validates :typ, :presence=>true, :inclusion=> ERLAUBTE_TYPEN

app/models/studium.rb

@@ -33,7 +33,7 @@ class Studium < ActiveRecord::Base
   validates :abkuerzung, :length=>{:maximum=>5}, :format=>{:with=>/^[a-zA-z]{0,5}$/}
   validates :typ, :inclusion => {:in => ["Bachelor","Master"] }
   validates :name, :uniqueness => true, :presence=>true
-  validates :zahl, :presence=>true, :format=>{:with=>/^0(33|66)[0-9]{3}$/}, :uniqueness => true 
+  validates :zahl, :presence=>true, :format=>{:with=>/^[0-9A-Z]{4,10}$/}, :uniqueness => true 
   mount_uploader :picture, PictureUploader
   translates :desc,:shortdesc, :versioning =>true,:fallbacks_for_empty_translations => true
   def title_context
@@ -49,14 +49,14 @@ class Studium < ActiveRecord::Base
     end
     for i in 1..length
       semester =Semester.new()
-      semester.name = i.to_s + '. ' + self.name
+      #semester.name = i.to_s + '. ' + self.name
       semester.nummer = i
       semester.ssws = ((i % 2 == 0) ? "SS" : "WS")
       semester.save
       self.semester << semester
     end
     semester = Semester.new()
-    semester.name = 'Ohne Zuordnung (' + self.name + ')'
+    #semester.name = 'Ohne Zuordnung (' + self.name + ')'
     semester.nummer = 0
     semester.ssws = "WS"
     semester.save

app/views/lvas/show.html.erb

@@ -30,7 +30,7 @@
 	<ul>
 	  <li><b>LVA-Nummer:</b> <%=@lva.lvanr %></li>
 	  <li><b>ECTS:</b> <%=@lva.ects %></li>
-	  <li><b>Stunden:</b> <%=@lva.ects %></li>
+	  <li><b>Stunden:</b> <%=@lva.stunden %></li>
 	</ul>
 	<h2>Module</h2>
 	<ul>

app/views/moduls/_modul.html.erb

@@ -5,7 +5,7 @@
 
 <div class="row-fluid">
   <div class="span8">
-<h2>Beschreibung </h2>    
+<h2><%=I18n.t("modul.desc")%></h2>    
 <p>
   <%= raw(@modul.desc) %>
 </p>
@@ -13,7 +13,7 @@
 </div>
 <div class="span4">
   <div class="lva-sidebar">
-  <h2>Modulgruppen</h2>
+  <h2><%=I18n.t("modul.mgs")%></h2>
   <ul>
 <% @modul.modulgruppen.each do |mg| %>
 <li>
@@ -21,7 +21,7 @@
 </li>
 <% end %>
 </ul>
-<h2>Lvas</h2>
+<h2><%=I18n.t("modul.lvas")%></h2>
 <% @modul.lvas.each_slice(3) do |row| %>
 <ul>
 <% row.each do |lv| %>