app/controllers/graph_controller.rb app/helpers/graph_helper.rb app/views/graph/show.html.erb public/javascripts/json2.js public/stylesheets/graph.css @@ -1986,6 +1986,5 @@ def search_by_name def admin_menu render(:layout => "layouts/menu") end - end app/controllers/patient_controller.rb @@ -459,11 +459,10 @@ class Encounter < OpenMRS def self.count_encounters_by_type_age_and_date(date,encounter_type = "General Reception") enc_type_id = EncounterType.find_by_name(encounter_type).id - #todays_encounters = Patient.find(:all, :conditions => ["DATE(date_created) = ?",date,enc_type_id],:group =>"patient_id") - todays_encounters = Encounter.find_by_sql("select p.patient_id from encounter e join patient p where Date(e.date_created)='#{date}' and p.patient_id=e.patient_id and e.encounter_type=17 group by e.patient_id").collect{|p|p.patient_id} rescue nil + todays_encounters = Encounter.find(:all,:conditions => ["DATE(encounter_datetime) = ? and encounter_type=?",date,enc_type_id]) patient_type = Hash.new(0) - todays_encounters.each{|p_id| - patient = Patient.find(p_id) + todays_encounters.each{|enc| + patient = Patient.find(enc.patient_id) patient_type["> 16,(#{patient.gender.first})"] += 1 if patient.age >= 16 and patient.gender == "Female" patient_type["> 16,(#{patient.gender.first})"] += 1 if patient.age >= 16 and patient.gender == "Male" patient_type["1 to 16,(#{patient.gender.first})"] += 1 if patient.age < 16 and patient.age >= 1 and patient.gender == "Female" app/models/encounter.rb @@ -137,14 +137,14 @@ function setFilingNumber(){ <tr><td><%= "1 to 16" %></td><td><%= total_under_16_over_1_male %></td><td><%= total_under_16_over_1_female %></td><td><%= total_under_16_over_1_female + total_under_16_over_1_male %></td></tr> <tr><td><%= "> 16" %></td><td><%= total_over_16_male %></td><td><%= total_over_16_female %></td><td><%=total_over_16_female + total_over_16_male %></td></tr> <tr><td>Total</td><td><%=total_male%></td><td><%=total_female%></td><td><%= total_male + total_female %></td></tr> - </table> + </table> <% end %> <% end %> <% if @show_next_appointment_date %> - Next appointment: <%= if @next_appointment_date then @next_appointment_date.strftime("%d-%b-%Y") else "(not set)" end %> - <!-- TODO display as a calendar --> + next appointment: <%= if @next_appointment_date then @next_appointment_date.strftime("%d-%b-%y") else "(not set)" end %> + <!-- todo display as a calendar --> <% end %> </div> </div> @@ -152,33 +152,33 @@ function setFilingNumber(){ <div class="right"> <% unless session[:encounter_datetime].nil? %> - <div class="date" <%= "style='background-color:tomato'" if session[:is_retrospective] %>><%= session[:encounter_datetime].strftime("%d %b %Y") %></div> + <div class="date" <%= "style='background-color:tomato'" if session[:is_retrospective] %>><%= session[:encounter_datetime].strftime("%d %b %y") %></div> <% end %> <table class="buttons"> <% if @show_standard_visit_encounter %> - <%= link_to_onmousedown_in_tr_td "Standard past visit", :controller => "standard_encounter", :action => 'menu' %> + <%= link_to_onmousedown_in_tr_td "standard past visit", :controller => "standard_encounter", :action => 'menu' %> <% end %> <% if @show_find_or_register_patient %> - <%= link_to_onmousedown_in_tr_td "Find or register patient", :action => 'search', :mode => "patient" %> + <%= link_to_onmousedown_in_tr_td "find or register patient", :action => 'search', :mode => "patient" %> <% elsif @show_find_patient %> - <%= link_to_onmousedown_in_tr_td "Find patient", :action => 'search', :mode => "patient" %> + <%= link_to_onmousedown_in_tr_td "find patient", :action => 'search', :mode => "patient" %> <% end %> <% if @show_find_or_register_guardian %> - <%= link_to_onmousedown_in_tr_td "Find or register guardian", :action => 'search', :mode => "guardian" %> + <%= link_to_onmousedown_in_tr_td "find or register guardian", :action => 'search', :mode => "guardian" %> <% end %> <% if @show_find_by_arv_number %> - <%= link_to_onmousedown_in_tr_td "Find patient by arv number", :action => 'search_by_national_id', :mode => "patient" %> + <%= link_to_onmousedown_in_tr_td "find patient by arv number", :action => 'search_by_national_id', :mode => "patient" %> <% end %> <% for form in @next_forms %> <%= link_to_onmousedown_in_tr_td form.name , :controller => 'form', :action => 'show', :id => form.id %> <% end unless @next_forms.nil? %> - <%= link_to_onmousedown_in_tr_td "Give drugs", :controller => "drug_order", :action => 'dispense' if @show_dispensation %> + <%= link_to_onmousedown_in_tr_td "give drugs", :controller => "drug_order", :action => 'dispense' if @show_dispensation %> <%= link_to_onmousedown_in_tr_td "Print visit summary",:controller => "label_printing",:action=>"print_drug_dispensed" if @show_print_visit_summary and not @next_appointment_date.nil? %> <%= link_to_onmousedown_in_tr_td "Update patient outcome", {:controller => "patient", :action => "update_outcome"}, :id => "update_patient_status" if @show_update_outcome%> <%= link_to_onmousedown_in_tr_td "Lab results", {:controller => "patient", :action => 'lab_menu'} if @show_lab_trail%> app/views/patient/menu.rhtml @@ -9,6 +9,7 @@ require 'has_many_through_association_extension' require 'fixtures' require 'float' require 'json/add/rails' +require 'scruffy' #require 'cached_model' if RUBY_PLATFORM =~ /java/ config/environment.rb @@ -123,8 +123,8 @@ describe PatientController do new_patient = @patient old_patient = patient(:pete) old_patient.set_filing_number - patient_controller.printing_message(new_patient,old_patient) - response.should have_text(expected_text) + expected_text = patient_controller.printing_message(new_patient,old_patient) + expected_text.should == "<div id='patients_info_div'>\n <table>\n <tr><td class='filing_instraction'>Filing actions required</td><td class='filing_instraction'>Name</td><td>Old Label</td><td>New label</td></tr>\n <tr><td>Move Active → Dormant</td><td class='filing_instraction'>Pete Puma</td><td class='old_label'><p class=active_heading>MPC Active</p><b></b></td><td class='new_label'><p class=dormant_heading>MPC Dormant</p><b>0 00 01</b></td></tr> \n <tr><td>Move Dormant → Active</td><td class='filing_instraction'>Andreas Jahn</td><td class='old_label'><p class=dormant_heading>MPC Dormant</p><b>0 00 01</b></td><td class='new_label'><p class=active_heading>MPC Active</p><b>0 00 01</b></td></tr>\n <tr><td></td><td></td><td><button class='page_button' onmousedown='print_filing_numbers();'>Print</button></td><td><button class='page_button' onmousedown='next_page();'>Done</button></td></tr>\n </table>" end end spec/controllers/patient_controller_spec.rb @@ -281,7 +281,8 @@ module ZebraPrinter #:nodoc: class StandardLabel < Label def initialize() - super(801, 329, 'T') + dimensions = (GlobalProperty.find_by_property("label_width_height").property_value rescue nil || "801,329").split(",").collect{|d|d.to_i} + super(dimensions.first, dimensions.last, 'T') end end vendor/plugins/zebra_printer/lib/zebra_printer.rb 40db25f59c66dc22c95824dc8d01a8277d7df562 ice mwatha@baobabhealth.org http://github.com/baobab/bart/commit/8c0fdbe16f7c93a98231d5b2bf078824c6f4b78d 8c0fdbe16f7c93a98231d5b2bf078824c6f4b78d 2008-10-16T07:54:09-07:00 2008-10-16T07:54:09-07:00 adding a new global property "label_width_height";fixing bugs in controller specs e352146a7857878efebaa3311880f8a76c85f2e9 ice mwatha@baobabhealth.org