public/stylesheets/genrept_hiv_reception.css
public/stylesheets/show_stats.css
@@ -232,7 +232,7 @@ class Report < OpenMRS
total = 0
results_to_be_passed_string.split(",").each{|x|total+=x.to_i rescue ""}
date = "#{v[0][0..15].to_date.strftime('%d-%b-%Y')}"
- html+= "<tr><td><input class='test_name' type=\"button\" onmousedown=\"document.location='/reports/user_stats_graph?id=#{results_to_be_passed_string}&date=#{date}&user_name=#{user_name}&stat_name=#{stat_name}';\" value=\"#{v[0][0..15].to_date.strftime('%d-%b-%Y')} - #{v[6][0..15].to_date.strftime('%d-%b-%Y')}\"/></td><td class='data_td'>#{v[0][17..-1]}</td><td class='data_td'>#{v[1][17..-1]}</td><td class='data_td'>#{v[2][17..-1]}</td><td class='data_td'>#{v[3][17..-1]}</td><td class='data_td'>#{v[4][17..-1]}</td><td class='data_td'>#{v[5][17..-1]}</td><td class='data_td'>#{v[6][17..-1]}</td><td class='data_totals_td'>#{total}</td></tr>"
+ html+= "<tr><td class='button_td'><input class='test_name' type=\"button\" onmousedown=\"document.location='/reports/user_stats_graph?id=#{results_to_be_passed_string}&date=#{date}&user_name=#{user_name}&stat_name=#{stat_name}';\" value=\"#{v[0][0..15].to_date.strftime('%d-%b-%Y')} - #{v[6][0..15].to_date.strftime('%d-%b-%Y')}\"/></td><td class='data_td'>#{v[0][17..-1]}</td><td class='data_td'>#{v[1][17..-1]}</td><td class='data_td'>#{v[2][17..-1]}</td><td class='data_td'>#{v[3][17..-1]}</td><td class='data_td'>#{v[4][17..-1]}</td><td class='data_td'>#{v[5][17..-1]}</td><td class='data_td'>#{v[6][17..-1]}</td><td class='data_totals_td'>#{total}</td></tr>"
}
html
end
app/models/report.rb
@@ -13,6 +13,11 @@ function myMwa(){
</script>
+<div id="popupBox_for_pg_info" align="center">
+<p>Searching in progress</p>
+<p><blink>Please wait.......</blink></p>
+</div>
+
<% relationships = "<option></option>"
["Parent","Child","Sister/brother","Spouse/partner","Other"].each{|relationship|
relationships+="<option>#{relationship}</option>"
@@ -26,10 +31,6 @@ function myMwa(){
<%= text_field_tag "last", {}, :ajaxurl => "/search/PatientName?field=family_name&value=", :allowFreeText => "true"%>
<label for="sex"><%= "Guardian " if params[:mode] == 'guardian' %>Sex</label>
<%= select_tag "sex", "<option></option>""<option>Female</option>" "<option>Male</option>" ,:tt_onload => "javascript:myMwa();" %>
- <label for="relationship_type"><%= "Guardian " if params[:field] == 'guardian' %></label>
- <%= select_tag "relationship_type",relationships if params[:field] == 'guardian' %>
+ <label for="relationship_type"><%= "Guardian " if params[:field] == 'guardian' || params[:mode] == "guardian" %></label>
+ <%= select_tag "relationship_type",relationships if params[:field] == 'guardian' || params[:mode] == "guardian"%>
<% end %>
-<div id="popupBox" align="center">
-<p>Searching in progress</p>
-<p><blink>Please wait.......</blink></p>
-</div>
app/views/patient/search.rhtml
@@ -1,105 +1,25 @@
-<style>
-table{
- background-color:#FFFF99;
- width:98%;
- -moz-user-select:none;
-}
-
-#table_head {
- width:760px;
- top:90px;
- position:absolute;
-}
-#table_data {
- -moz-user-select:none;
- height:435px;
- overflow:auto;
- position:absolute;
- top:131px;
- width:760px;
-}
-
-#data{padding-right:0;background:#FFFF99;width:742px;}
-#head{padding-right:1;background:#FFFF88;}
-
-#data td{
- -moz-user-select:none;
- background:#FFFF99 none repeat scroll 0 0;
- font-size:17px;
- padding-bottom:24px;
- padding-top:5px;
-}
-
-#head td {
- -moz-user-select:none;
- background:#FFFF88 none repeat scroll 0 0;
- font-size:22px;
- padding-top:3px;
-}
-
-#page_details{
- -moz-user-select:none;
- font-size:1.5em;
- position:absolute;
- top:10px;
- width:80%;
-}
-
-.patient_link{
- background-color:gainsboro;
- font-size:0.75em;
- height:47px;
- margin-bottom:-20px;
- margin-top:-11px;
- width:166px;
-}
-
-
-.buttonsDiv {
- -moz-user-select:none;
- display:block;
- height:250px;
- left:640px;
- position:absolute;
- right:10px;
- top:0;
- z-index:10;
-}
-
-#done_button {
- -moz-user-select:none;
- background-color:lightGreen;
- border:3px outset gray;
- color:black;
- display:block;
- font-size:24px;
- height:70px;
- margin:15px;
- text-align:center;
- width:100px;
-}
-</style>
+<%= stylesheet_link_tag "genrept_hiv_reception" %>
<div id="page_details">Latest reception encounters: <%= @stats_data.length rescue nil %></p>
From:<%= "#{@start_date} to #{@end_date}" %></div>
-<div id="table_head">
+<div id="head_div">
<table id="head">
<tr><td> </td><td>General Reception</td><td>HIV Reception</td><td>Date Registered</td></tr>
</table>
</div>
</br>
-<div id="table_data">
+<div id="data_div">
<table id="data">
<% @stats_data.each{|patient_id,encounters|
patient = Patient.find(patient_id) %>
<td id="patient_id"><input class='patient_link' type="button" onmousedown="document.location='/patient/set_patient/?id=<%=patient.id %>'" value='<%=patient.national_id rescue ''%>' /></td>
<td id="gen_recpt_date"><%= encounters.split(";")[0].split(",")[1] %> </td>
<td id="hiv_recpt_date"> <%= encounters.split(";")[1].split(",")[1] %></td>
- <td id="hiv_recpt_date"> <%= patient.date_created.to_date %></td>
+ <td id="registered_date"> <%= patient.date_created.to_date %></td>
</tr>
<% } %>
</table>
</div>
<div class="buttonsDiv">
- <button id='done_button' onmousedown="document.location='/patient/menu'>Done</button>
+ <button id='done_button' onmousedown="document.location='/reports/select'">Done</button>
</div>
app/views/reports/genrept_hiv_reception.rhtml
@@ -5,86 +5,7 @@
history.go(-1);
}
</script>
- <style>
-
-#done_button {
--moz-user-select:none;
-background-color:lightGreen;
-border:3px outset gray;
-color:black;
-display:block;
-font-size:24px;
-height:70px;
-margin:15px;
-text-align:center;
-width:100px;
-}
-
-
-.buttonsDiv {
--moz-user-select:none;
-display:block;
-height:250px;
-left:640px;
-position:absolute;
-right:10px;
-top:0;
-z-index:10;
-}
-
-#data{
--moz-user-select:none;
-height:435px;
-overflow:auto;
-position:absolute;
-top:96px;
-width:760px;
-}
-
-.data_td {
-padding-left:25;
-padding-right:18;
-text-align:center;
-}
-
-#data_table td{
-padding-top: 5px;
-padding-bottom: 15px;
-background:#FFFF99;
-text-align:center;
--moz-user-select:none;
-}
-
-#data_table {
-border-style:outset;
-background-color:lightyellow;
-width:80%;
-}
-
-#table_heading{padding-left:254;padding-top:15px;padding-bottom:15px;}
-.table_heading_td{text-align:center;font-size:15px;font-style:oblique;}
-
-.test_name{
-background-color:gainsboro;
-font-size:0.75em;
-height:48px;
-width:212px;
-margin-bottom:-8px;
-margin-top:5px;
-}
-
-.user_details{
-width:80%;
--moz-user-select:none;
-font-size: 1.5em;
-top:10px;
-position:absolute;
-}
-
-.data_totals_td{font-style:oblique;font-size:18px;}
-
-.user_details table{font-size:20px;}
-</style>
+ <%= stylesheet_link_tag "show_stats" %>
</head>
<body>
<div class="user_details">
@@ -97,7 +18,7 @@ position:absolute;
<div id='data'>
<table id="data_table">
<thead>
- <tr><td>WEEK</td><td class='table_heading_td'>Mon</td><td class='table_heading_td'>Tue<td class='table_heading_td'>Wed</td><td class='table_heading_td'>Thu</td><td class='table_heading_td'>Fri</td><td class='table_heading_td'>Sat</td><td class='table_heading_td'>Sun</td><td class='table_heading_td'>Total</td></tr>
+ <tr><td style="background:#FFFF99;">WEEK</td><td class='table_heading_td'>Mon</td><td class='table_heading_td'>Tue<td class='table_heading_td'>Wed</td><td class='table_heading_td'>Thu</td><td class='table_heading_td'>Fri</td><td class='table_heading_td'>Sat</td><td class='table_heading_td'>Sun</td><td class='table_heading_td' id="totals">Total</td></tr>
</thead>
<%= Report.detail_user_encounter_results_html(@results,@stats_name,@user.name) %>
</table>
app/views/reports/show_stats.rhtml
@@ -148,6 +148,11 @@
</style>
+<div id="popupBox_for_pg_info">
+ <p>Querying database</p>
+ <p><blink>Please wait.......</blink></p>
+</div>
+
<% form_tag :action => @form_action do %>
<% show_users = User.current_user.roles.map{|r|r.role.include?("superuser")}[0] rescue false %>
<%if show_users and @form_action == "stats_menu" %>
@@ -196,4 +201,3 @@
<%days = [""].concat day%>
<%= select_tag(:end_day, options_for_select(days), :field_type => 'number', :helpText => 'End Date') %>
<%end%>
-
app/views/reports/stats_date_select.rhtml
@@ -42,9 +42,9 @@
%>
<%= link_to_onmousedown_in_tr_td x.to_s.gsub("_"," "), :controller=>'reports', :action => "show_stats",:id=> @stats_data[x],:user_id => @user,:stats_name => x.to_s.gsub("_"," ") %>
<% } %>
- <%= link_to_onmousedown_in_tr_td 'Back', {:controller=>'patient', :action => "menu"},:id=>"done" %>
+ <%= link_to_onmousedown_in_tr_td 'Back', {:controller=>'reports', :action => "select"},:id=>"done" %>
<% else %>
- <%= link_to_onmousedown_in_tr_td 'Back', {:controller=>'patient', :action => "menu"},:id=>"done" %>
+ <%= link_to_onmousedown_in_tr_td 'Back', {:controller=>'reports', :action => "select"},:id=>"done" %>
<% end %>
</table>
</div>
app/views/reports/stats_menu.rhtml
1ed5c8ae42e3b386cc81bc7f0330a4c96eeab1f3
Mwatha Bwanali
ace@mombo.(none)
http://github.com/baobab/bart/commit/12f5e661955c62bfd9c0bb37d0d56f43ebbf08da
12f5e661955c62bfd9c0bb37d0d56f43ebbf08da
2009-03-17T12:09:19-07:00
2009-03-17T12:09:19-07:00
improving user interface with css
a5c0ca91ab42e640d35a9cffea7fd1a21d6bbe81
Mwatha Bwanali
ace@mombo.(none)