Permalink
Browse files

in progress

  • Loading branch information...
1 parent f1d0272 commit f2870f85a183945845baff3e6d747001d9e3fb29 @MikeBlyth committed Jan 22, 2013
View
@@ -2,7 +2,7 @@
# More info at https://github.com/guard/guard#readme
guard 'annotate' do
- watch( 'db/schema.rb' )
+ watch( 'db/structure.sql' )
# Uncomment the following line if you also want to run annotate anytime
# a model file changes
View
@@ -230,7 +230,7 @@ config
and other dependencies.
db
- Contains the database schema in schema.rb. db/migrate contains all the
+ Contains the database schema in structure.sql. db/migrate contains all the
sequence of Migrations for your schema.
doc
@@ -2,15 +2,16 @@
#
# Table name: diagnoses
#
-# id :integer not null, primary key
-# name :string(255)
-# label :string(255)
-# synonyms :string(255)
-# comments :string(255)
-# show_visits :boolean
-# sort_order :integer
-# created_at :datetime not null
-# updated_at :datetime not null
+# id :integer not null, primary key
+# name :string(255)
+# label :string(255)
+# synonyms :string(255)
+# comments :string(255)
+# show_visits :boolean
+# sort_order :integer
+# created_at :datetime not null
+# updated_at :datetime not null
+# with_comment :boolean
#
class Diagnosis < ActiveRecord::Base
@@ -2,15 +2,16 @@
#
# Table name: physicals
#
-# id :integer not null, primary key
-# name :string(255)
-# label :string(255)
-# synonyms :string(255)
-# comments :string(255)
-# sort_order :integer
-# show_visits :boolean
-# created_at :datetime not null
-# updated_at :datetime not null
+# id :integer not null, primary key
+# name :string(255)
+# label :string(255)
+# synonyms :string(255)
+# comments :string(255)
+# sort_order :integer
+# show_visits :boolean
+# created_at :datetime not null
+# updated_at :datetime not null
+# with_comment :boolean
#
class Physical < ActiveRecord::Base
View
@@ -2,15 +2,16 @@
#
# Table name: symptoms
#
-# id :integer not null, primary key
-# name :string(255)
-# label :string(255)
-# synonyms :string(255)
-# comments :string(255)
-# show_visits :boolean
-# sort_order :integer
-# created_at :datetime not null
-# updated_at :datetime not null
+# id :integer not null, primary key
+# name :string(255)
+# label :string(255)
+# synonyms :string(255)
+# comments :string(255)
+# show_visits :boolean
+# sort_order :integer
+# created_at :datetime not null
+# updated_at :datetime not null
+# with_comment :boolean
#
require 'selectable_items'
View
@@ -137,9 +137,10 @@ def diagnosis_labels
end
def arv_status_summary
- %w(stable drug_toxicity opportunistic_infection nonadherence).map |status|
- self.send "assessment_#{status}" ? status : nil
+ result = %w(stable drug_toxicity opportunistic_infection non_adherence).map do |status|
+ self.send("assessment_#{status}") ? status : nil
end.compact.join('; ')
+ return "#{result}." if result
end
# Default sort order will be on date
@@ -0,0 +1,7 @@
+class RenameVisitOi < ActiveRecord::Migration
+ def change
+ rename_column :visits, :assessment_oi, :assessment_opportunistic_infection
+ rename_column :visits, :assessment_nonadherence, :assessment_non_adherence
+ end
+
+end
Oops, something went wrong.

0 comments on commit f2870f8

Please sign in to comment.