From 5c83d36ea58f954ba14a2aca98f585bb79cca023 Mon Sep 17 00:00:00 2001
From: Thomas Blazek <wtblazek@gmail.com>
Date: Mon, 19 Aug 2013 16:46:26 +0200
Subject: [PATCH] semester migration

---
 app/models/semester.rb                               | 12 ++++++++++--
 .../20130819143148_remove_name_from_semesters.rb     |  7 +++++++
 2 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/20130819143148_remove_name_from_semesters.rb

diff --git a/app/models/semester.rb b/app/models/semester.rb
index 913a370..7b6c364 100755
--- a/app/models/semester.rb
+++ b/app/models/semester.rb
@@ -13,9 +13,17 @@
 #
 
 class Semester < ActiveRecord::Base
-  attr_accessible :name, :nummer, :ssws, :lva_ids
+  attr_accessible :nummer, :ssws, :lva_ids
   has_and_belongs_to_many :lvas
   belongs_to :studium, :foreign_key => "studium_id"
-  validates :name, :presence => true
   validates :nummer, :presence => true
+
+  def name
+    if self.nummer == 0
+      return I18n.t("ohnezuordnung") + " (" + self.studium.name + ")"
+      else
+      return self.nummer.to_s + ". " + self.studium.name
+      end
+    end
+    
 end
diff --git a/db/migrate/20130819143148_remove_name_from_semesters.rb b/db/migrate/20130819143148_remove_name_from_semesters.rb
new file mode 100644
index 0000000..4f364e8
--- /dev/null
+++ b/db/migrate/20130819143148_remove_name_from_semesters.rb
@@ -0,0 +1,7 @@
+class RemoveNameFromSemesters < ActiveRecord::Migration
+  def change
+    remove_column :semesters, :name
+
+
+    end
+end